new AgentC qui herite de new Agent et qui load la config a chaque iteration et l'affiche

Etienne Pallier
1 parent 88767c84
Showing 4 changed files with 388 additions and 79 deletions Show diff stats
docker/PYROS_DOCKER_RUN
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/agent/AgentC.py
src/core/pyros_django/obsconfig/configpyros.py
@@ -7,12 +7,15 @@ then
     ./PYROS_DOCKER_START.bat
 fi
  
+echo "LOG files :"
+
 # 1) Web server
 # - Display log on current terminal
 #docker exec -it pyros python3 pyros.py start webserver $@
 # - Save log in file
 #docker exec pyros python3 pyros.py start webserver $@ > ../../LOG_PYROS_webserver.log 2>&1 &
-docker exec pyros python3 pyros.py start -o tnc webserver > ../../LOG_PYROS_webserver.log 2>&1 &
+docker exec pyros python3 pyros.py start -o tnc webserver >> ../../LOG_PYROS_webserver.log 2>&1 &
+echo "- Webserver LOG file is ../../LOG_PYROS_webserver.log"
  
 # exit if webserver only
 #[[ $1 == "web" ]] && exit
@@ -24,13 +27,15 @@ if [[ $1 != &quot;web&quot; ]] ; then
 # - Display log on current terminal
 #docker exec -it pyros bash -c "cd simulators/plc/ ; ./plcSimulator.py"
 # - Save log in file
-docker exec pyros bash -c "cd simulators/plc/ ; ./plcSimulator.py" > ../../LOG_PYROS_plc_simulator.log 2>&1 &
+docker exec pyros bash -c "cd simulators/plc/ ; ./plcSimulator.py" >> ../../LOG_PYROS_plc_simulator.log 2>&1 &
+echo "- PLC simulator LOG file is ../../LOG_PYROS_plc_simulator.log"
  
 # 3) Agent Monitoring (AgentM)
 # - Display log on current terminal
 #docker exec -it pyros python3 pyros.py start agentM
 # - Save log in file
-docker exec pyros python3 pyros.py start agentM > ../../LOG_PYROS_agent_monitoring.log 2>&1 &
+docker exec pyros python3 pyros.py start agentM >> ../../LOG_PYROS_agent_monitoring.log 2>&1 &
+echo "- Agent Monitoring LOG file is ../../LOG_PYROS_agent_monitoring.log"
  
 fi
  
@@ -117,8 +117,11 @@ import config.old_config as config_old
 #from config import *
  
 from common.models import AgentSurvey, AgentCmd, AgentLogs
+
 #from config.configpyros import ConfigPyros
-from config.old_config.configpyros import ConfigPyros
+from config.old_config.configpyros import ConfigPyros as ConfigPyrosOld
+from src.core.pyros_django.obsconfig.configpyros import ConfigPyros
+
 #from dashboard.views import get_sunelev
 #from devices.TelescopeRemoteControlDefault import TelescopeRemoteControlDefault
 #from utils.JDManipulator import *
@@ -131,6 +134,7 @@ from device_controller.abstract_component.device_controller import (
 )
  
  
