git commit: updated refs/heads/master to d08d714

[ta...@apache.org]

Repository: cloudstack
Updated Branches:
  refs/heads/master bbb3ea598 -> d08d71427


CLOUDSTACK-7506: Fix base library to read hypevisor value from dictionary as opposed to only from function parameter

Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>


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

Branch: refs/heads/master
Commit: d08d71427bba562aa8b46a54143a783051297494
Parents: bbb3ea5
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Mon Sep 8 16:45:20 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Tue Sep 9 12:12:45 2014 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/lib/base.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d08d7142/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index d9c72f5..2a763ce 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -1085,7 +1085,10 @@ class Template:
         cmd.displaytext = services["displaytext"]
         cmd.name = "-".join([services["name"], random_gen()])
         cmd.format = services["format"]
-        cmd.hypervisor = hypervisor
+        if hypervisor:
+            cmd.hypervisor = hypervisor
+        elif "hypervisor" in services:
+            cmd.hypervisor = services["hypervisor"]
 
         if "ostypeid" in services:
             cmd.ostypeid = services["ostypeid"]