You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/04/24 18:23:33 UTC
[09/50] [abbrv] git commit: updated refs/heads/internallb to ca2fc30
return a ready template even if ostype doesn't match
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5a0f4b63
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5a0f4b63
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5a0f4b63
Branch: refs/heads/internallb
Commit: 5a0f4b63303fd6339b1d7aab20bc3833206a5a43
Parents: 4a0b05a
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Sun Apr 21 17:06:01 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sun Apr 21 17:06:01 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_routers.py | 2 +-
tools/marvin/marvin/integration/lib/common.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a0f4b63/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index 86ed4e9..7785576 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -80,7 +80,7 @@ class TestRouterServices(cloudstackTestCase):
# Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(cls.api_client, cls.services)
- self.services['mode'] = cls.zone.networktype
+ cls.services['mode'] = cls.zone.networktype
template = get_template(
cls.api_client,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a0f4b63/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 69aa733..e78f64a 100644
--- a/tools/marvin/marvin/integration/lib/common.py
+++ b/tools/marvin/marvin/integration/lib/common.py
@@ -134,6 +134,8 @@ def get_template(apiclient, zoneid, ostype, services=None):
for template in list_templates:
if template.ostypeid == ostypeid:
return template
+ elif template.isready:
+ return template
raise Exception("Exception: Failed to find template with OSTypeID: %s" %
ostypeid)
@@ -566,4 +568,4 @@ def list_vpc_offerings(apiclient, **kwargs):
cmd = listVPCOfferings.listVPCOfferingsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
- return(apiclient.listVPCOfferings(cmd))
\ No newline at end of file
+ return(apiclient.listVPCOfferings(cmd))