if result['code'] == 2:
# XXX only if we know it is the issue
del request.session['manifold']
- raise Exception, 'Error running query: %r' % result
+ # Flush django session
+ request.session.flush()
+ #raise Exception, 'Error running query: %r' % result
if result['code'] == 1:
print "WARNING"
def execute_query(request, query):
if not 'manifold' in request.session or not 'auth' in request.session['manifold']:
+ request.session.flush()
raise Exception, "User not authenticated"
manifold_api_session_auth = request.session['manifold']['auth']
return _execute_query(request, query, manifold_api_session_auth)
+import json
from manifold.core.query import Query
+from manifold.manifoldapi import execute_query
+
from unfold.page import Page
from plugins.lists.testbedlist import TestbedList
#messages.info(self.request, 'You have logged in')
page = Page(self.request)
+ print "Dashboard page"
# Slow...
#slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
testbed_query = Query().get('network').select('network_hrn','platform')
# DEMO GEC18 Query only PLE
- slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
+ user_query = Query().get('local:user').select('config','email')
+ user_details = execute_query(self.request, user_query)
+
+ # not always found in user_details...
+ config={}
+ for user_detail in user_details:
+ #email = user_detail['email']
+ if user_detail['config']:
+ config = json.loads(user_detail['config'])
+ user_detail['authority'] = config.get('authority',"Unknown Authority")
+
+ print user_detail
+ if user_detail['authority'] is not None:
+ sub_authority = user_detail['authority'].split('.')
+ root_authority = sub_authority[0]
+ slice_query = Query().get(root_authority+':user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
+ else:
+ slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
page.enqueue_query(slice_query)
page.enqueue_query(testbed_query)
+import json
from django.template import RequestContext
from django.shortcuts import render_to_response
from unfold.page import Page
from manifold.core.query import Query, AnalyzedQuery
+from manifold.manifoldapi import execute_query
from ui.topmenu import topmenu_items, the_user
tmp_default_slice='ple.upmc.myslicedemo'
# temporary : turn off the users part to speed things up
-#do_query_users=True
-do_query_users=False
+do_query_users=True
+#do_query_users=False
#do_query_leases=True
do_query_leases=False
#main_query_key = 'hrn'
query_resource_all = Query.get('resource').select(resource_fields)
- if do_query_users:
- query_user_all = Query.get('user').select(user_fields)
-
+
aq = AnalyzedQuery(main_query, metadata=metadata)
page.enqueue_query(main_query, analyzed_query=aq)
page.enqueue_query(query_resource_all)
if do_query_users:
- page.enqueue_query(query_user_all)
+ # Required: the user must have an authority in its user.config
+ # XXX Temporary solution
+ user_query = Query().get('local:user').select('config','email')
+ user_details = execute_query(self.request, user_query)
+
+ # not always found in user_details...
+ config={}
+ for user_detail in user_details:
+ #email = user_detail['email']
+ if user_detail['config']:
+ config = json.loads(user_detail['config'])
+ user_detail['authority'] = config.get('authority',"Unknown Authority")
+
+ if user_detail['authority'] is not None:
+ sub_authority = user_detail['authority'].split('.')
+ root_authority = sub_authority[0]
+ query_user_all = Query.get(root_authority+':user').select(user_fields)
+
+ # XXX TODO this filter doesn't work - to be improved in Manifold
+ #.filter_by('authority.authority_hrn', '=', user_detail['authority'])
+
+ page.enqueue_query(query_user_all)
+ else:
+ print "authority of the user is not in local:user db"
+ query_user_all = Query.get('user').select(user_fields)
+ # query_user_all = None
# ... and for the relations
# XXX Let's hardcode resources for now
# --------------------------------------------------------------------------
# USERS
- if do_query_users:
+ if do_query_users and query_user_all is not None:
tab_users = Tabs(
page = page,
domid = 'users',
+import json
from pprint import pprint
from manifold.manifoldapi import execute_query
from manifold.core.query import Query
def topmenu_items (current,request=None):
has_user=request.user.is_authenticated()
result=[]
+ print request.user
if has_user:
result.append({'label':'Dashboard', 'href': '/portal/dashboard/'})
result.append({'label':'Request a slice', 'href': '/portal/slice_request/'})
# ** Where am I a PI **
# For this we need to ask SFA (of all authorities) = PI function
- pi_authorities_query = Query.get('ple:user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
- try:
- pi_authorities_tmp = execute_query(request, pi_authorities_query)
- except:
- pi_authorities_tmp = set()
- pi_authorities = set()
- for pa in pi_authorities_tmp:
- pi_authorities |= set(pa['pi_authorities'])
- print "pi_authorities =", pi_authorities
- if len(pi_authorities) > 0:
- result.append({'label':'Validation', 'href': '/portal/validate/'})
+ user_query = Query().get('local:user').select('config','email')
+ user_details = execute_query(request, user_query)
+
+ # Required: the user must have an authority in its user.config
+ # XXX Temporary solution
+ # not always found in user_details...
+ config={}
+# Deactivated until fixed
+# if user_details is not None:
+# for user_detail in user_details:
+# #email = user_detail['email']
+# if user_detail['config']:
+# config = json.loads(user_detail['config'])
+# user_detail['authority'] = config.get('authority',"Unknown Authority")
+# print "topmenu: %s", (user_detail['authority'])
+# if user_detail['authority'] is not None:
+# sub_authority = user_detail['authority'].split('.')
+# root_authority = sub_authority[0]
+# pi_authorities_query = Query.get(root_authority+':user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
+# else:
+# pi_authorities_query = Query.get('user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
+# try:
+# pi_authorities_tmp = execute_query(request, pi_authorities_query)
+# except:
+# pi_authorities_tmp = set()
+# pi_authorities = set()
+# for pa in pi_authorities_tmp:
+# if 'pi_authorities' in pa:
+# pi_authorities |= set(pa['pi_authorities'])
+# print "pi_authorities =", pi_authorities
+# if len(pi_authorities) > 0:
+# result.append({'label':'Validation', 'href': '/portal/validate/'})
+ result.append({'label':'Validation', 'href': '/portal/validate/'})
dropdown = []
dropdown.append({'label':'Platforms', 'href': '/portal/platforms/'})
dropdown.append({'label':'My Account', 'href': '/portal/account/'})
git://git.onelab.eu / myslice.git / commitdiff