From 832f0293b33a8cbfe88cba3a80e514a03ece66ba Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Thu, 21 May 2015 12:21:35 +0530 Subject: [PATCH] CLOUDSTACK-8492: Fix dictionary access issue in createChecksum method - common.py Signed-off-by: Gaurav Aradhye This closes #272 --- tools/marvin/marvin/config/test_data.py | 2 +- tools/marvin/marvin/lib/common.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 2cbcf84d276..bc5f87513bf 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -936,7 +936,7 @@ test_data = { "datadiskdevice_1": '/dev/xvdb', "datadiskdevice_2": '/dev/xvdc', # Data Disk }, - "KVM": {"rootdiskdevice": "/dev/vda", + "kvm": {"rootdiskdevice": "/dev/vda", "datadiskdevice_1": "/dev/vdb", "datadiskdevice_2": "/dev/vdc" }, diff --git a/tools/marvin/marvin/lib/common.py b/tools/marvin/marvin/lib/common.py index b1efb626f68..fb21073658d 100644 --- a/tools/marvin/marvin/lib/common.py +++ b/tools/marvin/marvin/lib/common.py @@ -1438,13 +1438,13 @@ def createChecksum(service=None, format_volume_to_ext3( ssh_client, service["volume_write_path"][ - virtual_machine.hypervisor][disk_type] + virtual_machine.hypervisor.lower()][disk_type] ) cmds = ["fdisk -l", "mkdir -p %s" % service["data_write_paths"]["mount_dir"], "mount -t ext3 %s1 %s" % ( service["volume_write_path"][ - virtual_machine.hypervisor][disk_type], + virtual_machine.hypervisor.lower()][disk_type], service["data_write_paths"]["mount_dir"] ), "mkdir -p %s/%s/%s " % ( @@ -1514,7 +1514,7 @@ def compareChecksum( "mkdir -p %s" % service["data_write_paths"]["mount_dir"], "mount -t ext3 %s1 %s" % ( service["volume_write_path"][ - virt_machine.hypervisor][disk_type], + virt_machine.hypervisor.lower()][disk_type], service["data_write_paths"]["mount_dir"] ), ]