# Get the list of authorities
def authority_get_pis(request, authority_hrn):
+
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
query = Query.get('authority').filter_by('authority_hrn', '==', authority_hrn).select('pi_users')
results = execute_admin_query(request, query)
print "authority_get_pis = %s" % results
return ['support@onelab.eu']
else:
pi_user_hrns = [ hrn for x in pi_users for hrn in x['pi_users'] ]
- query = Query.get('user').filter_by('user_hrn', 'included', pi_user_hrns).select('user_email')
+
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+ query = Query.get('myslice:user').filter_by('user_hrn', 'included', pi_user_hrns).select('user_email')
results = execute_admin_query(request, query)
return [result['user_email'] for result in results]
def is_pi(wsgi_request, user_hrn, authority_hrn):
# XXX could be done in a single query !
- # select pi_authorities from user where user_hrn == "ple.upmc.jordan_auge"
- query = Query.get('user').filter_by('user_hrn', '==', user_hrn).select('pi_authorities')
+ # seauthorities from user where user_hrn == "ple.upmc.jordan_auge"
+
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+ query = Query.get('myslice:user').filter_by('user_hrn', '==', user_hrn).select('pi_authorities')
results = execute_admin_query(wsgi_request, query)
if not results:
# XXX Warning ?
# SFA get record
def sfa_get_user(request, user_hrn, pub):
- query_sfa_user = Query.get('user').filter_by('user_hrn', '==', user_hrn)
- result_sfa_user = execute_query(request, query_sfa_user)
+
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+ query_sfa_user = Query.get('myslice:user').filter_by('user_hrn', '==', user_hrn)
+ result_sfa_user = execute_admin_query(request, query_sfa_user)
return result_sfa_user
def sfa_update_user(request, user_hrn, user_params):
# user_params: keys [public_key]
if 'email' in user_params:
user_params['user_email'] = user_params['email']
- query = Query.update('user').filter_by('user_hrn', '==', user_hrn).set(user_params).select('user_hrn')
+
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+ query = Query.update('myslice:user').filter_by('user_hrn', '==', user_hrn).set(user_params).select('user_hrn')
results = execute_admin_query(request,query)
return results
def sfa_add_authority(request, authority_params):
+
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
query = Query.create('authority').set(authority_params).select('authority_hrn')
results = execute_query(request, query)
print "sfa_add_auth results=",results
def sfa_add_user_to_slice(request, user_hrn, slice_params):
# UPDATE myslice:slice SET researcher=['ple.upmc.jordan_auge','ple.inria.thierry_parmentelat','ple.upmc.loic_baron','ple.upmc.ciro_scognamiglio','ple.upmc.mohammed-yasin_rahman','ple.upmc.azerty'] where slice_hrn=='ple.upmc.myslicedemo'
- query_current_users = Query.get('slice').select('user').filter_by('slice_hrn','==',slice_params['hrn'])
+
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+ query_current_users = Query.get('myslice:slice').select('user').filter_by('slice_hrn','==',slice_params['hrn'])
results_current_users = execute_query(request, query_current_users)
slice_params['researcher'] = slice_params['researcher'] | results_current_users
- query = Query.update('slice').filter_by('user_hrn', '==', user_hrn).set(slice_params).select('slice_hrn')
+
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+ query = Query.update('myslice:slice').filter_by('user_hrn', '==', user_hrn).set(slice_params).select('slice_hrn')
results = execute_query(request, query)
# Also possible but not supported yet
# UPDATE myslice:user SET slice=['ple.upmc.agent','ple.upmc.myslicedemo','ple.upmc.tophat'] where user_hrn=='ple.upmc.azerty'
user_hrn = request.get('user_hrn', None)
user_hrns = list([user_hrn]) if user_hrn else list()
- user_query = Query().get('user').select('user_hrn','user_email').filter_by('user_hrn','==',user_hrn)
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+ user_query = Query().get('myslice:user').select('user_hrn','user_email').filter_by('user_hrn','==',user_hrn)
user_details_sfa = execute_admin_query(wsgi_request, user_query)
if not user_details_sfa:
raise Exception, "User %s doesn't exist, validate user before validating slice" % user_hrn
}
# ignored in request: id, timestamp, number_of_nodes, type_of_nodes, purpose
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
query = Query.create('myslice:slice').set(slice_params).select('slice_hrn')
results = execute_query(wsgi_request, query)
if not results:
if namespace is not None:
query = Query.create('%s:user' % namespace).set(sfa_user_params).select('user_hrn')
else:
- query = Query.create('user').set(sfa_user_params).select('user_hrn')
+ # REGISTRY ONLY TO BE REMOVED WITH MANIFOLD-V2
+ query = Query.create('myslice:user').set(sfa_user_params).select('user_hrn')
if as_admin:
results = execute_admin_query(wsgi_request, query)