openstack/ansible-collections-openstack
Code Issues Proposed changes

Convert os_server_info to use OpenStackModule

Browse Source 
Change-Id: I864c767ff06d32dd79b72826cfc09e7203e5291d
This commit is contained in:
Sagi Shnaidman 2020-04-21 14:26:56 +03:00
parent 466f3d4a0a
commit b824bf1c38
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/modules/os_server_info.py
View File

@ -65,47 +65,43 @@ EXAMPLES = '''
import fnmatch import fnmatch
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 main(): class ServerInfoModule(OpenStackModule):
argument_spec = openstack_full_argument_spec( argument_spec = dict(
server=dict(required=False), server=dict(required=False),
detailed=dict(required=False, type='bool', default=False), detailed=dict(required=False, type='bool', default=False),
filters=dict(required=False, type='dict', default=None), filters=dict(required=False, type='dict', default=None),
all_projects=dict(required=False, type='bool', default=False), all_projects=dict(required=False, type='bool', default=False),
) )
module_kwargs = openstack_module_kwargs()
module = AnsibleModule(argument_spec, **module_kwargs)
is_old_facts = module._name == 'os_server_facts'
if is_old_facts:
module.deprecate("The 'os_server_facts' module has been renamed to 'os_server_info', "
"and the renamed one no longer returns ansible_facts", version='2.13')
sdk, cloud = openstack_cloud_from_module(module) def run(self):
try: is_old_facts = self._name == 'os_server_facts'
openstack_servers = cloud.search_servers( if is_old_facts:
detailed=module.params['detailed'], filters=module.params['filters'], self.deprecate("The 'os_server_facts' module has been renamed to 'os_server_info', "
all_projects=module.params['all_projects']) "and the renamed one no longer returns ansible_facts", version='2.13')
openstack_servers = self.conn.search_servers(
detailed=self.params['detailed'], filters=self.params['filters'],
all_projects=self.params['all_projects'])
if module.params['server']: if self.params['server']:
# filter servers by name # filter servers by name
pattern = module.params['server'] pattern = self.params['server']
# TODO(mordred) This is handled by sdk now # TODO(mordred) This is handled by sdk now
openstack_servers = [server for server in openstack_servers openstack_servers = [server for server in openstack_servers
if fnmatch.fnmatch(server['name'], pattern) or fnmatch.fnmatch(server['id'], pattern)] if fnmatch.fnmatch(server['name'], pattern)
or fnmatch.fnmatch(server['id'], pattern)]
if is_old_facts: if is_old_facts:
module.exit_json(changed=False, ansible_facts=dict( self.exit_json(changed=False, ansible_facts=dict(
openstack_servers=openstack_servers)) openstack_servers=openstack_servers))
else: else:
module.exit_json(changed=False, openstack_servers=openstack_servers) self.exit_json(changed=False, openstack_servers=openstack_servers)
except sdk.exceptions.OpenStackCloudException as e:
module.fail_json(msg=str(e)) def main():
ServerInfoModule()
if __name__ == '__main__': if __name__ == '__main__':