26055 Commits

Author SHA1 Message Date
Rohit Yadav
008911d4b1 CLOUDSTACK-8195: Don't break IdP, return metadata XML
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 1172867df022358e8b5a2cd435dc1d8331fca8c9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-03 17:05:29 +05:30
Rohit Yadav
552f2ae60c CLOUDSTACK-8191: SAML users should have their own accounts
(cherry picked from commit 876c78fe1ba6abe132131b3449b21fd09f2c14e1)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-02 19:58:10 +05:30
Rohit Yadav
2f6691c6b9 CLOUDSTACK-8190: Fix xenserver traffic label for backward compatiblity
(cherry picked from commit 48ec9ac11b0772ffb9b7be4947f26aba0ad9b89d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/system.js
2015-02-02 16:20:50 +05:30
SrikanteswaraRao Talluri
fc6d925ade CLOUDSTACK-8161: added skips for the tests which are not supported on LXC:
1. vm create from ISO
2. dynamic scaling of VM.
3. windows VM on LXC
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-30 17:05:28 +05:30
SrikanteswaraRao Talluri
3eb5c76911 CLOUDSTACK-8161: added skips for the tests which are not supported on LXC:
1. snapshot related
2. template create from volume.
3. VM create from ISO.
4. Data volume related operations on a non RBD storage.

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-30 15:52:33 +05:30
Mike Tutkowski
5f16bf746b When canceling maintenance mode, the logic was looking at the id field of the work object instead of the id field of the VM object. 2015-01-29 23:11:29 -07:00
Mike Tutkowski
31f67c2b3c If the HypervisorType of a storage pool is Any, we need to retrieve hosts in the given zone for each HypervisorType. 2015-01-29 19:18:04 -07:00
Mike Tutkowski
326a175c08 Don't allow managed (primary) storage to be deleted if it contains one or more snapshots. 2015-01-29 16:51:45 -07:00
Mike Tutkowski
bd6a89939d Adding/updating comments around the volume's hypervisor snapshot reserve field 2015-01-29 15:50:42 -07:00
Mike Tutkowski
1b51bbbf74 Update hypervisor snapshot reserve for the root volume earlier than when it is currently being set 2015-01-29 13:01:51 -07:00
Marcus Sorensen
65e8e50dec LibvirtComputingResource: GuestOSName for OracleLinux 2015-01-29 08:28:55 -07:00
Rohit Yadav
0d74d7bdea use a preferable protocol that works on most infra
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f5f6c2d1a74444bbbf5a5f4565953b6410b87a5c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapperImpl.java

(cherry picked from commit 1bab1d0855f8813a54028aa58715db75d9c06ca0)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-29 16:03:29 +05:30
Marcus Sorensen
fa76b3c9f5 LibvirtComputingResource: make Oracle linux support virtio
Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2015-01-28 23:41:33 -07:00
Rohit Yadav
b9ae18c5fb appliance: except for openswan upgrade rest of the packages
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-28 23:26:47 +05:30
Rohit Yadav
6b6ce5d074 appliance: don't fail is bak is not found
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-28 18:27:19 +05:30
Mike Tutkowski
c2330f48dd Replace synchronized with the use of database locking 2015-01-27 17:36:21 -07:00
Jessica Wang
a696947eaf CLOUDSTACK-8182: UI > volumes > upload volume from URL > add Custom Disk Offering field which is optional. 2015-01-26 16:36:26 -08:00
Mike Tutkowski
8aa34d048a Putting in an extra check to see if this volume is already attached to a VM 2015-01-26 17:25:17 -07:00
Mike Tutkowski
c847831662 Do not allow deletion of the snapshot if the snapshot is being copied 2015-01-26 14:57:28 -07:00
Nitin Mehta
abf4e5c646 CLOUDSTACK-8181: Introducing a new allocator called firstfitleastconsumed. The purpose of this allocator is to find hosts/pools with least capacity usage (in terms of percentage) within the cluster and use those resources first before others. This allocator can be used changing vm.allocation.algorithm. For hosts it would decide the least consumed host through the setting host.capacityType.to.order.clusters to base the usage on cpu or ram.
Reviewed-by: Prachi
2015-01-26 10:48:06 -08:00
Daan Hoogland
29aeed71fc CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network 2015-01-26 16:54:53 +01:00
Mike Tutkowski
8204a44890 When creating a template from a managed-storage snapshot, put the snapshot in the Copying state before performing the copy (don't want to do anything with the snapshot until this process has completed) 2015-01-25 23:29:27 -07:00
Mike Tutkowski
f23c5ded0b Provide a more detailed snapshot name on the SAN side 2015-01-25 22:51:16 -07:00
Daan Hoogland
ebd7a7be5a state description c&p fix
cherry-picked from 766f8216a0bc96343a074c66757872052dd7b233, because of merge conflicts
2015-01-24 13:54:29 +01:00
Mike Tutkowski
e5ffcab09d Moving the call to getDeviceId(long, long) avoids a race condition when two volumes are being attached to a VM at the same time 2015-01-24 00:36:07 -07:00
Anthony Xu
7ef122dcc9 BUG-ID: CLOUDSTACK-8176
UI use xennetworklabel parameter name in zone create Wizards,
   in API, it uses xenservernetworklabel,
   the parameter name doesn't match, cause network name label not setup in CCP
2015-01-23 13:48:10 -08:00
Abhinandan Prateek
d9c5321a2d CLOUDSTACK-8178: fixed the mapping to match that on xen 6.5 2015-01-23 11:41:28 -05:00
Rohit Yadav
f9a8111e17 CLOUDSTACK-8151: Add removeRawUsageRecords API to cleanup old cloud_usage data
Call removeRawUsageRecords with interval (> 0) and it will clean up cloud_usage
table by removing records older than interval no. of days from today (current date)
and in case it runs when the job exec time is near, it will fail alerting
user to try again after a 15 min window.

There is an issue with async job scheduler, if this API were async it tries
to search and remove job from cloud_usage.async_job table and fails which is
why this API is sync and extends BaseCmd.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-23 19:38:32 +05:30
Rohit Yadav
9635e17701 hyperv: fix maven warning, add version to exec plugin
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-23 18:41:09 +05:30
Marcus Sorensen
35ede0418a CLOUDSTACK-8177
KVM: disable tickpolicy for kvmclock. Newer libvirt enforces that
kvmclock cannot accept parameters.
2015-01-23 02:46:16 -07:00
Marcus Sorensen
455998ce95 LibvirtComputingResource: Expose KVMStoragePoolManager
KVMStoragePoolManager is a singleton in practice, any plugin
or extension of LibvirtComputingResource will need to act on
the specific instance of KVMStoragePoolManager that LibvirtComputingResource
has initialized. Therefore, expose this variable for those who
wish to call storage commands from plugins or extensions.

Conflicts:

	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2015-01-23 02:45:54 -07:00
Mike Tutkowski
f983e6ed82 Un-plug any remaining VBDs and PBDs 2015-01-22 17:36:04 -07:00
Brian Federle
29fbc4b423 Reduce size of 'select view' dropdown to fix more dense toolbars. 2015-01-22 12:20:22 -08:00
Rohit Yadav
607ac8f4f4 services, awsapi: use better string comparision
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit d08369ad06b6d5ef801f79493c2aa4bdaeab1b83)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-22 18:10:23 +05:30
Gaurav Aradhye
8c68ac15c1 CLOUDSTACK-8170: Skipping tests on HyperV which try to scale VM in running state because feature not supported 2015-01-22 16:37:11 +05:30
Gaurav Aradhye
ab333e4e36 CLOUDSTACK-8124: Skipping snapshot tests on Hyper-V 2015-01-22 14:28:56 +05:30
Gaurav Aradhye
8894fc897b CLOUDSTACK-8174: Fixed cleanup issue in test_add_remove_network.py 2015-01-22 14:14:53 +05:30
Mike Tutkowski
2094286c8a Adding support for creating a volume from a snapshot when the snapshot is on managed storage 2015-01-21 13:06:05 -07:00
Rohit Yadav
664186f483 CLOUDSTACK-8160: use preferable protocols
(cherry picked from commit debfcdef788ce0d51be06db0ef10f6815f9b563b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-21 18:04:45 +05:30
Rohit Yadav
e7c80021d6 CLOUDSTACK-5946: Fix keystore filename to avoid warning logs
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit ed69d588ec56735451f2427c48bcfc499f863b9c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-21 18:04:00 +05:30
Mike Tutkowski
0f84e042b9 Adding support for creating a volume from a snapshot when the snapshot is on managed storage 2015-01-20 15:24:33 -07:00
Rohit Yadav
240e8ef8ac packaging: fix rpm package warning, fix day/date
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f702097b3ebf72d5b2b0725e07330f75a3657f81)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 07:49:19 +05:30
Rohit Yadav
60f18cc713 CID 1264632: Rely on a known and widely available encoding UTF8
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0763b5576dde92b1c4ecfbce3b3b593ed0ca90bc)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 07:49:09 +05:30
Abhinandan Prateek
6a20dd4ead CLOUDSTACK-8165: updating guest os id for xen template to corresponding 64 bit as default template is 64 bit 2015-01-19 16:03:56 +05:30
Abhinandan Prateek
d8def3dc0b CLOUDSTACK-8164: Look for all host to avoid NPE
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a1a601be5a08a42739c3ef999f551db1b7bd7749)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-19 11:30:49 +05:30
Rohit Yadav
cecab95cc9 CLOUDSTACK-8167: publish volume uuid on event bus in create snapshot cmd
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f6564b0b03362093efd1766a64e34184208eec3c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotCmd.java
2015-01-18 17:42:11 +05:30
Rohit Yadav
d9bd235bf6 engine/storage: add NPE check, break if parent snapshot is null
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit c06ca09b54b053b37db9d4fc47226558bf15c6ba)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-18 17:20:56 +05:30
SrikanteswaraRao Talluri
3384888c39 CLOUDSTACK-8161: mark the data volume related operations on LXC as skipped if RBD storage pool is not available
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-01-16 18:46:03 +05:30
Wei Zhou
71103772b7 CLOUDSTACK-7219: Cannot display Cluster Settings for missing commit 95e41fdf0da50c165a9317847058fce4efeddbcf 2015-01-16 10:56:25 +01:00
cloudtrends
5028874e1c under windows the publicKeyPath and privateKeyPath should replace from \ to / when send them into injectkeys.py , and use isOnWindows function . thanks karuturi kindly tips.
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #66
2015-01-16 11:33:00 +05:30