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