From: Yasin
Date: Fri, 19 Dec 2014 15:25:23 +0000 (+0100)
Subject: iot-lab get user login from the given url
X-Git-Tag: myslice-1.1~3^2~1
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=fdae9ef01adcc6dfccb3fd1589cf1c2faf8b88f1
iot-lab get user login from the given url
---
diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py
index f8b6b382..feb9a15b 100644
--- a/portal/slicetabexperiment.py
+++ b/portal/slicetabexperiment.py
@@ -16,6 +16,8 @@ from myslice.configengine import ConfigEngine
from myslice.theme import ThemeView
+import urllib2,json
+
class ExperimentView (FreeAccessView, ThemeView):
template_name = 'slice-tab-experiment.html'
@@ -60,7 +62,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 +72,29 @@ 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:
+ userData = "Basic " + ('auge' + ":" + 'k,mfg1+Q').encode("base64").rstrip()
+ req = urllib2.Request('https://devgrenoble.senslab.info/rest/admin/users')
+ 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:
+ 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
+ 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))
diff --git a/portal/templates/slice-tab-experiment.html b/portal/templates/slice-tab-experiment.html
index f359ac0d..eb9a4ecb 100644
--- a/portal/templates/slice-tab-experiment.html
+++ b/portal/templates/slice-tab-experiment.html
@@ -30,7 +30,7 @@
the following command:
- ssh {{username}}@fit3-dev.inrialpes.fr
+ ssh {{iot_login}}@fit3-dev.inrialpes.fr
{% endif %}
{% if nitos_resources or nitos_paris_resources %}