X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifoldapi%2Fmanifoldproxy.py;h=5268f41e70e112e9a020f320dfe14f0bef2ecb6a;hb=a948414844c79472807c5e66939a912a7b990433;hp=99959aee657c6377ad6ebc44cb80835a01fb65a7;hpb=4f924a3d5b8d6ca7cf022e15900369c7a0c4ce7e;p=myslice.git diff --git a/manifoldapi/manifoldproxy.py b/manifoldapi/manifoldproxy.py index 99959aee..5268f41e 100644 --- a/manifoldapi/manifoldproxy.py +++ b/manifoldapi/manifoldproxy.py @@ -10,8 +10,13 @@ from manifold.core.query import Query from manifold.core.result_value import ResultValue from manifoldapi import ManifoldAPI from manifoldresult import ManifoldException -from manifold.util.log import Log -from myslice.configengine import ConfigEngine + +# from unfold.sessioncache import SessionCache + +from myslice.settings import config, logger + +# register activity +import activity.slice debug=False #debug=True @@ -26,24 +31,29 @@ debug_empty=False # myslice/urls.py # as well as # static/js/manifold.js -def proxy (request,format): - """the view associated with /manifold/proxy/ -with the query passed using POST""" +def proxy(request, format): + from myslice.settings import config + url = config.manifold_url() + return _proxy(url, request, format) + +def _proxy(url, request, format): + """the view associated with /manifold/proxy/ with the query passed using POST""" # expecting a POST if request.method != 'POST': - print "manifoldproxy.api: unexpected method %s -- exiting"%request.method - return + logger.error("MANIFOLDPROXY unexpected method {} -- exiting".format(request.method)) + return HttpResponse ({"ret":0}, content_type="application/json") # we only support json for now # if needed in the future we should probably cater for # format_in : how is the query encoded in POST # format_out: how to serve the results if format != 'json': - print "manifoldproxy.proxy: unexpected format %s -- exiting"%format - return HttpResponse ({"ret":0}, mimetype="application/json") + logger.error("MANIFOLDPROXY unexpected format {} -- exiting".format(format)) + return HttpResponse ({"ret":0}, content_type="application/json") try: # translate incoming POST request into a query object - if debug: print 'manifoldproxy.proxy: request.POST',request.POST + #logger.debug("MANIFOLDPROXY request.POST {}".format(request.POST)) + manifold_query = Query() #manifold_query = ManifoldQuery() manifold_query.fill_from_POST(request.POST) @@ -52,20 +62,22 @@ 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 = ConfigEngine().manifold_admin_user_password() + admin_user, admin_password = config.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 'manifold' in request.session: + manifold_api_session_auth = request.session['manifold']['auth'] + else: + #manifold_api_session_auth = SessionCache().get_auth(request) + #if not manifold_api_session_auth: + return HttpResponse (json.dumps({'code':0,'value':[]}), content_type="application/json") + if debug_empty and manifold_query.action.lower()=='get': - json_answer=json.dumps({'code':0,'value':[]}) - print "By-passing : debug_empty & 'get' request : returning a fake empty list" - return HttpResponse (json_answer, mimetype="application/json") + return HttpResponse (json.dumps({'code':0,'value':[]}), content_type="application/json") # actually forward - manifold_api= ManifoldAPI(auth=manifold_api_session_auth) - if debug: print '===> manifoldproxy.proxy: sending to backend', manifold_query + manifold_api= ManifoldAPI(url, auth=manifold_api_session_auth) + # for the benefit of the python code, manifoldAPI raises an exception if something is wrong # however in this case we want to propagate the complete manifold result to the js world @@ -75,16 +87,34 @@ with the query passed using POST""" if 'description' in result and result['description'] \ and isinstance(result['description'], (tuple, list, set, frozenset)): result [ 'description' ] = [ ResultValue.to_html (x) for x in result['description'] ] - + + # + # register activity + # + # resource reservation + if (manifold_query.action.lower() == 'update') : + logger.debug(result['value'][0]) + if 'resource' in result['value'][0] : + for resource in result['value'][0]['resource'] : + activity.slice.resource(request, + { + 'slice' : result['value'][0]['slice_hrn'], + 'resource' : resource['hostname'], + 'resource_type' : resource['type'], + 'facility' : resource['facility_name'], + 'testbed' : resource['testbed_name'] + } + ) + json_answer=json.dumps(result) - return HttpResponse (json_answer, mimetype="application/json") + return HttpResponse (json_answer, content_type="application/json") - except Exception,e: - print "** PROXY ERROR **",e + except Exception as e: + logger.error("MANIFOLDPROXY {}".format(e)) import traceback - traceback.print_exc() - return HttpResponse ({"ret":0}, mimetype="application/json") + logger.error(traceback.format_exc()) + return HttpResponse ({"ret":0}, content_type="application/json") #################### # see CSRF_FAILURE_VIEW in settings.py @@ -92,5 +122,5 @@ with the query passed using POST""" # this however turns out disappointing/not very informative failure_answer=[ "csrf_failure" ] def csrf_failure(request, reason=""): - print "CSRF failure with reason '%s'"%reason - return HttpResponseForbidden (json.dumps (failure_answer), mimetype="application/json") + logger.error("CSRF failure with reason '{}'".format(reason)) + return HttpResponseForbidden (json.dumps (failure_answer), content_type="application/json")