From aa4fea231db714f369f0ec5203a9407c98152984 Mon Sep 17 00:00:00 2001 From: sailajamada Date: Thu, 4 Sep 2014 10:41:35 +0530 Subject: [PATCH] Fix for Test VM life Cycle Test suite- Failed to get Cent OS template --- tools/marvin/marvin/lib/common.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/marvin/marvin/lib/common.py b/tools/marvin/marvin/lib/common.py index 9e3d40cdbc8..72f78e31442 100644 --- a/tools/marvin/marvin/lib/common.py +++ b/tools/marvin/marvin/lib/common.py @@ -288,11 +288,16 @@ def get_template( Get the Templates pertaining to the inputs provided ''' list_templatesout = apiclient.listTemplates(cmd) - if validateList(list_templatesout)[0] != PASS: + + if list_templatesout is None: + return FAILED + + if validateList(list_templatesout[0]) == FAIL: return FAILED for template in list_templatesout: - if template.isready and template.templatetype == template_type: + if template.isready and template.templatetype == template_type and template.ostypename == ostype_desc: + print("found template") return template ''' Return default first template, if no template matched