Restructuration du projet - phase 2 :

pyros_django/ => src/core/pyros_django/ il a fallu faire des changements un peu partout... pour que tout remarche

Restructuration du projet - phase 2 :
pyros_django/ => src/core/pyros_django/ il a fallu faire des changements un peu partout... pour que tout remarche
Etienne Pallier
1 parent 1cffbf1c
Showing 14 changed files with 120 additions and 68 deletions Show diff stats
.pydevproject
devices_channel/README.md
devices_channel/client/devices_abstract/device_controller_abstract.py
devices_channel/client/devices_abstract/plc_controller_abstract.py
devices_channel/client/devices_abstract/telescope_controller_abstract.py
pyros.py
src/__init__.py
src/core/__init__.py
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/monitoring/AgentM.py
src/core/pyros_django/monitoring/tasks.py
src/core/pyros_django/pyros/settings.py
src/core/pyros_django/utils/Logger.py
start_agent.py
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
-                        
+                            
+    
     <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-                        
+                            
+    
     <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
-                        
+                            
+    
     <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-                
-        <path>/${PROJECT_DIR_NAME}/pyros_django</path>
-                
+        <path>/${PROJECT_DIR_NAME}/src</path>
         <path>/${PROJECT_DIR_NAME}/simulators</path>
-            
     </pydev_pathproperty>
-                        
+                            
+    
     <pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION">
-                                                
+                                                        
+        
         <key>DJANGO_MANAGE_LOCATION</key>
-                                                
+                                                        
+        
-        <value>pyros_django/manage.py</value>
-                                                
+        <value>src/core/pyros_django/manage.py</value>
+                                                        
+        
         <key>DJANGO_SETTINGS_MODULE</key>
-                                                
+                                                        
+        
         <value>pyros.settings</value>
-                                            
+                                                    
+    
     </pydev_variables_property>
-                    
+                        
+
-VERSION: 0.30.3
+VERSION: 0.30.4
-Date: 13/06/2019
+Date: 14/06/2019
 By: epallier@irap.omp.eu
-Comment : Restructuration du projet - phase 1 : src/ => pyros_django/
+Comment : Restructuration du projet - phase 2 : pyros_django/ => src/core/pyros_django/
@@ -13,7 +13,10 @@ Comment : Restructuration du projet - phase 1 : src/ =&gt; pyros_django/
 ********************************************************************************************
 HISTORY
-11/06/2019
+14/06/2019 (v0.30.3)
+	- Restructuration du projet - phase 1 : src/ => pyros_django/
+
+11/06/2019 (v0.30.2)
 	- Ajouté options "test" et "testall" dans pyros.py pour exécution des (anciens) tests unitaires
 	- Restructuring : private/ => venv/
@@ -22,7 +22,7 @@ import time
 sys.path.append("..")
 # from src_socket/client/
 sys.path.append("../../..")
-import pyros_django.utils.celme as celme
+import src.core.pyros_django.utils.celme as celme
 from devices_channel.client.logs import *
@@ -20,7 +20,7 @@ import time
 sys.path.append("..")
 # from src_socket/client/
 sys.path.append("../../..")
-import pyros_django.utils.celme as celme
+import src.core.pyros_django.utils.celme as celme
 # Local application imports
@@ -20,7 +20,7 @@ import time
 sys.path.append("..")
 # from src_socket/client/
 sys.path.append("../../..")
-import pyros_django.utils.celme as celme
+import src.core.pyros_django.utils.celme as celme
 # Local application imports
@@ -21,8 +21,12 @@ import time
 DEBUG = False
+PYROS_DJANGO_BASE_DIR = "src/core/pyros_django"
+
 INIT_FIXTURE = "initial_fixture.json"