+
 """
 =================================================================
     GENERAL MODULE CONSTANT & FUNCTIONS DEFINITIONS
@@ -380,6 +384,9 @@ class Agent:
     CONFIG_DIR_NAME = "config"
     '''
  
+    # My own ConfigPyros instance (Observatory Configuration) 
+    _oc = None
+
     # Parameters from config file
     # for /src/
     #_path_data = '../../config'
@@ -420,6 +427,10 @@ class Agent:
         print('ROOT_DIR', ROOT_DIR)
         print('DOC_DIR', DOC_DIR)
         '''
+
+        # SET CONFIG INSTANCE
+
+        # - OLD CONFIG
         print('config file is', config_filename)
         ##print('PYROS_ENV', config.PYROS_ENV)
         print('PYROS_ENV', config_old.PYROS_ENV)
@@ -430,6 +441,13 @@ class Agent:
         if config_old.is_prod_env(): print("PROD ENV")
         if config_old.is_debug(): print("IN DEBUG MODE")
  
+        # - NEW CONFIG
+        obs_config_file_path = os.environ["PATH_TO_OBSCONF_FILE"]
+        path_to_obs_config_folder = os.environ["PATH_TO_OBSCONF_FOLDER"]
+        unit = os.environ["unit_name"]
+        oc = ConfigPyros(obs_config_file_path)
+        self.set_config(oc, obs_config_file_path, path_to_obs_config_folder, unit)
+
         #self.name = name
         self.name = self.__class__.__name__
         '''
@@ -465,7 +483,7 @@ class Agent:
         #self._set_mode(self.MODE_IDLE)
         config_filename = self.get_config_filename(config_filename)
         self.printd(f"*** Config file used is={config_filename}")
-        self.config = ConfigPyros(config_filename)
+        self.config = ConfigPyrosOld(config_filename)
         if self.config.get_last_errno() != self.config.NO_ERROR:
             raise Exception(f"Bad config file name '{config_filename}', error {str(self.config.get_last_errno())}: {str(self.config.get_last_errmsg())}")
  
@@ -504,6 +522,96 @@ class Agent:
         self.printd("Agent survey is", self._agent_survey)
  
  
+    def set_config(self, oc: ConfigPyros, obs_config_file_path: str, path_to_obs_config_folder: str, unit: str):
+        self._oc = {
+            'config' : oc,
+            'env' : [
+                obs_config_file_path,
+                path_to_obs_config_folder,
+                unit
+            ]
+        }
+        '''
+        config_env = {
+            obs_config_file_path: obs_config_file_path,
+            path_to_obs_config_folder: path_to_obs_config_folder,
+            unit: unit
+        }
+        '''
+
+    def get_config_instance(self): return self._oc['config']
+
+    def get_config_env(self): return self._oc['env']
+
+    def show_config(self):
+        oc = self.get_config_instance()
+        obs_config_file_path, path_to_obs_config_folder, unit = self.get_config_env()
+    
+        self.printd(obs_config_file_path)
+        self.printd(path_to_obs_config_folder)
+        self.printd(unit)
+        print("\n")
+        print("- Observatory:", oc.get_obs_name())
+        my_unit_name = oc.get_units_name()[0]
+        my_unit = (oc.get_units()[my_unit_name])
+    
+        #print("- Unit description:", my_unit)
+    
+        print("\n")
+        print("- Computers:", oc.get_computers())
+    
+        print("\n")
+        print("- Active Computers:", oc.get_active_computers())
+    
+        print("\n")
+        print("- Active Devices:", oc.get_active_devices())
+    
+        print("\n")
+        print("- Unit:", my_unit_name)
+        print(oc.get_unit_by_name(my_unit_name))
+    
+        print("\n")
+        print("- Unit topology:", oc.get_topology(my_unit_name))
+    
+        print("\n")
+        print("- Unit active Agents:", oc.get_active_agents(my_unit_name))
+        print(oc.get_agents(my_unit_name))
+    
+        print("\n")
+        print("- Unit Agents per computer:", oc.get_agents_per_computer(my_unit_name))
+    
+        print("\n")
+        print("- Unit Agents per device:", oc.get_agents_per_device(my_unit_name))
+    
+        print("\n")
+        print("- Unit Channel groups:", oc.get_channel_groups(my_unit_name))
+    
+        print("\n")
+        print("- Unit Channels:", oc.get_channels(my_unit_name))
+    
+        print("\n")
+        print("- Unit/Channel info:", oc.get_channel_information(my_unit_name, 'OpticalChannel_up'))
+    
+        print("\n")
+        print("- Unit Components agents:", oc.get_components_agents(my_unit_name))
+    
+        print("\n")
+        print("- Unit database:", oc.get_database_for_unit(my_unit_name))
+    
+        print("\n")
+        print("- Devices names:", oc.get_devices_names())
+        print("\n")
+        print("- Devices names & files:", oc.get_devices_names_and_file())
+        print("\n")
+        print("- Devices:", oc.get_devices())
+    
+        print("\n")
+
+
+
+
+
+
     def get_config_filename(self, config_filename: str):
         if not config_filename:
             #config_filename = self.DEFAULT_CONFIG_FILE_NAME
@@ -647,6 +755,8 @@ class Agent:
         if not self._DO_MAIN_LOOP: return 
  
         self._load_config() # only if changed
+        self.show_config()
+
  
         # Log this agent status (update my current mode and status in DB)
         self._log_agent_status()
@@ -952,6 +1062,12 @@ class Agent:
             return -1
         '''
         self.printd("Loading the config file...")
+
+        # - NEW CONFIG
+        self.get_config_instance().load(self.get_config_env()[0])
+
+
+        # - OLD CONFIG
         self.config.load()
         if self.config.get_last_errno() != self.config.NO_ERROR:
             raise Exception(f"error {str(self.config.get_last_errno())}: {str(self.config.get_last_errmsg())}")
@@ -1625,6 +1741,7 @@ def build_agent(Agent_type:Agent, RUN_IN_THREAD=True):
     #agent = Agent_type(name, configfile, RUN_IN_THREAD)
     agent._set_with_simulator(WITH_SIM)
     agent._set_test_mode(TEST_MODE)
+
     #agent._set_debug_mode(DEBUG_MODE)
     return agent
  
@@ -1637,72 +1754,8 @@ if __name__ == &quot;__main__&quot;:
     #RUN_IN_THREAD=False
  
     agent = build_agent(Agent, RUN_IN_THREAD=RUN_IN_THREAD)
-    obs_config_file_path = os.environ["PATH_TO_OBSCONF_FILE"]
-    path_to_obs_config_folder = os.environ["PATH_TO_OBSCONF_FOLDER"]
-    unit = os.environ["unit_name"]
-    print("TOTO")
-    agent.printd(obs_config_file_path)
-    agent.printd(path_to_obs_config_folder)
-    agent.printd(unit)
-    from src.core.pyros_django.obsconfig.configpyros import ConfigPyros
-    oc = ConfigPyros(obs_config_file_path)
-
-    print("\n")
-    print("- Observatory:", oc.get_obs_name())
-
-    my_unit_name = oc.get_units_name()[0]
-    my_unit = (oc.get_units()[my_unit_name])
-    #print("- Unit description:", my_unit)
-
-    print("\n")
-    print("- Computers:", oc.get_computers())
-
-    print("\n")
-    print("- Active Computers:", oc.get_active_computers())
-
-    print("\n")
-    print("- Active Devices:", oc.get_active_devices())
-
-    print("\n")
-    print("- Unit:", my_unit_name)
-    print(oc.get_unit_by_name(my_unit_name))
-
-    print("\n")
-    print("- Unit topology:", oc.get_topology(my_unit_name))
-
-    print("\n")
-    print("- Unit active Agents:", oc.get_active_agents(my_unit_name))
-    print(oc.get_agents(my_unit_name))
-
-    print("\n")
-    print("- Unit Agents per computer:", oc.get_agents_per_computer(my_unit_name))
-
-    print("\n")
-    print("- Unit Agents per device:", oc.get_agents_per_device(my_unit_name))
-
-    print("\n")
-    print("- Unit Channel groups:", oc.get_channel_groups(my_unit_name))
-
-    print("\n")
-    print("- Unit Channels:", oc.get_channels(my_unit_name))
-
-    print("\n")
-    print("- Unit/Channel info:", oc.get_channel_information(my_unit_name, 'OpticalChannel_up'))
-
-    print("\n")
-    print("- Unit Components agents:", oc.get_components_agents(my_unit_name))
-
-    print("\n")
-    print("- Unit database:", oc.get_database_for_unit(my_unit_name))
-
-    print("\n")
-    print("- Devices names:", oc.get_devices_names())
-    print("\n")
-    print("- Devices names & files:", oc.get_devices_names_and_file())
-    print("\n")
-    print("- Devices:", oc.get_devices())
  
-    print("\n")
+    agent.show_config()
  
     exit(0)
     #agent = build_agent(Agent, name="GenericAgent", RUN_IN_THREAD=RUN_IN_THREAD)
@@ -0,0 +1,249 @@
+#!/usr/bin/env python3
+
+
+import sys
+##import utils.Logger as L
+
+##from .Agent import Agent
+sys.path.append("..")
+from agent.Agent import Agent, build_agent
+
+
+##log = L.setupLogger("AgentXTaskLogger", "AgentX")
+
+
+
+class AgentC(Agent):
+
+    # FOR TEST ONLY
+    # Run this agent in simulator mode
+    TEST_MODE = False
+    # Run the assertion tests at the end
+    TEST_WITH_FINAL_TEST = True
+    #TEST_MAX_DURATION_SEC = None
+    TEST_MAX_DURATION_SEC = 100
+    # Who should I send commands to ?
+    #TEST_COMMANDS_DEST = "myself"
+    TEST_COMMANDS_DEST = "AgentB"
+    # Scenario to be executed
+    TEST_COMMANDS_LIST = [
+        # Ask receiver to delete all its previous commands 
+        "flush_commands",
+
+        "go_active",
+
+        # Because of this command, the receiver agent :
+        # - will no more send any new command
+        # - will only execute "generic" commands (and not the "specific" ones)
+        "go_idle",
+
+        # Not executed (skipped) because receiver agent is now "idle"
+        #"specific0",
+
+        # Because of this command, the receiver agent
+        # will now be able to send new commands
+        "go_active",
+
+        # Executed because recipient agent is now "active"
+        "specific1",
+        # should abort previous command (specific1)
+        "abort",
+
+        # Executed completely because no abort
+        "specific2",
+
+        # fully executed, result is 7
+        "eval 4+3",
+
+        "go_idle",
+        "exit",
+    ]
+
+
+
+    """
+    =================================================================
+        FUNCTIONS RUN INSIDE MAIN THREAD
+    =================================================================
+    """
+
+    # @override
+    #def __init__(self, name:str=None, config_filename=None, RUN_IN_THREAD=True):
+    def __init__(self, config_filename=None, RUN_IN_THREAD=True):
+        ##if name is None: name = self.__class__.__name__
+        #super().__init__(name, config_filename, RUN_IN_THREAD)
+        super().__init__(config_filename, RUN_IN_THREAD)
+        #self._log.print(f"init done for {name}")
+        ###self._log.print("init done")
+
+    # @override
+    def init(self):
+        super().init()
+        # --- Set the mode according the startmode value
+        ##agent_alias = self.__class__.__name__
+        ##self.set_mode_from_config(agent_alias)
+
+    '''
+    # @override
+    def load_config(self):
+        super().load_config()
+    '''
+
+    '''
+    # @override
+    def update_survey(self):
+        super().update_survey()
+    '''
+
+    '''
+    # @override
+    def get_next_command(self):
+        return super().get_next_command()
+    '''
+
+    # @override
+    def do_log(self):
+        super().do_log()
+
+
+
+    """
+    =================================================================
+        FUNCTIONS RUN INSIDE A SUB-THREAD (OR A PROCESS) (thread_*())
+    =================================================================
+    """
+
+    # Define your own command step(s) here
+    def cmd_step1(self, step:int):
+        cmd = self._current_specific_cmd
+        cmd.result = f"in step #{step}/{self._thread_total_steps_number}"
+        cmd.save()
+        """
+        if self.RUN_IN_THREAD:
+            print("(save from thread)")
+            cmd.save()
+        else:
+            #@transaction.atomic
+            print("(save from process)")
+            with transaction.atomic():
+                cmd.save()
+                #Command.objects.select_for_update()
+        """
+
+    def cmd_step2(self, step:int):
+        self.cmd_step1(step)
+    def cmd_step3(self, step:int):
+        self.cmd_step1(step)
+    def cmd_step4(self, step:int):
+        self.cmd_step1(step)
+
+    """
+    # @override
+    def thread_exec_specific_cmd_step(self, step:int, sleep_time:float=1.0):
+        self.thread_stop_if_asked()
+        cmd = self._current_specific_cmd
+        print(f">>>>> Thread (cmd {cmd.name}): step #{step}/5")
+        self.sleep(sleep_time)
+    """
+
+    '''
+    # @override
+    def exec_specific_cmd_start(self, cmd:Command, from_thread=True):
+        super().exec_specific_cmd_start(cmd, from_thread)
+    '''
+
+
+    # @override
+    def thread_exec_specific_cmd_main(self):
+        # This is optional
+        self.thread_set_total_steps_number(5)
+
+        # HERE, write your own scenario
+
+        # scenario OK
+        self.thread_exec_specific_cmd_step(1, self.cmd_step1, 1)
+        self.thread_exec_specific_cmd_step(2, self.cmd_step2, 3)
+        self.thread_exec_specific_cmd_step(3, self.cmd_step1, 5)
+        self.thread_exec_specific_cmd_step(4, self.cmd_step3, 10)
+        self.thread_exec_specific_cmd_step(5, self.cmd_step1, 4)
+        # ... as many as you need
+
+        """ autre scenario
+        self.thread_exec_specific_cmd_step(1, self.cmd_step1, 1)
+        self.thread_exec_specific_cmd_step(2, self.cmd_step2, 2)
+        self.thread_exec_specific_cmd_step(3, self.cmd_step1, 2)
+        self.thread_exec_specific_cmd_step(4, self.cmd_step3, 2)
+        self.thread_exec_specific_cmd_step(5, self.cmd_step1, 3)
+        """
+
+    '''
+    # @override
+    def exec_specific_cmd_end(self, cmd:Command, from_thread=True):
+        super().exec_specific_cmd_end(cmd, from_thread)
+    '''
+
+    # @override
+    def simulator_test_results_main(self, commands):
+        nb_asserted = 0
+        for cmd in commands:
+            if cmd.name == "flush_commands":
+                assert cmd.is_executed()
+                nb_asserted+=1
+            # 2 times
+            if cmd.name == "go_active":
+                assert cmd.is_executed()
+                nb_asserted+=1
+            # 2 times
+            if cmd.name == "go_idle":
+                assert cmd.is_executed()
+                nb_asserted+=1
+            """
+            if cmd.name == "specific0":
+                assert cmd.is_skipped()
+                assert cmd.result == "in step #5/5"
+                nb_asserted+=1
+            """
+            if cmd.name == "specific1":
+                assert cmd.is_killed()
+                nb_asserted+=1
+            if cmd.name == "specific2":
+                assert cmd.is_executed()
+                assert cmd.result == "in step #5/5"
+                nb_asserted+=1
+            if cmd.name == "eval 4+3":
+                assert cmd.is_executed()
+                assert cmd.get_result() == "7"
+                nb_asserted+=1
+            if cmd.name in ("abort"):
+                assert cmd.is_executed()
+                nb_asserted+=1
+            if cmd.name in ("exit"):
+                assert cmd.is_executed()
+                nb_asserted+=1
+        return nb_asserted
+
+
+"""
+=================================================================
+    MAIN FUNCTION
+=================================================================
+"""
+if __name__ == "__main__":
+    # with thread
+    RUN_IN_THREAD=True
+    # with process
+    #RUN_IN_THREAD=False
+
+    agent = build_agent(AgentC, RUN_IN_THREAD=RUN_IN_THREAD)
+    #agent.show_config()
+    #exit(0)
+
+    '''
+    TEST_MODE, configfile = extract_parameters()
+    #agent = AgentX()
+    agent = AgentA("AgentA", configfile, RUN_IN_THREAD)
+    agent.setSimulatorMode(TEST_MODE)
+    print(agent)
+    '''
+
+    agent.run()
@@ -4,6 +4,7 @@ import yaml,sys,logging,os, pickle, time
 from datetime import datetime
 from pykwalify.errors import PyKwalifyException,SchemaError
 from pathlib import Path
+
 class ConfigPyros:
     # (AKo) : Config file path is checked on the settings file, if the file isn't valid (i.e not found) the error will be launched by the settings file when starting the application 
     devices_links = {}
@@ -18,7 +19,8 @@ class ConfigPyros:
     obs_config_file_content = None
     #obs_config_path = os.environ.get("PATH_TO_OBSCONF_FOLDER",os.path.join(os.environ["DJANGO_PATH"],"../../../privatedev/config/default/"))
     errors = None
-    def verify_if_pickle_needs_to_be_updated(self,observatory_config_file)->bool:
+
+    def verify_if_pickle_needs_to_be_updated(self, observatory_config_file)->bool:
         """
  
         Args:
