X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_pl.py;h=ae4215a8cee4c06f2ab8cdfb7f9a434c901a2432;hp=c0e9d9ebcb6929f4d4d2e7c6e58f607b5a904f05;hb=eababa96fb603cdd552bc03091813544b099befd;hpb=dafdaa32a23b683eb4e7e835f70b4c42daeb1136 diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index c0e9d9eb..ae4215a8 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -37,9 +37,10 @@ def __get_registry_objects(slice_xrn, creds, users): if users: # dont allow special characters in the site login base - only_alphanumeric = re.compile('[^a-zA-Z0-9]+') - login_base = only_alphanumeric.sub('', hrn_auth[:20]).lower() - + #only_alphanumeric = re.compile('[^a-zA-Z0-9]+') + #login_base = only_alphanumeric.sub('', hrn_auth[:20]).lower() + slicename = hrn_to_pl_slicename(hrn) + login_base = slicename.split('_')[0] reg_objects = {} site = {} @@ -59,7 +60,7 @@ def __get_registry_objects(slice_xrn, creds, users): slice = {} slice['expires'] = int(time.mktime(Credential(string=creds[0]).get_lifetime().timetuple())) slice['hrn'] = hrn - slice['name'] = site['login_base'] + "_" + get_leaf(hrn) + slice['name'] = hrn_to_pl_slicename(hrn) slice['url'] = hrn slice['description'] = hrn slice['pointer'] = 0