libnetplan: expose dhcp4 and dhcp6 properties

include/netplan.h

@@ -127,6 +127,12 @@ netplan_netdef_has_match(const NetplanNetDefinition* netdef);
 NETPLAN_PUBLIC gboolean
 netplan_netdef_match_interface(const NetplanNetDefinition* netdef, const char* name, const char* mac, const char* driver_name);
 
+NETPLAN_PUBLIC gboolean
+netplan_netdef_get_dhcp4(const NetplanNetDefinition* netdef);
+
+NETPLAN_PUBLIC gboolean
+netplan_netdef_get_dhcp6(const NetplanNetDefinition* netdef);
+
 /********** Old API below this ***********/
 
 NETPLAN_DEPRECATED NETPLAN_PUBLIC const char *

python-cffi/netplan/_build_cffi.py

@@ -85,6 +85,8 @@
     gboolean netplan_netdef_get_delay_virtual_functions_rebind(const NetplanNetDefinition* netdef);
     gboolean netplan_netdef_match_interface(
         const NetplanNetDefinition* netdef, const char* name, const char* mac, const char* driver_name);
+    gboolean netplan_netdef_get_dhcp4(const NetplanNetDefinition* netdef);
+    gboolean netplan_netdef_get_dhcp6(const NetplanNetDefinition* netdef);
 
     // NetDefinition (internal)
     ssize_t _netplan_netdef_get_embedded_switch_mode(const NetplanNetDefinition* netdef, char* out_buffer, size_t out_buf_size);

python-cffi/netplan/netdef.py

@@ -40,6 +40,14 @@ def _match_interface(self, iface_name: str = None, iface_driver: str = None, ifa
     def addresses(self) -> '_NetdefAddressIterator':
         return _NetdefAddressIterator(self._ptr)
 
+    @property
+    def dhcp4(self) -> bool:
+        return bool(lib.netplan_netdef_get_dhcp4(self._ptr))
+
+    @property
+    def dhcp6(self) -> bool:
+        return bool(lib.netplan_netdef_get_dhcp6(self._ptr))
+
     @property
     def _has_match(self) -> bool:
         return bool(lib.netplan_netdef_has_match(self._ptr))

src/util.c

@@ -940,6 +940,18 @@ netplan_netdef_get_set_name(const NetplanNetDefinition* netdef, char* out_buffer
     return netplan_copy_string(netdef->set_name, out_buffer, out_buf_size);
 }
 
+gboolean
+netplan_netdef_get_dhcp4(const NetplanNetDefinition* netdef)
+{
+    return netdef->dhcp4;
+}
+
+gboolean
+netplan_netdef_get_dhcp6(const NetplanNetDefinition* netdef)
+{
+    return netdef->dhcp6;
+}
+
 gboolean
 is_multicast_address(const char* address)
 {

tests/test_libnetplan.py

@@ -663,6 +663,27 @@ def test_interface_has_pointer_to_peer(self):
         self.assertEqual(state['patch0-1'].links.get('peer').id, "patch1-0")
         self.assertEqual(state['patch1-0'].links.get('peer').id, "patch0-1")
 
+    def test_dhcp4_dhcp6(self):
+        state = state_from_yaml(self.confdir, '''network:
+  ethernets:
+    eth0:
+      dhcp4: true
+      dhcp6: false
+      ''')
+
+        self.assertTrue(state['eth0'].dhcp4)
+        self.assertFalse(state['eth0'].dhcp6)
+
+        state = state_from_yaml(self.confdir, '''network:
+  ethernets:
+    eth0:
+      dhcp4: false
+      dhcp6: true
+      ''')
+
+        self.assertFalse(state['eth0'].dhcp4)
+        self.assertTrue(state['eth0'].dhcp6)
+
 
 class TestFreeFunctions(TestBase):
     def test_create_yaml_patch_dict(self):