+_previous_dir = None
+
 AGENTS = {
     #"agentX" : "agent", 
     "agent" : "Agent", 
@@ -243,7 +247,7 @@ def shell():
     print("    >>> agent.run(2) (=> will run 2 iterations)")
     print("    >>> cmd = agent.send_command('AgentB','eval 2+2')")
     print("    >>> cmd")
-    print("    >>> cmd1.get_updated_result()")
+    print("    >>> cmd.get_updated_result()")
     print("    >>> ...")
     print("    - See documentation, section 'Play with a pyros agent' inside the chapter 'Running pyros' for more details")
     print()
@@ -259,11 +263,13 @@ def shell():
     print()
     print("Type 'exit()' to quit")
     print()
-    os.chdir("pyros_django/")
+    change_dir(PYROS_DJANGO_BASE_DIR)
+
     # execProcess("python install.py install")
     if not test_mode(): execProcessFromVenv("manage.py shell")
     # Go back to the initial dir
-    os.chdir("../")
+    #os.chdir("../")
+    change_dir("PREVIOUS")
     return True
@@ -276,7 +282,7 @@ def dbshell():
     print("Type 'exit' to quit")
     print()
     # execProcess("python install.py install")
-    if not test_mode(): execProcessFromVenv("pyros_django/manage.py dbshell")
+    if not test_mode(): execProcessFromVenv(PYROS_DJANGO_BASE_DIR+"/manage.py dbshell")
     # Go back to the initial dir
     return True
@@ -307,17 +313,17 @@ def test():
     apps = ['common', 'scheduler', 'routine_manager', 'user_manager', 'alert_manager.tests.TestStrategyChange']
     for app in apps:
         _loaddata() or die()
-        change_dir("pyros_django")
+        change_dir(PYROS_DJANGO_BASE_DIR)
         execProcessFromVenv('manage.py test ' + app) or die()
-        change_dir("..")
+        change_dir("PREVIOUS")
     # execProcess("python install.py install")
     return True
 @pyros_launcher.command(help="Run ALL tests")
 def testall():
-    change_dir("pyros_django")
+    change_dir(PYROS_DJANGO_BASE_DIR)
     execProcessFromVenvAsync("manage.py test")
-    change_dir("..")
+    change_dir("PREVIOUS")
     return True
@@ -386,7 +392,7 @@ def start(agent:str, configfile:str):
     if configfile: 
         print("With config file", configfile)
     else: 
-        configfile = '' 
+        configfile = ''
     #if test_mode(): print("in test mode")
     #if verbose_mode(): print("in verbose mode")
@@ -425,11 +431,11 @@ def start(agent:str, configfile:str):
             # Agent "webserver"
             if agent_name == "webserver": 
                 cmd = "manage.py runserver"
-                os.chdir("pyros_django")
+                os.chdir(PYROS_DJANGO_BASE_DIR)
             #if not test_mode(): execProcessFromVenv("start_agent.py " + agent_name + " " + configfile)
             elif agent_name == "agentM": 
-                os.chdir("pyros_django/monitoring/")
+                os.chdir(PYROS_DJANGO_BASE_DIR+"/monitoring/")
                 cmd = f"Agent{agent_name[5:]}.py"
                 if test_mode(): cmd += " -t"
                 if configfile: cmd += " {configfile}"
@@ -438,7 +444,7 @@ def start(agent:str, configfile:str):
             elif agent_name.startswith("agent"):
                 # Run agent without actual commands sent to devices (FOR_REAL=False)
                 ##agentX.run(FOR_REAL=True)
-                os.chdir("pyros_django/agent/")
+                os.chdir(PYROS_DJANGO_BASE_DIR+"/agent/")
                 #cmd = "-m AgentX"
                 #cmd = f" Agent{agent_name[5:]}.py {configfile}"
                 cmd = f"Agent{agent_name[5:]}.py"
@@ -507,39 +513,42 @@ def _update_python_packages_from_requirements():
 def _update_plantuml_diags():
     res = False
-    for dirpath, dirnames, files in os.walk('pyros_django'):
+    for dirpath, dirnames, files in os.walk(PYROS_DJANGO_BASE_DIR):
         if os.path.basename(dirpath) == "doc":
             diagrams = glob.glob(dirpath+os.sep+"*.pu")
             for diag in diagrams: res = execProcessFromVenv("-m plantuml "+diag)
     return res
 def _migrate():
-    change_dir("pyros_django")
+    change_dir(PYROS_DJANGO_BASE_DIR)
     # Migrate only migrations for the app "common"
     #res = execProcessFromVenv("manage.py migrate common")
     # Migrate all migrations for ALL apps
     res = execProcessFromVenv("manage.py migrate")
-    change_dir("..")
+    change_dir("PREVIOUS")
     return res
 def _makemigrations():
-    change_dir("pyros_django")
+    change_dir(PYROS_DJANGO_BASE_DIR)
     #execProcessFromVenv(self.venv_bin + " manage.py makemigrations")
     #res = execProcessFromVenv("manage.py makemigrations common")
     res = execProcessFromVenv("manage.py makemigrations")
-    change_dir("..")
+    change_dir("PREVIOUS")
     return res
 #TODO: mettre la fixture en date naive (sans time zone)
 def _loaddata():
-    change_dir("pyros_django")
+    change_dir(PYROS_DJANGO_BASE_DIR)
     #execProcessFromVenv(self.venv_bin + " manage.py loaddata misc" + os.sep + "fixtures" + os.sep + self.INIT_FIXTURE)
     res = execProcessFromVenv("manage.py loaddata misc" + os.sep + "fixtures" + os.sep + INIT_FIXTURE)
-    change_dir("..")
+    change_dir("PREVIOUS")
     return res
 def change_dir(path):
+    global _previous_dir
+    if path == "PREVIOUS": path=_previous_dir
+    _previous_dir = os.getcwd()
     if DEBUG: print("Moving to : " + path)
     os.chdir(path)
     if DEBUG: print("Current directory : " + str(os.getcwd()))
@@ -3,7 +3,7 @@
 VERSION = "0.5"
 DEBUG=True
-DEBUG=False
+#DEBUG=False
 """TODO:
@@ -45,6 +45,8 @@ from django.conf import settings as djangosettings
 # To avoid a "ModuleNotFoundError: No module named 'src'"
 sys.path.append("..")
 sys.path.append("../..")
+sys.path.append("../../..")
+sys.path.append("../../../..")
 ##sys.path.append("src")
 print("Starting with this sys.path", sys.path)
@@ -56,7 +58,8 @@ print(&quot;Starting with this sys.path&quot;, sys.path)
 ##os.chdir("src")
 print("Current directory : " + str(os.getcwd()))
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pyros_django.pyros.settings")
+#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.core.pyros_django.pyros.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.core.pyros_django.pyros.settings")
 # os.environ['SECRET_KEY'] = 'abc'
 # os.environ['ENVIRONMENT'] = 'production'
 import django
@@ -332,8 +335,19 @@ class Agent:
     MODE_ACTIVE = "ACTIVE"
     MODE_IDLE = "IDLE"
+    PYROS_DJANGO_BASE_DIR = "src/core/pyros_django"
     DEFAULT_CONFIG_FILE_NAME = "config_unit_simulunit1.xml"
-    CONFIG_DIR = "config"
+    CONFIG_DIR_NAME = "config"
+
+    # Parameters from config file
+    # for /src/
+    #_path_data = '../../config'
+    # for /src/core/pyros_django/
+    #_path_data = '../../../../config'
+    # Path to config
+    _path_data = ''
+    _computer_alias = ''
+    _computer_description = ''
     # Current and next command to send
     cmdts = None
@@ -344,10 +358,6 @@ class Agent:
     _current_specific_cmd = None
     _current_specific_thread = None
-    # Parameters from config file
-    _computer_alias = ''
-    _computer_description = ''
-    _path_data = '../../config'
     _iter_num = None
@@ -364,6 +374,14 @@ class Agent:
         self._log = LogPyros()
         self._log.set_agent_alias(self.name)
+        #print(os.path.dirname(__file__))
+        my_parent_abs_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+        #print(os.path.dirname(os.path.realpath(__file__)))
+        #print(djangosettings.BASE_DIR)
+        self.BASE_DIR = my_parent_abs_dir.split(self.PYROS_DJANGO_BASE_DIR)[0]
+        #print(self.BASE_DIR)
+        self._path_data = os.path.join(self.BASE_DIR, self.CONFIG_DIR_NAME)
+
         #self.set_mode(self.MODE_IDLE)
         if not config_filename:
             config_filename = self.DEFAULT_CONFIG_FILE_NAME
@@ -374,14 +392,14 @@ class Agent:
         # => give it an absolute path (and remove "src/agent/" from it)
         if config_filename == os.path.basename(config_filename):
             # Build abs path including current agent dir
-            config_filename = os.path.abspath(self.CONFIG_DIR + os.sep + config_filename)
+            config_filename = os.path.abspath(self.CONFIG_DIR_NAME + os.sep + config_filename)
             # Remove "src/agent_name/" from abs dir :
-            # (1) Remove "src/"
-            config_filename = config_filename.replace(os.sep+"pyros_django"+os.sep,os.sep)
+            # (1) Remove "src/core/pyros_django/"
+            config_filename = config_filename.replace(self.PYROS_DJANGO_BASE_DIR+os.sep, os.sep)
             # (2) Remove "agent_name/"
             #TODO: bidouille, faire plus propre
-            config_filename = config_filename.replace(os.sep+"agent"+os.sep,os.sep)
-            config_filename = config_filename.replace(os.sep+"monitoring"+os.sep,os.sep)
+            config_filename = config_filename.replace(os.sep+"agent"+os.sep, os.sep)
+            config_filename = config_filename.replace(os.sep+"monitoring"+os.sep, os.sep)
         self.printd("Config file used is", config_filename)
         #self.printd("current path", os.getcwd())
         #self.printd("this file path :", __file__)
@@ -446,6 +464,7 @@ class Agent:
         while self.DO_RESTART:
             self.DO_RESTART = False
+            self.printd("on est ici: ", os.getcwd())
             self.load_config()
             if self.SIMULATOR_MODE:
@@ -746,12 +765,16 @@ class Agent:
         unit_subtag = 'computer'
         aliases = self.config.get_aliases(unit_subtag)
         for alias in aliases:
+            self.printd("alias", alias)
             value = self.config.get_paramvalue(alias,'local','hostname')
+            self.printd("value", value)
             if value == hostname:
+                self.printd("value", value)
                 self._computer_alias = alias
                 value = self.config.get_paramvalue(alias,unit_subtag,'description')
                 self._computer_description = value
                 value = self.config.get_paramvalue(alias,'path','data')
+                # Overrides default value
                 self._path_data = value
                 break
         print(f"hostname = {hostname}")
@@ -10,11 +10,11 @@ import sys
 sys.path.append("..")
 sys.path.append("../..")
-from pyros_django.agent.Agent import Agent, extract_parameters
+from src.core.pyros_django.agent.Agent import Agent, extract_parameters
 # PM 20190416 recycle code
-from pyros_django.devices.PLC import PLCController
-from pyros_django.monitoring.plc_checker import PlcChecker
+from src.core.pyros_django.devices.PLC import PLCController
+from src.core.pyros_django.monitoring.plc_checker import PlcChecker
 from common.models import *
 ##log = L.setupLogger("AgentXTaskLogger", "AgentX")
@@ -2,7 +2,7 @@ from __future__ import absolute_import
 from django.conf import settings
 from common.models import *
-from pyros_django.monitoring.plc_checker import PlcChecker
+from src.core.pyros_django.monitoring.plc_checker import PlcChecker
 from devices.PLC import PLCController
 from utils.JDManipulator import *
 import json
@@ -50,6 +50,7 @@ import os
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # Output folder for images
+#TODO: c'est quoi ce dossier ? existe-t-il vraiment ???
 OUTPUT_FOLDER = os.path.join(BASE_DIR, "../images_folder")
 # Quick-start development settings - unsuitable for production
@@ -144,10 +145,10 @@ LOGIN_URL = &quot;/&quot;
 # DATABASE CONFIG
 '''
-From MySQL 5.7 onwards and on fresh installs of MySQL 5.6, 
-the default value of the sql_mode option contains STRICT_TRANS_TABLES. 
-That option escalates warnings into errors when data are truncated upon insertion, 
-so Django highly recommends activating a strict mode for MySQL to prevent data loss 
+From MySQL 5.7 onwards and on fresh installs of MySQL 5.6,
+the default value of the sql_mode option contains STRICT_TRANS_TABLES.
+That option escalates warnings into errors when data are truncated upon insertion,
+so Django highly recommends activating a strict mode for MySQL to prevent data loss
 (either STRICT_TRANS_TABLES or STRICT_ALL_TABLES)
 '''
 mysql_options = { 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'" }
 from django.conf import settings
 import logging
-logging.basicConfig(filename='%s/../logs/pyros.log'%(settings.BASE_DIR), format='-> At : [%(asctime)s]\n\t By module [%(module)s] logger : [%(name)s] : "%(message)s"', level=logging.DEBUG)
+# If django project is in /src/ :
+#RELATIVE_PATH_TO_LOG_DIR = '../logs/'
+#logging.basicConfig(filename='%s/../logs/pyros.log'%(settings.BASE_DIR), format='-> At : [%(asctime)s]\n\t By module [%(module)s] logger : [%(name)s] : "%(message)s"', level=logging.DEBUG)
+# If django project is in /src/core/pyros_django/ : 
+RELATIVE_PATH_TO_LOG_DIR = '../../../logs'
+logging.basicConfig(filename = f'{settings.BASE_DIR}/{RELATIVE_PATH_TO_LOG_DIR}/pyros.log', 
+                    format = '-> At : [%(asctime)s]\n\t By module [%(module)s] logger : [%(name)s] : "%(message)s"', 
+                    level = logging.DEBUG)
+#logging.basicConfig(filename='%s/../../../logs/pyros.log'%(settings.BASE_DIR), format='-> At : [%(asctime)s]\n\t By module [%(module)s] logger : [%(name)s] : "%(message)s"', level=logging.DEBUG)
 def setupLogger(logger_name, log_file, level=logging.INFO):
     l = logging.getLogger(logger_name)
     formatter = logging.Formatter('[%(message)s] at %(filename)s : %(lineno)s')
-    fileHandler = logging.FileHandler('%s/../logs/%s.log'%(settings.BASE_DIR, log_file), mode='w')
+    #fileHandler = logging.FileHandler('%s/../logs/%s.log'%(settings.BASE_DIR, log_file), mode='w')
+    fileHandler = logging.FileHandler(f'{settings.BASE_DIR}/{RELATIVE_PATH_TO_LOG_DIR}/{log_file}.log', mode='w')
     fileHandler.setFormatter(formatter)
     # streamHandler = logging.StreamHandler()
     # streamHandler.setFormatter(formatter)
@@ -85,24 +85,24 @@ if agent_name not in AGENTS:
     sys.exit(1)
 if agent_name == "majordome":
-    from pyros_django.majordome.tasks import Majordome
+    from src.core.pyros_django.majordome.tasks import Majordome
     Majordome().run(FOR_REAL=True)
     sys.exit(0)
 if agent_name == "monitoring":
-    from pyros_django.monitoring.tasks import Monitoring
+    from src.core.pyros_django.monitoring.tasks import Monitoring
     Monitoring().run()
     sys.exit(0)
 if agent_name == "agentA":
-    from pyros_django.agent.AgentA import AgentA
+    from src.core.pyros_django.agent.AgentA import AgentA
     agentA = AgentA(name="agentA", config_filename=configfile)
     # Run agent without actual commands sent to devices (FOR_REAL=False)
     agentA.run(FOR_REAL=True)
     sys.exit(0)
 if agent_name == "agentM":
-    from pyros_django.monitoring.AgentM import AgentM
+    from src.core.pyros_django.monitoring.AgentM import AgentM
     agentM = AgentM(name="agentM", config_filename=configfile)
     # Run agent without actual commands sent to devices (FOR_REAL=False)
     agentM.run(FOR_REAL=True)
@@ -116,7 +116,7 @@ agent.run(FOR_REAL=True)
 # Default agent is AgentX
-from pyros_django.agent.AgentX import AgentX
+from src.core.pyros_django.agent.AgentX import AgentX
 # AgentX().run(FOR_REAL=False)
 agentX = AgentX(name="agentX", config_filename=configfile)