myslice prefixed queries to speed up the portal

[myslice.git] / manifoldapi / manifoldproxy.py

diff --git a/manifoldapi/manifoldproxy.py b/manifoldapi/manifoldproxy.py
index 3c5a04b..9385bfa 100644 (file)
--- a/manifoldapi/manifoldproxy.py
+++ b/manifoldapi/manifoldproxy.py
@@ -59,6 +59,7 @@ with the query passed using POST"""
             manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
         else:
             if 'manifold' in request.session:
+                print '===> manifoldproxy.proxy: before auth', manifold_query
                 manifold_api_session_auth = request.session['manifold']['auth']
             else:
                 json_answer=json.dumps({'code':0,'value':[]})
@@ -88,8 +89,18 @@ with the query passed using POST"""
         #
         # resource reservation
         if (manifold_query.action.lower() == 'update') :
-            for resources in result['value'][0]['resources'] :
-                activity.slice.resource(request, { 'slice' : result['value'][0]['slice_hrn'], 'resource' : result['value'][0]})
+            print 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)