You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/09/30 23:52:18 UTC
[19/31] git commit: updated refs/heads/ui-restyle to ef74127
CLOUDSTACK: 4706 - Adding missing method get_region in common.py
Signed-off-by: venkataswamybabu budumuru <ve...@citrix.com>
(cherry picked from commit 503fe75dc93be209f0382ddf9c0b548009342565)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b7e00d37
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b7e00d37
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b7e00d37
Branch: refs/heads/ui-restyle
Commit: b7e00d37006aef9d5c832fa43f7f3ddcdff7eadb
Parents: 55ef4b8
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Wed Sep 18 20:50:37 2013 -0400
Committer: venkataswamybabu budumuru <ve...@citrix.com>
Committed: Mon Sep 30 15:19:58 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/common.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7e00d37/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 e895885..164ef20 100644
--- a/tools/marvin/marvin/integration/lib/common.py
+++ b/tools/marvin/marvin/integration/lib/common.py
@@ -94,6 +94,22 @@ def add_netscaler(apiclient, zoneid, NSservice):
return netscaler
+def get_region(apiclient, services=None):
+ "Returns a default region"
+
+ cmd = listRegions.listRegionsCmd()
+ if services:
+ if "regionid" in services:
+ cmd.id = services["regionid"]
+
+ regions = apiclient.listRegions(cmd)
+
+ if isinstance(regions, list):
+ assert len(regions) > 0
+ return regions[0]
+ else:
+ raise Exception("Failed to find specified region.")
+
def get_domain(apiclient, services=None):
"Returns a default domain"