ipadnszone: Allow execution of plugin in client host.

Update dnszone README file and add tests for executing plugin with
`ipaapi_context` set to `client`.

A new test playbook can be found at:

    tests/dnszone/test_dnszone_client_context.yml

The new test file can be executed in a FreeIPA client host that is
not a server. In this case, it should be defined in the `ipaclients`
group, in the inventory file.

Due to differences in data returned when running in a client context,
verification if zone is active had to be modified.
This commit is contained in:
Rafael Guterres Jeffman
2021-09-03 13:31:57 -03:00
parent a834de1f95
commit cf7b197a1f
5 changed files with 68 additions and 2 deletions

View File

@@ -202,6 +202,7 @@ Variable | Description | Required
-------- | ----------- | -------- -------- | ----------- | --------
`ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
`ipaadmin_password` | The admin password is a string and is required if there is no admin ticket available on the node | no `ipaadmin_password` | The admin password is a string and is required if there is no admin ticket available on the node | no
`ipaapi_context` | The context in which the module will execute. Executing in a server context is preferred. If not provided context will be determined by the execution environment. Valid values are `server` and `client`. | no
`name` \| `zone_name` | The zone name string or list of strings. | no `name` \| `zone_name` | The zone name string or list of strings. | no
`name_from_ip` | Derive zone name from reverse of IP (PTR). Can only be used with `state: present`. | no `name_from_ip` | Derive zone name from reverse of IP (PTR). Can only be used with `state: present`. | no
`forwarders` | The list of forwarders dicts. Each `forwarders` dict entry has:| no `forwarders` | The list of forwarders dicts. Each `forwarders` dict entry has:| no

View File

@@ -405,7 +405,7 @@ class DNSZoneModule(FreeIPABaseModule):
is_zone_active = False is_zone_active = False
else: else:
zone = response["result"] zone = response["result"]
is_zone_active = zone.get("idnszoneactive") == ["TRUE"] is_zone_active = "TRUE" in zone.get("idnszoneactive")
return zone, is_zone_active return zone, is_zone_active

View File

@@ -2,6 +2,7 @@
- name: Ensure zone is absent. - name: Ensure zone is absent.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: name:
- testzone.local - testzone.local
- test1.testzone.local - test1.testzone.local

View File

@@ -1,6 +1,6 @@
--- ---
- name: Test dnszone - name: Test dnszone
hosts: ipaserver hosts: "{{ ipa_test_host | default('ipaserver') }}"
become: true become: true
gather_facts: true gather_facts: true
@@ -14,6 +14,7 @@
- name: Check if zone is present, when in shouldn't be. - name: Check if zone is present, when in shouldn't be.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
state: present state: present
check_mode: yes check_mode: yes
@@ -23,6 +24,7 @@
- name: Check if zone is present again, when in shouldn't be. - name: Check if zone is present again, when in shouldn't be.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
state: present state: present
check_mode: yes check_mode: yes
@@ -32,6 +34,7 @@
- name: Ensure zone is present. - name: Ensure zone is present.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
state: present state: present
register: result register: result
@@ -40,6 +43,7 @@
- name: Check if zone is present, when in should be. - name: Check if zone is present, when in should be.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
state: present state: present
check_mode: yes check_mode: yes
@@ -49,6 +53,7 @@
- name: Ensure zone is present, again. - name: Ensure zone is present, again.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
state: present state: present
register: result register: result
@@ -57,6 +62,7 @@
- name: Ensure zone is disabled. - name: Ensure zone is disabled.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
state: disabled state: disabled
register: result register: result
@@ -65,6 +71,7 @@
- name: Ensure zone is disabled, again. - name: Ensure zone is disabled, again.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
state: disabled state: disabled
register: result register: result
@@ -73,6 +80,7 @@
- name: Ensure zone is enabled. - name: Ensure zone is enabled.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
state: enabled state: enabled
register: result register: result
@@ -81,6 +89,7 @@
- name: Ensure zone is enabled, again. - name: Ensure zone is enabled, again.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
state: enabled state: enabled
register: result register: result
@@ -89,6 +98,7 @@
- name: Ensure forward_policy is none. - name: Ensure forward_policy is none.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
forward_policy: none forward_policy: none
register: result register: result
@@ -97,6 +107,7 @@
- name: Ensure forward_policy is none, again. - name: Ensure forward_policy is none, again.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
forward_policy: none forward_policy: none
register: result register: result
@@ -105,6 +116,7 @@
- name: Ensure forward_policy is first. - name: Ensure forward_policy is first.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
forward_policy: first forward_policy: first
register: result register: result
@@ -113,6 +125,7 @@
- name: Ensure forward_policy is first, again. - name: Ensure forward_policy is first, again.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
forward_policy: first forward_policy: first
register: result register: result
@@ -121,6 +134,7 @@
- name: Ensure first forwarder is set. - name: Ensure first forwarder is set.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
forwarders: forwarders:
- ip_address: 8.8.8.8 - ip_address: 8.8.8.8
@@ -131,6 +145,7 @@
- name: Ensure first and second forwarder are set. - name: Ensure first and second forwarder are set.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
forwarders: forwarders:
- ip_address: 8.8.8.8 - ip_address: 8.8.8.8
@@ -142,6 +157,7 @@
- name: Ensure first and second forwarder are set, again. - name: Ensure first and second forwarder are set, again.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
forwarders: forwarders:
- ip_address: 8.8.8.8 - ip_address: 8.8.8.8
@@ -153,6 +169,7 @@
- name: Ensure only second forwarder is set. - name: Ensure only second forwarder is set.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
forwarders: forwarders:
- ip_address: 2001:4860:4860::8888 - ip_address: 2001:4860:4860::8888
@@ -162,6 +179,7 @@
- name: Nothing changes. - name: Nothing changes.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
@@ -169,6 +187,7 @@
- name: Ensure no forwarders are set. - name: Ensure no forwarders are set.
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: testzone.local name: testzone.local
forwarders: [] forwarders: []
register: result register: result
@@ -177,6 +196,7 @@
- name: Create zones test1 - name: Create zones test1
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: test1.testzone.local name: test1.testzone.local
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
@@ -184,6 +204,7 @@
- name: Create zones test1, again - name: Create zones test1, again
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: test1.testzone.local name: test1.testzone.local
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
@@ -191,6 +212,7 @@
- name: Create zones test2 - name: Create zones test2
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: test2.testzone.local name: test2.testzone.local
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
@@ -198,6 +220,7 @@
- name: Create zones test2, again - name: Create zones test2, again
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: test2.testzone.local name: test2.testzone.local
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
@@ -205,6 +228,7 @@
- name: Create zones test3 - name: Create zones test3
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: test3.testzone.local name: test3.testzone.local
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
@@ -212,6 +236,7 @@
- name: Create zones test3, again - name: Create zones test3, again
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: test3.testzone.local name: test3.testzone.local
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
@@ -219,6 +244,7 @@
- name: Ensure multiple zones are absent - name: Ensure multiple zones are absent
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: name:
- test1.testzone.local - test1.testzone.local
- test2.testzone.local - test2.testzone.local
@@ -230,6 +256,7 @@
- name: Ensure multiple zones are absent, again - name: Ensure multiple zones are absent, again
ipadnszone: ipadnszone:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
name: name:
- test1.testzone.local - test1.testzone.local
- test2.testzone.local - test2.testzone.local

View File

@@ -0,0 +1,37 @@
---
- name: Test dnszone
hosts: ipaclients, ipaserver
become: no
gather_facts: no
tasks:
- name: Include FreeIPA facts.
include_tasks: ../env_freeipa_facts.yml
# Test will only be executed if host is not a server.
- name: Execute with server context in the client.
ipadnszone:
ipaadmin_password: SomeADMINpassword
ipaapi_context: server
name: ThisShouldNotWork
register: result
failed_when: not (result.failed and result.msg is regex("No module named '*ipaserver'*"))
when: ipa_host_is_client
# Import basic module tests, and execute with ipa_context set to 'client'.
# If ipaclients is set, it will be executed using the client, if not,
# ipaserver will be used.
#
# With this setup, tests can be executed against an IPA client, against
# an IPA server using "client" context, and ensure that tests are executed
# in upstream CI.
- name: Test dnszone using client context, in client host.
import_playbook: test_dnszone.yml
when: groups['ipaclients']
vars:
ipa_test_host: ipaclients
- name: Test dnszone using client context, in server host.
import_playbook: test_dnszone.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients']