Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev

Alain Klotz
2 parents aa8e5884 3ac24fdf
Showing 4 changed files with 80 additions and 48 deletions Show diff stats
pyros2
src/majordome/Agent.py
src/majordome/AgentX.py
src/majordome/start_agent_agentX.py
@@ -213,7 +213,6 @@ def shell():
     print("See documentation, chapter '9.6 - Play with the pyros objects' for more details")
     print("Type 'exit()' to quit")
     print()
-    execProcess(PYTHON + " install.py")
     os.chdir("src/")
     # execProcess("python install.py install")
     if not test_mode(): execProcessFromVenv(" manage.py shell")
@@ -262,6 +261,7 @@ def check_agent(agent):
 def start(agent:str, configfile:str):
     print("Running start command")
     if configfile: print("With config file", configfile)
+    else: configfile = '' 
     #if test_mode(): print("in test mode")
     #if verbose_mode(): print("in verbose mode")
     if not check_agent(agent): return
@@ -303,7 +303,10 @@ def start(agent:str, configfile:str):
                 # self.execProcessFromVenvAsync(self.VENV_BIN + ' start_agent_'+agent+'.py')
                 print("Launching agent", agent_name, "...")
                 #if not test_mode(): execProcess(VENV_BIN + " start_agent_" + agent_name + ".py")
-                if not test_mode(): execProcessFromVenv("start_agent_" + agent_name + ".py")
+                #TODO:
+                # - start_agent agent_name (1 script unique)
+                # - start_agent -c configfile
+                if not test_mode(): execProcessFromVenv("start_agent_" + agent_name + ".py " + configfile)
  
                 # Go back to src/
                 # self.changeDirectory('..')
@@ -66,14 +66,6 @@ log = L.setupLogger(&quot;MajordomeTaskLogger&quot;, &quot;Majordome&quot;)
 """
  
  
-#class AGENT_MODE:
-STATUS_LAUNCH = "Launched"
-STATUS_INIT = "Initializing"
-STATUS_ACTIVE = "Active"
-STATUS_PAUSED = "Paused"
-STATUS_EXIT = "Exiting"
-
-
  
 class Agent:
     # (EP) do this so that Majordome can be run from a thread, and called with thread.start():
@@ -83,10 +75,34 @@ class Agent:
     FOR_REAL = True
     mainloop_waittime = 3
     subloop_waittime = 2
-    STATUS = STATUS_LAUNCH
-
-    def __init__(self, name: str):
+    STATUS = None
+    MODE = None
+    config = None
+
+    # Statuses
+    STATUS_LAUNCH = "LAUNCHED"
+    STATUS_INIT = "INITIALIZING"
+    STATUS_MAIN_LOOP = "IN_MAIN_LOOP"
+    STATUS_PROCESS_LOOP = "IN_PROCESS_LOOP"
+    STATUS_EXIT = "EXITING"
+
+    # Modes
+    MODE_ACTIVE = "ACTIVE"
+    MODE_IDLE = "IDLE"
+
+    def __init__(self, name:str=None, config_filename:str=None):
+        self.set_mode(self.MODE_IDLE)
+        self.set_status(self.STATUS_LAUNCH)
         self.name = name
+        #config_filename = '/PROJECTS/GFT/SOFT/PYROS_SOFT/CURRENT/config/config_unit_simulunit1.xml'
+        if not config_filename:
+            #TODO: ajouter path pyros (pas en dur) : PYROS_PATH (from current dir)
+            config_filename = '/PROJECTS/GFT/SOFT/PYROS_SOFT/CURRENT/config/config_unit_simulunit1.xml'
+        # --- Instanciate an object for configuration
+        self.config = ConfigPyros(config_filename)
+        if self.config.get_last_errno() != self.config.NO_ERROR:
+            raise Exception("Bad config file name, error code " + str(self.config.get_last_errno()))
+
  
     def __str__(self):
         return "I am agent " + self.name
@@ -98,6 +114,12 @@ class Agent:
  
         self.FOR_REAL = FOR_REAL
  
+        self.load_config()
+        #TODO: lire param start_mode (si ce param, alors changer le mode)
+
+        self.init()
+
+        '''
         print()
         print(self)
         print("FOR REAL ?", self.FOR_REAL)
@@ -115,22 +137,20 @@ class Agent:
             # except Config.ObjectDoesNotExist:
             print("Config read (or write) exception", str(e))
             return -1
-
-        self.init()
-
-        self.set_status(STATUS_ACTIVE)
+        '''
  
         # Main loop
         while True:
+            self.set_status(self.STATUS_MAIN_LOOP)
  
             """
             A chaque tour de boucle, remplir champ "iamalive" avec timestamp + durée validité (> temps iteration,  n minutes par défaut) 
