cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sailajam...@apache.org
Subject git commit: updated refs/heads/master to 6aca8c5
Date Thu, 04 Sep 2014 07:48:29 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master aa4fea231 -> 6aca8c5f3


Revert "Fix for Test VM life Cycle Test suite- Failed to get Cent OS template"

This reverts commit aa4fea231db714f369f0ec5203a9407c98152984.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6aca8c5f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6aca8c5f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6aca8c5f

Branch: refs/heads/master
Commit: 6aca8c5f39f12091b1ab9e40a4d71a84f46e4170
Parents: aa4fea2
Author: sailajamada <sailaja.mada@citrix.com>
Authored: Thu Sep 4 13:10:43 2014 +0530
Committer: sailajamada <sailaja.mada@citrix.com>
Committed: Thu Sep 4 13:10:43 2014 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/lib/common.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6aca8c5f/tools/marvin/marvin/lib/common.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/common.py b/tools/marvin/marvin/lib/common.py
index 72f78e3..9e3d40c 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


Mime
View raw message