bugfix DEFAULT_VALIDITY_DURATION in AgentCmd et ajout de ma config perso

Etienne Pallier
1 parent 6a41fe96
Showing 7 changed files with 246 additions and 15 deletions Show diff stats
private/plugins/README
privatedev/config/tnc/computer_XYZ_EP.yml
privatedev/config/tnc/observatory_tnc.yml
privatedev/plugin/agent/AgentBasic.py
pyros.py
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/common/models.py
@@ -0,0 +1,25 @@
+# Schema file to check the syntax of this config file
+schema: schema_computer-2.0.yml
+
+# Here is the description of the configuration of an isolated computer
+COMPUTER:
+
+    inventory_label: CPT-XCY-001
+    manufacturer: XCY
+    model: X26A
+    description: "Intel(R) Core(TM) i5-4250U CPU @ 1.30GHz   1.90 GHz RAM = 4 GB"
+    sn: 00331-10000-00001-AA478
+    power:
+        voltage: 12
+        intensity: 5
+        socket: "IEC 60130-10 Type A: 5.5 mm OD, 2.5 mm ID"
+
+    #hostname: macp1219
+    hostname: c32f49397c28
+    virtual_machine: False
+    os: Mac
+    os_version: "10"
+    network_interfaces: 
+    - 00-A8-3D-68-22-87 # Gigabit 2
+    - 00-A8-3D-68-22-86 # Gigabit 3
+    - 16-82-FE-44-64-E8 # Wifi
@@ -132,7 +132,17 @@ OBSERVATORY:
                 network_interface_index: 0
                 # IP attributed by the Router
                 network_ip: 192.168.1.7
-                
+
+            - COMPUTER:
+                name: EtienneComputer
+                file: computer_XYZ_EP.yml
+                    # Describe here the configuration of the computer in operation
+                role: Main
+                    # Choice of the interface to connect the computer to the network (cf.network_interfaces infile)
+                network_interface_index: 0
+                    # IP attributed by the Router
+                network_ip: 192.168.0.11
+
     # === Assembly of devices into units
     # A unit is a robotic telescope 
     UNITS: 
@@ -295,11 +305,12 @@ OBSERVATORY:
                     computer: AKlotzPersoComputer
                     protocol: privatedev/plugin/agent/AgentImagesProcessor_tnc_up1.py
  
-                # SF11-IPC (for AKo)
+                # Basic Agent (for EP, to test the Agent base class)
                 - AGENT:
-                    name: AgentImagesProcessor_tnc_up1_ako
-                    computer: AKoralewskiPersoComputer
-                    protocol: privatedev/plugin/agent/AgentImagesProcessor_tnc_up1.py
+                    name: AgentBasic
+                    computer: EtienneComputer
+                    protocol: private/plugin/agent/AgentBasic.py
+
  
             TOPOLOGY:
  
@@ -0,0 +1,193 @@
+#!/usr/bin/env python3
+
+import sys
+
+import os
+pwd = os.environ['PROJECT_ROOT_PATH']
+if pwd not in sys.path:
+    sys.path.append(pwd)
+
+from src.core.pyros_django.agent.Agent import Agent, build_agent
+
+##import utils.Logger as L
+
+##from .Agent import Agent
+##log = L.setupLogger("AgentXTaskLogger", "AgentX")
+
+
+
+class AgentBasic(Agent):
+
+    # FOR TEST ONLY
+    # Run this agent in simulator mode
+    TEST_MODE = False
+    # Run the assertion tests at the end
+    TEST_WITH_FINAL_TEST = False
+    #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
+
+
+
+
+    """
+    =================================================================
+        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):
+        ##if name is None: name = self.__class__.__name__
+        #super().__init__(name, config_filename, RUN_IN_THREAD)
+        super().__init__(config_filename)
+        #self._log.print(f"init done for {name}")
+        self._log.print("init done")
+    '''
+    def __init__(self, name:str=None):
+        if name is None:
+            name = self.__class__.__name__
+        super().__init__()
+        #super().__init__(RUN_IN_THREAD)        
+
+    # @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 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__":
+
+    agent = build_agent(AgentBasic)
+
+    '''
+    TEST_MODE, configfile = extract_parameters()
+    #agent = AgentX()
+    agent = AgentA("AgentA", configfile, RUN_IN_THREAD)
+    agent.setSimulatorMode(TEST_MODE)
+    print(agent)
+    '''
+    agent.run()
@@ -78,7 +78,8 @@ AGENTS = {
     "majordome": "majordome",
     #"scheduler": "scheduler",
     "alert_manager": "alert_manager",
-    "agentImagesProcessor_tnc_up1": "../../../privatedev/plugin/agent"
+    "agentImagesProcessor_tnc_up1": "../../../privatedev/plugin/agent",
+    "agentBasic": "agent",
 }
 # AGENTS = ["agentX", "webserver", "monitoring", "majordome", "scheduler", "alert_manager"]
 # AGENTS = ["all", "webserver", "monitoring", "majordome", "scheduler", "alert"]
@@ -396,7 +396,7 @@ class Agent:
         # -------------------------------
  
         # Agent general command
-        ("Agent set_mode ATTENTIVE", 2, "MODE = ATTENTIVE"),
+        ("self set_mode ATTENTIVE", 2, "MODE = ATTENTIVE"),
         # => should get "ATTENTIVE"
         ("self get_mode", 1, "MODE = ATTENTIVE"),
  
@@ -1593,9 +1593,9 @@ class Agent:
         #ex: send_command(“AgentX”,”GENERIC”,”EVAL”,“3+4”)
         ex: send_command(“AgentX”,"EVAL”,“3+4”)
         """
