From bab974c3bcd9f3f0b9a5812a59c70ace81716c0f Mon Sep 17 00:00:00 2001
From: Prasanna Santhanam <tsp@apache.org>
Date: Wed, 26 Dec 2012 13:36:58 -0800
Subject: [PATCH] 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
---
 tools/marvin/marvin/jsonHelper.py                        | 2 +-
 tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/marvin/marvin/jsonHelper.py b/tools/marvin/marvin/jsonHelper.py
index b2e7d2ff7dc..652cce0bf9e 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:
diff --git a/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg b/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg
index 219c4dbbff5..7c733ade256 100644
--- a/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg
+++ b/tools/marvin/marvin/sandbox/demo/simulator/simulator.cfg
@@ -148,10 +148,6 @@
             "name": "workers", 
             "value": "10"
         }, 
-        {
-            "name": "use.user.concentrated.pod.allocation", 
-            "value": "false"
-        }, 
         {
             "name": "account.cleanup.interval", 
             "value": "600"