8350 Commits

Author SHA1 Message Date
Daan Hoogland
27bc791746 rats 2014-07-17 09:23:03 +02:00
Edison Su
771b53b342 CLOUDSTACK-4725: if storage pool has different path, but the uuid is the same, then treat them as the same storage pool 2014-07-16 16:38:17 -07:00
Daan Hoogland
5b37c65577 oversimplified test fixed 2014-07-16 17:28:01 +02:00
Hugo Trippaers
b0d7e10aef Prevent a NPE when shutting down a network that did not have a vlan
assigned yet.
2014-07-16 16:57:12 +02:00
Daan Hoogland
cc37eb50cf checkstyle: unused imports 2014-07-16 16:52:02 +02:00
Daan Hoogland
799258662c rvr4vpc simple test for deployRouter 2014-07-16 16:44:28 +02:00
Hugo Trippaers
dbc7d80329 Aggregate command cleanup is not required for the virtual router as we
already cleanup in the finish.

And consequently dies if somebody tries to test with assertions enabled.
2014-07-16 16:24:54 +02:00
Daan Hoogland
5ccd904e83 simple first test for backward compatibility testing in rvr4vpc work 2014-07-16 10:59:58 +02:00
amoghvk
3d8dd1c921 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2014-07-14 17:30:12 -07:00
Amogh Vasekar
c30821f703 CLOUDSTACK-6671: Missing patch in master 2014-07-14 17:00:08 -07:00
Amogh Vasekar
09069fcc87 CLOUDSTACK-6358: Add missing patches in master for KVM 2014-07-14 16:51:55 -07:00
Alena Prokharchyk
4f0640dac4 CLOUDSTACK-6595: allow to expunge the vm when its in Error state, in addition to Expunging/Destroyed states 2014-07-14 14:40:11 -07:00
Jayapal
778e04cb77 CLOUDSTACK-7104: perform ipassoc for ip when network is implemented after the gc 2014-07-14 19:50:36 +05:30
Alena Prokharchyk
63b81995f6 CLOUDSTACK-7100: update global config - trim leading and trailing whitespaces before global config value update 2014-07-11 16:02:51 -07:00
Alena Prokharchyk
7098367dc6 Fixed code causing warnings in ActionEventUtils 2014-07-11 14:59:39 -07:00
Likitha Shetty
00778de96e CLOUDSTACK-7099. Volume snapshot is not getting backed up.
Correctly inject ConfigDao into SnapshotStateListener.
2014-07-11 17:06:15 +05:30
Jayapal
73b622c823 CLOUDSTACK-7068: addIpToNicCmd changed to BaseAsyncCreate 2014-07-09 14:57:25 +05:30
Min Chen
cc8fc746df CLOUDSTACK-6468:IAM - Templates - Admin user is not allowed to edit
template and set isExtractable() paramater.
(cherry picked from commit b6617843d258d9437a17d39e698edba430768f9a)