-        #return AgentCmd.send_cmd(self.name, self._get_real_agent_name_for_alias(to_agent), cmd_name, cmd_args)
-        cmd = self.create_cmd_for(to_agent, cmd_name, cmd_args)
-        cmd.send()
+        #return AgentCmd.send_cmd_from_to(self.name, self._get_real_agent_name_for_alias(to_agent), cmd_name, cmd_args)
+        cmd = self.create_cmd_for(to_agent, cmd_name, cmd_args).send()
+        #cmd.send()
         return cmd
  
     def create_cmd_for(self, to_agent, cmd_name, cmd_args=None) -> AgentCmd:
@@ -464,7 +464,7 @@ class AgentCmd(models.Model):
         "CMD_EXECUTED",
     )
  
-    # Command default validity duration (from sending time) in hours, before peremption (in sec)
+    # Command default validity duration (from sending time), before peremption (in sec)
     # => From the time a command was sent (cmd.s_deposit_time), it is still valid during VALIDITY_DURATION hours
     # => After that, it is considered as "expired" (obsolete) and must be marked as "CMD_OUTOFDATE" and not be executed anymore (and can be purged)
     # => Thus, a command is expired FROM time = s_deposit_time + VALIDITY_DURATION
@@ -485,7 +485,7 @@ class AgentCmd(models.Model):
     ##name = models.CharField(max_length=400, help_text='command name', null=False)
     full_name = models.CharField(max_length=400, help_text='command full name (with type and args)', null=False)
  
-    validity_duration = models.PositiveIntegerField('(in hour)', default=DEFAULT_VALIDITY_DURATION)
+    validity_duration = models.PositiveIntegerField('(in sec)', default=DEFAULT_VALIDITY_DURATION)
     exec_timeout = models.PositiveIntegerField('(in sec)', default=DEFAULT_EXEC_TIMEOUT)
  
     #state = models.CharField(choices = CMD_STATUS_CODES, default=CMD_STATUS_CODES.CMD_PENDING, max_length=20)
@@ -621,7 +621,7 @@ class AgentCmd(models.Model):
     """
  
     @classmethod
-    def send_cmd(cls, agent_from, agent_to, cmd_name, cmd_args=None, cmd_validity:int=None, cmd_timeout:int=None):
+    def send_cmd_from_to(cls, agent_from, agent_to, cmd_name, cmd_args=None, cmd_validity:int=None, cmd_timeout:int=None):
         # def send(cls, from_agent, to_agent, cmd_name, cmd_args=None):
         """
         ex: send("AgentA",“AgentB”,"EVAL”,“3+4”)
@@ -639,7 +639,8 @@ class AgentCmd(models.Model):
  
     @classmethod
     def max_deposit_date_for_peremption(cls):
-        return datetime.utcnow().astimezone() - timedelta(hours=cls.DEFAULT_VALIDITY_DURATION)
+        return datetime.utcnow().astimezone() - timedelta(seconds=cls.DEFAULT_VALIDITY_DURATION)
+        #return datetime.utcnow().astimezone() - timedelta(hours=cls.DEFAULT_VALIDITY_DURATION)
  
     @classmethod
     def delete_commands_with_running_status_for_agent(cls, agent_name):
@@ -733,7 +734,7 @@ class AgentCmd(models.Model):
         NB: datetime.utcnow() is equivalent to datetime.now(timezone.utc)
         """
         printd(
-            f"(Looking for commands sent to me that are not executing and perempted - i.e. older than {cls.DEFAULT_VALIDITY_DURATION} hour(s))")
+            f"(Looking for commands sent to me that are not executing and perempted - i.e. older than {cls.DEFAULT_VALIDITY_DURATION/60} minute(s))")
         #COMMAND_PEREMPTION_DATE_FROM_NOW = datetime.utcnow() - timedelta(hours = cls.COMMANDS_PEREMPTION_HOURS)
         #print("peremption date", COMMAND_PEREMPTION_DATE_FROM_NOW)
         old_commands = cls.objects.filter(