X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=d0a8a3ea84b40cdde9ac9dd365efdfd164951955;hb=b57d73b52870350b8150f00126394fd0df6d09f1;hp=d43a3cd4e6b2fc39c52242b47c61b2914d77d40a;hpb=bd8ad6aafd20775cf6884faa98cadf30839cc032;p=myslice.git diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py index d43a3cd4..d0a8a3ea 100644 --- a/manifold/manifoldproxy.py +++ b/manifold/manifoldproxy.py @@ -11,7 +11,7 @@ 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 @@ -52,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':