etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6906: Fixing volume resize BVT

This commit is contained in:
Girish Shilamkar 2014-06-20 07:12:18 -07:00
parent 450d890942
commit 5638c493ff
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
test/integration/smoke/test_volumes.py
View File

@ -650,9 +650,16 @@ class TestVolumes(cloudstackTestCase):
# resize the data disk
self.debug("Resize Volume ID: %s" % self.volume.id)
self.services["disk_offering"]["disksize"] = 20
disk_offering_20_GB = DiskOffering.create(
self.apiclient,
self.services["disk_offering"]
)
self.cleanup.append(disk_offering_20_GB)
cmd = resizeVolume.resizeVolumeCmd()
cmd.id = self.volume.id
cmd.diskofferingid = self.services['customresizeddiskofferingid']
cmd.diskofferingid = disk_offering_20_GB.id
self.apiClient.resizeVolume(cmd)
@ -665,7 +672,7 @@ class TestVolumes(cloudstackTestCase):
type='DATADISK'
)
for vol in list_volume_response:
if vol.id == self.volume.id and vol.size == 3221225472L and vol.state == 'Ready':
if vol.id == self.volume.id and int(vol.size) == (int(disk_offering_20_GB.disksize) * (1024** 3)) and vol.state == 'Ready':
success = True
if success:
break
@ -679,22 +686,16 @@ class TestVolumes(cloudstackTestCase):
"Check if the data volume resized appropriately"
)
# resize the root disk
self.debug("Resize Root for : %s" % self.virtual_machine.id)
# get root vol from created vm
list_volume_response = Volume.list(
self.apiClient,
virtualmachineid=self.virtual_machine.id,
type='ROOT',
listall=True
)
rootvolume = list_volume_response[0]
self.services["disk_offering"]["disksize"] = 10
disk_offering_10_GB = DiskOffering.create(
self.apiclient,
self.services["disk_offering"]
)
self.cleanup.append(disk_offering_10_GB)
cmd = resizeVolume.resizeVolumeCmd()
cmd.id = rootvolume.id
cmd.size = 10
cmd.id = self.volume.id
cmd.diskofferingid = disk_offering_10_GB.id
cmd.shrinkok = "true"
self.apiClient.resizeVolume(cmd)
@ -704,10 +705,10 @@ class TestVolumes(cloudstackTestCase):
while count < 3:
list_volume_response = Volume.list(
self.apiClient,
id=rootvolume.id
id=self.volume.id
)
for vol in list_volume_response:
if vol.id == rootvolume.id and vol.size == 10737418240L and vol.state == 'Ready':
if vol.id == self.volume.id and int(vol.size) == (int(disk_offering_10_GB.disksize) * (1024 ** 3)) and vol.state == 'Ready':
success = True
if success:
break