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 2012/12/27 22:48:16 UTC
[26/32] git commit: marvin : cloudstack-version is not reqd for json
load
marvin : cloudstack-version is not reqd for json load
To build back cloudstack response we don't need to load the
'cloudstack-version' string, only the response
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bab974c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bab974c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bab974c3
Branch: refs/heads/ui-plugins
Commit: bab974c3bcd9f3f0b9a5812a59c70ace81716c0f
Parents: 5aefd77
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Wed Dec 26 13:36:58 2012 -0800
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Dec 26 19:22:17 2012 -0800
----------------------------------------------------------------------
tools/marvin/marvin/jsonHelper.py | 2 +-
.../marvin/sandbox/demo/simulator/simulator.cfg | 4 ----
2 files changed, 1 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bab974c3/tools/marvin/marvin/jsonHelper.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/jsonHelper.py b/tools/marvin/marvin/jsonHelper.py
index b2e7d2f..652cce0 100644
--- a/tools/marvin/marvin/jsonHelper.py
+++ b/tools/marvin/marvin/jsonHelper.py
@@ -121,7 +121,7 @@ def getResultObj(returnObj, responsecls=None):
if len(returnObj) == 0:
return None
- responseName = returnObj.keys()[0]
+ responseName = filter(lambda a: a!=u'cloudstack-version', returnObj.keys())[0]
response = returnObj[responseName]
if len(response) == 0:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bab974c3/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg b/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg
index 219c4db..7c733ad 100644
--- a/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg
+++ b/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg
@@ -149,10 +149,6 @@
"value": "10"
},
{
- "name": "use.user.concentrated.pod.allocation",
- "value": "false"
- },
- {
"name": "account.cleanup.interval",
"value": "600"
},