google
diff --git a/‎.github/workflows/testing.yml‎
Lines changed: 16 additions & 4 deletions b/‎.github/workflows/testing.yml‎
Lines changed: 16 additions & 4 deletions
diff --git a/‎.gitignore‎
Lines changed: 11 additions & 0 deletions b/‎.gitignore‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎docs/get_started.md‎
Lines changed: 15 additions & 8 deletions b/‎docs/get_started.md‎
Lines changed: 15 additions & 8 deletions
diff --git a/‎framework/python/src/common/util.py‎
Lines changed: 35 additions & 32 deletions b/‎framework/python/src/common/util.py‎
Lines changed: 35 additions & 32 deletions
diff --git a/‎framework/python/src/core/session.py‎
Lines changed: 2 additions & 0 deletions b/‎framework/python/src/core/session.py‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎framework/python/src/core/testrun.py‎
Lines changed: 4 additions & 0 deletions b/‎framework/python/src/core/testrun.py‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎framework/python/src/net_orc/ip_control.py‎
Lines changed: 2 additions & 2 deletions b/‎framework/python/src/net_orc/ip_control.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎framework/python/src/net_orc/network_orchestrator.py‎
Lines changed: 5 additions & 2 deletions b/‎framework/python/src/net_orc/network_orchestrator.py‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎framework/python/src/net_orc/network_validator.py‎
Lines changed: 39 additions & 32 deletions b/‎framework/python/src/net_orc/network_validator.py‎
Lines changed: 39 additions & 32 deletions
diff --git a/‎framework/python/src/test_orc/test_orchestrator.py‎
Lines changed: 24 additions & 0 deletions b/‎framework/python/src/test_orc/test_orchestrator.py‎
Lines changed: 24 additions & 0 deletions
@@ -138,15 +138,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
     - name: Install Node
       uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
       with:
-        node-version: 18.19.0
+        node-version: '20'
+        cache: 'npm'
+        cache-dependency-path: './modules/ui/package-lock.json'
+
     - name: Install Chromium Browser
       run: sudo apt install chromium-browser
+
     - name: Install dependencies
-      run: npm install && npm ci
+      run: npm ci
       working-directory: ./modules/ui
+
     - name: Run tests
       run: |
         export CHROME_BIN=/usr/bin/chromium-browser
@@ -161,16 +167,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
     - name: Install Node
       uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
       with:
-        node-version: 18.19.0
+        node-version: '20'
+        cache: 'npm'
+        cache-dependency-path: './modules/ui/package-lock.json'
+
     - name: Install dependencies
-      run: npm install && npm ci
+      run: npm ci
       working-directory: ./modules/ui
+
     - name: Run ESLint
       run: npm run lint
       working-directory: ./modules/ui
+
     - name: Run format check
       run: npm run format
       working-directory: ./modules/ui
@@ -27,3 +27,14 @@ testing/unit/services/output/
 make/DEBIAN/postinst
 
 testrun.log
+
+# Ignore vagrant files
+test_vm/.vagrant/
+
+# Ingnore  TLS test certificates
+test_vm/certs/
+test_vm/*.cnf
+test_vm/*.csr
+test_vm/*.pem
+test_vm/*.key
+test_vm/*.crt
@@ -67,16 +67,23 @@ Testrun installs under the `/usr/local/testrun` directory. Testing data is avail
 ## Start Testrun
 
 Follow these steps to start Testrun:
-1. Attach the network interfaces.
-    -  Connect one USB Ethernet adapter to the internet source (e.g., router or switch) using an Ethernet cable.
-    -  Connect the other USB Ethernet adapter directly to the IoT device you want to test using an Ethernet cable.
 
-    Notes:
-    
-    -  Disable both adapters in the host system (IPv4, IPv6, and general) by opening **Settings**, then **Network**.
-    -  Keep the DUT powered off until prompted. Otherwise, Testrun will not be able to fully capture the device behavior during startup - resulting in inaccurate test results.
+1. Connect the ethernet cables.
+
+This is where you physically plug in the ethernet cables to your hardware: PC, IoT device, Internet connection. You must use two separate network ports on your PC (either two built-in ports, two USB-ethernet adapters, or one of each).    
+
+* **Internet Connection**.
+  * If using a USB adapter: Plug the USB end of the adapter into your PC. Then, connect an ethernet cable to the adapter's ethernet port and plug the other end of the cable into your internet source (like a router or network switch)
+  * If using a built-in port: Connect an ethernet cable from your PC's built-in port directly to your internet source.
+* **IoT Device Connection**. Using a second ethernet cable, plug the other network port (the remaining built-in port or the other USB adapter) directly into the IoT device you intend to test.
+    - If using a USB Adapter: Plug the USB end of the second adapter into your PC. Then, connect an ethernet cable to the adapter's ethernet port and plug the other end of the cable directly into the IoT device you intend to test.
+    - If using a built-in port: Connect an ethernet cable from the remaining built-in port directly into the IoT device you intend to test.
+
+  Notes:
+    -  **Disable Host Networking**: You must disable both network adapters in the host system. Open Settings, then Network, and turn off IPv4, IPv6, and general network functions for both interfaces.
+    -  **Keep Device Powered Off**: Keep the DUT (Device Under Test) physically connected to your PC using the ethernet cable but powered off until you are prompted to turn it on later in the setup process. If the device starts up early, Testrun won't be able to fully capture its behavior during startup, which will result in inaccurate test results.
 
-1. Start Testrun with the command `sudo testrun`
+2. Start Testrun with the command `sudo testrun`
     -  To run Testrun in network-only mode (without running any tests), use the `--net-only` option.
     -  To run Testrun with just one interface (connected to the device), use the `--single-intf` option.
 
 
@@ -15,6 +15,7 @@
 """Provides basic utilities for Testrun."""
 import getpass
 import os
+import pwd
 import subprocess
 import shlex
 import typing as t
@@ -55,52 +56,54 @@ def interface_exists(interface):
   """Checks whether an interface is available"""
   return interface in netifaces.interfaces()
 
+
 def prettify(mac_string):
   """Formats a MAC address with colons"""
   return ':'.join([f'{ord(b):02x}' for b in mac_string])
 
-def get_host_user():
-  """Returns the username of the host user"""
-  user = get_os_user()
 
-  # If primary method failed, try secondary
-  if user is None:
-    user = get_user()
+def get_sudo_user() -> t.Optional[str]:
+  """Returns the username of the sudo user if running under sudo, else None."""
+  return os.environ.get('SUDO_USER')
 
-  return user
 
-def get_os_user():
-  """Attempts to get the username using os library"""
+def get_pwd_user() -> t.Optional[str]:
+  """Returns the username of the current user using pwd module"""
   user = None
-  try:
-    user = os.getlogin()
-  except OSError:
-    # Handle the OSError exception
-    LOGGER.error('An OS error occurred whilst calling os.getlogin()')
-  except Exception: # pylint: disable=W0703
-    # Catch any other unexpected exceptions
-    LOGGER.error('An unknown exception occurred whilst calling os.getlogin()')
+  user = pwd.getpwuid(os.getuid()).pw_name
   return user
 
-def get_user():
-  """Attempts to get the host user using the getpass library"""
+
+def get_host_user()-> t.Optional[str]:
+  """Returns the username of the host user"""
+  user_functions = [get_sudo_user, os.getlogin, getpass.getuser, get_pwd_user]
   user = None
-  try:
-    user = getpass.getuser()
-  except (KeyError, ImportError, ModuleNotFoundError, OSError) as e:
+  error_messages = []
+  for func in user_functions:
+    try:
+      user = func()
+      if user is not None:
+        break
+    except (KeyError, ImportError, ModuleNotFoundError, OSError) as e:
     # Handle specific exceptions individually
-    if isinstance(e, KeyError):
-      LOGGER.error('USER environment variable not set or unavailable.')
-    elif isinstance(e, ImportError):
-      LOGGER.error('Unable to import the getpass module.')
-    elif isinstance(e, ModuleNotFoundError):
-      LOGGER.error('The getpass module was not found.')
-    elif isinstance(e, OSError):
-      LOGGER.error('An OS error occurred while retrieving the username.')
-    else:
-      LOGGER.error('An exception occurred:', e)
+      if isinstance(e, KeyError):
+        error_message = 'USER environment variable not set or unavailable.'
+        error_messages.append(error_message)
+      elif isinstance(e, ImportError):
+        error_messages.append('Unable to import the getpass module.')
+      elif isinstance(e, ModuleNotFoundError):
+        error_messages.append('The getpass module was not found.')
+      elif isinstance(e, OSError):
+        error_message = 'OS error occurred while retrieving the username.'
+        error_messages.append(error_message)
+      else:
+        error_messages.append('An exception occurred: ' + str(e))
+  if user is None:
+    LOGGER.error(next(error_messages))
+
   return user
 
+
 def set_file_owner(path, owner):
   """Change the owner of a file"""
   run_command(f'chown -R {owner} {path}')
 
@@ -175,6 +175,8 @@ def start(self):
     self.reset()
     self._status = TestrunStatus.STARTING
     self.pause_message = False
+
+  def start_timer(self):
     self._started = datetime.datetime.now()
 
   def get_started(self):
 
@@ -491,6 +491,10 @@ def _device_stable(self, mac_addr):
 
     LOGGER.info(f'Device with mac address {mac_addr} is ready for testing.')
     self._set_status(TestrunStatus.IN_PROGRESS)
+
+    # Start testrun timer
+    self.get_session().start_timer()
+
     self._test_orc.run_test_modules()
 
     self._stop_network()
 
@@ -264,11 +264,11 @@ def configure_container_interface(self,
       return False
     return True
 
-  def ping_via_gateway(self, host):
+  def ping_via_gateway(self, host: str) -> bool:
     """Ping the host trough the gateway container"""
     command = f'timeout 3 docker exec tr-ct-gateway ping -W 1 -c 1 {host}'
     output = util.run_command(command, supress_error=True)
-    if '0% packet loss' in output[0]:
+    if re.search(r'\s0% packet loss', output[0]):
       return True
     return False
 
 
@@ -16,6 +16,7 @@
 import ipaddress
 import json
 import os
+import re
 from scapy.all import sniff, wrpcap, BOOTP, AsyncSniffer
 from scapy.error import Scapy_Exception
 import shutil
@@ -356,8 +357,10 @@ def _ping(self, net_module):
     host = net_module.net_config.ipv4_address
     namespace = 'tr-ctns-' + net_module.dir_name
     cmd = 'ip netns exec ' + namespace + ' ping -c 1 ' + str(host)
-    success = util.run_command(cmd, output=False)
-    return success
+    out, _  = util.run_command(cmd, supress_error=True)
+    if re.search(r'\s0% packet loss', out):
+      return True
+    return False
 
   def _ci_pre_network_create(self):
     """ Stores network properties to restore network after
 
@@ -15,6 +15,7 @@
 """Holds logic for validation of network services prior to runtime."""
 import json
 import os
+import pwd
 import shutil
 import time
 import docker
@@ -179,44 +180,50 @@ def _start_network_device(self, device):
 
     LOGGER.info('Validation device ' + device.name + ' has finished')
 
-  def _get_host_user(self):
-    user = self._get_os_user()
-
-    # If primary method failed, try secondary
-    if user is None:
-      user = self._get_user()
+  def _get_sudo_user(self):
+    """Returns the username of the sudo user."""
+    return os.environ.get('SUDO_USER')
 
-    LOGGER.debug(f'Network validator host user: {user}')
-    return user
-
-  def _get_os_user(self):
+  def _get_pwd_user(self):
+    """Returns the username of the current user using pwd module"""
     user = None
-    try:
-      user = os.getlogin()
-    except OSError:
-      # Handle the OSError exception
-      LOGGER.error('An OS error occurred while retrieving the login name.')
-    except Exception as error: # pylint: disable=W0703
-      # Catch any other unexpected exceptions
-      LOGGER.error('An exception occurred:', error)
+    user = pwd.getpwuid(os.getuid()).pw_name
     return user
 
-  def _get_user(self):
+  def _get_host_user(self):
+    """Returns the username of the host user"""
+    user_functions = [
+      self._get_sudo_user,
+      os.getlogin,
+      getpass.getuser,
+      self._get_pwd_user
+    ]
     user = None
-    try:
-      user = getpass.getuser()
-    except (KeyError, ImportError, ModuleNotFoundError, OSError) as e:
+    error_messages = []
+    for func in user_functions:
+      try:
+        user = func()
+        if user is not None:
+          break
+      except (KeyError, ImportError, ModuleNotFoundError, OSError) as e:
       # Handle specific exceptions individually
-      if isinstance(e, KeyError):
-        LOGGER.error('USER environment variable not set or unavailable.')
-      elif isinstance(e, ImportError):
-        LOGGER.error('Unable to import the getpass module.')
-      elif isinstance(e, ModuleNotFoundError):
-        LOGGER.error('The getpass module was not found.')
-      elif isinstance(e, OSError):
-        LOGGER.error('An OS error occurred while retrieving the username.')
-      else:
-        LOGGER.error('An exception occurred:', e)
+        if isinstance(e, KeyError):
+          error_message = 'USER environment variable not set or unavailable.'
+          error_messages.append(error_message)
+        elif isinstance(e, ImportError):
+          error_messages.append('Unable to import the getpass module.')
+        elif isinstance(e, ModuleNotFoundError):
+          error_messages.append('The getpass module was not found.')
+        elif isinstance(e, OSError):
+          error_message = 'OS error occurred while retrieving the username.'
+          error_messages.append(error_message)
+        else:
+          error_messages.append('An exception occurred: ' + str(e))
+    if user is None:
+      LOGGER.error(next(error_messages))
+
+    LOGGER.debug(f'Network validator host user: {user}')
+
     return user
 
   def _get_device_status(self, module):
 
@@ -15,6 +15,7 @@
 import copy
 import os
 import json
+import pathlib
 import re
 import time
 import shutil
@@ -234,6 +235,8 @@ def _write_reports(self, test_report):
 
     util.run_command(f"chown -R {self._host_user} {out_dir}")
 
+    self._cleanup_modules_html_reports(out_dir)
+
   def _generate_report(self):
 
     device = self.get_session().get_target_device()
@@ -271,6 +274,27 @@ def _generate_report(self):
 
     return report
 
+  def _cleanup_modules_html_reports(self, out_dir):
+    """Cleans up any HTML reports generated by test modules to save space."""
+
+    for module in self._test_modules:
+      module_template_path = os.path.join(
+          os.path.join(out_dir, module.name),
+          f"{module.name}_report.j2.html")
+      module_report_path = os.path.join(
+          os.path.join(out_dir, module.name),
+          f"{module.name}_report.jinja2")
+      try:
+        if os.path.exists(module_template_path):
+          os.remove(module_template_path)
+          LOGGER.debug(f"Removed module template: {module_template_path}")
+        if os.path.exists(module_report_path):
+          p = pathlib.Path(module_report_path)
+          p.rename(p.with_suffix(".html"))
+      except Exception as e:
+        LOGGER.error(f"Error {module_template_path}: {e}")
+
+
   def _cleanup_old_test_results(self, device):
 
     if device.max_device_reports is not None: