new methods is_xxx for AgentCmd

Etienne Pallier
1 parent 9fa0958e
Showing 3 changed files with 53 additions and 29 deletions Show diff stats
privatedev/plugin/agent/AgentBasic.py
src/core/pyros_django/agent/AgentBasic.py
src/core/pyros_django/common/models.py
@@ -36,7 +36,7 @@ class AgentBasic(Agent):
         ("do_specific10", 10, 0),
         #("set_specific2", 5, 0),
         ("do_specific30", 3, 0),
-        ("existing_but_unimplemented_cmd", 3, 0),
+        ####("existing_but_unimplemented_cmd", 3, 0),
     ]
  
     # @override
@@ -44,6 +44,18 @@ class AgentBasic(Agent):
  
         # Format : ("self cmd_name cmd_args", timeout, "expected_result", expected_status),
         #("self do_stop now", 200, '', Agent.CMD_STATUS.CMD_EXECUTED),
+
+        # do_stop
+        #("self do_stop now", 200, 'STOPPING now', Agent.CMD_STATUS.CMD_EXECUTED),
+        #("self do_stop", 200, 'STOPPING asap', Agent.CMD_STATUS.CMD_EXECUTED),
+        #("self do_stop asap", 200, 'STOPPING asap', Agent.CMD_STATUS.CMD_EXECUTED),
+        
+        ("self do_restart now", 200, 'RESTARTING now', Agent.CMD_STATUS.CMD_EXECUTED),
+        #("self get_specific_cmds", 200, 'EXCEPTION - One specific cmd is unimplemented: existing_but_unimplemented_cmd', Agent.CMD_STATUS.CMD_EXEC_ERROR),
+        ("self get_specific_cmds", 200, 'do_specific10(arg1:int,arg2:int,arg3:float,arg4:str,arg5:typing.Tuple[int, str, int],arg6:typing.List[int]);do_specific30()', Agent.CMD_STATUS.CMD_EXECUTED),
+        ("self do_stop", 200, 'STOPPING asap', Agent.CMD_STATUS.CMD_EXECUTED),
+
+
         ("self do_specific10 2 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", 200, '16.5', None),
  
         # bad parameters (missing or too many, or bad type)=> CMD_INVALID
@@ -125,11 +137,11 @@ class AgentBasic(Agent):
  
     # @override
     def main_loop_start(self):
-        print("LOOP START")
+        print("AgentBasic LOOP START")
  
     # @override
     def main_loop_end(self):
-        print("LOOP END");
+        print("AgentBasic LOOP END");
  
     # @override
     def routine_process_before_body(self):
@@ -36,7 +36,7 @@ class AgentBasic(Agent):
         ("do_specific10", 10, 0),
         #("set_specific2", 5, 0),
         ("do_specific30", 3, 0),
-        ("existing_but_unimplemented_cmd", 3, 0),
+        ####("existing_but_unimplemented_cmd", 3, 0),
     ]
  
     # @override
@@ -45,15 +45,14 @@ class AgentBasic(Agent):
         # Format : ("self cmd_name cmd_args", timeout, "expected_result", expected_status),
         #("self do_stop now", 200, '', Agent.CMD_STATUS.CMD_EXECUTED),
  
-
-
         # do_stop
         #("self do_stop now", 200, 'STOPPING now', Agent.CMD_STATUS.CMD_EXECUTED),
         #("self do_stop", 200, 'STOPPING asap', Agent.CMD_STATUS.CMD_EXECUTED),
         #("self do_stop asap", 200, 'STOPPING asap', Agent.CMD_STATUS.CMD_EXECUTED),
  
         ("self do_restart now", 200, 'RESTARTING now', Agent.CMD_STATUS.CMD_EXECUTED),
