X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicetabexperiment.py;h=ab2fee2ee966ea1cb5c4f5d03cbd55eeec6be017;hb=16f3b84ff36f5ea9e0c1f4de19363adfbb69c1e7;hp=ca94231548decf09b7e0ead32563c38d7b6b0e5b;hpb=f8bf9fe459d94a73dff2c1f4fdcda88ac5031a95;p=unfold.git diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py index ca942315..ab2fee2e 100644 --- a/portal/slicetabexperiment.py +++ b/portal/slicetabexperiment.py @@ -17,6 +17,8 @@ from myslice.configengine import ConfigEngine from myslice.theme import ThemeView from myslice.configengine import ConfigEngine +from sfa.planetlab.plxrn import hash_loginbase + import urllib2,json class ExperimentView (FreeAccessView, ThemeView): @@ -26,12 +28,14 @@ class ExperimentView (FreeAccessView, ThemeView): username = self.request.user - split_slicename = slicename.split('.') - ple_slicename = split_slicename[0] + '8' + split_slicename[1] + '_' + split_slicename[2] - - query_current_resources = Query.get('slice').select('resource').filter_by('slice_hrn','==',slicename) + query_current_resources = Query.get('slice').select('resource','parent_authority').filter_by('slice_hrn','==',slicename) current_resources = execute_query(request, query_current_resources) + parent_authority = current_resources[0]['parent_authority'] + + split_slicename = slicename.split('.') + ple_slicename = hash_loginbase(parent_authority) + '_' + split_slicename[-1] + ple_resource_list=[] nitos_resource_list=[] nitos_paris_resource_list=[] @@ -76,6 +80,7 @@ class ExperimentView (FreeAccessView, ThemeView): all_users = list() #get all iotlab users + all_users = list() try: engine = ConfigEngine() userData = "Basic " + (engine.iotlab_admin_user() + ":" + engine.iotlab_admin_password()).encode("base64").rstrip()