From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 2 Jan 2015 13:20:49 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=95fcc57dcf3c6d264dfe895a8d0255a489ee2c8c;hp=d872f626aac4a56a193845cd40e3527e3f975bc3;p=unfold.git

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

diff --git a/myslice/configengine.py b/myslice/configengine.py
index 5ce52605..680ddbce 100644
--- a/myslice/configengine.py
+++ b/myslice/configengine.py
@@ -35,6 +35,10 @@ class ConfigEngine(object):
     default_manifold_admin_password = 'demo'
     default_myslice_theme           = 'onelab'
 
+    #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"
 
     def __init__ (self):
         parser = RawConfigParser ()
diff --git a/portal/actions.py b/portal/actions.py
index e378ca50..31e4bcb6 100644
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -11,6 +11,8 @@ from django.template.loader     import render_to_string
 from django.core.mail           import EmailMultiAlternatives, send_mail
 
 from myslice.theme              import ThemeView
+from myslice.configengine       import ConfigEngine
+
 
 theme = ThemeView()
 
@@ -808,9 +810,9 @@ def iotlab_create_user (wsgi_request, request, namespace = None, as_admin=False)
     import time
     from requests.auth import HTTPBasicAuth
     
-    URL_REST = 'https://devgrenoble.senslab.info/rest/admin/users'
-    LOGIN_ADMIN = "auge"
-    PASSWORD_ADMIN = "k,mfg1+Q"
+    URL_REST = ConfigEngine.default_iotlab_url
+    LOGIN_ADMIN = ConfigEngine.default_iotlab_admin_user
+    PASSWORD_ADMIN = ConfigEngine.default_iotlab_admin_password
 
     auth = HTTPBasicAuth(LOGIN_ADMIN,PASSWORD_ADMIN)
     headers = {'content-type': 'application/json'}
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)
diff --git a/rest/monitor.py b/rest/monitor.py
index 4372a354..77295495 100644
--- a/rest/monitor.py
+++ b/rest/monitor.py
@@ -7,7 +7,7 @@ import ConfigParser
 
 def servicesStatus(request):
     Config = ConfigParser.ConfigParser()
-    Config.read(os.getcwd() + "/myslice/monitor.ini")
+    Config.read(os.getcwd() + "/myslice/myslice/monitor.ini")
     
     result = {}
     
@@ -16,15 +16,15 @@ def servicesStatus(request):
     
     cert = os.path.abspath(Config.get('monitor', 'cert'))
     if not os.path.isfile(cert) :
-         return HttpResponse(json.dumps({'error' : '-1'}), content_type="application/json")
+         return HttpResponse(json.dumps({'error' : '-2'}), content_type="application/json")
      
      
     if not Config.has_option('monitor', 'pkey') :
-        return HttpResponse(json.dumps({'error' : '-2'}), content_type="application/json")
+        return HttpResponse(json.dumps({'error' : '-3'}), content_type="application/json")
     
     pkey = os.path.abspath(Config.get('monitor', 'pkey'))
     if not os.path.isfile(pkey) :
-         return HttpResponse(json.dumps({'error' : '-2'}), content_type="application/json")
+         return HttpResponse(json.dumps({'error' : '-4'}), content_type="application/json")
     
     services = Config.sections()
     for s in services :