Add get_specifics_cmd in agent, and add option to simulate computer hostname for agentSST

Alexis Koralewski
1 parent 01ef8ec6
Showing 3 changed files with 37 additions and 6 deletions Show diff stats
pyros.py
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/agent/AgentSST.py
@@ -1116,9 +1116,9 @@ def new_start(configfile: str, observatory: str, unit: str, computer_hostname: s
     if verbose_mode():
         cmd += " -v"
     if configfile:
-        cmd += " {configfile}"
+        cmd += f" {configfile}"
     if computer_hostname:
-        cmd += " -c {computer_hostname}"
+        cmd += f" --computer {computer_hostname}"
  
     # if not test_mode(): current_processes.append( [execProcessFromVenvAsync(cmd), agent_name, -1] )
     # Append this process ( [process id, agent_name, result=failure] )
@@ -1419,6 +1419,14 @@ class Agent:
     def show_mode_and_status(self):
         log.info(f"CURRENT MODE is {self.mode} (status is {self.status})")
  
+    def get_specifics_cmd(self):
+        specific_commands = ""
+        for index, command_tuple in enumerate(self.AGENT_SPECIFIC_COMMANDS):
+            specific_commands += f"{command_tuple[0]}"
+            if index != len(self.AGENT_SPECIFIC_COMMANDS)-1:
+                specific_commands += ";"
+        return specific_commands
+
     def get_mode(self):
         return self.mode
  
@@ -1641,7 +1649,8 @@ class Agent:
         ex: send_command(“AgentX”,"EVAL”,“3+4”)
         """
         #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, validity, timeout).send()
+        #cmd = self.create_cmd_for(to_agent, cmd_name, cmd_args, validity, timeout).send()
+        cmd = self.create_cmd_for(to_agent, cmd_name, cmd_args, validity).send()
         #cmd.send()
         return cmd
  
@@ -1934,6 +1943,8 @@ class Agent:
             #cmd.set_result(eval(cmd_args)) 
             #result = eval(cmd_args)
             result = self.do_eval(cmd_args[0])
+        elif cmd_name == "get_specifics_cmd":
+            result = self.get_specifics_cmd()
  
         cmd.set_as_processed(result)
         log.info("...Agent level GENERAL cmd has been executed")
@@ -2056,6 +2067,7 @@ class Agent:
         return cmd.is_agent_general_cmd()
  
  
+
     '''
     def _exec_agent_cmd(self, cmd:Command):
         # AGENT "GENERAL LEVEL" command
@@ -2544,10 +2556,12 @@ class Agent:
 =================================================================
 """
  
+import argparse
 def extract_parameters():
     """ Usage: Agent.py [-t] [configfile] """
     # arg 1 : -t
     # arg 2 : configfile
+
     DEBUG_MODE = False
     TEST_MODE = False
     WITH_SIM = False
@@ -2580,11 +2594,25 @@ def build_agent(Agent_type:Agent) -&gt; Agent :
     log.debug("debug mode is" + os.getenv("PYROS_DEBUG"))
  
     #print(logger)
-
+    parser = argparse.ArgumentParser(description='Start an agent.')
+    parser.add_argument("--test",help='Launch agent in test mode',action="store_true")
+    parser.add_argument("--debug",help='Launch agent in debug mode',action="store_true")
+    parser.add_argument("--computer",dest="computer",help='Launch agent with simulated computer hostname',action="store")
+    parser.add_argument("{configfile}")
+    args = parser.parse_args()
+    if args.test:
+        TEST_MODE = True
+    if args.debug:
+        DEBUG_MODE = True
+        
     #agent = Agent("GenericAgent", configfile, RUN_IN_THREAD=True)
     #agent = Agent_type(configfile, RUN_IN_THREAD, DEBUG_MODE=DEBUG_MODE)
     #agent = Agent_type(RUN_IN_THREAD)
+    
     agent = Agent_type()
+    if agent.name == "AgentSST":
+        if args.computer:
+            agent.set_computer(args.computer)
     # AgentSP isn't in a config, so to avoid that WITH_SIM returns an error it's a special case
     if agent.name == "AgentSP":
         agent._set_with_simulator(False)
@@ -39,7 +39,7 @@ class AgentSST(Agent):
         self.PROJECT_ROOT_PATH = os.environ["PROJECT_ROOT_PATH"]
         if name is None:
             name = self.__class__.__name__
-        # self.computer = socket.gethostname()        
+        self.computer = socket.gethostname()    
         WITH_DOCKER = False
         if os.environ.get("WITH_DOCKER"):
             WITH_DOCKER = True
@@ -59,16 +59,19 @@ class AgentSST(Agent):
                 + os.sep
             )
         self.VENV_PYTHON = VENV_BIN + "python3"
-        log.info(f"PC hostname is {self.computer}")
+        #log.info(f"PC hostname is {self.computer}")
         #name_from_config = self.get_config().get_agent_sst_of_current_computer()
  
     def init(self):
         super().init()
+        log.info(f"PC hostname is {self.computer}")
         self.start_agents()
         self.TEST_MODE = False
         time.sleep(10)
         self.set_delay(3)
  
+    def set_computer(self,computer):
+        self.computer = computer
     def start_agents(self,agent_name=None):
         """
         Start all agents or one agent of obs_config