Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

[unfold.git] / portal / slicetabexperiment.py

diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py
index 254b676..ab2fee2 100644 (file)
--- 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,20 +78,22 @@ 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:
-            userData = "Basic " + (ConfigEngine.default_iotlab_admin_user + ":" + ConfigEngine.default_iotlab_admin_password).encode("base64").rstrip()
-            req = urllib2.Request(ConfigEngine.default_iotlab_url)
+            engine = ConfigEngine()
+            userData = "Basic " + (engine.iotlab_admin_user() + ":" + engine.iotlab_admin_password()).encode("base64").rstrip()
+            req = urllib2.Request(engine.iotlab_url())
             req.add_header('Accept', 'application/json')
             req.add_header("Content-type", "application/x-www-form-urlencoded")
             req.add_header('Authorization', userData)
             # make the request and print the results
             res = urllib2.urlopen(req)
             all_users = json.load(res) 
-        except URLError as e:
+        except urllib2.URLError as e:
             print "There is a problem in getting iotlab users %s" % e.reason
        
-        #print all_users 
 
         #getting the login from email
         #initial value  no-account == contact_admin