DNS Record Support for Bloxone Ansible v2

changelogs/fragments/46-dns-record.yml

@@ -0,0 +1,9 @@
+deprecated_features:
+  - b1_a_record - is deprecated in favor of 'dns_record'.
+  - b1_a_record_gather - is deprecated in favor of 'dns_record_info'.
+  - b1_cname_record - is deprecated in favor of 'dns_record'.
+  - b1_cname_record_gather - is deprecated in favor of 'dns_record_info'.
+  - b1_ns_record - is deprecated in favor of 'dns_record'.
+  - b1_ns_record_gather - is deprecated in favor of 'dns_record_info'.
+  - b1_ptr_record - is deprecated in favor of 'dns_record'.
+  - b1_ptr_record_gather - is deprecated in favor of 'dns_record_info'.

plugins/modules/dns_record.py

@@ -10,7 +10,7 @@
 DOCUMENTATION = r"""
 ---
 module: dns_record
-short_description: Manage Record
+short_description: Manage DNS Resource Record
 description:
     - Manage Record
 version_added: 2.0.0
@@ -455,34 +455,33 @@ def find(self):
                 raise e
         else:
             if self.params["zone"] is not None:
-                filter = f"zone=='{self.params['zone']}' and type=='{self.params['type']}'"
+                if self.params["name_in_zone"] is not None:
+                    filter = f"zone=='{self.params['zone']}' and type=='{self.params['type']}' and name_in_zone=='{self.params['name_in_zone']}'"
+                else:
+                    filter = f"zone=='{self.params['zone']}' and type=='{self.params['type']}'"
 
             elif self.params["absolute_name_spec"] is not None:
                 filter = f"absolute_name_spec=='{self.params['absolute_name_spec']}' and type=='{self.params['type']}'"
 
-            else:
-                return self.fail_json(
-                    msg="Either Zone or Name in Zone and Zone or Absolute Name Spec and View is required to create a record"
-                )
-
             resp = RecordApi(self.client).list(filter=filter, inherit="full")
 
             if len(resp.results) == 1:
                 return resp.results[0]
             if len(resp.results) == 0:
                 return None
 
-            for i in resp.results:
-                if i["address"] != self.params["address"]:
-                    resp.results.pop(i)
-
-            if len(resp.results) == 1:
-                return resp.results[0]
+            for index, val in resp.results:
+                if type == "A":
+                    if getattr(val, "rdata")["address"] == self.params["rdata"]["address"]:
+                        return resp.results[index]
+                if type == "PTR":
+                    if getattr(val, "rdata")["dname"] == self.params["rdata"]["dname"]:
+                        return resp.results[index]
 
             if self.params["absolute_name_spec"] is not None:
-                for i in resp.results:
-                    if i["view"] != self.params["view"]:
-                        resp.results.pop(i)
+                for index, val in resp.results:
+                    if getattr(val, "view") == self.params["view"]:
+                        return resp.results[index]
 
             if len(resp.results) == 1:
                 return resp.results[0]
@@ -503,11 +502,7 @@ def update(self):
             return None
 
         update_body = self.payload
-
-        if getattr(update_body, "view") is not None:
-            update_body = self.validate_readonly_on_update(self.existing, update_body, ["type", "zone", "view"])
-        else:
-            update_body = self.validate_readonly_on_update(self.existing, update_body, ["type", "zone"])
+        update_body = self.validate_readonly_on_update(self.existing, update_body, ["type", "zone"])
 
         resp = RecordApi(self.client).update(id=self.existing.id, body=update_body, inherit="full")
         return resp.result.model_dump(by_alias=True, exclude_none=True)
@@ -590,6 +585,9 @@ def main():
         argument_spec=module_args,
         supports_check_mode=True,
         required_if=[("state", "present", ["rdata", "type"])],
+        required_together=[("absolute_name_spec", "view")],
+        required_one_of=[("absolute_name_spec", "zone")],
+        mutually_exclusive=[("zone", "absolute_name_spec"), ("name_in_zone", "absolute_name_spec"), ("zone", "view")],
     )
 
     module.run_command()

plugins/modules/dns_record_info.py

@@ -10,7 +10,7 @@
 DOCUMENTATION = r"""
 ---
 module: dns_record_info
-short_description: Manage Record
+short_description: Manage DNS Resource Record
 description:
     - Manage Record
 version_added: 2.0.0

tests/integration/targets/dns_a_record/tasks/main.yml

@@ -260,7 +260,17 @@
           - a_record_info is not failed
           - a_record_info.objects | length == 1
           - a_record_info.objects[0].id == a_record.id
-          # create_ptr and check_rmz cannot be asserted here because the flags are not returned in the response of the call
+    - name: Get Information about the PTR Record created in the Reverse Mapping Zone
+      infoblox.bloxone.dns_record_info:
+        filters:
+          zone: "{{ rmz.id }}"
+          type: "PTR"
+      register: ptr_record_info
+    - assert:
+        that:
+          - ptr_record_info is not failed
+          - ptr_record_info.objects | length == 1
+          - ptr_record_info.objects[0].zone == rmz.id
 
     - name: Create an A Record with Name in Zone and Zone
       infoblox.bloxone.dns_record:
@@ -323,6 +333,7 @@
            address: "15.0.0.0"
          type: "A"
          state: absent
+       ignore_errors : true
 
      - name: "Delete the A Record"
        infoblox.bloxone.dns_record:
@@ -332,6 +343,7 @@
            address: "10.0.0.0"
          type: "A"
          state: absent
+       ignore_errors : true
 
      - name: "Delete the Auth Zone"
        ansible.builtin.include_role: