translate most modules to using print() as imported from __future__

[myslice.git] / portal / slicetabexperiment.py

diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py
index 92b5644..9eaaea7 100644 (file)
--- a/portal/slicetabexperiment.py
+++ b/portal/slicetabexperiment.py
@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 # this somehow is not used anymore - should it not be ?
 from django.core.context_processors import csrf
 from django.http import HttpResponseRedirect
@@ -28,12 +30,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]
-        
-        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=[]
@@ -65,7 +69,7 @@ class ExperimentView (FreeAccessView, ThemeView):
 
 
         except Exception,e:
-            print "Exception in slicetabexperiment.py in OneLab resource search %s" % e
+            print("Exception in slicetabexperiment.py in OneLab resource search %s" % e)
         
         #print "list of ple res hrns"
         #print ple_resource_list
@@ -76,7 +80,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,9 +94,8 @@ class ExperimentView (FreeAccessView, ThemeView):
             res = urllib2.urlopen(req)
             all_users = json.load(res) 
         except urllib2.URLError as e:
-            print "There is a problem in getting iotlab users %s" % e.reason
+            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