Tools: removed debug msgs

[unfold.git] / portal / slicetabexperiment.py

diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py
index f8b6b38..92b5644 100644 (file)
--- a/portal/slicetabexperiment.py
+++ b/portal/slicetabexperiment.py
@@ -15,6 +15,11 @@ from ui.topmenu import topmenu_items, the_user
 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):
     template_name = 'slice-tab-experiment.html'
@@ -24,8 +29,8 @@ class ExperimentView (FreeAccessView, ThemeView):
         username = self.request.user    
         
         split_slicename = slicename.split('.')
-        ple_slicename = split_slicename[0] + '8' + split_slicename[1] + '_' + split_slicename[2]
-
+        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)
         current_resources = execute_query(request, query_current_resources)
 
@@ -60,7 +65,7 @@ class ExperimentView (FreeAccessView, ThemeView):
 
 
         except Exception,e:
-            print "Exception in slicetabexperiment.py in ple 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
@@ -70,8 +75,30 @@ class ExperimentView (FreeAccessView, ThemeView):
         #print iotlab_resource_list
         #print "list of nitos res hrns"
         #print nitos_resource_list
-        
-        
 
-        return render_to_response(self.template, { 'theme' : self.theme,'slicename':slicename, 'ple_slicename':ple_slicename, 'username':username, 'ple_resources':ple_resource_list, 'nitos_resources': nitos_resource_list, 'nitos_paris_resources':nitos_paris_resource_list, 'iotlab_resources':iotlab_resource_list }, context_instance=RequestContext(request))
+        #get all  iotlab users
+        try:
+            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 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
+        iot_login = 'contact_admin'
+        username = str(username)
+        for user in all_users:
+            if user['email'] == username:
+                iot_login = user['login']
+            
+        return render_to_response(self.template, { 'theme' : self.theme,'slicename':slicename, 'ple_slicename':ple_slicename, 'username':username, 'ple_resources':ple_resource_list, 'nitos_resources': nitos_resource_list, 'nitos_paris_resources':nitos_paris_resource_list, 'iotlab_resources':iotlab_resource_list, 'iot_login':iot_login }, context_instance=RequestContext(request))