Major refactoring

Signed-off-by: vezio <tyler.rimaldi@ibm.com>
IBM · Aug 25, 2024 · 5d8dcaa · 5d8dcaa
1 parent fab3be9
commit 5d8dcaa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/autopilot-daemon/Dockerfile b/autopilot-daemon/Dockerfile
@@ -76,11 +76,13 @@ COPY gpu-mem/entrypoint.py /home/autopilot/gpu-mem/entrypoint.py
 
 # Network tests files
 # COPY network/metrics-entrypoint.py /home/autopilot/network/metrics-entrypoint.py
-COPY network/iperf3-entrypoint.py /home/autopilot/network/iperf3-entrypoint.py
 COPY network/ping-entrypoint.py /home/autopilot/network/ping-entrypoint.py
-COPY network/start-iperf-servers.py /home/autopilot/network/start-iperf-servers.py
-COPY network/start-iperf-clients.py /home/autopilot/network/start-iperf-clients.py
-COPY network/iperf3-debrief.sh /home/autopilot/network/iperf3-debrief.sh
+COPY network/iperf3_entrypoint.py /home/autopilot/network/iperf3_entrypoint.py
+COPY network/iperf3_utils.py /home/autopilot/network/iperf3_utils.py
+COPY network/network_workload.py /home/autopilot/network/network_workload.py
+COPY network/iperf3_start_servers.py /home/autopilot/network/iperf3_start_servers.py
+# COPY network/start-iperf-clients.py /home/autopilot/network/start-iperf-clients.py
+# COPY network/iperf3-debrief.sh /home/autopilot/network/iperf3-debrief.sh
 
 # Remapped Rows test files
 COPY gpu-remapped/entrypoint.py /home/autopilot/gpu-remapped/entrypoint.py

diff --git a/autopilot-daemon/network/iperf3_start_servers.py b/autopilot-daemon/network/iperf3_start_servers.py
@@ -29,13 +29,13 @@ def main():
             subprocess.run(command, text=True, capture_output=True, check=True)
         except subprocess.CalledProcessError as e:
             log.error(
-                f"Server failed to start on {ip}:{port} using {iface} in {CURR_POD_NAME} on {CURR_WORKER_NODE_NAME}. "
-                "Exited with error: {e.stderr}"
+                f"Server failed to start on {ip}:{port} using {iface} in {CURR_POD_NAME} on {CURR_WORKER_NODE_NAME}.\n "
+                f"Exited with error: {e.stderr}"
             )
             sys.exit(1)
         except KeyError:
             log.error(
-                f"No IPv4 address found for interface {iface} in {CURR_POD_NAME} on {CURR_WORKER_NODE_NAME}."
+                f"No AF_INET (IPv4) address found for interface {iface} in {CURR_POD_NAME} on {CURR_WORKER_NODE_NAME}."
             )
             sys.exit(1)