6721 Commits

Author SHA1 Message Date
Min Chen
ef541a2a7b Fix CLOUDSTACK-2538: Add name as an optional parameter for addImageStore
api.
2013-05-20 13:39:43 -07:00
Min Chen
255d08ae7c Fix CLOUDSTACK-2586: ExtractTemplate for S3 template should give URL
directly from S3.
2013-05-20 12:06:36 -07:00
Edison Su
f7c1b711ad merge to master 2013-05-16 23:56:20 -07:00
Likitha Shetty
caf0dd22b7 Dedicate Public IP range - If every public ip range in the system is dedicated when an account with no dedicate ranges
acquires a new public ip the request should fail
2013-05-17 09:51:10 +05:30
Mice Xia
3ed9e42dd2 fix null pointer dereference in cloud-server 2013-05-17 09:44:01 +08:00
Prachi Damle
890603be37 Unit test does not use this file anymore. 2013-05-16 15:28:02 -07:00
Prachi Damle
a2eb7bab1e CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
- Changes merged from planner_reserve branch
- Exposing deploymentplanner as an optional parameter while creating a service offering
- changes to DeploymentPlanningManagerImpl to make sure host reserve-release happens between conflicting planner usages.
2013-05-16 15:02:17 -07:00
Vijayendra Bhamidipati
15be97772e PVLAN : Implementing PVLAN deployment capability for VMware deployments in cloudstack. 2013-05-16 14:50:16 -07:00
Kishan Kavala
d078f92167 CLOUDSTACK-2544: Fix NPE while comparing lastHostId during capacity calculation 2013-05-16 19:14:41 +05:30
Murali Reddy
f441582e1b CLOUDSTACK-2378: assignToGSLBRule or removeFromGlobalLoadBalancerRule APIs are failing when there are multiple physical network in a zone
adding support for deployments where multiple physical networks are configured for guest traffic in a zone
2013-05-16 18:26:14 +05:30
Murali Reddy
d2d0398e33 CLOUDSTACK-2529: GlobalLoadBalancerResponse should have the full FQDN
for the global load balanced service
2013-05-16 15:19:41 +05:30
Mice Xia
e26442f7d0 instead of '==', use equals() to compare two strings in cloud-server 2013-05-16 16:18:53 +08:00
Mice Xia
6d57393629 instead of using '==', use equals() to test Long value equality 2013-05-16 16:00:02 +08:00
Saksham Srivastava
e260817318 CLOUDSTACK-2130: UpdateDefaultNicForVirtualMachine api should also create usage events for updating new default network
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-05-16 14:22:36 +08:00
Wei Zhou
3fa8fda37c CLOUDSTACK-962: Because of the same reason to this (CLOUDSTACK-685)
https://reviews.apache.org/r/11157/

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-15 19:41:49 -07:00
Jayapal
56e8da7890 CLOUDSTACK-2134 updated acl checks for aquiring nic secondary ip 2013-05-15 19:41:49 -07:00
Likitha Shetty
fd354dbd7c CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 19:41:49 -07:00
Jayapal
85789534f0 CLOUDSTACK-2369 fixed adding same private gw twice 2013-05-15 19:41:49 -07:00
Wei Zhou
1f5ae4bae3 CLOUDSTACK:685 Fix user stat collection in PrepareStop part of VirtualNetworkApplianceImpl 2013-05-15 19:41:48 -07:00
Sanjay Tripathi
88422248cc CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts 2013-05-15 19:41:48 -07:00
Nitin Mehta
4c9ca2b502 CLOUDSTACK-2459 Fix the scale vm tests 2013-05-15 19:41:47 -07:00
Kishan Kavala
c75b1894bc Updated network acl service test to avoid default ACL modification 2013-05-15 19:41:47 -07:00
Kishan Kavala
2dc076f232 CLOUDSTACK-2487: Show error while adding acl_item to default ACL 2013-05-15 19:41:47 -07:00
Min Chen
b66c484905 Fix size issue in copying template from S3 to cache storage to make
system vm up.
2013-05-15 18:54:55 -07:00
Min Chen
d5050d3157 Fix ExtractVolume bug in generating URL. 2013-05-15 18:53:22 -07:00
Sheng Yang
2d2c0c48cd Merge branch 'pvlan'
Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2013-05-15 16:08:08 -07:00
Prachi Damle
ddd7cfd71c CLOUDSTACK-2519: VMs on local storage incorrectly destroyed when removing another host using deleteHost API
- For DeleteHost API: Search for Volumes in READY state on the local storage of the host to find VM's in 'Running' State
- For PrepareForMaintenance API: Search for Volumes not in Destroy or Expunging state to check if the Local Storage on the host is being used.
2013-05-15 13:28:41 -07:00
Alena Prokharchyk
9f59c618e2 CLOUDSTACK-2517: fixed private gateway creation. Following fixes went in:
1) Only PrivateNetworkGuru handles network creation for the private gateway. Exluded Guest Network Guru from this list (was mistakenly included as a part of merge for Nicira integration)
2) Pass vpc_id to createNetwork call when the network is created as a part of private gateway creation
3) Fixed VPC restart when there are multiple private gateways present (have to grab all the private gateways when creating nic profiles for the VPC router that is being re-created)
4) 41-42 db upgarde: set vpc_id for the private networks of the existing VPCs
2013-05-15 13:12:51 -07:00
Wei Zhou
8f7a51ee5f CLOUDSTACK-962: Because of the same reason to this (CLOUDSTACK-685)
https://reviews.apache.org/r/11157/

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-15 16:39:22 +01:00
Jayapal
36a312d4b2 CLOUDSTACK-2134 updated acl checks for aquiring nic secondary ip 2013-05-15 18:08:15 +05:30
Likitha Shetty
f893aa8a78 CLOUDSTACK-2116
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 18:05:01 +05:30
Jayapal
9b6513466f CLOUDSTACK-2369 fixed adding same private gw twice 2013-05-15 16:45:52 +05:30
Wei Zhou
7370638915 CLOUDSTACK:685 Fix user stat collection in PrepareStop part of VirtualNetworkApplianceImpl 2013-05-15 16:45:52 +05:30
Sanjay Tripathi
9542f10592 CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts 2013-05-15 15:28:37 +05:30
Nitin Mehta
24cdddbf5e CLOUDSTACK-2459 Fix the scale vm tests 2013-05-15 14:25:39 +05:30
Kishan Kavala
39caa0ebdd Updated network acl service test to avoid default ACL modification 2013-05-15 14:20:29 +05:30
Edison Su
a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Kishan Kavala
3388b77156 CLOUDSTACK-2487: Show error while adding acl_item to default ACL 2013-05-15 12:51:08 +05:30
Edison Su
879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Min Chen
c6a5a7ee00 Fix CLOUDSTACK-2495: public templates are not visible to non-root users. 2013-05-14 21:52:29 -07:00
Min Chen
564d3d6fa0 Fix CLOUDSTACK-2488: Delete iso async job is running forever. 2013-05-14 16:12:49 -07:00
Alena Prokharchyk
26cefdcfac When UUID field is null for existing records, set it to id
Conflicts:
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
2013-05-14 15:11:41 -07:00
Min Chen
252f384e89 Fix CLOUDSTACK-2485: ClassCastException in extracting ISO. 2013-05-14 14:57:02 -07:00
Min Chen
03c255068b Fix CLOUDSTACK-2484: not able to deploy VM from registered ISO. 2013-05-14 14:57:02 -07:00
Min Chen
2102ede2e7 Fix CLOUDSTACK-2469: default template is not downloaded. 2013-05-14 11:42:24 -07:00
Jayapal
46f8b6f34a CLOUDSTACK-2400 updated the error message and replacenetworkacl on private gateway 2013-05-14 16:11:33 +05:30
Jayapal
c94c71b4ce CLOUDSTACK-2441: Fix deleting private gateways while deleting vpc in case multiple private gateways 2013-05-14 16:10:38 +05:30
Alena Prokharchyk
dfdc089668 CLOUDSTACK-2465: fixed network creation in VPC - removed extra call to createGuestNetwork introduced by the NetworkACL feature merge 2013-05-13 15:28:08 -07:00
Sheng Yang
065d2561b9 CLOUDSTACK-2392: Not allow create pvlan network with ipv6 2013-05-13 11:40:40 -07:00
Min Chen
e6faa47a4b Remove unnecessary state machine entry after refactoring
sendMessageAsyncWithListener to use sendMessageAsync.
2013-05-13 11:36:44 -07:00