X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=7bd41433b9830c554b6df74fe5a659384922bb87;hb=5764f6bd5ce6407add272bdbbcc53832b9a9b488;hp=b272e2dcc34d20628185bbed42760c1c83d61aa9;hpb=58c5ad9dac78de73fe8762541ebf36a7ce00b409;p=unfold.git diff --git a/portal/actions.py b/portal/actions.py index b272e2dc..7bd41433 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -14,6 +14,8 @@ from myslice.theme import ThemeView theme = ThemeView() +import activity.slice + # Thierry: moving this right into the code so # most people can use myslice without having to install sfa # XXX tmp sfa dependency, should be moved to SFA gateway @@ -23,6 +25,8 @@ theme = ThemeView() # 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 @@ -44,10 +48,12 @@ def authority_get_pi_emails(request, authority_hrn): #default_email = default_email.replace('\n', '') #return default_email # the above doesn't work - return ['support@myslice.info'] + 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] @@ -93,8 +99,10 @@ def clear_user_creds(request, user_email): 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 ? @@ -106,19 +114,25 @@ def is_pi(wsgi_request, user_hrn, authority_hrn): # 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') - results = execute_query(request,query) + + # 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 @@ -128,10 +142,14 @@ def sfa_add_authority(request, authority_params): 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' @@ -588,7 +606,8 @@ def create_slice(wsgi_request, request): 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 @@ -610,13 +629,15 @@ def create_slice(wsgi_request, request): } # ignored in request: id, timestamp, number_of_nodes, type_of_nodes, purpose - query = Query.create('slice').set(slice_params).select('slice_hrn') + # 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: raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn'] else: clear_user_creds(wsgi_request,user_email) - + # log user activity + activity.slice.validate(request, { "slice" : hrn }) try: theme.template_name = 'slice_request_validated.txt' text_content = render_to_string(theme.template, request) @@ -749,7 +770,8 @@ def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False): 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) @@ -780,6 +802,42 @@ def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False): return results +def iotlab_create_user (wsgi_request, request, namespace = None, as_admin=False): + + import requests + import time + from requests.auth import HTTPBasicAuth + + URL_REST = 'https://devgrenoble.senslab.info/rest/admin/users' + LOGIN_ADMIN = "auge" + PASSWORD_ADMIN = "k,mfg1+Q" + + auth = HTTPBasicAuth(LOGIN_ADMIN,PASSWORD_ADMIN) + headers = {'content-type': 'application/json'} + + for user in PendingUser.objects.raw('SELECT * FROM portal_pendinguser WHERE email = %s', [request['email']]): + password= user.password + + + iotlab_user_params = { + "type" : "SA", + "login" : request['email'], + "password" : password, + "firstName" : request['first_name'], + "lastName" : request['last_name'], + "email" : request['email'], + "structure" : request['authority_hrn'], + "city" : "N/A", + "country" : "N/A", + "sshPublicKey" : request['public_key'], + "motivations" : "SFA federation", + } + + iotlab_user_params1 = json.dumps(iotlab_user_params) + r=requests.post(url=URL_REST, data=iotlab_user_params1, headers=headers, auth=auth) + print 'Create iotlab user : ', r.status_code, r.text + return r.text + def create_user(wsgi_request, request, namespace = None, as_admin = False): # XXX This has to be stored centrally USER_STATUS_ENABLED = 2 @@ -796,6 +854,10 @@ def create_user(wsgi_request, request, namespace = None, as_admin = False): # Add reference accounts for platforms manifold_add_reference_user_accounts(wsgi_request, request) + # Add the user to iotlab portal if theme is set to onelab + if theme.theme == 'onelab': + iotlab_create_user (wsgi_request, request) + def create_pending_user(wsgi_request, request, user_detail): """ """ @@ -823,7 +885,6 @@ def create_pending_user(wsgi_request, request, user_detail): theme.template_name = 'activate_user_email_subject.txt' subject = render_to_string(theme.template, request) subject = subject.replace('\n', '') - #sender = 'support@myslice.info' theme.template_name = 'email_default_sender.txt' sender = render_to_string(theme.template, request) sender = sender.replace('\n', '')