Repository: cloudstack Updated Branches: refs/heads/master 1d2f3300a -> aa4fea231
Fix for Test VM life Cycle Test suite- Failed to get Cent OS template Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa4fea23 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa4fea23 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa4fea23 Branch: refs/heads/master Commit: aa4fea231db714f369f0ec5203a9407c98152984 Parents: 1d2f330 Author: sailajamada <sailaja.m...@citrix.com> Authored: Thu Sep 4 10:41:35 2014 +0530 Committer: sailajamada <sailaja.m...@citrix.com> Committed: Thu Sep 4 10:41:35 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/lib/common.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa4fea23/tools/marvin/marvin/lib/common.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/lib/common.py b/tools/marvin/marvin/lib/common.py index 9e3d40c..72f78e3 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