etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix smoke tests passing osTypeId parameter on VMware templates registration

This commit is contained in:
nvazquez 2020-10-22 01:26:54 -03:00
parent 8c68843142
commit 5d24e735f5
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tools/marvin/marvin/lib/base.py
View File

@ -1370,22 +1370,24 @@ class Template:
elif "hypervisor" in services:
cmd.hypervisor = services["hypervisor"]
if "ostypeid" in services:
cmd.ostypeid = services["ostypeid"]
elif "ostype" in services:
# Find OSTypeId from Os type
sub_cmd = listOsTypes.listOsTypesCmd()
sub_cmd.description = services["ostype"]
ostypes = apiclient.listOsTypes(sub_cmd)
if cmd.hypervisor.lower() not in ["vmware"]:
# Since version 4.15 VMware templates honour the guest OS defined in the template
if "ostypeid" in services:
cmd.ostypeid = services["ostypeid"]
elif "ostype" in services:
# Find OSTypeId from Os type
sub_cmd = listOsTypes.listOsTypesCmd()
sub_cmd.description = services["ostype"]
ostypes = apiclient.listOsTypes(sub_cmd)
if not isinstance(ostypes, list):
if not isinstance(ostypes, list):
raise Exception(
"Unable to find Ostype id with desc: %s" %
services["ostype"])
cmd.ostypeid = ostypes[0].id
else:
raise Exception(
"Unable to find Ostype id with desc: %s" %
services["ostype"])
cmd.ostypeid = ostypes[0].id
else:
raise Exception(
"Unable to find Ostype is required for registering template")
"Unable to find Ostype is required for registering template")
cmd.url = services["url"]
@ -1421,9 +1423,6 @@ class Template:
if "directdownload" in services:
cmd.directdownload = services["directdownload"]
if "deployasis" in services:
cmd.deployasis = services["deployasis"]
# Register Template
template = apiclient.registerTemplate(cmd)