X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=0d4059f0da458fd545e5886be06ea8df44e64bd2;hb=d9bbe0a36624c6fe558c05307964be1b3ed4e3b1;hp=d4de3096283edf45e7652583b5ffb3c33ee01027;hpb=d88dd4a28b502d57131145b1a8b7d0c3b949d805;p=myslice.git
diff --git a/portal/accountview.py b/portal/accountview.py
index d4de3096..0d4059f0 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -39,12 +39,15 @@ class AccountView(LoginRequiredAutoLogoutView):
platform_details = execute_query(self.request, platform_query)
account_details = execute_query(self.request, account_query)
- # initial assignment needed for users having no account
+ # initial assignment needed for users having account.config = {}
platform_name = ''
account_type = ''
account_usr_hrn = ''
account_pub_key = ''
account_reference = ''
+ my_users = ''
+ my_slices = ''
+ my_auths = ''
platform_name_list = []
platform_name_secondary_list = []
platform_access_list = []
@@ -54,10 +57,16 @@ class AccountView(LoginRequiredAutoLogoutView):
account_type_secondary_list = []
account_reference_list = []
delegation_type_list = []
+ user_cred_exp_list = []
+ slice_list = []
+ auth_list = []
+ slice_cred_exp_list = []
+ auth_cred_exp_list = []
usr_hrn_list = []
- pub_key_list = []
+ pub_key_list = []
+
for platform_detail in platform_details:
- if 'sfa' in platform_detail['gateway_type'] and platform_detail['disabled']==0:
+ if 'sfa' in platform_detail['gateway_type']:
total_platform = platform_detail['platform']
total_platform_list.append(total_platform)
@@ -65,11 +74,50 @@ class AccountView(LoginRequiredAutoLogoutView):
if platform_detail['platform_id'] == account_detail['platform_id']:
platform_name = platform_detail['platform']
account_config = json.loads(account_detail['config'])
- # a bit more pythonic
account_usr_hrn = account_config.get('user_hrn','N/A')
account_pub_key = account_config.get('user_public_key','N/A')
account_reference = account_config.get ('reference_platform','N/A')
-
+ # credentials
+ acc_user_cred = account_config.get('delegated_user_credential','N/A')
+ acc_slice_cred = account_config.get('delegated_slice_credentials','N/A')
+ acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
+
+ if 'N/A' not in acc_user_cred:
+ exp_date = re.search('(.*)', acc_user_cred)
+ if exp_date:
+ user_exp_date = exp_date.group(1)
+ user_cred_exp_list.append(user_exp_date)
+
+ my_users = [{'cred_exp': t[0]}
+ for t in zip(user_cred_exp_list)]
+
+
+ if 'N/A' not in acc_slice_cred:
+ for key, value in acc_slice_cred.iteritems():
+ slice_list.append(key)
+ # get cred_exp date
+ exp_date = re.search('(.*)', value)
+ if exp_date:
+ exp_date = exp_date.group(1)
+ slice_cred_exp_list.append(exp_date)
+
+ my_slices = [{'slice_name': t[0], 'cred_exp': t[1]}
+ for t in zip(slice_list, slice_cred_exp_list)]
+
+ if 'N/A' not in acc_auth_cred:
+ for key, value in acc_auth_cred.iteritems():
+ auth_list.append(key)
+ #get cred_exp date
+ exp_date = re.search('(.*)', value)
+ if exp_date:
+ exp_date = exp_date.group(1)
+ auth_cred_exp_list.append(exp_date)
+
+ my_auths = [{'auth_name': t[0], 'cred_exp': t[1]}
+ for t in zip(auth_list, auth_cred_exp_list)]
+
+
+ # for reference accounts
if 'reference' in account_detail['auth_type']:
account_type = 'Reference'
delegation = 'N/A'
@@ -85,7 +133,7 @@ class AccountView(LoginRequiredAutoLogoutView):
else:
account_type = 'Principal'
delegation = 'Manual'
-
+ # for principal (auth_type=user/managed) accounts
if 'reference' not in account_detail['auth_type']:
platform_name_list.append(platform_name)
account_type_list.append(account_type)
@@ -104,20 +152,22 @@ class AccountView(LoginRequiredAutoLogoutView):
platform_access_list.append(platform_access)
# Removing the platform which already has access
+ print platform_access_list
+ print total_platform_list
for platform in platform_access_list:
+ print platform
total_platform_list.remove(platform)
-
+ # we could use zip. this one is used if columns have unequal rows
platform_list = [{'platform_no_access': t[0]}
for t in itertools.izip_longest(total_platform_list)]
-
-
-
-
context = super(AccountView, self).get_context_data(**kwargs)
context['data'] = lst
context['ref_acc'] = secondary_list
context['platform_list'] = platform_list
+ context['my_users'] = my_users
+ context['my_slices'] = my_slices
+ context['my_auths'] = my_auths
context['person'] = self.request.user
context['firstname'] = config.get('firstname',"?")
context['lastname'] = config.get('lastname',"?")
@@ -319,8 +369,9 @@ def account_process(request):
else:
messages.error(request, 'Account error: You need an account in myslice platform to perform this action')
return HttpResponseRedirect("/portal/account/")
-
- elif 'fuseco' in request.POST:
+
+ # add reference platforms
+ elif 'add_fuseco' in request.POST:
# The recipients are the PI of the authority
#recipients = authority_get_pi_emails(request, authority_hrn)
recipients = ["support@myslice.info"]
@@ -331,7 +382,7 @@ def account_process(request):
messages.info(request, 'Request to get access on Fuseco platform received. Please wait for PI\'s reply.')
return HttpResponseRedirect("/portal/account/")
- elif 'ple' in request.POST:
+ elif 'add_ple' in request.POST:
# The recipients are the PI of the authority
#recipients = authority_get_pi_emails(request, authority_hrn)
recipients = ["support@myslice.info"]
@@ -342,7 +393,7 @@ def account_process(request):
messages.info(request, 'Request to get access on PLE platform received. Please wait for PI\'s reply.')
return HttpResponseRedirect("/portal/account/")
- elif 'omf' in request.POST:
+ elif 'add_omf' in request.POST:
# The recipients are the PI of the authority
#recipients = authority_get_pi_emails(request, authority_hrn)
recipients = ["support@myslice.info"]
@@ -353,7 +404,7 @@ def account_process(request):
messages.info(request, 'Request to get access on OMF:NITOS platform received. Please wait for PI\'s reply.')
return HttpResponseRedirect("/portal/account/")
- elif 'wilab' in request.POST:
+ elif 'add_wilab' in request.POST:
# The recipients are the PI of the authority
#recipients = authority_get_pi_emails(request, authority_hrn)
recipients = ["support@myslice.info"]
@@ -374,6 +425,8 @@ def account_process(request):
send_mail("Onelab user %s requested an account in IOTLab"%requester , msg, sender, recipients)
messages.info(request, 'Request to get access on IOTLab platform received. Please wait for PI\'s reply.')
return HttpResponseRedirect("/portal/account/")
+
+ #delete reference platoforms
else:
messages.info(request, 'Under Construction. Please try again later!')