test_snapshot_ab: move metrics dimension setting into configure_vm

Move the initialization of the metrics logger dimensions into
`configure_vm`, as later on there will be multiple tests having to do
exactly the same sequence of configure + setup metrics.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

tests/integration_tests/performance/test_snapshot_ab.py

@@ -40,12 +40,7 @@ def id(self):
         """Computes a unique id for this test instance"""
         return "all_dev" if self.all_devices else f"{self.vcpus}vcpu_{self.mem}mb"
 
-    def configure_vm(
-        self,
-        microvm_factory,
-        guest_kernel,
-        rootfs,
-    ) -> Microvm:
+    def configure_vm(self, microvm_factory, guest_kernel, rootfs, metrics) -> Microvm:
         """Creates the initial snapshot that will be loaded repeatedly to sample latencies"""
         vm = microvm_factory.build(
             guest_kernel,
@@ -74,6 +69,17 @@ def configure_vm(
             )
             vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path="/v.sock")
 
+        metrics.set_dimensions(
+            {
+                "performance_test": "test_restore_latency",
+                "net_devices": str(self.nets),
+                "block_devices": str(self.blocks),
+                "vsock_devices": str(int(self.all_devices)),
+                "balloon_devices": str(int(self.all_devices)),
+                **vm.dimensions,
+            }
+        )
+
         return vm
 
     def sample_latency(self, microvm_factory, snapshot) -> List[float]:
@@ -122,19 +128,10 @@ def test_restore_latency(
 
     We only test a single guest kernel, as the guest kernel does not "participate" in snapshot restore.
     """
-    vm = test_setup.configure_vm(microvm_factory, guest_kernel_linux_5_10, rootfs)
-    vm.start()
-
-    metrics.set_dimensions(
-        {
-            "performance_test": "test_restore_latency",
-            "net_devices": str(test_setup.nets),
-            "block_devices": str(test_setup.blocks),
-            "vsock_devices": str(int(test_setup.all_devices)),
-            "balloon_devices": str(int(test_setup.all_devices)),
-            **vm.dimensions,
-        }
+    vm = test_setup.configure_vm(
+        microvm_factory, guest_kernel_linux_5_10, rootfs, metrics
     )
+    vm.start()
 
     snapshot = vm.snapshot_full()
     vm.kill()