Repository: cloudstack Updated Branches: refs/heads/master dfa607fb4 -> 210941846
Fixed Marvin Issue: Hypervisor value was hardcoded to XenServer while deploying VM if not specified Signed-off-by: Santhosh Edukulla <santhosh.eduku...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21094184 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21094184 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21094184 Branch: refs/heads/master Commit: 2109418469e7434bfc13fce0a20d5464d0b7862f Parents: dfa607f Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Tue Aug 5 14:04:19 2014 +0530 Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com> Committed: Tue Aug 5 16:04:19 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/lib/base.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21094184/tools/marvin/marvin/lib/base.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index eb05a18..ddfb8b3 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"]
