X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicetabexperiment.py;h=324ee0a9623792944996f8a50a57577668972a68;hb=111d0fcb9681bf94ff184fe43bf636b6d672cbff;hp=9c4ab47ecebc6933e64e17da8b83158143b5aefa;hpb=161a8f3e0af3ad2043e00bb24d26331cc71faa26;p=unfold.git diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py index 9c4ab47e..324ee0a9 100644 --- a/portal/slicetabexperiment.py +++ b/portal/slicetabexperiment.py @@ -28,15 +28,14 @@ class ExperimentView (FreeAccessView, ThemeView): username = self.request.user - split_slicename = slicename.split('.') - ple_slicename = hash_loginbase(split_slicename[0] + '.' + split_slicename[1]) + '_' + split_slicename[2] - - print "testing-yasin" - print ple_slicename - - 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=[] @@ -79,6 +78,7 @@ class ExperimentView (FreeAccessView, ThemeView): #print "list of nitos res hrns" #print nitos_resource_list + all_users = list() #get all iotlab users try: engine = ConfigEngine() @@ -93,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