Commit Graph

7116 Commits

Author SHA1 Message Date
Alena Prokharchyk fc33d69b2a CLOUDSTACK-4023: lock the network during the shutdownNetwork (just the way we do when implement network)
Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2013-08-02 13:20:47 -07:00
Alex Huang a673d17171 Added missing file 2013-08-02 11:07:56 -07:00
Alex Huang 8930cfa983 Switched over to use the new jobs framework 2013-08-02 11:07:55 -07:00
Alex Huang 0b1f97d048 Added Configurable interface 2013-08-02 11:07:54 -07:00
Alena Prokharchyk 4e53ce0677 CLOUDSTACK-4022: listProjects - do searchIncludingRemoved when getting info of corresponding projectAccount because when the project is being removed, its account is marked as Removed first, but we might still want to retrieve its info 2013-08-02 09:03:57 -07:00
Bharat Kumar 80e2934bb7 fix to add the the overcommit details of the vms in uservm details table when decreasing the overcommit to one.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-02 19:09:26 +05:30
Kishan Kavala 536fd0e8a1 CLOUDSTACK-4005: Do not allow snapshot on zone wide primary storage when KVM.snapshot.enabled is set to false 2013-08-02 18:04:28 +05:30
Bharat Kumar 65370f31bc upgrade to ASF 4.2 "cloud" Database Schema Inconsistencies on the Upgraded Setup - Table "volumes"
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-02 17:07:22 +05:30
Kishan Kavala 65fc2ec345 CLOUDSTACK-4032: Added KVM.snapshot.enabled config to 41to42 upgrade
Conflicts:
	setup/db/db/schema-410to420.sql
2013-08-02 12:04:33 +05:30
Fang Wang 8f7b90badf CLOUDSTACK-3759 [Automation] Failed to attach volume to VM, while vm are in stopped state Fix the null pointer.
Signed-off-by: Edison Su <sudison@gmail.com>
2013-08-01 17:47:11 -07:00
Alena Prokharchyk a3b86573b9 CLOUDSTACK-4020: lock nic entry in releaseNic method. Otherwise multiple threads can try to release the same nic at the same time, and it will lead to NPEs and backend failures
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-08-01 16:19:10 -07:00
Bharat Kumar 21f1b137cb Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command
Reviewed-by: Alena Prokharchyk

Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2013-08-01 13:36:20 -07:00
Nitin Mehta 2a20ac21ac =CLOUDSTACK-3102 ResourceDetail API - If you add detail for any resource other than volume and nic then throw an exception 2013-08-01 17:38:58 +05:30
Likitha Shetty 871e3bb279 CLOUDSTACK-3981. ListAccounts always sets 'networkTotal' to 0.
Add vpc resource count to the response. And set the right values for network resource count.
2013-08-01 14:18:33 +05:30
Bharat Kumar b9a2b07ceb Fix for incorect capacity displayed at the dashboard. 2013-08-01 12:31:07 +05:30
Harikrishna Patnala f12adfff8a CLOUDSTACK-3042: handle System VM Scaling up of memory/CPU based on the presence of tools in the template
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-08-01 12:20:48 +05:30
Mice Xia 51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-08-01 10:47:36 +08:00
Edison Su 4eefce15be CLOUDSTACK-3950: the issue can be reproduced by: copy iso failed during the first time, for some reason, then copy the same iso again, the issue be triggered. 2013-07-31 15:49:48 -07:00
Bharat Kumar 980b227817 recalculate the capacity after overcomit change.
Conflicts:
	server/src/com/cloud/capacity/CapacityManager.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-07-31 18:39:14 +05:30
Wido den Hollander ce06d6542a CLOUDSTACK-3951: Don't require SSH access to KVM nodes when cancelling maintenance 2013-07-31 15:07:32 +02:00
Harikrishna Patnala 3d9fc3dbc0 CLOUDSTACK-2717: listCapabilities API to return
allow.public.user.templates configuration parameter value
 defined at account level.
Signed by - Nitin Mehta<nitin.mehta@citrix.com>
2013-07-31 16:58:32 +05:30
Bharat Kumar c7a1dbb176 Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-31 15:31:42 +05:30
Harikrishna Patnala 2c53ede1de CLOUDSTACK-3848: Usage events for dynamic scaling of cpu/ram operation on VM 2013-07-31 15:07:17 +05:30
Min Chen 622a9e1b95 CLOUDSTACK-3949:[Object_Store_Refactor][Usage] No usage event is
generated for registered ISO.
2013-07-30 18:08:05 -07:00
Prachi Damle a8360e41c0 CLOUDSTACK-3942 NPE from findStoragePool method
Changes:
- Added null checks for podId

