WIP more logging.

Author: juagargi

acceptance/multihomed/test.py

@@ -91,6 +91,18 @@ def _server_primary_ip(self):
                 return ip
         raise RuntimeError("could not determine server primary IP")
 
+    def bash_at_server(self, cmd, *args, **kwargs):
+            print(
+                self.dc.execute(
+                    "tester_1-ff00_0_111",
+                    "bash",
+                    "-c",
+                    cmd,
+                    *args,
+                    **kwargs,
+                )
+            )
+
     def _run(self):
         # Wait until SCION control-plane/path connectivity is established.
         self.await_connectivity()
@@ -108,7 +120,7 @@ def _run(self):
         bound_port = 31001
         multihomed_port = 31000
 
-        # SERVERLOGFILE="/tmp/log.txt"
+        SERVERLOGFILE="/tmp/log.txt"
 
         print(f"server IPs configured: primary={primary_ip}, secondary={secondary_ip}")
 
@@ -144,40 +156,23 @@ def _run(self):
         print("server terminated successfully")
         time.sleep(2)
 
-
-        def bash_at_server(cmd, *args, **kwargs):
-            print(
-                self.dc.execute(
-                    "tester_1-ff00_0_111",
-                    "bash",
-                    "-c",
-                    cmd,
-                    *args,
-                    **kwargs,
-                )
-            )
-
-        # # bash(f"ls -l / ; echo ; ls -l /tmp ; echo ; ls -l /share")
-        # # bash("whoami ; id")
-        # bash_at_server(f"touch {SERVERLOGFILE} ; " +
-        #                f"chown {os.getuid()}:{os.getgid()} {SERVERLOGFILE}",
-        #                user="0:0")
-        # # bash(f"ls -l {LOGFILE}")
-
-
-        # 2) Multihomed check using server primary IP while server is unbound (0.0.0.0).
+        # Multihomed server.
+        self.bash_at_server(f"touch {SERVERLOGFILE} ; " +
+                            f"chown {os.getuid()}:{os.getgid()} {SERVERLOGFILE}",
+                            user="0:0")
+        self.bash_at_server(f"ls -l {SERVERLOGFILE}")
         self.dc.execute_detached(
             "tester_1-ff00_0_111",
             "bash",
             "-c",
-            # f"test-server -bind 0.0.0.0 -port {multihomed_port} > {SERVERLOGFILE} 2>&1",
-            f"test-server -bind 0.0.0.0 -port {multihomed_port}",
+            f"test-server -bind 0.0.0.0 -port {multihomed_port} > {SERVERLOGFILE} 2>&1",
         )
         time.sleep(2)
         print("---------------------------------------------------")
-        bash_at_server(f"ifconfig ; echo -e '\n\n' ; route -n")
+        self.bash_at_server("ifconfig ; echo ; route -n ; echo ; ps aux")
         print("---------------------------------------------------")
 
+        # 2) Multihomed check using server primary IP while server is unbound (0.0.0.0).
         remote_primary = f"1-ff00:0:111,{primary_ip}:{multihomed_port}"
         print(f"running client against primary IP: {remote_primary}")
         result_primary = self.dc.execute(
@@ -194,33 +189,19 @@ def bash_at_server(cmd, *args, **kwargs):
         # through the secondary destination without enforcing the response source address.
         remote_secondary = f"1-ff00:0:111,{secondary_ip}:{multihomed_port}"
         print(f"running client against secondary IP: {remote_secondary}")
-        result_secondary = self.dc.execute(
-            "tester_1-ff00_0_112",
-            "bash",
-            "-c",
-            f'test-client -local "{local_addr}" -remote "{remote_secondary}"',
-        )
-        print(result_secondary)
-
-
-
-
-        # print("bringing one interface down at the server")
-        # print("---------------------------------------------------")
-        # # bash_at_server(f"ifconfig eth1 down ; echo 'removed eth0' ; sleep 2 ; " +
-        # #      "ifconfig ; echo -n '\n' ; route -n", user="0:0")
-        # bash_at_server(f"ip addr del 192.168.200.11/24 dev eth1 ; sleep 1 ; ifconfig ; route -n",
-        #                user="0:0")
-        # print("---------------------------------------------------")
-        # # Give docker some time to bring down the interface in the container.
-        # time.sleep(5)
-
-
-
-
-
-
-
+        result_secondary = ""
+        try:
+            result_secondary = self.dc.execute(
+                "tester_1-ff00_0_112",
+                "bash",
+                "-c",
+                f'test-client -local "{local_addr}" -remote "{remote_secondary}"',
+            )
+        finally:
+            print("Client results:")
+            print(result_secondary)
+            print("\n\nServer log:")
+            self.bash_at_server(f"cat {SERVERLOGFILE}")
 
 
 if __name__ == "__main__":