Commit Graph

21831 Commits

Author SHA1 Message Date
Min Chen 5d262d7b59 CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
migration to S3.
2013-12-26 12:39:39 -08:00
Devdeep Singh 30d55cf0c4 CLOUDSTACK-5456: Download root volume when vm is in stopped state fails on hyper-v. Made
changes to make sure the volume entry is created in the db with the right image format.
2013-12-26 19:13:31 +05:30
Koushik Das ad33f0ad66 CLOUDSTACK-2560: Adding duplicate ASA device entity failure should be handled with API
Handling duplicate ASA appliance addition gracefully
2013-12-26 17:21:58 +05:30
Jayapal 16763be77f Fixed issue in setting vm ip,mac in vm_instance table
This issue is not seen in 4.2, It is observed only in 4.3.
2013-12-26 16:58:04 +05:30
Saksham Srivastava ab4f095c68 CLOUDSTACK-4622:If a VM from guest network is added to network tier of VPC then IP reservation allows the CIDR to be a superset of Network CIDR for that VPC tier
Signed-off-by: Jayapal <jayapal@apache.org>
2013-12-26 16:58:04 +05:30
Devdeep Singh 1a033eddae CLOUDSTACK-5308, CLOUDSTACK-5542: Copy command didn't handle the scenario
when a volume is copied to secondary storage for template creation.
Updated the command to handle it.
2013-12-26 15:32:41 +05:30
Devdeep Singh c75f8bcc06 CLOUDSTACK-5420: The agent manager wasn't transitioning the host to maintenance
mode if their are no vms running on the host. Made the change to do so.
2013-12-26 11:15:51 +05:30
Devdeep Singh 38d6c2ea60 CLOUDSTACK-5639: Cold storage migration doesn't work for hyper-v. Made
changes to make sure CopyCommand honours requests for volume copy from
primary to secondary storage and vice versa.
2013-12-25 15:23:48 +05:30
Alena Prokharchyk 03226ba539 Added deviceId parameter to the NicResponse. This information can be useful for the user if he wants to see the order of the networks in his vm 2013-12-24 15:34:43 -08:00
Kishan Kavala 435aefec15 CLOUDSTACK-5254: If VR is not upgraded, leave firewall rule in Active state. Rule will be applied when VR is upgraded 2013-12-24 18:13:50 +05:30
Likitha Shetty e659751a8a CLOUDSTACK-5508. Vmware - When there are multiple secondary stores, the newly added secondary store is not being selected for backing up snapshots.
If the snapshot being backed up is a a delta snapshot, pick the image store where the parent snapshot is stored. Otheriwse pick a random image store.
2013-12-24 17:34:19 +05:30
Girish Shilamkar b544669a84 CLOUDSTACK-5497: Fix test_guest_vlan_range.py to get free vlan range 2013-12-24 11:11:17 +05:30
Alena Prokharchyk 914bc46484 CLOUDSTACK-5390: when calculate index (page #) in NetworkManager, rely on fact that getStartIndex() returned by API, returns pageSize*(page-1). So to get index(page), you need to do the reverse calculation 2013-12-23 16:28:06 -08:00
Alena Prokharchyk fbba17e68c Resource metadata support for cloudStack user 2013-12-23 14:25:07 -08:00
Alena Prokharchyk 79e64aa535 Resource metadata support for Disk Offering 2013-12-23 12:36:13 -08:00
Jessica Wang 8f9342425d CLOUDSTACK-5345: UI > Virtual Routers > Group by account > pass listAll=true to listAccounts API. 2013-12-23 12:20:42 -08:00
Jessica Wang 1e0ed7d5f8 CLOUDSTACK-5606: UI > Copy Template action, Copy ISO action is now availble to region-wide secondary storage (S3, Swift). 2013-12-23 11:34:30 -08:00
Jessica Wang 2868f36dbd CLOUDSTACK-5612: UI > Network > Guest Networks > detailView > to distinguish between non-vpc network and vpc network(tier) easier, move VPC ID field up. 2013-12-23 10:56:12 -08:00
Daan Hoogland 3da5de545e create a (mini-)branch instead of creating a commit to revert 2013-12-23 14:35:29 +01:00
Antonio Fornie dad4249498 SecurityProfile and ACL for NiciraNvpApi, including Unit and Integration tests
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-23 14:30:03 +01:00
Gaurav Aradhye a160b46cd4 CLOUDSTACK-4780: Changes related to checking snapshot path
on NFS server, also made marvin import paths specific
2013-12-23 17:58:51 +05:30
Gaurav Aradhye 5d03fa83a2 CLOUDSTACK-5518: Fixing non contiguous vlan test case 2013-12-23 17:56:14 +05:30
Kishan Kavala cca60cd86d fix network ACL unit test 2013-12-23 17:27:16 +05:30
Kishan Kavala 0335009a1e CLOUDSTACK-5300: Catch vpn add error failure, removed failed user and return failure status 2013-12-23 17:15:21 +05:30
Kishan Kavala 55d84bdd5f CLOUDSTACK-5587, CLOUDSTACK-5589: Router version in 2.2.x routers is null. Added null check when comparing min version 2013-12-23 17:15:03 +05:30
Devdeep Singh 34894f5a9d CLOUDSTACK-5564: The deployment on other hosts in the cluster used to fail because
cloudstack though the storage pool wasn't accessible from the host. Make sure host
to pool mapping is added in the storage_pool_host_ref table when a host is added
to the cluster.
2013-12-23 17:06:11 +05:30
Devdeep Singh 216554d574 CLOUDSTACK-5210: Fix the sockets reported by the hyperv agent. 2013-12-23 13:25:22 +05:30
Girish Shilamkar fde14bcc32 Revert "CLOUDSTACK-4780: Changes related to checking snapshot on NFS server"
This reverts commit 33fb241fdf.
2013-12-21 12:47:32 +05:30
Nitin Mehta 83bbe682d9 CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 17:42:45 -08:00
Nitin Mehta edc1b78d84 Revert "Revert "CLOUDSTACK-5281:""
This reverts commit ab37009e90.
2013-12-20 17:30:05 -08:00
Alex Huang ab37009e90 Revert "CLOUDSTACK-5281:"
This reverts commit 6b62a04eaf.
2013-12-20 17:23:33 -08:00
Alex Huang c2baed665b Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies 2013-12-20 17:21:34 -08:00
Nitin Mehta 6b62a04eaf CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 16:58:43 -08:00
Nitin Mehta f083f91b0b CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
2013-12-20 15:33:37 -08:00
Brian Federle 08a69b0053 CLOUDSTACK-5544: Snapshot action filter: Remove check on volume state
Removes conditional check of volume state for snapshot action filter,
since it causes a null pointer when trying to access view outside the storage
section. Now only '.revertable' attribute is checked. Storage state should now
be verified at the API level only.
2013-12-20 13:48:21 -08:00
Alena Prokharchyk 1832cf6660 CLOUDSTACK-5597: don't perform data disk allocation on the primary storage when attachVolume calls is made for the vm which ROOT disk hasn't been created yet. 2013-12-20 13:39:13 -08:00
Brian Federle 932758e2ef CLOUDSTACK-5551: Pass search 'name' field to listConfigurations UI
Passes search bar value (by 'name') for the settings in the following sections'
detail views:

-Account
-Primary storage
-Cluster
-Zone
2013-12-20 13:38:46 -08:00
Edison Su 9947e688c4 CS-18564: create template from snapshot failed, due to the volume(the
snapshot created from) is deleted.
2013-12-20 12:45:02 -08:00
Edison Su e52a4d9306 CLOUDSTACK-5572: quicevm won't save memory, as it needs pv driver installed
Conflicts:

	engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
2013-12-20 12:36:30 -08:00
Edison Su 179cdea8e9 CLOUDSTACK-5596: reload vm state after vm been force stopped
Conflicts:

	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
2013-12-20 11:26:50 -08:00
Daan Hoogland 7b0c85da3c CLOUDSTACK-5502: interpret vlan='untagged' as vlan == null 2013-12-20 13:46:58 +01:00
Rajani Karuturi 50a428c3aa CLOUDSTACK-4886: printing ****** to stdout instead of db users password 2013-12-20 17:38:39 +05:30
Devdeep Singh 74cb4b1c5a CLOUDSTACK-5555: Fixing booting a vm on hyperv with data disk. Made
changes to attach a data disk on scsi controller when a vm is being
created.
2013-12-20 17:12:59 +05:30
Devdeep Singh 0182a18797 CLOUDSTACK-5311: Fixing the hypervisor version in capabilities table. 2013-12-20 11:26:56 +05:30
Marcus Sorensen 7644b92a8b account for vxlan interfaces named vx<vni> 2013-12-19 17:42:42 -07:00
Edison Su 62bb5d8848 fix checkstyle 2013-12-19 15:05:58 -08:00
Edison Su 0824c78761 CLOUDSTACK-4939 - Failed to create snapshot (KVM, Multiple hosts, Sharedstorage)
Conflicts:

	engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java

Conflicts:

	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
	plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
2013-12-19 14:17:30 -08:00
Edison Su 8caf52c6bc add xenserver 6.2.0 hotfix support, to optimize vdi copy
add xenserver hot fix

Conflicts:

	api/src/com/cloud/vm/VirtualMachineName.java
	core/src/com/cloud/host/HostInfo.java
	core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
	deps/XenServerJava/src/com/xensource/xenapi/VDI.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
	server/src/com/cloud/configuration/Config.java
2013-12-19 14:15:41 -08:00
Edison Su c40d03b417 CS-18582: if EIP is used, extract volume and template returns wrong public ip address. If remote agent is ssvm agent, then looking up public ip address from ssvm table
Conflicts:

	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java
	engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
2013-12-19 14:01:20 -08:00
edison su 9c77f68095 Revert "Remove uncessary changes."
This reverts commit fcab2b776a.
2013-12-19 13:35:52 -08:00