revert acceptance/hiden_paths test

JordiSubira · Mar 15, 2024 · 4471bf7 · 4471bf7
1 parent ea05ad5
commit 4471bf7
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/acceptance/hidden_paths/test.py b/acceptance/hidden_paths/test.py
@@ -65,15 +65,6 @@ def setup_prepare(self):
             "4": "172.20.0.65",
             "5": "172.20.0.73",
         }
-        # TODO(JordiSubira): These addresses will change if the topology file is modified.
-        # In any case, after rebasing this branch this probably does not work anymore, since
-        # SVC resolution and address setup is modified.
-        control_addresses = {
-            "2": "172.20.0.51:30090",
-            "3": "172.20.0.59:30090",
-            "4": "172.20.0.67:30090",
-            "5": "172.20.0.75:30090",
-        }
         # Each AS participating in hidden paths has their own hidden paths configuration file.
         hp_configs = {
             "2": "hp_groups_as2_as5.yml",
@@ -101,11 +92,14 @@ def setup_prepare(self):
             # even though some don't need the registration service.
             as_dir_path = self.artifacts / "gen" / ("ASff00_0_%s" % as_number)
 
+            topology_file = as_dir_path / "topology.json"
+            control_service_addr = scion.load_from_json(
+                'control_service.%s.addr' % control_id, [topology_file])
             topology_update = {
                 "hidden_segment_lookup_service.%s.addr" % control_id:
-                    control_addresses[as_number],
+                    control_service_addr,
                 "hidden_segment_registration_service.%s.addr" % control_id:
-                    control_addresses[as_number],
+                    control_service_addr,
             }
             topology_file = as_dir_path / "topology.json"
             scion.update_json(topology_update, [topology_file])