mirror of
https://github.com/systemd/systemd
synced 2024-07-08 20:15:55 +00:00
test-network: also set custom altternative name for netdevsim interface
Due to the bug in kernel 6.9 caused by
8debcf5832,
the net_id udev builtin does not work for netdevsim interface.
So, eni99np1 cannot be used with kernel 6.9 anymore.
Workaround for #32910.
This commit is contained in:
Yu Watanabe
parent
12e0d6ed38
commit
f1f1be71fe
11
test/test-network/conf/25-netdevsim.link
Normal file
11
test/test-network/conf/25-netdevsim.link
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
[Match]
|
||||
Driver=netdevsim
|
||||
|
||||
[Link]
|
||||
NamePolicy=keep kernel database onboard slot path
|
||||
AlternativeNamesPolicy=database onboard slot path mac
|
||||
# Also set a fixed name. Workaround for bug in kernel 6.9:
|
||||
# https://github.com/torvalds/linux/commit/8debcf5832c3e8a6baaea27c75ad8a6ba5077beb
|
||||
AlternativeName=sim99
|
||||
MACAddressPolicy=persistent
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
[Match]
|
||||
Name=eni99np1
|
||||
Name=sim99
|
||||
|
||||
[Network]
|
||||
Address=192.168.100.100/24
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@ Driver=netdevsim
|
|||
[Link]
|
||||
NamePolicy=keep kernel database onboard slot path
|
||||
AlternativeNamesPolicy=database onboard slot path mac
|
||||
# Also set a fixed name. Workaround for bug in kernel 6.9:
|
||||
# https://github.com/torvalds/linux/commit/8debcf5832c3e8a6baaea27c75ad8a6ba5077beb
|
||||
AlternativeName=sim99
|
||||
MACAddressPolicy=persistent
|
||||
|
||||
[SR-IOV]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
[Match]
|
||||
Name=eni99np1
|
||||
Name=sim99
|
||||
|
||||
[Network]
|
||||
Address=192.168.100.100/24
|
||||
|
|
|
|||
|
|
@ -562,7 +562,7 @@ def link_exists(*links):
|
|||
return True
|
||||
|
||||
def link_resolve(link):
|
||||
return check_output(f'ip link show {link}').split(':')[1].strip()
|
||||
return check_output(f'ip link show {link}').split(':')[1].strip().split('@')[0]
|
||||
|
||||
def remove_link(*links, protect=False):
|
||||
for link in links:
|
||||
|
|
@ -5282,14 +5282,14 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
|
|||
|
||||
@expectedFailureIfNetdevsimWithSRIOVIsNotAvailable()
|
||||
def test_sriov(self):
|
||||
copy_network_unit('25-default.link', '25-sriov.network')
|
||||
copy_network_unit('25-netdevsim.link', '25-sriov.network')
|
||||
|
||||
self.setup_netdevsim(num_vfs=3)
|
||||
|
||||
start_networkd()
|
||||
self.wait_online('eni99np1:routable')
|
||||
self.wait_online('sim99:routable')
|
||||
|
||||
output = check_output('ip link show dev eni99np1')
|
||||
output = check_output('ip link show dev sim99')
|
||||
print(output)
|
||||
self.assertRegex(output,
|
||||
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
|
||||
|
|
@ -5304,12 +5304,12 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
|
|||
self.setup_netdevsim()
|
||||
|
||||
start_networkd()
|
||||
self.wait_online('eni99np1:routable')
|
||||
self.wait_online('sim99:routable')
|
||||
|
||||
# the name eni99np1 may be an alternative name.
|
||||
ifname = link_resolve('eni99np1')
|
||||
# The name sim99 is an alternative name, and cannot be used by udevadm below.
|
||||
ifname = link_resolve('sim99')
|
||||
|
||||
output = check_output('ip link show dev eni99np1')
|
||||
output = check_output('ip link show dev sim99')
|
||||
print(output)
|
||||
self.assertRegex(output,
|
||||
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
|
||||
|
|
@ -5325,7 +5325,7 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
|
|||
udevadm_reload()
|
||||
udevadm_trigger(f'/sys/devices/netdevsim99/net/{ifname}')
|
||||
|
||||
output = check_output('ip link show dev eni99np1')
|
||||
output = check_output('ip link show dev sim99')
|
||||
print(output)
|
||||
self.assertRegex(output,
|
||||
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
|
||||
|
|
@ -5341,7 +5341,7 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
|
|||
udevadm_reload()
|
||||
udevadm_trigger(f'/sys/devices/netdevsim99/net/{ifname}')
|
||||
|
||||
output = check_output('ip link show dev eni99np1')
|
||||
output = check_output('ip link show dev sim99')
|
||||
print(output)
|
||||
self.assertRegex(output,
|
||||
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
|
||||
|
|
@ -5357,7 +5357,7 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
|
|||
udevadm_reload()
|
||||
udevadm_trigger(f'/sys/devices/netdevsim99/net/{ifname}')
|
||||
|
||||
output = check_output('ip link show dev eni99np1')
|
||||
output = check_output('ip link show dev sim99')
|
||||
print(output)
|
||||
self.assertRegex(output,
|
||||
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
|
||||
|
|
@ -5373,7 +5373,7 @@ class NetworkdSRIOVTests(unittest.TestCase, Utilities):
|
|||
udevadm_reload()
|
||||
udevadm_trigger(f'/sys/devices/netdevsim99/net/{ifname}')
|
||||
|
||||
output = check_output('ip link show dev eni99np1')
|
||||
output = check_output('ip link show dev sim99')
|
||||
print(output)
|
||||
self.assertRegex(output,
|
||||
'vf 0 .*00:11:22:33:44:55.*vlan 5, qos 1, vlan protocol 802.1ad, spoof checking on, link-state enable, trust on, query_rss on\n *'
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user