7373 Commits

Author SHA1 Message Date
Sanjay Tripathi
13fc4690fc CLOUDSTACK-3488: listStoragePools throws NPE if any of the storage pools are not in the right state.
This issue is reporducible if user adds a primary storage and quickly fires
listStoragePool API command without waiting for the responce of previous
createStoragePool API command. So during this period
(before receiving createStoragePool API resonce), the primary srorage is in
initialized status and the "scope" of storage is not set.
2013-07-26 16:00:06 +05:30
Alex Huang
2dc3ede0a8 Remove a line to make it compile 2013-07-25 20:29:13 -07:00
Alex Huang
111febc567 Fixed up the rest of the management server code that calls clustermanager 2013-07-25 19:57:45 -07:00
Alex Huang
9aaa378b08 Moved ClusterManager into it's own package. Removed the agent load balancing code. 2013-07-25 19:00:26 -07:00
Alex Huang
395cbcc023 Move the rest of the generics out of virtualmachinemanager 2013-07-25 19:00:25 -07:00
Min Chen
db93ebf169 Fix build break due to commit 2e0847bfe01e74f5c80e028b66aee74d7a07493f. 2013-07-25 18:04:12 -07:00
Min Chen
45d38c4142 CLOUDSTACK-3709:[Object_Store_Refactor][UI] Can't delete NFS Cache
storage through UI.  Fixed at API side.

Conflicts:
	server/src/com/cloud/storage/StorageManagerImpl.java
2013-07-25 17:33:28 -07:00
Alena Prokharchyk
2e0847bfe0 CLOUDSTACK-3232: InternalLB system vm - allocate control ip address from the private range when vm's hypervisor is vmWare 2013-07-25 16:39:23 -07:00
Edison Su
5e427bd2f6 CLOUDSTACK-2536: fix the regression introduced by 4c81ea69c4e8326cc81a0e2607f6a6d99645ce5f 2013-07-25 16:36:06 -07:00
Prachi Damle
dc66b6baa6 CLOUDSTACK-3821 RegisterTemplate URL validation issue
Changes:
- Added validation for the url path
2013-07-25 15:57:57 -07:00
Min Chen
588efa0150 Fix an incomplete logging message. 2013-07-25 15:47:39 -07:00
Edison Su
a39de009da CLOUDSTACK-2536: fix the regression introduced by 4c81ea69c4e8326cc81a0e2607f6a6d99645ce5f 2013-07-25 15:13:00 -07:00
Ian Duffy
eaa4143371 Merge LDAPPlugin
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-25 17:54:52 +05:30
Koushik Das
deb701b7e0 CLOUDSTACK-3493: [storage ref] Attach volume to VM is failing in case of Primary-Localstorage .
Some existing scenarios for root and data volume combination was not working. These are
a. Local root + Shared data
b. Shared root + Local data

Enabled these scenarios as part of this fix
2013-07-25 17:10:20 +05:30
Alex Huang
555211a080 Moved Configuration from api to utils and moved the package. This was done by eclipse so I only ran the unit test to verify everything is fine 2013-07-25 03:57:12 -07:00
Nitin Mehta
8ee4e5ac14 =Disable the test and write a better one 2013-07-25 15:52:05 +05:30
Nitin Mehta
1f64354ec8 CLOUDSTACK-3712
Use Vminstance instead of user vm for scaling stopped vms.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-25 14:58:42 +05:30
Chiradeep Vittal
1744ed7ad5 CLOUDSTACK-3626 register the correct user and account for api calls made with api keys and secret keys 2013-07-25 14:45:59 +05:30
Harikrishna Patnala
0010faee4b Fix for CLOUDSTACK-2536
Removing memoryovercommitratio and cpuovercommitratio parameters from addCluster and updateCluster APIs,
since these can be configurable using updateConfiguration API at cluster level.
By default while creating cluster these values are taken from global configuration parameters.
2013-07-25 13:42:08 +05:30
Edison Su
7f200d966e CLOUDSTACK-3681: fix bunch of bugs related to vmware, regarding to snapshot 2013-07-24 19:06:30 -07:00
Bharat Kumar
e14f5d0aeb Cloudstack-3694 Dnsmasq rewrite in bash
(Sheng: Fix typo, fix log and error message, remove 'set -x' in script)

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-07-24 14:00:31 -07:00
Edison Su
be3883b678 fix create template from snapshot if it's swift 2013-07-24 09:48:07 -07:00
Likitha Shetty
b7a483608f CLOUDSTACK-3735. Domain deletion fails even when the networks within the domain have been destroyed.
When a network is destroyed remove the corresponding network entry from domain_network_ref and account_network_ref table
2013-07-24 20:03:51 +05:30
Saksham Srivastava
135a2e66c5 CLOUDSTACK-2508: Template usage should report both physical and virtual sizes 2013-07-24 18:17:09 +05:30
Sateesh Chodapuneedi
79d49ca2dc CLOUDSTACK-3758 [Vmware][ZWPS] Failed to create volume from snapshot
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-24 03:51:23 +05:30
Alex Huang
e99a1ef1d9 Moved the rest of VirtualMachineManager to be vm agnostic 2013-07-23 18:24:59 -07:00
Alex Huang
9bc5870f01 Removed the remove method. Not sure why we added to VirtualMachineManager 2013-07-23 18:24:58 -07:00
Alex Huang
3ae0acc26f Forgot to save something in VirtualMachineManager 2013-07-23 18:24:58 -07:00
Alex Huang
861be3063c Simplify the components that VirtualMachineManager uses 2013-07-23 18:24:57 -07:00
Min Chen
67b15ed956 CLOUDSTACK-3639:Unable to create template from snapshot when there are
multiple secondary storages in the zone.
2013-07-23 16:56:46 -07:00
Sheng Yang
8295cb0ac2 CLOUDSTACK-3250: Add PvlanSetupCommand into maintenance mode allowed command list
Then the rule in the old host can be cleared.
2013-07-23 15:19:34 -07:00
Min Chen
956e8301c2 CLOUDSTACK-3716: State of expunged volumes are not consistent in volumes
table and volume_store_ref.

