From 2109418469e7434bfc13fce0a20d5464d0b7862f Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Tue, 5 Aug 2014 14:04:19 +0530 Subject: [PATCH] Fixed Marvin Issue: Hypervisor value was hardcoded to XenServer while deploying VM if not specified Signed-off-by: Santhosh Edukulla --- tools/marvin/marvin/lib/base.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index eb05a180aa1..ddfb8b3c492 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -354,7 +354,7 @@ class VirtualMachine: projectid=None, startvm=None, diskofferingid=None, affinitygroupnames=None, affinitygroupids=None, group=None, hostid=None, keypair=None, ipaddress=None, mode='default', - method='GET', hypervisor="XenServer", customcpunumber=None, + method='GET', hypervisor=None, customcpunumber=None, customcpuspeed=None, custommemory=None, rootdisksize=None): """Create the instance""" @@ -369,7 +369,10 @@ class VirtualMachine: cmd.zoneid = zoneid elif "zoneid" in services: cmd.zoneid = services["zoneid"] - cmd.hypervisor = hypervisor + if hypervisor: + cmd.hypervisor = hypervisor + elif "hypervisor" in services: + cmd.hypervisor = services["hypervisor"] if "displayname" in services: cmd.displayname = services["displayname"]