snake_case

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@2362 b32b6428-25c9-4566-ad07-03861ab6144f

apps/rest/xaal/rest/app.py

@@ -28,7 +28,7 @@ cfg = None
 
 def monitor_filter(msg):
     """ Filter incomming messages. Return False if you don't want to use this device"""
-    if msg.devtype in BLACK_LIST:
+    if msg.dev_type in BLACK_LIST:
         return False
     return True
 
@@ -90,7 +90,7 @@ def list_devices():
     """ Return the list of devices in JSON"""
     l = []
     for dev in monitor.devices:
-        h = {'address':dev.address,'devtype':dev.devtype,'info':dev.description.get('info',None)}
+        h = {'address':dev.address,'dev_type':dev.dev_type,'info':dev.description.get('info',None)}
         l.append(h)
     response.headers['Content-Type'] = 'application/json'
     return json_encode(l)
@@ -101,7 +101,7 @@ def get_device(addr):
     response.headers['Content-Type'] = 'application/json'
     dev = search_device(addr)
     if dev:
-        res = {'address':dev.address,'devtype':dev.devtype}
+        res = {'address':dev.address,'dev_type':dev.dev_type}
         res.update({'attributes':dev.attributes})
         res.update({'description':dev.description})
         res.update({'metadata':dev.db})

apps/rest/xaal/rest/static/device.html

@@ -10,7 +10,7 @@
 <table>
 <tr><th>Name</th><th>value</th></tr>
 <tr><td>address</td><td><span id="address">undef</span></td></tr>
-<tr><td>devtype</td><td><span id="devtype">undef</span></td></tr>
+<tr><td>dev_type</td><td><span id="dev_type">undef</span></td></tr>
 <tr><td>JSON URL</td><td><span id="resturl">undef</span></td></tr>
 </table>
 
@@ -53,8 +53,8 @@ function update() {
     var url=baseUrl+"/devices/"+addr;
     $.getJSON(url, function(result){
         $("#address").text(result["address"]);
-        var schema= "http://recherche.telecom-bretagne.eu/xaal/documentation/" + result["devtype"];
-        $("#devtype").html("<a href="+schema+">"+result["devtype"]+"</a>");
+        var schema= "http://recherche.telecom-bretagne.eu/xaal/documentation/" + result["dev_type"];
+        $("#dev_type").html("<a href="+schema+">"+result["dev_type"]+"</a>");
         $("#resturl").html("<a href="+url+">"+url+"</a>");
            
         $("#description").html("<tr><th>Name</th><th>Value</th></tr>");

apps/rest/xaal/rest/static/index.html

@@ -32,12 +32,12 @@ function update() {
   $.getJSON(url, function(result){
         $("#devices").html("<tr><th>DevType</th><th>Address</th><th>Info</th></tr>");
         $.each(result, function(i, field){
-            var devtype= field['devtype'];
+            var dev_type= field['dev_type'];
             var addr= field['address'];
             var json= "./device.html?addr="+addr;
             var link= "<a href="+json+">"+addr+"</a>";
             var info=field['info'];
-            $("#devices").append("<tr><td>"+devtype+"</td><td>" +link+ "</td><td>"+info+"</td></tr>");
+            $("#devices").append("<tr><td>"+dev_type+"</td><td>" +link+ "</td><td>"+info+"</td></tr>");
         });
     });
 }