X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicetabexperiment.py;h=ab2fee2ee966ea1cb5c4f5d03cbd55eeec6be017;hb=e94639e8556463159fbc42a1834df818b5a83c05;hp=f198e1589a7d8ac1e247179c5d7cba121e744f05;hpb=52a0b9984635eab3576e652a3a55c7bb15f564d6;p=unfold.git diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py index f198e158..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=[] @@ -74,7 +78,9 @@ class ExperimentView (FreeAccessView, ThemeView): #print "list of nitos res hrns" #print nitos_resource_list + 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() @@ -88,7 +94,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