You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ga...@apache.org on 2015/06/18 11:54:22 UTC
git commit: updated refs/heads/master to a5a1818
Repository: cloudstack
Updated Branches:
refs/heads/master 5c5d445d3 -> a5a1818d2
CLOUDSTACK-8555: Skip resize volume operation for HyperV
Signed-off-by: Gaurav Aradhye <ga...@clogeny.com>
This closes #465
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a5a1818d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a5a1818d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a5a1818d
Branch: refs/heads/master
Commit: a5a1818d2a489f7294a0a95783b68705081031c9
Parents: 5c5d445
Author: pritisarap12 <pr...@clogeny.com>
Authored: Tue Jun 16 16:16:44 2015 +0530
Committer: Gaurav Aradhye <ga...@clogeny.com>
Committed: Thu Jun 18 15:23:52 2015 +0530
----------------------------------------------------------------------
.../testpaths/testpath_disablestoragepool.py | 38 +++++++++++---------
1 file changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5a1818d/test/integration/testpaths/testpath_disablestoragepool.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_disablestoragepool.py b/test/integration/testpaths/testpath_disablestoragepool.py
index 3d34ac3..e3461cc 100644
--- a/test/integration/testpaths/testpath_disablestoragepool.py
+++ b/test/integration/testpaths/testpath_disablestoragepool.py
@@ -558,15 +558,17 @@ class TestPathDisableStorage_Basic(cloudstackTestCase):
self.virtual_machine_2.attach_volume(self.userapiclient, self.volume_2)
# Step 6: Resize DATA disk to a higher value for attached disk
- try:
- self.volume_1.resize(self.userapiclient, diskofferingid=self.resized_disk_offering.id)
- list_volume_1 = Volume.list(self.userapiclient, id=self.volume_1.id)
- self.assertEqual(list_volume_1[0].diskofferingid,
- self.resized_disk_offering.id,
- 'check list volume response for volume id: %s' % self.volume_1.id)
- self.debug('Step 6: volume id %s got resized successfully' % list_volume_1[0].id)
- except Exception as e:
- self.fail('Step 6: Volume resize on disabled pool failed: % s' % e)
+
+ if self.hypervisor.lower() not in ('hyperv'):
+ try:
+ self.volume_1.resize(self.userapiclient, diskofferingid=self.resized_disk_offering.id)
+ list_volume_1 = Volume.list(self.userapiclient, id=self.volume_1.id)
+ self.assertEqual(list_volume_1[0].diskofferingid,
+ self.resized_disk_offering.id,
+ 'check list volume response for volume id: %s' % self.volume_1.id)
+ self.debug('Step 6: volume id %s got resized successfully' % list_volume_1[0].id)
+ except Exception as e:
+ self.fail('Step 6: Volume resize on disabled pool failed: % s' % e)
# Step 7: Take VM Snapshot
if self.hypervisor.lower() not in ('kvm', 'hyperv', 'lxc'):
@@ -632,14 +634,16 @@ class TestPathDisableStorage_Basic(cloudstackTestCase):
self.debug('Step 12: volume id:% s successfully attached to vm id % s' % (self.volume_2.id, self.virtual_machine_1.id))
# Step 13: Re-size Volume to higher disk offering
- try:
- self.virtual_machine_1.stop(self.userapiclient)
- self.volume_2.resize(self.userapiclient, diskofferingid=self.resized_disk_offering.id)
- list_volume_2 = Volume.list(self.userapiclient, id=self.volume_2.id)
- self.assertEqual(list_volume_2[0].diskofferingid, self.resized_disk_offering.id, 'check list volume response for volume id: %s' % self.volume_2.id)
- self.debug('Step 13: volume id %s got resized successfully' % list_volume_2[0].id)
- except Exception as e:
- self.fail('Step 13: Failed to resize volume % s ' % e)
+ if self.hypervisor.lower() not in ('hyperv'):
+ try:
+ self.virtual_machine_1.stop(self.userapiclient)
+ self.volume_2.resize(self.userapiclient, diskofferingid=self.resized_disk_offering.id)
+ list_volume_2 = Volume.list(self.userapiclient, id=self.volume_2.id)
+ self.assertEqual(list_volume_2[0].diskofferingid, self.resized_disk_offering.id, 'check list volume response for volume id: %s' % self.volume_2.id)
+ self.debug('Step 13: volume id %s got resized successfully' % list_volume_2[0].id)
+ except Exception as e:
+ self.fail('Step 13: Failed to resize volume % s ' % e)
+
self.virtual_machine_1.start(self.userapiclient)
# Step 14: Reboot VM