NM activator/bring_up_interfaces: reload and bring up individual netw…

…ork conns

Reloading the network manager service is equivalent to "nmcli reload" and this
command only reloads the global .conf files and DNS config, not connections.
This means changes to connection files will not take effect. For those to take
effect, we need "nmcli conn load/reload" and then "nmcli conn up". Thus,
reloading network manager as well as reloading the connections are required to
cover all cases.

While at it, rename "reload-or-try-restart" -> "try-reload-or-restart" since
the former is legacy and the later is the officially documented sub-command.

Fixes: canonicalGH-6064
Fixes: bde913a ("fix(NetworkManager): Fix network activator")

Signed-off-by: Ani Sinha <[email protected]>

cloudinit/net/activators.py

@@ -206,9 +206,9 @@ def bring_up_interfaces(cls, device_names: Iterable[str]) -> bool:
                 state,
             )
         return _alter_interface(
-            ["systemctl", "reload-or-try-restart", "NetworkManager.service"],
+            ["systemctl", "try-reload-or-restart", "NetworkManager.service"],
             "all",
-        )
+        ) and all(cls.bring_up_interface(device) for device in device_names)
 
 
 class NetplanActivator(NetworkActivator):

tests/unittests/test_net_activators.py

@@ -247,8 +247,8 @@ def test_available(self, activator, available_calls, available_mocks):
         ),
         {},
     ),
-    ((["systemctl", "reload-or-try-restart", "NetworkManager.service"],), {}),
-]
+    ((["systemctl", "try-reload-or-restart", "NetworkManager.service"],), {}),
+] + NETWORK_MANAGER_BRING_UP_CALL_LIST
 
 NETWORKD_BRING_UP_CALL_LIST: list = [
     ((["ip", "link", "set", "dev", "eth0", "up"],), {}),