Conflicts:

	server/src/com/cloud/storage/StorageManagerImpl.java
2013-07-30 17:53:31 -07:00
Min Chen c2192808aa CLOUDSTACK-3686: Registering a template does not generate a usage event. 2013-07-30 17:35:12 -07:00
Alex Huang 1e1ee902a2 Moved over the new jobs framework from vmsync. This has not been integrated into the server package yet. Will do that next 2013-07-30 15:00:58 -07:00
Min Chen 730d045085 CLOUDSTACK-3857: create VOLUME_CREATE event at CreateVolumeCmd instead
of at AttachVolumeCmd.
2013-07-30 14:51:02 -07:00
Alena Prokharchyk 9f66d18de6 CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id 2013-07-30 14:30:53 -07:00
Alena Prokharchyk 9b7c4a6c47 CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
2013-07-30 14:13:58 -07:00
Alena Prokharchyk 244cf3b20a CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command
Fixed the build: use CallerContext instead of UserContext
2013-07-30 13:53:31 -07:00
Alena Prokharchyk 43dc85cea1 Revert "CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command"
This reverts commit 416331ae80.
2013-07-30 12:05:09 -07:00
Alena Prokharchyk 416331ae80 CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command 2013-07-30 11:17:17 -07:00
frank 6070a8b370 CloudStack CLOUDSTACK-1812
create physical network fails while creating basic zone
2013-07-30 11:11:17 -07:00
Marcus Sorensen 566ce3e625 Summary: Fix null pointer and op_networks blocker to account cleanup
Detail: Accounts can fail in cleanup/gc process due to inconsistent op_networks
table and null pointer in looking up account for event publishing.

BUG-ID: CLOUDSTACK-3957
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1375204815 -0600
2013-07-30 11:22:11 -06:00
Alena Prokharchyk a36c8a962b CLOUDSTACK-3902: createVpcOffering - throw an excpetion when sourceNat service is not passed in 2013-07-30 10:08:46 -07:00
Murali Reddy b2fdfc5084 CLOUDSTACK-3642: [Usage][PortableIP] CS is not generating usage events
for portable IPs

generating usage event for acquire and release
2013-07-30 19:01:10 +05:30
Murali Reddy c520aae346 CLOUDSTACK-2991: [PortableIPRange] CS should not allow portable IP with
sourceNAT service on it

if a portable ip is first IP associated with a non-VPC network, then its
being considered as source nat IP. This fix adds exemption for portable
IP not to be considred for source nat.
2013-07-30 15:49:09 +05:30
Thomas O'Dowd 5552d26872 Fix a few typos in ConfigurationManager.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit c78ed39b2f)
2013-07-30 11:25:15 +05:30
Prasanna Santhanam 34e751fb8d simulator supports migration
Add simultor to the seemingly strict filter which should happen within
the hypervisor resource and not the virtualmachine :/

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 3d4d350dbe)
2013-07-30 11:25:14 +05:30
Alex Huang 486e0d02f8 Fixed the applicationcontext.xml because I removed a class. oh kelven oh kelven, when can we get back our java based config for core components...this is so bad for refactoring 2013-07-29 19:13:33 -07:00
Alex Huang 1d4b22d6de Removed AgentMonitor and moved it inside AgentManager 2013-07-29 19:13:32 -07:00
Alex Huang d0a3a69170 Unused code removal 2013-07-29 19:13:31 -07:00
Alex Huang 46e644e134 Separate agentmanager from server code. Moved out ssvm. Remove methods that shouldn't be used 2013-07-29 19:13:31 -07:00
Edison Su f486d36f88 CLOUDSTACK-3908: fix extract path 2013-07-29 16:58:51 -07:00
Min Chen 42da3efbc3 CLOUDSTACK-3862: Remove S3/Swift-backed Secondary Storage Code. 2013-07-29 14:31:33 -07:00
Alena Prokharchyk e6ec6137ab CLOUDSTACK-3914: assignToLoadBalancer - return false, when empty vmIds list is passed in 2013-07-29 13:55:55 -07:00
Edison Su ae534388c0 CLOUDSTACK-3852: fix upload volume
Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
	server/src/com/cloud/template/TemplateManagerImpl.java