@@ -35,7 +37,7 @@ class ConfigPyros:
         else:
             pickle_file_mtime = os.path.getmtime(self.CONFIG_PATH+self.pickle_file)
             obs_config_mtime = os.path.getmtime(observatory_config_file)
-            
+
             obs_config = self.read_and_check_config_file(observatory_config_file)
             if obs_config_mtime > pickle_file_mtime:
                 # create obs file (yaml) from pickle["obsconfig"] with date of pickle within history folder-> nom ficher + année + mois + jour + datetime (avec secondes) -> YYYY/MM/DD H:m:s
@@ -58,7 +60,7 @@ class ConfigPyros:
                 device_file_mtime = os.path.getmtime(device_file)
                 if device_file_mtime > pickle_file_mtime:
                     return True
-                
+
             for computer in self.obs_config["OBSERVATORY"]["COMPUTERS"]:
                 computer_file = self.CONFIG_PATH+computer["COMPUTER"]["file"]
                 computer_file_mtime = os.path.getmtime(computer_file)
@@ -66,9 +68,9 @@ class ConfigPyros:
                     return True
         return False
  
-    def load(self,observatory_config_file):
-        does_pickle_needs_to_be_updated = self.verify_if_pickle_needs_to_be_updated(observatory_config_file)
-        if os.path.isfile(self.CONFIG_PATH+self.pickle_file) and does_pickle_needs_to_be_updated == False:
+    def load(self, observatory_config_file: str):
+        pickle_needs_to_be_updated = self.verify_if_pickle_needs_to_be_updated(observatory_config_file)
+        if os.path.isfile(self.CONFIG_PATH+self.pickle_file) and pickle_needs_to_be_updated == False:
             print("Reading pickle file")
             try:
                 can_pickle_file_be_read = False
@@ -91,7 +93,7 @@ class ConfigPyros:
                 # we rewrite the pickle file, the content will be the same otherwise we would be in the else case
                 print("Rewritting the pickle file (an error occured while reading it, the content will be the same as it was")
                 pickle_dict = {}
-                
+
                 self.obs_config = self.read_and_check_config_file(observatory_config_file) 
                 obs_file = open(observatory_config_file,"r")
                 pickle_dict["raw_config"] = obs_file.read()
@@ -107,7 +109,7 @@ class ConfigPyros:
         else:
             print("Pickle file needs to be created or updated")
             pickle_dict = {}
-            
+
             self.obs_config = self.read_and_check_config_file(observatory_config_file) 
             pickle_dict["obs_config"] = self.obs_config
             pickle_dict["devices"] = self.get_devices()
@@ -138,7 +140,7 @@ class ConfigPyros:
                 else:
                     print(f"{yaml_file} can't be accessed, waiting for availability")
                     time.sleep(0.5)
-        
+
             c = pykwalify.core.Core(source_file=yaml_file, schema_files=[self.SCHEMA_PATH+schema_file])
             return c.validate(raise_exception=True)
         except SchemaError: