micrOSDevToolKit 2.9.11__py3-none-any.whl → 2.10.2__py3-none-any.whl

toolkit/dashboard_apps/SystemTest.py

@@ -426,11 +426,22 @@ def check_intercon(host=None):
                 break
         return _state, _output
 
+    def run_intercon_hello(tout):
+        nonlocal host
+        cmd_list = [f'hello >>{host}']
+        _output = CLIENT.execute(cmd_list, tout=8)
+        _new_intercon = True
+        if "hello:" in _output[1]:  # TODO: remove...
+            # LEGACY WAY: FALLBACK
+            cmd_list = ['intercon sendcmd "{}" "hello" >json'.format(host)]
+            _output = CLIENT.execute(cmd_list, tout=tout)
+            _new_intercon = False
+        return _new_intercon, _output
+
     info_msg = '[ST] Check device-device connectivity'
     print(info_msg)
     host = 'test.local' if host is None else host
-    cmd_list = ['intercon sendcmd "{}" "hello" >json'.format(host)]
-    output = CLIENT.execute(cmd_list, tout=8)
+    new_intercon, output = run_intercon_hello(tout=8)
     output = _convert_return_to_dict(output)
     device_was_found = False
     if output[0] is False or output[1] is None:
@@ -443,7 +454,7 @@ def check_intercon(host=None):
     elif len(output[1]) > 1 and "hello" in output[1]['verdict']:
         response_state, response = _get_intercon_output(output[1]['tag'])
         # Valid input on online device
-        output = "Device was found: {}:{}".format(host, f"{output}: {response}")
+        output = "Device was found: {}:{} version: {}".format(host, f"{output}: {response}", "NEW" if new_intercon else "LEGACY")
         state = True & response_state, f'{info_msg}:\n\t\t{output}'
         device_was_found = True
     else:
@@ -451,13 +462,13 @@ def check_intercon(host=None):
 
     if device_was_found:
         # DO Negative testing as well
-        cmd_list = ['intercon sendcmd "notavailable.local" "hello" >json']
-        output_neg = CLIENT.execute(cmd_list, tout=15)
+        host = "notavailable.local"
+        _, output_neg = run_intercon_hello(tout=20)
         output_neg = _convert_return_to_dict(output_neg)
         state_neg = False, output_neg
         if len(output_neg[1]) > 1 and "hello" in output_neg[1]['verdict']:
             response_state, response = _get_intercon_output(output_neg[1]['tag'])
-            output_neg = f'Device was not found: "notavailable.local":{output_neg}: {response}'
+            output_neg = f'Device was not found: {host}":{output_neg}: {response}'
             state_neg = True & response_state, output_neg
         return state[0] & state_neg[0], "{}\n\t\tNegative test: {}".format(state[1], state_neg[1])
     return state

toolkit/lib/micrOSClient.py

@@ -85,10 +85,22 @@ class micrOSClient:
 
     @staticmethod
     def validate_ipv4(str_in):
-        pattern = "^([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$"
-        if bool(re.match(pattern, str_in)):
-            return True
-        return False
+        parts = str_in.split(".")
+        # An IPv4 address must have exactly 4 parts
+        if len(parts) != 4:
+            return False
+        for part in parts:
+            # Each part must be a number and not empty
+            if not part.isdigit():
+                return False
+            num = int(part)
+            # Each number must be in the valid range (0-255)
+            if num < 0 or num > 255:
+                return False
+            # Prevents leading zeros (e.g., "01" is invalid)
+            if part != str(num):
+                return False
+        return True
 
     def __connect(self, timeout):
         # Server connection - create socket
@@ -312,13 +324,20 @@ class micrOSClient:
 
         history = load_command_history(self.telnet_prompt)              # History: Beta feature
         print(self.telnet_prompt, end="")
+        is_empty = False                                                # Empty input support
         while True:
             try:
-                cmd = input()               # CANNOT contain prompt - it is coming back from response data
-                # send command
+                # INPUT HANDLING
+                cmd = input(self.telnet_prompt if is_empty else '')     # CANNOT contain prompt - it is coming back from response data
+                if len(cmd.strip()) == 0:
+                    is_empty = True
+                    continue
+                is_empty = False
+                # SEND COMMAND
                 output = self.send_cmd(cmd, timeout=timeout, stream=True)
                 if not (history is None or output is None) and "Shell: for hints type help." not in output:   # History: Beta feature
                     history.add_history(cmd)
+                # OUTPUT HANDLING
                 if 'Bye!' in str(output):
                     break
                 if output is None:

toolkit/socketClient.py

@@ -215,9 +215,8 @@ class ConnectionData:
                 # Generate line printout
                 base_info = "{uid}{spr1}{fuid}".format(uid=uid, spr1=spacer1, fuid=fuid)
                 spacer1 = " " * (spr_offset2 - len(base_info))
-                data_line_str = "{base}{spr2}{ip}\t{stat}\t\t{version}\t\t{elapt}" \
-                    .format(base=base_info, spr2=spacer1, ip=ip,
-                            stat=is_online, version=version_data, elapt=elapsed_time)
+                spacer2 = "\t" if len(version_data) > 7 else "\t\t"
+                data_line_str = f"{base_info}{spacer1}{ip}\t{is_online}\t\t{version_data}{spacer2}{elapsed_time}"
                 return data_line_str, online_ip
             return None