cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gau...@apache.org
Subject git commit: updated refs/heads/master to 832f029
Date Thu, 21 May 2015 07:03:17 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 4222364be -> 832f0293b


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

Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #272


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/832f0293
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/832f0293
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/832f0293

Branch: refs/heads/master
Commit: 832f0293b33a8cbfe88cba3a80e514a03ece66ba
Parents: 4222364
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Thu May 21 12:21:35 2015 +0530
Committer: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Committed: Thu May 21 12:32:45 2015 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/config/test_data.py | 2 +-
 tools/marvin/marvin/lib/common.py       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/832f0293/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 2cbcf84..bc5f875 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"
                     },

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/832f0293/tools/marvin/marvin/lib/common.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/common.py b/tools/marvin/marvin/lib/common.py
index b1efb62..fb21073 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"]
             ),
             ]


Mime
View raw message