From 370f70abb70d413b23c0732fe2ff21c9a88d0706 Mon Sep 17 00:00:00 2001 From: Rezende & Pedro & Carlos & Raphael Date: Fri, 24 Oct 2014 14:58:44 -0200 Subject: [PATCH] Adding new changes for merge. --- portal/actions.py | 31 ++++++---- portal/homeview.py | 2 +- portal/lsapiclient.py | 4 +- portal/slicerequestview.py | 2 +- .../templates/fibre/fibre_account-view.html | 6 ++ portal/templates/fibre/fibre_institution.html | 5 -- .../fibre/fibre_registration_view.html | 57 +++++++++++-------- .../fibre/fibre_slice_request_email.html | 2 +- portal/templates/fibre/fibre_termsview.html | 57 ++++++++++++------- 9 files changed, 102 insertions(+), 64 deletions(-) diff --git a/portal/actions.py b/portal/actions.py index c7ed62bc..20a623da 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -593,21 +593,31 @@ def create_slice(wsgi_request, request): Exception """ hrn = "%s.%s" % (request['authority_hrn'], request['slice_name']) + # XXX tmp sfa dependency from sfa.util.xrn import Xrn urn = Xrn(hrn, request['type']).get_urn() # Add User to Slice if we have the user_hrn in pendingslice table user_hrn = request.get('user_hrn', None) + user_obj = User.objects.get(username = user_hrn.split(".")[1]) + list_users = [] user_hrns = list([user_hrn]) if user_hrn else list() + for user in user_hrns: + list_users +=[User.objects.get(username = user.split(".")[1])] + + #user_query = Query.get('local:user').select('email').filter_by('email','==',user.username) + #user_details_sfa = execute_admin_query(wsgi_request, user_query) + + pendinguser = PendingUser.objects.filter(login__iexact = user_obj.username) + if pendinguser : + raise Exception, "User %s doesn't exist, validate user before validating slice" % user_obj.username + #if not user_details_sfa: + # raise Exception, "User %s doesn't exist, validate user before validating slice" % user_hrn + #for user in list_users: + + user_email = user_obj.email - user_query = Query().get('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 - for user in user_details_sfa: - user_email = user['user_email'] - # XXX LOIC Quick fix because this is totally inconsistent if not 'number_of_nodes' in request: request['number_of_nodes']="" @@ -622,15 +632,16 @@ def create_slice(wsgi_request, request): 'slice_enabled' : True } # ignored in request: id, timestamp, number_of_nodes, type_of_nodes, purpose - + query = Query.create('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) + clear_user_creds(wsgi_request,user_obj.username) # log user activity - activity.slice.validate(self.request, "Slice validation", { "slice" : hrn }) + activity.slice.validate(request, "Slice validation")#, { "slice" : hrn }) + try: theme.template_name = 'slice_request_validated.txt' text_content = render_to_string(theme.template, request) diff --git a/portal/homeview.py b/portal/homeview.py index cf3fcbab..ddad254b 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -65,7 +65,7 @@ class HomeView (FreeAccessView, ThemeView): ## first you must open a connection to the server try: # Connect to NOC - l = ldap.initialize("ldap://10.128.0.50:389") + l = ldap.initialize("ldap://200.130.15.186:389") # Bind/authenticate with a root user to search all objects l.simple_bind_s("cn=Manager,dc=br,dc=fibre","fibre2013") diff --git a/portal/lsapiclient.py b/portal/lsapiclient.py index 23584abf..c99ecae7 100644 --- a/portal/lsapiclient.py +++ b/portal/lsapiclient.py @@ -16,7 +16,9 @@ class LaboraSchedulerClient: 'get_user_id_by_username', 'add_user_public_key', 'delete_user_public_key' ] def __init__ ( self, organization ): - self.url, self.key = self.getOrganizationConfigs( organization ) + #self.url, self.key = self.getOrganizationConfigs( organization ) + self.url = "https://portal.ufrj.fibre.org.br:3002/LS-Sched/" + self.key = "9763dd03f2da8138fb22a63d78e5e9792b59a637" def __getattr__(self, name): diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index 97a11dd0..b51273f5 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -117,7 +117,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): 'authority_hrn' : authority_hrn, 'organization' : wsgi_request.POST.get('org_name', ''), 'slice_name' : wsgi_request.POST.get('slice_name', ''), - 'url' : wsgi_request.POST.get('url', ''), + 'url' : wsgi_request.POST.get('exp_url', ''), 'purpose' : wsgi_request.POST.get('purpose', ''), 'current_site' : current_site } diff --git a/portal/templates/fibre/fibre_account-view.html b/portal/templates/fibre/fibre_account-view.html index 9941e97c..c8028522 100644 --- a/portal/templates/fibre/fibre_account-view.html +++ b/portal/templates/fibre/fibre_account-view.html @@ -37,6 +37,12 @@

Platform: Myslice

+ Email diff --git a/portal/templates/fibre/fibre_institution.html b/portal/templates/fibre/fibre_institution.html index 1d6cf97e..87b6dab9 100644 --- a/portal/templates/fibre/fibre_institution.html +++ b/portal/templates/fibre/fibre_institution.html @@ -98,13 +98,10 @@ $(document).ready(function() { {% if user_details.parent_authority %} $.post("/rest/slice/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) { - var username = "{{person.username}}"; var list_slices = []; var table_slices = []; /* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "users", "slice_urn", "slice_expires" */ $.each( data, function( key, val ) { - if(String(val.users[0]).indexOf("@") != -1){ - if(String(val.users[0]).split("@")[1] == username.split("@")[1]){ list_slices.push( "
  • " + val.slice_hrn + "
    • " ); if(val.nodes=="undefined" || val.nodes==null){ nodes_length=0; @@ -133,8 +130,6 @@ $(document).ready(function() { slice_row += ""+val.slice_expires+""; slice_row += ""; table_slices.push(slice_row); - } - } }); /* $("div#slice-list").html($( "