Skip to content

Commit ef9a9e1

Browse files
Enhance recovery local unsealing function to accept a suffix for labels (#7685)
Co-authored-by: Amaury Chamayou <amchamay@microsoft.com>
1 parent 3784072 commit ef9a9e1

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

tests/e2e_operations.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2246,15 +2246,13 @@ def run_initial_tcb_version_checks(const_args):
22462246

22472247

22482248
def run_recovery_local_unsealing(
2249-
const_args, recovery_f=0, rekey=False, recovery_shares_refresh=False
2249+
const_args, suffix, recovery_f=0, rekey=False, recovery_shares_refresh=False
22502250
):
22512251
LOG.info("Running recovery local unsealing")
22522252
args = copy.deepcopy(const_args)
22532253
args.nodes = infra.e2e_args.min_nodes(args, f=1)
22542254
args.enable_local_sealing = True
2255-
args.label += (
2256-
f"_unsealing_{recovery_f}_rekey_{rekey}_refresh_{recovery_shares_refresh}"
2257-
)
2255+
args.label += suffix
22582256

22592257
with infra.network.network(args.nodes, args.binary_dir) as network:
22602258
network.start_and_open(args)
@@ -2935,10 +2933,14 @@ def run_propose_request_vote(const_args):
29352933
def run_snp_tests(args):
29362934
run_initial_uvm_descriptor_checks(args)
29372935
run_initial_tcb_version_checks(args)
2938-
run_recovery_local_unsealing(args)
2939-
run_recovery_local_unsealing(args, rekey=True)
2940-
run_recovery_local_unsealing(args, recovery_shares_refresh=True)
2941-
run_recovery_local_unsealing(args, recovery_f=1)
2936+
run_recovery_local_unsealing(args, suffix="_unsealing")
2937+
run_recovery_local_unsealing(args, rekey=True, suffix="_unsealing_with_rekey")
2938+
run_recovery_local_unsealing(
2939+
args,
2940+
recovery_shares_refresh=True,
2941+
suffix="_unsealing_with_recovery_shares_refresh",
2942+
)
2943+
run_recovery_local_unsealing(args, recovery_f=1, suffix="_unsealing_with_f_equal_1")
29422944
run_recovery_unsealing_validate_audit(args)
29432945
test_error_message_on_failure_to_read_aci_sec_context(args)
29442946
run_self_healing_open(args)

0 commit comments

Comments
 (0)