Merge pull request #30716 from yuwata/network-cancel-request

network: also remove configuration on cancelling request
This commit is contained in:
Luca Boccassi
2024-01-10 19:33:16 +00:00
committed by GitHub
6 changed files with 64 additions and 30 deletions
+5 -1
View File
@@ -4024,7 +4024,11 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
remove_network_unit('25-nexthop-nothing.network', '25-nexthop-dummy-2.network')
copy_network_unit('25-nexthop-1.network', '25-nexthop-dummy-1.network')
networkctl_reload()
# Of course, networkctl_reconfigure() below is unnecessary in normal operation, but it is intentional
# here to test reconfiguring with different .network files does not trigger race.
# See also comments in link_drop_requests().
networkctl_reconfigure('dummy98') # reconfigured with 25-nexthop-dummy-2.network
networkctl_reload() # reconfigured with 25-nexthop-dummy-1.network
self.check_nexthop(manage_foreign_nexthops, first=True)