Signed-off-by: Nitin Mehta <nitin.mehta@citrix.com>
2014-07-08 14:20:45 -07:00
Alena Prokharchyk
b517156fe3 CLOUDSTACK-7039: don't log exception stackTrace when catch sql exception on system/admin user/account insert 2014-07-07 16:45:23 -07:00
Frank.Zhang
65497b69c7 CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-07-07 14:52:45 -07:00
Frank.Zhang
3ddc9e7674 CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-07-07 11:40:21 -07:00
Santhosh Edukulla
a600d8408e Fixed Resource Leaks, null dereferences, few other issues reported by coverity 2014-07-04 16:17:58 +05:30
Daan Hoogland
b2d613f536 CLOUDSTACK-6242: catching all to allow continuation on configuration
error (CLOUDSTACK-7039 through CLOUDSTACK-7042)
2014-07-03 08:41:47 +02:00
Prachi Damle
48574f2d60 CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account
Changes:
- removing unused imports
2014-07-02 17:49:53 -07:00
Prachi Damle
9f68870a77 CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account
Changes:
-DeploymentPlanner should include disabled resources only when the VM owner is Admin account.
The disabled resources should be ignored when VM is owned by any other user.
2014-07-02 17:49:51 -07:00
Alena Prokharchyk
324b5d5a57 CLOUDSTACK-7045: save started/completed events for createPrivateGateway and createStaticRoute apis 2014-07-02 17:23:35 -07:00
Nitin Mehta
1f7a818440 CLOUDSTACK-7000: Fix bugs in ListSnapshotPolicy and updateSnapshotPolicy command
(cherry picked from commit 63c4f028971f80a9dfa32125a3eed71468209497)
2014-07-02 13:13:51 -07:00
Kishan Kavala
421d6029db Remove cloud-server dependency for cloud-usage project 2014-07-02 15:28:42 +05:30
Santhosh Edukulla
97d296bfbd Fixed Coverity reported performance issues like inefficient string concatenations, wrong boxing or unboxing types, inefficent map element retrievals
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-07-01 22:06:25 +02:00
Jayapal
f45c9f9d2f CLOUDSTACK-7027: Removing left over static nat rule 2014-07-01 15:16:35 +05:30
Nitin Mehta
0c9c5a71b4 CLOUDSTACK-4364: Restore VM - log a usage event for newly created volume 2014-06-30 14:41:37 -07:00
Mike Tutkowski
afd48819a6 Fixing an issue introduced with Review Request 22717 2014-06-27 14:03:08 -06:00
Hugo Trippaers
190116c94c Fix CID 1223793 Use equals to test equality of values contained in
objects.
2014-06-27 15:15:29 +02:00
Sanjay Tripathi
28505c2729 CLOUDSTACK-6884: List Capacity API always returns GPU capacity also even if type is different. 2014-06-27 15:58:42 +05:30
Nitin Mehta
80ef915fd5 CLOUDSTACK-7000: ListSnapshotPolicy should list by policyid. Introduce updateSnapshotPolicy command
(cherry picked from commit fce21439facea267d958d8939059ba65afb3578a)
2014-06-26 11:38:41 -07:00
Hugo Trippaers
cd0ef09344 Fix typo and add the right exception to the error map. 2014-06-25 15:51:28 +02:00
Hugo Trippaers
49b0936a72 Fix several potential issues reported by coverity. 2014-06-25 15:51:28 +02:00
Daan Hoogland
17850c7aff CLOUDSTACK-6747: call a more forgiving test on the supplied peer
cidr-list
2014-06-25 15:45:28 +02:00
Mike Tutkowski
3d9eaf0753 Fixed some spacing issues from 4d6c682f18d9bca50c145b55d8fa61ea1ab71755 2014-06-24 15:27:06 -06:00
punith-cloudbyte
4d6c682f18 supporting nfs protocol and resize feature for managed storage for xenserver
resize feature refactored

Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>
2014-06-24 15:16:45 -06:00
Nitin Mehta
cb5e8c591f CLOUDSTACK-6987: Add support for storing metadata for snapshot policy and controlling policy using display flag
(cherry picked from commit 5cf8edd7ec22095e70d72486a2380228fb3728af)
2014-06-24 14:07:39 -07:00
Mike Tutkowski
c344693e48 Inform the applicable storage plug-in's life cycle that capacity (bytes and/or IOPS) can be updated 2014-06-24 14:39:57 -06:00
Daan Hoogland
c79ab570b0 Revert "CLOUDSTACK-6967: Initial OVM3 drop"
This reverts commit 8a485b9b59e4108e862022baf7477f768380b325.
2014-06-24 10:24:01 +02:00
Funs
8a485b9b59 CLOUDSTACK-6967: Initial OVM3 drop
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)

Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js
2014-06-23 12:39:10 +02:00
Anshul Gangwar
6416de5770 CLOUDSTACK-6968: allowing cluster scope volumes to attach to any VM. If migration is
needed then first they will be migrated to appropriate cluster before attaching.
2014-06-23 12:15:10 +05:30
Santhosh Edukulla
1c80185170 Fixed Resource Leaks, null dereferences, invalid value comparisons, invalid result set loop
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-21 12:38:46 +02:00
Min Chen
a97455b602 CLOUDSTACK-6971: createAutoScaleVmProfile failed with NPE due to lack of bean
injection.
2014-06-20 14:28:26 -07:00
Kelven Yang
60f4203cbc Protect event interpretion from causing NPE exception 2014-06-20 10:16:04 -07:00
Anshul Gangwar
450d890942 CLOUDSTACK-6830: Fixed during VM migration, volumes on zone wide primary store
requires storage migration resulting in failure of VM migration. This also improves
the hostsformigration api. Firstly we were trying to list all hosts and then
finding suitable storage pools for all volumes and then we were checking whether
vm migration requires storage migration to that host. Now the process is updated.
We are checking for only those volumes which are not in zone wide primary store.
We are verifying by comparing volumes->poolid->clusterid to host clusterid. If it
uses local or clusterids are different then verifying whether host has suitable
storage pools for the volume of the vm to be migrated too.
2014-06-20 16:32:19 +05:30
Murali Reddy
7e355de365 CLOUDSTACK-6750: [OVS] With stretched network deploying vm in a ovs
disabled zone does not fail

Fix ensures that connectivity service provider is enabled in the zone on
to which nework is being streched.
2014-06-19 16:06:56 +05:30