2013-07-29 11:50:16 -07:00
Edison Su d64c318f57 CLOUDSTACK-3510
Persist the download url in the db for volume download.
Signed off by : nitin mehta<nitin.mehta@citrix.com>

Conflicts:

	server/src/com/cloud/storage/VolumeManagerImpl.java
2013-07-29 11:50:15 -07:00
Alena Prokharchyk 4c0053fb2d CLOUDSTACK-3909: deployVM API - validate hypervisorType parameter when the vm is being deployed from ISO 2013-07-29 11:16:39 -07:00
Alex Huang a4cea4ebf2 Removed schema from the dependency of many components 2013-07-29 10:55:19 -07:00
Rajesh Battala 1b398aa3fc CLOUDSTACK-3846 usage event is not generated for volume resize 2013-07-29 18:51:00 +05:30
Bharat Kumar 4dc874fefc Cloudstack-2622 createipAlias.sh/deleteipAliash.sh should not be allowed with Isolated Guest Networks
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-29 18:36:20 +05:30
Bharat Kumar a8387568f3 Fixed the conditon which checks for the provider's capabilty and reapply ipaliases on virtual router restart.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-29 17:40:00 +05:30
Harikrishna Patnala 2f369973e2 CLOUDSTACK-3779: Support System vm scaling on VMWare
Marked the system template new system template as dynamicallyScalable
   - handled upgrade case
   - moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-29 15:25:07 +05:30
Harikrishna Patnala 8ef097ef6e CLOUDSTACK-3669: Bringing down the dynamic scalable check (for VM whether it has xstools or vmware tools in it) to the management layer.
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-07-29 15:16:21 +05:30
Sateesh Chodapuneedi 26d8c668f9 CLOUDSTACK-3870 [VMware] Management traffic network over a VLAN is not working
CLOUDSTACK-3437 In case of multiple physical network setup we see log message "can't get physical network"

CloudStack's control network is management network in case of VMware.
Processing management VLAN id provided in zone traffic label for management traffic.`

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-07-29 08:20:51 +05:30
Prachi Damle 790a02f936 CLOUDSTACK-3343 UI/API should also return the mode(Strict/Preferred) when listing the ServiceOffering that uses ImplicitDedicationPlanner
Changes:
- API is fixed to return the service_offering details

Conflicts:

	api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
2013-07-28 22:44:00 -07:00
Min Chen 1fb513e783 CLOUDSTACK-3861: Remove s3.enable and swift.enable from global setting. 2013-07-27 21:56:46 -07:00
Prachi Damle abfc351b78 CLOUDSTACK-3814 Duplicate entry for CPU, Public ip address in dashboard
Changes:
- ListCapacity API was searching the capacities per zone, pod and cluster causing duplicates to end up in th result.
- Instead we should group by zone if zone and pod both are null. Group by pod if zone is provided but no pod. Or group by cluster when zone and pod both are provided.
2013-07-27 16:24:48 -07:00
Harikrishna Patnala a8ad908666 CLOUDSTACK-3703: change service offering of stopped vm on
Conflicts:
	server/test/com/cloud/vm/UserVmManagerTest.java
2013-07-27 19:52:30 +05:30
Min Chen b17b40bbfe CLOUDSTACK-3857:[Object_Store_Refactor][Usage] Two VOLUME_CREATE usage
events are generated for one data disk after creating and attaching to
VM.
2013-07-26 17:45:05 -07:00
Min Chen c8cafb91a7 CLOUDSTACK-3818: NFS Cache Improperly Named. 2013-07-26 15:07:45 -07:00
Alex Huang f5e5b39c9b Moved the DB layer code into framework-db and change only the necessary projects to refer to it. Cut down on the dependencies introduced with all the code in utils. 2013-07-26 15:02:10 -07:00
Rajesh Battala 24a8d60d6f CLOUDSTACK-62 [AWS Style Health Checks] Response of the API listLoadBalancerRuleInstances should show the service state of a VM if health check is configured for it 2013-07-26 16:40:26 +05:30
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 2e0847bfe0. 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 4c81ea69c4 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 4c81ea69c4 2013-07-25 15:13:00 -07:00
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 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