refactor(tests): remove build_vm_micro

We have too many ways to create microvms. This drops one of them. We
cannot immediately replace it with the guest_kernel/rootfs fixtures
because the of the baselines.

Signed-off-by: Pablo Barbáchano <[email protected]>

Author: pb8o

tests/framework/builder.py

@@ -333,42 +333,10 @@ def build_from_artifacts(
             io_engine=io_engine,
         )
 
-    def build_vm_nano(
-        self,
-        fc_binary=None,
-        jailer_binary=None,
-        net_ifaces=None,
-        diff_snapshots=False,
-        daemonize=True,
-        io_engine=None,
-    ):
+    def build_vm_nano(self, **kwargs):
         """Create a clean VM in an initial state."""
         return self.build_from_artifacts(
-            "2vcpu_256mb",
-            "vmlinux-4.14",
-            "ubuntu-18.04",
-            None,
-            net_ifaces=net_ifaces,
-            diff_snapshots=diff_snapshots,
-            fc_binary=fc_binary,
-            jailer_binary=jailer_binary,
-            daemonize=daemonize,
-            io_engine=io_engine,
-        )
-
-    def build_vm_micro(
-        self, fc_binary=None, jailer_binary=None, net_ifaces=None, diff_snapshots=False
-    ):
-        """Create a clean VM in an initial state."""
-        return self.build_from_artifacts(
-            "2vcpu_512mb",
-            "vmlinux-4.14",
-            "ubuntu-18.04",
-            None,
-            net_ifaces=net_ifaces,
-            diff_snapshots=diff_snapshots,
-            fc_binary=fc_binary,
-            jailer_binary=jailer_binary,
+            "2vcpu_256mb", "vmlinux-4.14", "ubuntu-18.04", None, **kwargs
         )
 
     def cleanup(self):

tests/integration_tests/performance/test_snapshot_perf.py

@@ -465,7 +465,6 @@ def test_older_snapshot_resume_latency(
     @type: performance
     """
     logger = logging.getLogger("old_snapshot_load")
-
     builder = MicrovmBuilder(bin_cloner_path)
     snapshot_type = SnapshotType.FULL
     microvm.download()
@@ -476,8 +475,13 @@ def test_older_snapshot_resume_latency(
     logger.info("Source Jailer: %s", jailer.local_path())
 
     # Create a fresh microvm with the binary artifacts.
-    vm_instance = builder.build_vm_micro(
-        firecracker_release.local_path(), jailer.local_path()
+    vm_instance = builder.build_from_artifacts(
+        "2vcpu_512mb",
+        "vmlinux-4.14",
+        "ubuntu-18.04",
+        None,
+        fc_binary=firecracker_release.local_path(),
+        jailer_binary=jailer.local_path(),
     )
     basevm = vm_instance.vm
     basevm.start()