Be explicit about how the common directory is passed (#7603)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Amaury Chamayou <amchamay@microsoft.com>

Author: 3 people

tests/e2e_operations.py

@@ -1291,7 +1291,6 @@ def run_initial_uvm_descriptor_checks(const_args):
             )
             recovered_network.start_in_recovery(
                 recovered_network_args,
-                common_dir=network.common_dir,
                 ledger_dir=current_ledger_dir,
                 committed_ledger_dirs=committed_ledger_dirs,
                 snapshots_dir=snapshots_dir,
@@ -1374,7 +1373,6 @@ def run_initial_tcb_version_checks(const_args):
         ) as recovered_network:
             recovered_network.start_in_recovery(
                 recovered_network_args,
-                common_dir=network.common_dir,
                 ledger_dir=current_ledger_dir,
                 committed_ledger_dirs=committed_ledger_dirs,
                 snapshots_dir=snapshots_dir,
@@ -1441,7 +1439,9 @@ def run_recovery_local_unsealing(
     args = copy.deepcopy(const_args)
     args.nodes = infra.e2e_args.min_nodes(args, f=1)
     args.enable_local_sealing = True
-    args.label += "_unsealing"
+    args.label += (
+        f"_unsealing_{recovery_f}_rekey_{rekey}_refresh_{recovery_shares_refresh}"
+    )
 
     with infra.network.network(args.nodes, args.binary_dir) as network:
         network.start_and_open(args)

tests/infra/network.py

@@ -221,7 +221,7 @@ class Network:
 
     def __init__(
         self,
-        hosts,
+        hosts=None,
         binary_dir=".",
         dbg_nodes=None,
         existing_network=None,
@@ -242,34 +242,35 @@ def __init__(
         if existing_network is None:
             self.consortium = None
             self.users = []
-            self.hosts = hosts
+            self.hosts = hosts or []
             self.next_node_id = next_node_id
             self.txs = txs
             self.jwt_issuer = jwt_issuer
             self.service_load = service_load
             self.recovery_count = 0
+            self.common_dir = None
         else:
             self.consortium = existing_network.consortium
             self.users = existing_network.users
+            self.hosts = hosts or infra.e2e_args.nodes(
+                existing_network.args, len(existing_network.nodes)
+            )
             self.next_node_id = existing_network.next_node_id
             self.txs = existing_network.txs
             self.jwt_issuer = existing_network.jwt_issuer
-            self.hosts = infra.e2e_args.nodes(
-                existing_network.args, len(existing_network.nodes)
-            )
             self.service_load = None
             if existing_network.service_load:
                 self.service_load = existing_network.service_load
                 self.service_load.set_network(self)
             self.recovery_count = existing_network.recovery_count
+            self.common_dir = existing_network.common_dir
 
         self.ignoring_shutdown_errors = False
         self.ignore_error_patterns = []
         self.nodes = []
         self.status = ServiceStatus.CLOSED
         self.binary_dir = binary_dir
         self.library_dir = library_dir
-        self.common_dir = None
         self.election_duration = None
         self.observed_election_duration = None
         self.key_generator = os.path.join(binary_dir, self.KEY_GEN)
@@ -695,8 +696,10 @@ def start_in_recovery(
         :param snapshots_dir: snapshot directory to recover from.
         :param common_dir: common directory containing member and user keys and certs.
         """
-        self.common_dir = common_dir or get_common_folder_name(
-            args.workspace, args.label
+        self.common_dir = (
+            common_dir
+            or self.common_dir
+            or get_common_folder_name(args.workspace, args.label)
         )
         committed_ledger_dirs = committed_ledger_dirs or []
 
@@ -785,8 +788,10 @@ def start_in_self_healing_open(
         suspend_after_start=False,
         **kwargs,
     ):
-        self.common_dir = common_dir or get_common_folder_name(
-            args.workspace, args.label
+        self.common_dir = (
+            common_dir
+            or self.common_dir
+            or get_common_folder_name(args.workspace, args.label)
         )
 
         self.per_node_args_override = self.per_node_args_override or {

tests/recovery.py

@@ -678,7 +678,10 @@ def test_recover_service_aborted(network, args, from_snapshot=False):
     current_ledger_dir, committed_ledger_dirs = old_primary.get_ledger()
 
     aborted_network = infra.network.Network(
-        args.nodes, args.binary_dir, args.debug_nodes, network
+        args.nodes,
+        binary_dir=args.binary_dir,
+        dbg_nodes=args.debug_nodes,
+        existing_network=network,
     )
     aborted_network.start_in_recovery(
         args,