[dhcp_static] Allow removing entry with just name, fixes #69

pfsensible · Dec 18, 2023 · 322b53d · 322b53d
1 parent 768d5f6
commit 322b53d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/plugins/modules/pfsense_dhcp_static.py b/plugins/modules/pfsense_dhcp_static.py
@@ -223,7 +223,7 @@ def _validate_params(self):
 
         params = self.params
 
-        if re.fullmatch(r'(?:[0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}', params['macaddr']) is None:
+        if params['macaddr'] is not None and re.fullmatch(r'(?:[0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}', params['macaddr']) is None:
             self.module.fail_json(msg='A valid MAC address must be specified.')
 
         if params['netif'] is not None:

diff --git a/tests/unit/plugins/modules/fixtures/pfsense_dhcp_static_config.xml b/tests/unit/plugins/modules/fixtures/pfsense_dhcp_static_config.xml
@@ -211,9 +211,9 @@
 			<numberoptions></numberoptions>
 			<staticmap>
 				<mac>ab:ab:ab:ab:ab:ab</mac>
-				<cid></cid>
+				<cid>dhcphostid</cid>
 				<ipaddr>10.0.0.100</ipaddr>
-				<hostname></hostname>
+				<hostname>dhcphostname</hostname>
 				<descr></descr>
 				<filename></filename>
 				<rootpath></rootpath>

diff --git a/tests/unit/plugins/modules/test_pfsense_dhcp_static.py b/tests/unit/plugins/modules/test_pfsense_dhcp_static.py
@@ -120,8 +120,13 @@ def test_dhcp_static_create_invalid_macaddr(self):
         obj = dict(name='test_entry', macaddr='ab:ab:ab:ab:ab:hh', ipaddr='10.10.0.101', netif='opt2')
         self.do_module_test(obj, failed=True, msg=msg)
 
-    def test_dhcp_static_delete(self):
+    def test_dhcp_static_delete_macaddr(self):
         """ test """
         obj = dict(macaddr='ab:ab:ab:ab:ab:ab', netif='opt1', state='absent')
         command = "delete dhcp_static ''"
+
+    def test_dhcp_static_delete_name(self):
+        """ test """
+        obj = dict(name='dhcphostid', netif='opt1', state='absent')
+        command = "delete dhcp_static 'dhcphostid'"
         self.do_module_test(obj, command=command, delete=True)