Conflicts:
	server/src/com/cloud/storage/VolumeManagerImpl.java
2013-07-23 15:06:34 -07:00
Alena Prokharchyk
57623832b0 CLOUDSTACK-3478: fixed volume destroy. #1 - don't call destroy() when the volume is in Expunged/Expunging/Destroy state. #2 - added state transition for Expunged state 2013-07-23 14:40:59 -07:00
Alena Prokharchyk
3962f117ac CLOUDSTACK-3733: fixed migrateVm - no need to cast vm to user vm to retrieve the iso information. Extract iso information from VirtualMachineProfile object passed to the method.
Conflicts:
	server/src/com/cloud/storage/VolumeManagerImpl.java
2013-07-23 11:04:39 -07:00
Wei Zhou
9985a895a4 CLOUDSTACK-3734: remove wrong break in 'for' block in VirtualMachineManagerImpl.java 2013-07-23 17:37:39 +02:00
Sanjay Tripathi
a7084b2dac CLOUDSTACK-3727: Resource Count calculation happens for deleted accounts on restart of managment server.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-23 20:25:15 +05:30
Likitha Shetty
7e87221372 CLOUDSTACK-3526. When volume upload is in progress the state of the volume is UploadError.
Update volume_view to join volumes table with volume_store_ref table instead of volume_host_ref table.
2013-07-23 18:44:39 +05:30
Saksham Srivastava
89b94bb754 CLOUDSTACK-3382. Alert should be raised if a vm is migrated from dedicated to non-dedicated resource and vice versa.
Alerts are generated for VM migration between:
1) Source host is dedicated and destination host is not.
2) Source host is not dedicated and destination host is dedicated.
3) Both hosts are dedicated to different accounts/domains
2013-07-23 13:38:14 +05:30
Alex Huang
51377c40f2 Forgot to populate a method to called advanceStop 2013-07-22 20:06:05 -07:00
Alex Huang
5297a071d2 Changed virtual machine stop to use uuid 2013-07-22 20:06:04 -07:00
Alex Huang
319d91e1c2 Removed the getByTypeAndId() method and replace it with getById method 2013-07-22 20:06:04 -07:00
Alex Huang
6ac361e6a2 Removed VM generic from VirtualMachineGuru. Part of the cleanup to make vmsync a simple vm manager that doesn't understand the different types of vms 2013-07-22 16:32:59 -07:00
Min Chen
db8b9ea53a Remove CLOUDSTACK-3513 debugging messages. 2013-07-22 16:18:16 -07:00
Min Chen
0fb3286cb1 CLOUDSTACK-3513:[Automation] Failed to copy iso and template between
zones. Failed to pass generated copy url to DownloadCommand.
2013-07-22 16:17:56 -07:00
Anthony Xu
3d05fb0b3e throw exception if stopping VM fails, then UI can show the error message in stead of fails silently 2013-07-22 16:14:01 -07:00
Anthony Xu
04cdd90a84 in one zone, Admin should not be allowed to add a Shared Network with a subnet that is already associated with another Vlan. 2013-07-22 14:29:38 -07:00
Alex Huang
1325014a03 Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms. 2013-07-22 11:48:11 -07:00
Alex Huang
7928963d16 Changed start to use uuid instead of generic vm start 2013-07-22 11:46:33 -07:00
Alena Prokharchyk
d0422904d7 CLOUDSTACK-3711: return descriptive error message to the regular user when his resource limit has exceed. No harm in returning this info as the user aware of the resource limits/number of resources available for allocation, for his account
Conflicts:
	server/src/com/cloud/api/ApiServer.java
2013-07-22 10:28:42 -07:00
Sheng Yang
2df1d7f328 Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm"
This reverts commit f99d599930a4bc1bfcdfd44d4f088cdae58890e5.

Due to it break vpc function and block regression test.

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImplTest.java
2013-07-21 22:23:48 -07:00