feat(dhcp): Make dhcpcd the default dhcp client (canonical#4912)

isc-dhcp-client is no longer supported by upstream

BREAKING CHANGE: dhcpcd has been promoted to the default dhcp client.
Previous behavior can be configured in cloud.cfg via the dhcp_client_priority
key.

cloudinit/net/dhcp.py

@@ -967,4 +967,4 @@ def parse_static_routes(routes: str) -> List[Tuple[str, str]]:
         return []
 
 
-ALL_DHCP_CLIENTS = [IscDhclient, Dhcpcd, Udhcpc]
+ALL_DHCP_CLIENTS = [Dhcpcd, IscDhclient, Udhcpc]

config/cloud.cfg.tmpl

@@ -301,7 +301,7 @@ system_info:
 {% elif variant in ["ubuntu", "unknown"] %}
 {# SRU_BLOCKER: do not ship network renderers on Xenial, Bionic or Eoan #}
   network:
-    dhcp_client_priority: [dhclient, dhcpcd, udhcpc]
+    dhcp_client_priority: [dhcpcd, dhclient, udhcpc]
     renderers: ['netplan', 'eni', 'sysconfig']
     activators: ['netplan', 'eni', 'network-manager', 'networkd']
 {% elif is_rhel %}

tests/unittests/distros/test__init__.py

@@ -543,10 +543,10 @@ def test_get_tmp_exec_path(
             id="first_client_is_found_from_config_udhcpc",
         ),
         pytest.param(
-            IscDhclient,
+            Dhcpcd,
             {"network": {"dhcp_client_priority": []}},
             None,
-            id="first_client_is_found_no_config_dhclient",
+            id="first_client_is_found_no_config_dhcpcd",
         ),
         pytest.param(
             Dhcpcd,

tests/unittests/net/test_dhcp.py

@@ -381,7 +381,7 @@ class TestDHCPDiscoveryClean(CiTestCase):
     @mock.patch("cloudinit.net.dhcp.os.remove")
     @mock.patch("cloudinit.net.dhcp.subp.subp")
     @mock.patch("cloudinit.net.dhcp.subp.which")
-    def test_dhclient_exits_with_error(
+    def test_dhcpcd_exits_with_error(
         self, m_which, m_subp, m_remove, m_fallback
     ):
         """Log and do nothing when nic is absent and no fallback is found."""
@@ -394,7 +394,7 @@ def test_dhclient_exits_with_error(
             maybe_perform_dhcp_discovery(Distro("fake but not", {}, None))
 
         self.assertIn(
-            "DHCP client selected: dhclient",
+            "DHCP client selected: dhcpcd",
             self.logs.getvalue(),
         )
 

tests/unittests/sources/test_cloudstack.py

@@ -268,17 +268,23 @@ def test_get_hostname_fqdn_fallback(self):
             )
         )
 
+        lease = {
+            "interface": "eth0",
+            "fixed-address": "192.168.0.1",
+            "subnet-mask": "255.255.255.0",
+            "routers": "192.168.0.1",
+            "renew": "4 2017/07/27 18:02:30",
+            "expire": "5 2017/07/28 07:08:15",
+        }
         self.patches.enter_context(
             mock.patch(
                 DHCP_MOD_PATH + ".IscDhclient.get_newest_lease",
-                return_value={
-                    "interface": "eth0",
-                    "fixed-address": "192.168.0.1",
-                    "subnet-mask": "255.255.255.0",
-                    "routers": "192.168.0.1",
-                    "renew": "4 2017/07/27 18:02:30",
-                    "expire": "5 2017/07/28 07:08:15",
-                },
+                return_value=lease,
+            )
+        )
+        self.patches.enter_context(
+            mock.patch(
+                DHCP_MOD_PATH + ".Dhcpcd.get_newest_lease", return_value=lease
             )
         )