X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=d0a8a3ea84b40cdde9ac9dd365efdfd164951955;hb=804932e8a431ddbf0d7c56457625457967b48d4c;hp=99e7b0aa7943faa670c9be942f40a943fcf97296;hpb=d6bcc3a19ef4edb1b2a7efd436e02d39ab1ce329;p=myslice.git

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index 99e7b0aa..d0a8a3ea 100644
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -11,14 +11,10 @@ from manifold.core.result_value import ResultValue
 from manifold.manifoldapi       import ManifoldAPI
 from manifold.manifoldresult    import ManifoldException
 from manifold.util.log          import Log
-from myslice.config             import Config
+from myslice.configengine       import ConfigEngine
 
 debug=False
-debug=True
-
-# add artificial delay in s
-debug_spin=0
-#debug_spin=1
+#debug=True
 
 # pretend the server only returns - empty lists to 'get' requests - this is to mimick 
 # misconfigurations or expired credentials or similar corner case situations
@@ -56,9 +52,10 @@ with the query passed using POST"""
         # We allow some requests to use the ADMIN user account
         if (manifold_query.get_from() == 'local:user' and manifold_query.get_action() == 'create') \
                 or (manifold_query.get_from() == 'local:platform' and manifold_query.get_action() == 'get'):
-            admin_user, admin_password = Config().manifold_admin_user_password()
+            admin_user, admin_password = ConfigEngine().manifold_admin_user_password()
             manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
         else:
+            print request.session['manifold']
             manifold_api_session_auth = request.session['manifold']['auth']
 
         if debug_empty and manifold_query.action.lower()=='get':
@@ -81,12 +78,6 @@ with the query passed using POST"""
 
         json_answer=json.dumps(result)
 
-        # this is an artificial delay added for debugging purposes only
-        if debug_spin>0:
-            print "Adding additional artificial delay",debug_spin
-            import time
-            time.sleep(debug_spin)
-
         return HttpResponse (json_answer, mimetype="application/json")
 
     except Exception,e: