now at startup all nodes are setted as inactive

OnosTeam · Sep 11, 2016 · a151586 · a151586
1 parent 75965d0
commit a151586
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 11 deletions.
diff --git a/scripts_folder/Serial_connection_Handler.py b/scripts_folder/Serial_connection_Handler.py
@@ -5,7 +5,7 @@
 import arduinoserial
 import os
 import time,string
-from globalVar import *           # import parameter globalVar.py
+from conf import *           # import parameter globalVar.py
 
 exit=0
 

diff --git a/scripts_folder/Serial_connection_Handler.pyc b/scripts_folder/Serial_connection_Handler.pyc
diff --git a/scripts_folder/arduinoserial.py b/scripts_folder/arduinoserial.py
@@ -53,7 +53,7 @@
 import sys
 import time
 import getopt
-from globalVar import *           # import parameter globalVar.py
+from conf import *           # import parameter globalVar.py
 import thread,threading,time,string
 
 

diff --git a/scripts_folder/arduinoserial.pyc b/scripts_folder/arduinoserial.pyc
diff --git a/scripts_folder/conf.py b/scripts_folder/conf.py
@@ -21,7 +21,7 @@
 
 
 
-import globalVar
+from globalVar import*
 from web_object import *
 import router_handler
 import hw_node
@@ -241,7 +241,10 @@ def importConfig():
     node_address=tmp_node_dict[a][u"nodeAddress"]   
     hardware_node_type=hardwareModelDict[node_type]
     nodeDict[node_serial_number]=hw_node.HwNode(node_serial_number,hardware_node_type,node_address,router_hardware_fw_version) 
-
+    if nodeDict[node_serial_number].getNodeTimeout()!="never":
+      nodeDict[node_serial_number].setNodeActivity(0)  #set the node as inactive at startup if there is a getNodeTimeout for the node
+
+
   #ricreate the nodeDict from the json backup
   #note that the io config will be done in webserver.py where i add the objectList elements to object_dict
 

diff --git a/scripts_folder/conf.pyc b/scripts_folder/conf.pyc
diff --git a/scripts_folder/config_files/data.json b/scripts_folder/config_files/data.json
@@ -27,7 +27,7 @@
     }, 
     "WLightSS0004": {
       "hwModelName": "ProminiS", 
-      "nodeAddress": "003", 
+      "nodeAddress": "254", 
       "node_serial_number": "WLightSS0004"
     }
   }, 

diff --git a/scripts_folder/globalVar.py b/scripts_folder/globalVar.py
@@ -1638,15 +1638,15 @@
 conf_options={u"online_server_enable":online_server_enable,u"enable_mail_output_service":enable_mail_output_service,u"enable_mail_service":enable_mail_service,u"accept_only_from_white_list":accept_only_from_white_list,u"mail_whiteList":mail_whiteList,u"timezone":timezone,u"login_required":login_required,u"logTimeout":logTimeout,"online_usersDict":online_usersDict,"enable_onos_auto_update":enable_onos_auto_update,"scenarios_enable":scenarios_enable}
 
 #localhost/setup/node_manager/RouterGL0001
-hardwareModelDict["RouterGL"]={"hwName":"RouterGL","max_pin":5,"hardware_type":"gl.inet_only","pin_mode":{},"parameters":{},"timeout":180}
+hardwareModelDict["RouterGL"]={"hwName":"RouterGL","max_pin":5,"hardware_type":"gl.inet_only","pin_mode":{},"parameters":{},"timeout":"never"}
 hardwareModelDict["RouterGL"]["pin_mode"]["sr_relay"]={"socket":[(20,19)]}
 hardwareModelDict["RouterGL"]["pin_mode"]["digital_input"]={"d_sensor":[(21)]}
 hardwareModelDict["RouterGL"]["pin_mode"]["digital_output"]={"button":[(18),(22)]}
 hardwareModelDict["RouterGL"]["parameters"]["bash_pin_enable"]=1
 hardwareModelDict["RouterGL"]["parameters"]["serial_port_enable"]=0
 
 
-hardwareModelDict["RouterGA"]={"hwName":"RouterGA","max_pin":5,"hardware_type":"gl.inet_with_arduino2009","pin_mode":{},"parameters":{},"timeout":180}
+hardwareModelDict["RouterGA"]={"hwName":"RouterGA","max_pin":5,"hardware_type":"gl.inet_with_arduino2009","pin_mode":{},"parameters":{},"timeout":"never"}
 hardwareModelDict["RouterGA"]["pin_mode"]["sr_relay"]={"socket":[(20,19)]}
 hardwareModelDict["RouterGA"]["pin_mode"]["digital_input"]={"d_sensor":[(21)]}
 hardwareModelDict["RouterGA"]["pin_mode"]["digital_output"]={"button":[(18),(22)]}

diff --git a/scripts_folder/globalVar.pyc b/scripts_folder/globalVar.pyc
diff --git a/scripts_folder/hw_node.py b/scripts_folder/hw_node.py
@@ -23,7 +23,7 @@
 
 
 
-from  globalVar import *
+from  conf import *
 
 
 

diff --git a/scripts_folder/hw_node.pyc b/scripts_folder/hw_node.pyc
diff --git a/scripts_folder/node_query_handler.py b/scripts_folder/node_query_handler.py
@@ -10,7 +10,7 @@
 """
 
 
-from globalVar import *
+from conf import *
 
 
 

diff --git a/scripts_folder/node_query_handler.pyc b/scripts_folder/node_query_handler.pyc
diff --git a/scripts_folder/router_handler.py b/scripts_folder/router_handler.py
@@ -24,7 +24,7 @@
 
 
 
-from globalVar import *
+from conf import *
 from node_query_handler import *
 import arduinoserial,Serial_connection_Handler
 

diff --git a/scripts_folder/router_handler.pyc b/scripts_folder/router_handler.pyc
diff --git a/scripts_folder/web_object.py b/scripts_folder/web_object.py
@@ -18,7 +18,7 @@
 
 #import os
 
-from globalVar import *           # import parameter globalVar.py
+from conf import *           # import parameter globalVar.py
 global exit  #if exit ==1 all the program stop and exit
 
 global router_hardware_type

diff --git a/scripts_folder/web_object.pyc b/scripts_folder/web_object.pyc
diff --git a/scripts_folder/webserver.py b/scripts_folder/webserver.py
@@ -1310,6 +1310,17 @@ def createNewWebObjFromNode(hwType0,node_sn):
   a.InitFunction()
   s=a.getStartStatus()
   a.setStatus(s)
+  obj_node_address=a.getHwNodeSerialNumber()
+  if obj_node_address in nodeDict.keys():
+    if nodeDict[obj_node_address].getNodeTimeout()!="never": 
+      a.setStatus("inactive")
+      nodeDict[obj_node_address].updateLastNodeSync(99999)
+
+
+
+
+
+
 
 
 for a in object_dict.keys():#check and remove the not used scenarios from web_object attachedScenarios