-            + nom agent dans table agents_survey (status "IDLE", "RUNNING", "...")
+            + nom agent dans table agents_survey (nom agent + mode + status + updated timestamp)
             """
  
             print()
             print("Starting main loop iteration...")
-
+            self.show_mode_and_status()
  
             self.load_config()
  
@@ -138,7 +158,6 @@ class Agent:
  
             self.read_db_commands()
  
-            self.do_log()
  
             '''
             if self.config.majordome_state == "STOP":
@@ -151,34 +170,45 @@ class Agent:
             '''
  
             # Sub-level loop (only if ACTIVE)
-            if self.is_active() : self.core_process()
+            if self.is_active():
+                self.set_status(self.STATUS_PROCESS_LOOP)
+                self.core_process()
  
             self.waitfor(self.mainloop_waittime)
  
             print("Ending main loop iteration...")
  
+            #self.do_log(LOG_DEBUG, "Ending main loop iteration")
+
  
  
     def waitfor(self, nbsec):
             print(f"Now, waiting for {nbsec} seconds...")
             time.sleep(nbsec)
  
+    def set_status(self, status:str):
+        print(f"Switching from status {self.STATUS} to status {status}")
+        self.STATUS = status
+
+    def set_mode(self, mode:str):
+        print(f"Switching from mode {self.MODE} to mode {mode}")
+        self.MODE = mode
+
     def is_active(self):
-        return self.STATUS == STATUS_ACTIVE
+        return self.MODE == self.MODE_ACTIVE
  
     def set_active(self):
-        self.STATUS = STATUS_ACTIVE
+        self.set_mode(self.MODE_ACTIVE)
  
-    def set_passive(self):
-        self.STATUS = STATUS_PAUSED
+    def set_idle(self):
+        self.MODE = self.MODE_IDLE
  
-    def set_status(self, status:str):
-        print(f"Switching from status {self.STATUS} to status {status}")
-        self.STATUS = status
+    def show_mode_and_status(self):
+        print(f"CURRENT MODE is {self.MODE} (with status {self.STATUS})")
  
  
     def die(self):
-        self.set_status(STATUS_EXIT)
+        self.set_status(self.STATUS_EXIT)
  
     """
     suspend/resume
@@ -191,7 +221,7 @@ class Agent:
         et lire table agents_command pour reprendre via resume, 
         et update la table agents_survey pour donner son status "idle"
         """
-        self.set_passive()
+        self.set_idle()
         return True
  
     def resume(self):
@@ -210,7 +240,8 @@ class Agent:
  
     def init(self):
         print("Initializing...")
-        self.set_status(STATUS_INIT)
+        self.set_status(self.STATUS_INIT)
+
  
     def load_config(self):
         """
@@ -219,21 +250,14 @@ class Agent:
         """
         print("Loading the config file...")
         #config_filename = 'c:/srv/develop/pyros/config/config_unit_simulunit1.xml'
-        config_filename = '/PROJECTS/GFT/SOFT/PYROS_SOFT/CURRENT/config/config_unit_simulunit1.xml'
-        # --- Instanciate an object for configuration
-        config = ConfigPyros(config_filename)
         #config.set_configfile(config_filename)
-        if config.get_last_errno() != config.NO_ERROR:
-            print("Error code = {}".format(config.get_last_errno()))
-        else:     
-            # --- Load the configuration file if needed only (i.e. modified)
-            config.load()
-            # --- get the parameter value of <mount1/localization/home>
-            instanciation = 'mount1'
-            section = 'localization'
-            key = 'home'
-            paramvalue = config.get_paramvalue(instanciation, section, key)
-            print("paramvalue <{}/{}/{}> = {}".format(instanciation, section, key,paramvalue))
+        self.config.load()
+        # --- get the parameter value of <mount1/localization/home>
+        instanciation = 'mount1'
+        section = 'localization'
+        key = 'home'
+        paramvalue = self.config.get_paramvalue(instanciation, section, key)
+        print("paramvalue <{}/{}/{}> = {}".format(instanciation, section, key,paramvalue))
  
         """
         # self.config = Config.objects.get(pk=1)
@@ -53,8 +53,8 @@ log = L.setupLogger(&quot;MajordomeTaskLogger&quot;, &quot;Majordome&quot;)
  
 class AgentX(Agent):
  
-    def __init__(self, name):
-        super().__init__(name)
+    def __init__(self, name, config_filename=None):
+        super().__init__(name, config_filename)
  
     # @override
     def init(self):
@@ -4,6 +4,11 @@ import os
 import sys
 from django.conf import settings as djangosettings
  
+configfile = None
+
+if len(sys.argv) == 2:
+    configfile = sys.argv[1]
+
 # from AgentX import AgentX
  
  
@@ -56,7 +61,7 @@ from majordome.AgentX import AgentX
 # AgentX().run(FOR_REAL=False)
 # AgentX().run()
  
-agentx = AgentX(name="agentX")
+agentx = AgentX(name="agentX", config_filename=configfile)
  
 # agentx.run(FOR_REAL=False)
 agentx.run(FOR_REAL=True)