c06d319ef4
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-09 22:54:01 -04:00
911ed25fbc
Merge branch 'master' into vpc
2012-07-09 18:31:28 -07:00
c2134b431f
VPC: CS-15505 - allocate guest nics when new VR starts in VPC
2012-07-09 18:30:58 -07:00
525ba472e8
VPC: CS-15481: don't allow creating networkACLs for overlapping cidrs/ports
2012-07-09 18:23:58 -07:00
55db112990
CS-15503: don't send Ips in Releasing state as a part of VPC VR start
2012-07-09 18:23:50 -07:00
21519070fc
VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManager.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-09 18:23:35 -07:00
d52c6e2313
listPublicIpAddresses api: don't set associatedWithNetworkId if corresponding field is null in the DB
2012-07-09 18:13:32 -07:00
10dcc117c3
VPC: CS-15486 - prepare public nic as a part of VR deployment
2012-07-09 18:12:54 -07:00
29e90f8358
CS-15429: When an instance is created with data volume, account limit for this data volume was not checked against. Adding a check for that.
...
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-10 06:02:30 +05:30
ccf2851ca6
CS-12739: VM wizard: add asterisk next to network 'name' field
...
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
2012-07-09 16:41:14 -07:00
8404dba5e0
CS-15452: Fix wrong repsonse ID for s2s vpn
2012-07-09 16:21:21 -07:00
e91dd3e653
CS-12739:DeployvM wizard when choosing to Add a new network if user does not provide the network name then clicking on Next does nothing
2012-07-10 04:43:01 +05:30
84cdf2c28d
CS-15459: fixed listTags by resourceType
2012-07-09 14:59:58 -07:00
10e70bcb9c
CS-15392: Add error handling to edit user action
...
Original patch by: Olga Smola <olya.smola@gmail.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
2012-07-09 14:54:15 -07:00
20bbaf01ce
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-09 16:42:16 -04:00
f6aea09a16
CS-15498: Fix delete s2s vpn NPE
2012-07-09 12:04:57 -07:00
fa414bbf0a
It's due to replace.properties is missing, by default the password is cloud for user cloud
...
Revert "removing unneeded password from cloud-dev setup-script"
This reverts commit f157b702e4
2012-07-09 11:48:43 -07:00
fe15da5e3e
add replace.properties back
2012-07-09 11:47:10 -07:00
444dba6edd
Fixed origin merge cleanup error.
2012-07-09 11:49:22 -04:00
082d5634d1
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Conflicts:
server/src/com/cloud/netapp/NetappAllocator.java
server/src/com/cloud/netapp/dao/LunDao.java
server/src/com/cloud/netapp/dao/PoolDao.java
server/src/com/cloud/netapp/dao/VolumeDao.java
server/src/com/cloud/network/lb/dao/ElasticLbVmMapDao.java
server/src/com/cloud/servlet/ConsoleProxyClientParam.java
server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java
server/src/com/cloud/servlet/ConsoleProxyServlet.java
server/src/com/cloud/storage/dao/VolumeHostDao.java
server/src/com/cloud/storage/dao/VolumeHostDaoImpl.java
server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
2012-07-09 11:48:34 -04:00
f157b702e4
removing unneeded password from cloud-dev setup-script
2012-07-08 22:14:20 -04:00
a6086dc806
Removed @author tag from bunch of resources
2012-07-06 17:25:36 -07:00
63d6941bdc
ResourceTags: respect tag parameter in listTemplates/listIsos commands
...
Conflicts:
server/src/com/cloud/storage/dao/VMTemplateDao.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
2012-07-06 16:59:14 -07:00
5be0a3eeb1
VPC: fixed listNetworkACLs by networkId
...
Conflicts:
api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
2012-07-06 16:43:39 -07:00
8d38f4e051
CS-15167: AWS API calls do not honor the "admin" accounts ability to view/act on the resources owned by regular users.
2012-07-06 16:00:27 -07:00
c9eb0c59bf
VPC: allow adding private gateway to the VPC when the VR is in Stopped state
2012-07-06 15:28:07 -07:00
818a3c72ac
VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
2012-07-06 14:57:26 -07:00
47ea9f254c
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-06 17:28:38 -04:00
32fef61ac2
[Defect / Enhancement / New Feature] CS-15281 : Removal of third party dependencies in Citrix code base
2012-07-06 17:28:29 -04:00
ca231fe8be
CS-15401: Fix arrow BG for PF/LB UI for Japanese language
...
When opening Network screen, arrows to the right side of "show all"
for firewall, load balancer and port forwarding are divided in
Japanese localized environment. This fix adjusts the CSS to fit longer
characters in this condition.
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
2012-07-06 14:04:08 -07:00
353423acec
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/dao/NetworkDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
85677b71fe
Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
...
Conflicts:
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
2012-07-06 11:43:31 -07:00
710fa36bfd
CS-15474: fixed response name for the deleteTags API
2012-07-06 11:43:31 -07:00
ec26e836fc
CS-15459: fixed listTags for userVms
2012-07-06 11:43:31 -07:00
7acf8585b1
Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed
...
2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
api/src/com/cloud/api/commands/ListSnapshotsCmd.java
api/src/com/cloud/api/commands/ListVolumesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
api/src/com/cloud/api/response/VolumeResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
server/src/com/cloud/vm/dao/UserVmDaoImpl.java
2012-07-06 11:43:31 -07:00
7349842c42
CS-15116: Add missing scripts for XCP server
...
Thank for the help from Wilhem Putz(wp@typoheads.at ) to identify the issue.
2012-07-06 11:34:36 -07:00
d33429783f
Fixed deploydb
2012-07-06 11:18:16 -07:00
7044fa695d
VPC: CS-15469: createNetworkACL - startPort is not accepted if protocol is ICMP
2012-07-06 11:11:36 -07:00
e1fe1616d7
VPC: fixed CS-15465 - lb creation for ip not associated with any networks
2012-07-06 11:09:56 -07:00
e19e26ec4e
VPC: don't fail when create/remove static route when VPC VR is in Stopped state
2012-07-06 11:09:15 -07:00
b13acc6459
VPC: don't allow vm to be a part of more than one VPC
2012-07-06 11:09:06 -07:00
d6774e6a86
VPC: don't allow vpcs for the same account with overlapping cidrs
2012-07-06 11:08:58 -07:00
83f566cfe7
VPC: added "forVpc" (boolean) parameter to listRouters call - filter by the fact if router belongs to VPC or not
2012-07-06 11:08:48 -07:00
234ae447ee
VPC: added field networkacl_service_provided to physical_network_service_providers table
2012-07-06 11:08:39 -07:00
07eb6e3cf7
VPC: CS-15447 - fail vpc creation when vpc provider is not enabled at least in one physical network in the target zone
2012-07-06 11:08:28 -07:00
b4fec75ff7
VPC: added dns1/dns2 + networkDomain to the list of bootload args passed on VPC VR start
2012-07-06 11:08:17 -07:00
540ea34f57
VPC: removed NetworkACL interface; added getTrafficType() to Firewall
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-06 11:08:00 -07:00
0dfe603d48
VPC: createLB rule - removed duplicated check for ip services when createLB rule
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-06 11:07:26 -07:00
093af8a6a9
CS-15388: Fix labels
...
Labels for CPU/Mem (as found in compute offering window) are missing
the required values for CPU and RAM
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
2012-07-06 10:27:09 -07:00
54203f08ad
Small stop-gap fix to include cloud-elb.jar and cloud-netapp.jar in the rpms
2012-07-06 10:06:46 -04:00
Chip Childers
Alena Prokharchyk
Deepti Dohare
Brian Federle
Sheng Yang
Pranav Saxena
Edison Su
David Nalley
Likitha Shetty
Pradeep Soundararajan
Hugo Trippaers