Skip to content

Commit a1eac4a

Browse files
committed
test: simplify get_iface to not pass machine
This is only used in Cockpit and only on `self.machine`.
1 parent 56e8469 commit a1eac4a

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

test/common/netlib.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ def cleanupDevs():
132132
self.allow_journal_messages("pcp-archive: no such metric: network.interface.* Unknown metric name",
133133
"direct: instance name lookup failed: network.*")
134134

135-
def get_iface(self, m, mac):
136-
def getit():
137-
path = m.execute(f"grep -li '{mac}' /sys/class/net/*/address")
135+
def get_iface(self, mac: str) -> str:
136+
def getit() -> str:
137+
path = self.machine.execute(f"grep -li '{mac}' /sys/class/net/*/address")
138138
return path.split("/")[-2]
139139
iface = wait(getit).strip()
140140
print(f"{mac} -> {iface}")
@@ -144,10 +144,10 @@ def add_iface(self, activate=True):
144144
m = self.machine
145145
mac = m.add_netiface(networking=self.network.interface())
146146
# Wait for the interface to show up
147-
self.get_iface(m, mac)
147+
self.get_iface(mac)
148148
# Trigger udev to make sure that it has been renamed to its final name
149149
m.execute("udevadm trigger; udevadm settle")
150-
iface = self.get_iface(m, mac)
150+
iface = self.get_iface(mac)
151151
if activate:
152152
self.nm_activate_eth(iface)
153153
return iface

test/verify/check-networkmanager-bond

+2-2
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ class TestBondingVirt(netlib.NetworkCase):
302302
b = self.browser
303303
m = self.machine
304304

305-
iface = self.get_iface(m, m.networking["mac"])
305+
iface = self.get_iface(m.networking["mac"])
306306

307307
self.login_and_go("/network")
308308
self.wait_for_iface(iface)
@@ -334,7 +334,7 @@ class TestBondingVirt(netlib.NetworkCase):
334334
b = self.browser
335335
m = self.machine
336336

337-
iface = self.get_iface(m, m.networking["mac"])
337+
iface = self.get_iface(m.networking["mac"])
338338
self.ensure_nm_uses_dhclient()
339339

340340
self.login_and_go("/network")

test/verify/check-networkmanager-checkpoints

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class TestNetworkingCheckpoints(netlib.NetworkCase):
2828
b = self.browser
2929
m = self.machine
3030

31-
iface = self.get_iface(m, "52:54:00:12:34:56")
31+
iface = self.get_iface("52:54:00:12:34:56")
3232

3333
if "debian" in m.image:
3434
self.sed_file("s/managed=false/managed=true/", "/etc/NetworkManager/NetworkManager.conf",
@@ -113,7 +113,7 @@ class TestNetworkingCheckpoints(netlib.NetworkCase):
113113
# into the UI and wait for the expected interface to appear
114114
# and be active, and then slow down dhclient.
115115

116-
iface = self.get_iface(m, "52:54:00:12:34:56")
116+
iface = self.get_iface("52:54:00:12:34:56")
117117
con_id = self.iface_con_id(iface)
118118
m.execute(f'nmcli con mod "{con_id}" ipv4.dhcp-timeout {dhcp_timeout}')
119119

0 commit comments

Comments
 (0)