From d08d71427bba562aa8b46a54143a783051297494 Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Mon, 8 Sep 2014 16:45:20 +0530 Subject: [PATCH] CLOUDSTACK-7506: Fix base library to read hypevisor value from dictionary as opposed to only from function parameter Signed-off-by: SrikanteswaraRao Talluri --- tools/marvin/marvin/lib/base.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index d9c72f56ac7..2a763ce3b1a 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"]