From: Yasin Date: Tue, 23 Dec 2014 17:15:44 +0000 (+0100) Subject: actions.py X-Git-Tag: myslice-1.2~1^2^2~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=89f3f37dff300d2013c75cdfa8b81151bf585129;p=myslice.git actions.py --- diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py index feb9a15b..254b6765 100644 --- a/portal/slicetabexperiment.py +++ b/portal/slicetabexperiment.py @@ -15,6 +15,7 @@ from ui.topmenu import topmenu_items, the_user from myslice.configengine import ConfigEngine from myslice.theme import ThemeView +from myslice.configengine import ConfigEngine import urllib2,json @@ -75,8 +76,8 @@ class ExperimentView (FreeAccessView, ThemeView): #get all iotlab users try: - userData = "Basic " + ('auge' + ":" + 'k,mfg1+Q').encode("base64").rstrip() - req = urllib2.Request('https://devgrenoble.senslab.info/rest/admin/users') + userData = "Basic " + (ConfigEngine.default_iotlab_admin_user + ":" + ConfigEngine.default_iotlab_admin_password).encode("base64").rstrip() + req = urllib2.Request(ConfigEngine.default_iotlab_url) req.add_header('Accept', 'application/json') req.add_header("Content-type", "application/x-www-form-urlencoded") req.add_header('Authorization', userData)