7235 Commits

Author SHA1 Message Date
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
Chip Childers
8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04: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
Alex Huang
5595a099b2 Added commons io to server 2013-07-30 14:07:21 -07:00
Alex Huang
a8da8c8dff Added commons io to runtime 2013-07-30 14:07:20 -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 416331ae800a4511913f2c2b8ef25d4c2b8606b0.
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 c78ed39b2f53a3544b93515e6bb4889eef8c5888)
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 3d4d350dbe9728d3de42e4ee7a6ad06c6e10fced)
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