ConfigEngine: iotlab login/pass are defined in myslice.ini

diff --git a/myslice/configengine.py b/myslice/configengine.py
index 680ddbc..3d92bb1 100644 (file)
--- a/myslice/configengine.py
+++ b/myslice/configengine.py
@@ -37,8 +37,8 @@ class ConfigEngine(object):
 
     #iotlab dev url
     default_iotlab_url = "https://devgrenoble.senslab.info/rest/admin/users"
-    default_iotlab_admin_user = "auge"
-    default_iotlab_admin_password= "k,mfg1+Q"
+    default_iotlab_admin_user = "xxx"
+    default_iotlab_admin_password= "yyy"
 
     def __init__ (self):
         parser = RawConfigParser ()
@@ -50,6 +50,11 @@ class ConfigEngine(object):
         parser.add_section('myslice')
         parser.set ('myslice', 'theme', ConfigEngine.default_myslice_theme)
 
+        parser.add_section('iotlab')
+        parser.set ('iotlab', 'url', ConfigEngine.default_iotlab_url)
+        parser.set ('iotlab', 'admin_user', ConfigEngine.default_iotlab_admin_user)
+        parser.set ('iotlab', 'admin_password', ConfigEngine.default_iotlab_admin_password)
+
         parser.add_section('googlemap')
         parser.set ('googlemap','api_key', None)
         parser.read (os.path.join(ROOT,'myslice/myslice.ini'))
@@ -66,6 +71,15 @@ class ConfigEngine(object):
         return (self.config_parser.get('manifold','admin_user'),
                 self.config_parser.get('manifold','admin_password'))
 
+    def iotlab_url (self):
+        return self.config_parser.get('iotlab','url')
+
+    def iotlab_admin_user(self):
+        return self.config_parser.get('iotlab','admin_user')
+
+    def iotlab_admin_password(self):
+        return self.config_parser.get('iotlab','admin_password')
+
     def googlemap_api_key (self):
         return self.config_parser.get('googlemap','api_key')
 

diff --git a/portal/slicetabexperiment.py b/portal/slicetabexperiment.py
index 6dfbea0..f198e15 100644 (file)
--- a/portal/slicetabexperiment.py
+++ b/portal/slicetabexperiment.py
@@ -76,15 +76,16 @@ class ExperimentView (FreeAccessView, ThemeView):
 
         #get all  iotlab users
         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
        
         all_users = list()