cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: marvin : cloudstack-version is not reqd for json load
Date Wed, 26 Dec 2012 21:39:17 GMT
Updated Branches:
  refs/heads/api_refactoring 21c1623a0 -> 7e52f2c48


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/7e52f2c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7e52f2c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7e52f2c4

Branch: refs/heads/api_refactoring
Commit: 7e52f2c48cb42afe959730f2c350e1fb5dd803d6
Parents: 21c1623
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Wed Dec 26 13:36:58 2012 -0800
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Dec 26 13:36:58 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/7e52f2c4/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/7e52f2c4/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"
         }, 


Mime
View raw message