test: simplify get_iface to not pass machine

This is only used in Cockpit and only on `self.machine`.

Author: jelly

test/common/netlib.py

@@ -134,9 +134,9 @@ def cleanupDevs() -> None:
         self.allow_journal_messages("pcp-archive: no such metric: network.interface.* Unknown metric name",
                                     "direct: instance name lookup failed: network.*")
 
-    def get_iface(self, m, mac):
-        def getit():
-            path = m.execute(f"grep -li '{mac}' /sys/class/net/*/address")
+    def get_iface(self, mac: str) -> str:
+        def getit() -> str:
+            path = self.machine.execute(f"grep -li '{mac}' /sys/class/net/*/address")
             return path.split("/")[-2]
         iface = wait(getit).strip()
         print(f"{mac} -> {iface}")
@@ -148,10 +148,10 @@ def add_iface(self, activate: bool = True) -> str:
         assert self.network is not None
         mac = m.add_netiface(networking=self.network.interface())
         # Wait for the interface to show up
-        self.get_iface(m, mac)
+        self.get_iface(mac)
         # Trigger udev to make sure that it has been renamed to its final name
         m.execute("udevadm trigger; udevadm settle")
-        iface = self.get_iface(m, mac)
+        iface = self.get_iface(mac)
         if activate:
             self.nm_activate_eth(iface)
         return iface

test/verify/check-networkmanager-bond

@@ -302,7 +302,7 @@ class TestBondingVirt(netlib.NetworkCase):
         b = self.browser
         m = self.machine
 
-        iface = self.get_iface(m, m.networking["mac"])
+        iface = self.get_iface(m.networking["mac"])
 
         self.login_and_go("/network")
         self.wait_for_iface(iface)
@@ -334,7 +334,7 @@ class TestBondingVirt(netlib.NetworkCase):
         b = self.browser
         m = self.machine
 
-        iface = self.get_iface(m, m.networking["mac"])
+        iface = self.get_iface(m.networking["mac"])
         self.ensure_nm_uses_dhclient()
 
         self.login_and_go("/network")

test/verify/check-networkmanager-checkpoints

@@ -28,7 +28,7 @@ class TestNetworkingCheckpoints(netlib.NetworkCase):
         b = self.browser
         m = self.machine
 
-        iface = self.get_iface(m, "52:54:00:12:34:56")
+        iface = self.get_iface("52:54:00:12:34:56")
 
         if "debian" in m.image:
             self.sed_file("s/managed=false/managed=true/", "/etc/NetworkManager/NetworkManager.conf",
@@ -113,7 +113,7 @@ class TestNetworkingCheckpoints(netlib.NetworkCase):
         # into the UI and wait for the expected interface to appear
         # and be active, and then slow down dhclient.
 
-        iface = self.get_iface(m, "52:54:00:12:34:56")
+        iface = self.get_iface("52:54:00:12:34:56")
         con_id = self.iface_con_id(iface)
         m.execute(f'nmcli con mod "{con_id}" ipv4.dhcp-timeout {dhcp_timeout}')