openstack/ansible-collections-openstack
Code Issues Proposed changes

Migrating dns_zone from AnsibleModule to OpenStackModule

Browse Source 
Change-Id: Ib8e5a6afe0ce6a7a095ac489ceed8879926ba7f5
This commit is contained in:
Kristian Kucerak 2020-12-07 07:54:15 +00:00 committed by Shnaidman Sagi (Sergey)
parent 981d268039
commit 19f24568a2
1 changed files with 77 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
plugins/modules/dns_zone.py
View File

@ -114,13 +114,22 @@ zone:
sample: [] sample: []
''' '''
from ansible.module_utils.basic import AnsibleModule from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
openstack_module_kwargs,
openstack_cloud_from_module)
def _system_state_change(state, email, description, ttl, masters, zone): class DnsZoneModule(OpenStackModule):
argument_spec = dict(
name=dict(required=True, type='str'),
zone_type=dict(required=False, choices=['primary', 'secondary'], type='str'),
email=dict(required=False, type='str'),
description=dict(required=False, type='str'),
ttl=dict(required=False, type='int'),
masters=dict(required=False, type='list', elements='str'),
state=dict(default='present', choices=['absent', 'present'], type='str'),
)
def _system_state_change(self, state, email, description, ttl, masters, zone):
if state == 'present': if state == 'present':
if not zone: if not zone:
return True return True
@ -136,11 +145,10 @@ def _system_state_change(state, email, description, ttl, masters, zone):
return True return True
return False return False
def _wait(self, timeout, zone, state):
def _wait(timeout, cloud, zone, state, module, sdk):
"""Wait for a zone to reach the desired state for the given state.""" """Wait for a zone to reach the desired state for the given state."""
for count in sdk.utils.iterate_timeout( for count in self.sdk.utils.iterate_timeout(
timeout, timeout,
"Timeout waiting for zone to be %s" % state): "Timeout waiting for zone to be %s" % state):
@ -148,53 +156,36 @@ def _wait(timeout, cloud, zone, state, module, sdk):
return return
try: try:
zone = cloud.get_zone(zone.id) zone = self.conn.get_zone(zone.id)
except Exception: except Exception:
continue continue
if zone and zone.status == 'ERROR': if zone and zone.status == 'ERROR':
module.fail_json(msg="Zone reached ERROR state while waiting for it to be %s" % state) self.fail_json(msg="Zone reached ERROR state while waiting for it to be %s" % state)
def run(self):
def main(): name = self.params['name']
argument_spec = openstack_full_argument_spec( state = self.params['state']
name=dict(required=True), wait = self.params['wait']
zone_type=dict(required=False, choices=['primary', 'secondary']), timeout = self.params['timeout']
email=dict(required=False, default=None),
description=dict(required=False, default=None),
ttl=dict(required=False, default=None, type='int'),
masters=dict(required=False, default=None, type='list', elements='str'),
state=dict(default='present', choices=['absent', 'present']),
)
module_kwargs = openstack_module_kwargs() zone = self.conn.get_zone(name)
module = AnsibleModule(argument_spec,
supports_check_mode=True,
**module_kwargs)
name = module.params.get('name')
state = module.params.get('state')
wait = module.params.get('wait')
timeout = module.params.get('timeout')
sdk, cloud = openstack_cloud_from_module(module)
try:
zone = cloud.get_zone(name)
if state == 'present': if state == 'present':
zone_type = module.params.get('zone_type') zone_type = self.params['zone_type']
email = module.params.get('email') email = self.params['email']
description = module.params.get('description') description = self.params['description']
ttl = module.params.get('ttl') ttl = self.params['ttl']
masters = module.params.get('masters') masters = self.params['masters']
if module.check_mode: if self.ansible.check_mode:
module.exit_json(changed=_system_state_change(state, email, self.exit_json(changed=self._system_state_change(state, email,
description, ttl, description, ttl,
masters, zone)) masters, zone))
if zone is None: if zone is None:
zone = cloud.create_zone( zone = self.conn.create_zone(
name=name, zone_type=zone_type, email=email, name=name, zone_type=zone_type, email=email,
description=description, ttl=ttl, masters=masters) description=description, ttl=ttl, masters=masters)
changed = True changed = True
@ -203,39 +194,41 @@ def main():
masters = [] masters = []
pre_update_zone = zone pre_update_zone = zone
changed = _system_state_change(state, email, changed = self._system_state_change(state, email,
description, ttl, description, ttl,
masters, pre_update_zone) masters, pre_update_zone)
if changed: if changed:
zone = cloud.update_zone( zone = self.conn.update_zone(
name, email=email, name, email=email,
description=description, description=description,
ttl=ttl, masters=masters) ttl=ttl, masters=masters)
if wait: if wait:
_wait(timeout, cloud, zone, state, module, sdk) self._wait(timeout, zone, state)
module.exit_json(changed=changed, zone=zone) self.exit_json(changed=changed, zone=zone)
elif state == 'absent': elif state == 'absent':
if module.check_mode: if self.ansible.check_mode:
module.exit_json(changed=_system_state_change(state, None, self.exit_json(changed=self._system_state_change(state, None,
None, None, None, None,
None, zone)) None, zone))
if zone is None: if zone is None:
changed = False changed = False
else: else:
cloud.delete_zone(name) self.conn.delete_zone(name)
changed = True changed = True
if wait: if wait:
_wait(timeout, cloud, zone, state, module, sdk) self._wait(timeout, zone, state)
module.exit_json(changed=changed) self.exit_json(changed=changed)
except sdk.exceptions.OpenStackCloudException as e:
module.fail_json(msg=str(e)) def main():
module = DnsZoneModule()
module()
if __name__ == '__main__': if __name__ == '__main__':