X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicetabexperiment.py;h=1779d1c87cf9bcc1cb61daaff10497cd227587e4;hb=6c978327b002ef4b46047ce22ba7e8f61768f652;hp=f198e1589a7d8ac1e247179c5d7cba121e744f05;hpb=aa013b53ba402e3e46625cf8443272aa5cdf5f57;p=myslice.git diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py index f198e158..1779d1c8 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=[] @@ -75,6 +79,7 @@ class ExperimentView (FreeAccessView, ThemeView): #print nitos_resource_list #get all iotlab users + all_users = list() try: engine = ConfigEngine() userData = "Basic " + (engine.iotlab_admin_user() + ":" + engine.iotlab_admin_password()).encode("base64").rstrip() @@ -88,7 +93,6 @@ class ExperimentView (FreeAccessView, ThemeView): except urllib2.URLError as e: print "There is a problem in getting iotlab users %s" % e.reason - all_users = list() #getting the login from email #initial value no-account == contact_admin