-        ("self get_specific_cmds", 200, 'EXCEPTION - One specific cmd is unimplemented: existing_but_unimplemented_cmd', Agent.CMD_STATUS.CMD_EXEC_ERROR),
+        #("self get_specific_cmds", 200, 'EXCEPTION - One specific cmd is unimplemented: existing_but_unimplemented_cmd', Agent.CMD_STATUS.CMD_EXEC_ERROR),
+        ("self get_specific_cmds", 200, 'do_specific10(arg1:int,arg2:int,arg3:float,arg4:str,arg5:typing.Tuple[int, str, int],arg6:typing.List[int]);do_specific30()', Agent.CMD_STATUS.CMD_EXECUTED),
         ("self do_stop", 200, 'STOPPING asap', Agent.CMD_STATUS.CMD_EXECUTED),
  
  
@@ -929,30 +929,16 @@ class AgentCmd(models.Model):
     def is_read(self):
         return self.r_read_time is not None
  
+    # CMD status
+
+    # 1 - pending
     def is_pending(self):
         return self.state == self.CMD_STATUS_CODES.CMD_PENDING
  
-    def is_running(self):
-        return self.state == self.CMD_STATUS_CODES.CMD_RUNNING
-
-    # execution finished without error
-    def is_executed(self):
-        return self.state == self.CMD_STATUS_CODES.CMD_EXECUTED
-
-    # Cmd is finished if not pending or running
-    def is_finished(self):
-        return not (self.is_pending() or self.is_running())
-    
-    # Cmd is finished with error : finished but NOT executed
-    def is_finished_with_error(self):
-        return self.is_finished() and not self.is_executed()
-
-    def is_skipped(self):
-        return self.state == self.CMD_STATUS_CODES.CMD_SKIPPED
-
-    def is_killed(self):
-        return self.state == self.CMD_STATUS_CODES.CMD_EXEC_KILLED
-
+    # 2 - ERROR cases (from PENDING)
+    def is_invalid(self): return self.state == self.CMD_STATUS_CODES.CMD_INVALID
+    def is_unimplemented(self): return self.state == self.CMD_STATUS_CODES.CMD_UNIMPLEMENTED
+    def is_skipped(self): return self.state == self.CMD_STATUS_CODES.CMD_SKIPPED
     def is_expired(self):
         if self.state == self.CMD_STATUS_CODES.CMD_EXPIRED: return True
         # Must NOT be running
@@ -967,8 +953,21 @@ class AgentCmd(models.Model):
         print(f"Elapsed time is {elapsed_time}, (max is {max_time})")
         if elapsed_time > max_time:
         """
+    # finished with issue (from pending)
+    def is_pending_issue(self): return self.is_invalid() or self.is_unimplemented() or self.is_skipped() or self.is_expired()
+
+    # 3 - running
+    def is_running(self):
+        return self.state == self.CMD_STATUS_CODES.CMD_RUNNING
  
-    def is_timeout(self):
+    # 4 - ERROR cases (from RUNNING)
+    def is_exec_error(self): return self.state == self.CMD_STATUS_CODES.CMD_EXEC_ERROR
+    def is_exec_killed(self): return self.state == self.CMD_STATUS_CODES.CMD_EXEC_KILLED
+    # alias
+    def is_killed(self): return self.is_exec_killed()
+    # alias
+    def is_timeout(self): return self.is_exec_timeout()
+    def is_exec_timeout(self):
         if self.state == self.CMD_STATUS_CODES.CMD_EXEC_TIMEOUT: return True
         # Must be running
         if not self.is_running(): return False
@@ -976,6 +975,20 @@ class AgentCmd(models.Model):
         elapsed_time = (datetime.utcnow().astimezone() - self.r_start_time)
         printd("elapsed_time since exec", elapsed_time)
         return elapsed_time > timedelta(seconds=self.exec_timeout)
+    # finished with any execution issue
+    def is_exec_issue(self): return self.state.startswith("CMD_EXEC_")
+
+    # 5 - Execution finished
+    # Cmd is finished if not pending or running
+    def is_finished(self):
+        return not (self.is_pending() or self.is_running())
+    # Cmd is finished with error : finished but NOT executed
+    def is_finished_with_error(self):
+        return self.is_finished() and not self.is_executed()
+    # Cmd is finished without error (normal case)
+    def is_executed(self):
+        return self.state == self.CMD_STATUS_CODES.CMD_EXECUTED
+
  
     # --- GETTERS/SETTERS functions ---