apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Marvin utils.py:checkVolumeSize Fix for test_01_create_volume to use the correct volume name for XenServer

Browse Source 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
This commit is contained in:
Doug Clark 2014-05-21 12:06:45 +00:00 committed by SrikanteswaraRao Talluri
parent 570c3a2130
commit 6f0b57216c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ from marvin.lib.common import (get_domain,
get_zone, get_zone,
get_template) get_template)
from marvin.lib.utils import checkVolumeSize from marvin.lib.utils import checkVolumeSize
from marvin.codes import SUCCESS, FAILED, ERROR_CODE_530 from marvin.codes import SUCCESS, FAILED, ERROR_CODE_530, XEN_SERVER
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
#Import System modules #Import System modules
import os import os
@ -213,6 +213,15 @@ class TestCreateVolume(cloudstackTestCase):
ssh = self.virtual_machine.get_ssh_client( ssh = self.virtual_machine.get_ssh_client(
reconnect=True reconnect=True
) )
# Get the updated volume information
list_volume_response = Volume.list(
self.apiClient,
id=volume.id)
if list_volume_response[0].hypervisor.lower() == XEN_SERVER.lower():
volume_name = "/dev/xvd" + chr(ord('a') + int(list_volume_response[0].deviceid))
self.debug(" Using XenServer volume_name: %s" % (volume_name))
ret = checkVolumeSize(ssh_handle=ssh,volume_name=volume_name,size_to_verify=vol_sz)
else:
ret = checkVolumeSize(ssh_handle=ssh,size_to_verify=vol_sz) ret = checkVolumeSize(ssh_handle=ssh,size_to_verify=vol_sz)
self.debug(" Volume Size Expected %s Actual :%s" %(vol_sz,ret[1])) self.debug(" Volume Size Expected %s Actual :%s" %(vol_sz,ret[1]))
self.virtual_machine.detach_volume(self.apiClient, volume) self.virtual_machine.detach_volume(self.apiClient, volume)

5
tools/marvin/marvin/lib/utils.py
View File

@ -460,10 +460,9 @@ def checkVolumeSize(ssh_handle=None,
fdisk_output = ssh_handle.runCommand(cmd_inp) fdisk_output = ssh_handle.runCommand(cmd_inp)
if fdisk_output["status"] != SUCCESS: if fdisk_output["status"] != SUCCESS:
return FAILED return FAILED
temp_out = fdisk_output["stdout"] for line in fdisk_output["stdout"]:
for line in temp_out.split("\n"):
if volume_name in line: if volume_name in line:
parts = line.split() parts = line.strip().split()
if str(parts[-2]) == str(size_to_verify): if str(parts[-2]) == str(size_to_verify):
return [SUCCESS,str(parts[-2])] return [SUCCESS,str(parts[-2])]
return [FAILED,"Volume Not Found"] return [FAILED,"Volume Not Found"]