cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to c98ac9a
Date Fri, 10 Jan 2014 14:27:04 GMT
Updated Branches:
  refs/heads/master 641f85cf6 -> c98ac9aae


CLOUDSTACK-5113: Fix get_template method to return 'BUILTIN' template in ready state with
matching given ostype


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

Branch: refs/heads/master
Commit: c98ac9aae09cce5abeb5bfd24b96dda116b66aa3
Parents: 641f85c
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Fri Jan 10 19:51:55 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Fri Jan 10 19:56:38 2014 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/integration/lib/common.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c98ac9aa/tools/marvin/marvin/integration/lib/common.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/common.py b/tools/marvin/marvin/integration/lib/common.py
index 504cd4c..550de1a 100644
--- a/tools/marvin/marvin/integration/lib/common.py
+++ b/tools/marvin/marvin/integration/lib/common.py
@@ -237,15 +237,14 @@ def get_template(apiclient, zoneid, ostype, services=None,
     if isinstance(list_templates, list):
         assert len(list_templates) > 0, "received empty response on template of type %s"%ostype
         for template in list_templates:
-            if template.ostypeid == ostypeid:
-                return template
-            elif template.isready and template.templatetype == templatetype:
+            if template.ostypeid == ostypeid and template.isready and template.templatetype
== templatetype:
                 return template
 
-    raise Exception("Exception: Failed to find template with OSTypeID: %s" %
-                                                                    ostypeid)
+    raise Exception("Exception: Failed to find template of type %s with OSTypeID and which
is in "
+                                "ready state: %s" %(templatetype, ostypeid))
     return
 
+
 def download_systemplates_sec_storage(server, services):
     """Download System templates on sec storage"""
 


Mime
View raw message