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

CLOUDSTACK-8492: Fix dictionary access issue in createChecksum method - common.py

Browse Source 
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #272
This commit is contained in:
Gaurav Aradhye 2015-05-21 12:21:35 +05:30
parent 4222364bea
commit 832f0293b3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/marvin/marvin/config/test_data.py
View File

@ -936,7 +936,7 @@ test_data = {
"datadiskdevice_1": '/dev/xvdb', "datadiskdevice_1": '/dev/xvdb',
"datadiskdevice_2": '/dev/xvdc', # Data Disk "datadiskdevice_2": '/dev/xvdc', # Data Disk
}, },
"KVM": {"rootdiskdevice": "/dev/vda", "kvm": {"rootdiskdevice": "/dev/vda",
"datadiskdevice_1": "/dev/vdb", "datadiskdevice_1": "/dev/vdb",
"datadiskdevice_2": "/dev/vdc" "datadiskdevice_2": "/dev/vdc"
}, },

6
tools/marvin/marvin/lib/common.py
View File

@ -1438,13 +1438,13 @@ def createChecksum(service=None,
format_volume_to_ext3( format_volume_to_ext3(
ssh_client, ssh_client,
service["volume_write_path"][ service["volume_write_path"][
virtual_machine.hypervisor][disk_type] virtual_machine.hypervisor.lower()][disk_type]
) )
cmds = ["fdisk -l", cmds = ["fdisk -l",
"mkdir -p %s" % service["data_write_paths"]["mount_dir"], "mkdir -p %s" % service["data_write_paths"]["mount_dir"],
"mount -t ext3 %s1 %s" % ( "mount -t ext3 %s1 %s" % (
service["volume_write_path"][ service["volume_write_path"][
virtual_machine.hypervisor][disk_type], virtual_machine.hypervisor.lower()][disk_type],
service["data_write_paths"]["mount_dir"] service["data_write_paths"]["mount_dir"]
), ),
"mkdir -p %s/%s/%s " % ( "mkdir -p %s/%s/%s " % (
@ -1514,7 +1514,7 @@ def compareChecksum(
"mkdir -p %s" % service["data_write_paths"]["mount_dir"], "mkdir -p %s" % service["data_write_paths"]["mount_dir"],
"mount -t ext3 %s1 %s" % ( "mount -t ext3 %s1 %s" % (
service["volume_write_path"][ service["volume_write_path"][
virt_machine.hypervisor][disk_type], virt_machine.hypervisor.lower()][disk_type],
service["data_write_paths"]["mount_dir"] service["data_write_paths"]["mount_dir"]
), ),
] ]