From 7e2c75f0d63565824dad1957d5bba164f6ea9d6b Mon Sep 17 00:00:00 2001 From: Andrew Laucius Date: Wed, 15 Jan 2025 10:07:32 -0500 Subject: [PATCH] Remove network_overrides if empty for backcompat Signed-off-by: Andrew Laucius --- tests/framework/microvm.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/framework/microvm.py b/tests/framework/microvm.py index dca79b04e0d..e5d3b8cb1e4 100644 --- a/tests/framework/microvm.py +++ b/tests/framework/microvm.py @@ -1004,12 +1004,20 @@ def restore_from_snapshot( for k, v in rename_interfaces.items() ] + optional_kwargs = {} + if network_overrides: + # For backwards compatibility ab testing we want to avoid adding + # new parameters until we have a release baseline with the new + # parameter. Once the release baseline has moved, this assignment + # can be inline in the snapshot_load command below + optional_kwargs["network_overrides"] = network_overrides + self.api.snapshot_load.put( mem_backend=mem_backend, snapshot_path=str(jailed_vmstate), enable_diff_snapshots=snapshot.is_diff, resume_vm=resume, - network_overrides=iface_overrides, + **optional_kwargs, ) # This is not a "wait for boot", but rather a "VM still works after restoration" if snapshot.net_ifaces and resume: