From 38eb38815468b1971d4ee4d26692f291a3d87f9f Mon Sep 17 00:00:00 2001 From: Ondra Machacek Date: Tue, 14 Mar 2017 18:37:01 +0100 Subject: [PATCH] ovirt: cloud: make the datacenter input compatible (#22483) This patch makes sure that all inputs of datacenter are compatible. So it's 'data_center' everywhere. --- lib/ansible/modules/cloud/ovirt/ovirt_clusters.py | 12 ++++++------ .../cloud/ovirt/ovirt_external_providers.py | 2 +- lib/ansible/modules/cloud/ovirt/ovirt_networks.py | 12 ++++++------ lib/ansible/modules/cloud/ovirt/ovirt_quotas.py | 14 +++++++------- .../modules/cloud/ovirt/ovirt_quotas_facts.py | 8 ++++---- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_clusters.py b/lib/ansible/modules/cloud/ovirt/ovirt_clusters.py index 70eb8eead1..052aa12378 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_clusters.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_clusters.py @@ -42,7 +42,7 @@ options: - "Should the cluster be present or absent" choices: ['present', 'absent'] default: present - datacenter: + data_center: description: - "Datacenter name where cluster reside." description: @@ -214,7 +214,7 @@ EXAMPLES = ''' # Create cluster - ovirt_clusters: - datacenter: mydatacenter + data_center: mydatacenter name: mycluster cpu_type: Intel SandyBridge Family description: mycluster @@ -222,7 +222,7 @@ EXAMPLES = ''' # Create virt service cluster: - ovirt_clusters: - datacenter: mydatacenter + data_center: mydatacenter name: mycluster cpu_type: Intel Nehalem Family description: mycluster @@ -424,8 +424,8 @@ class ClustersModule(BaseModule): self.param('ksm') is not None ) else None, data_center=otypes.DataCenter( - name=self.param('datacenter'), - ) if self.param('datacenter') else None, + name=self.param('data_center'), + ) if self.param('data_center') else None, management_network=otypes.Network( name=self.param('network'), ) if self.param('network') else None, @@ -525,7 +525,7 @@ def main(): serial_policy=dict(default=None, choices=['vm', 'host', 'custom']), serial_policy_value=dict(default=None), scheduling_policy=dict(default=None), - datacenter=dict(default=None), + data_center=dict(default=None), description=dict(default=None), comment=dict(default=None), network=dict(default=None), diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_external_providers.py b/lib/ansible/modules/cloud/ovirt/ovirt_external_providers.py index 790d415f93..afc7840abe 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_external_providers.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_external_providers.py @@ -233,7 +233,7 @@ def main(): password=dict(default=None, no_log=True), tenant_name=dict(default=None, aliases=['tenant']), authentication_url=dict(default=None, aliases=['auth_url']), - data_center=dict(default=None, aliases=['data_center']), + data_center=dict(default=None), read_only=dict(default=None, type='bool'), network_type=dict( default='external', diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_networks.py b/lib/ansible/modules/cloud/ovirt/ovirt_networks.py index ed92ec41e2..9e935c9817 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_networks.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_networks.py @@ -42,7 +42,7 @@ options: - "Should the network be present or absent" choices: ['present', 'absent'] default: present - datacenter: + data_center: description: - "Datacenter name where network reside." description: @@ -80,7 +80,7 @@ EXAMPLES = ''' # Create network - ovirt_networks: - datacenter: mydatacenter + data_center: mydatacenter name: mynetwork vlan_tag: 1 vm_network: true @@ -130,8 +130,8 @@ class NetworksModule(BaseModule): comment=self._module.params['comment'], description=self._module.params['description'], data_center=otypes.DataCenter( - name=self._module.params['datacenter'], - ) if self._module.params['datacenter'] else None, + name=self._module.params['data_center'], + ) if self._module.params['data_center'] else None, vlan=otypes.Vlan( self._module.params['vlan_tag'], ) if self._module.params['vlan_tag'] else None, @@ -201,7 +201,7 @@ def main(): choices=['present', 'absent'], default='present', ), - datacenter=dict(default=None, required=True), + data_center=dict(default=None, required=True), name=dict(default=None, required=True), description=dict(default=None), comment=dict(default=None), @@ -231,7 +231,7 @@ def main(): network = networks_module.search_entity( search_params={ 'name': module.params['name'], - 'datacenter': module.params['datacenter'], + 'datacenter': module.params['data_center'], }, ) if state == 'present': diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_quotas.py b/lib/ansible/modules/cloud/ovirt/ovirt_quotas.py index af65fddb05..0f38aeb8bd 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_quotas.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_quotas.py @@ -42,7 +42,7 @@ options: - "Should the quota be present/absent." choices: ['present', 'absent'] default: present - datacenter: + data_center: description: - "Name of the datacenter where quota should be managed." required: true @@ -84,7 +84,7 @@ EXAMPLES = ''' # Add cluster quota to cluster cluster1 with memory limit 20GiB and CPU limit to 10: ovirt_quotas: name: quota1 - datacenter: dcX + data_center: dcX clusters: - name: cluster1 memory: 20 @@ -93,7 +93,7 @@ ovirt_quotas: # Add cluster quota to all clusters with memory limit 30GiB and CPU limit to 15: ovirt_quotas: name: quota2 - datacenter: dcX + data_center: dcX clusters: - memory: 30 cpu: 15 @@ -101,7 +101,7 @@ ovirt_quotas: # Add storage quota to storage data1 with size limit to 100GiB ovirt_quotas: name: quota3 - datacenter: dcX + data_center: dcX storage_grace: 40 storage_threshold: 60 storages: @@ -111,7 +111,7 @@ ovirt_quotas: # Remove quota quota1 (Note the quota must not be assigned to any VM/disk): ovirt_quotas: state: absent - datacenter: dcX + data_center: dcX name: quota1 ''' @@ -223,7 +223,7 @@ def main(): default='present', ), name=dict(required=True), - datacenter=dict(required=True), + data_center=dict(required=True), description=dict(default=None), cluster_threshold=dict(default=None, type='int', aliases=['cluster_soft_limit']), cluster_grace=dict(default=None, type='int', aliases=['cluster_hard_limit']), @@ -242,7 +242,7 @@ def main(): auth = module.params.pop('auth') connection = create_connection(auth) datacenters_service = connection.system_service().data_centers_service() - dc_name = module.params['datacenter'] + dc_name = module.params['data_center'] dc_id = getattr(search_by_name(datacenters_service, dc_name), 'id', None) if dc_id is None: raise Exception("Datacenter '%s' was not found." % dc_name) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_quotas_facts.py b/lib/ansible/modules/cloud/ovirt/ovirt_quotas_facts.py index 1aaa485b35..7a8fd68fbe 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_quotas_facts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_quotas_facts.py @@ -36,7 +36,7 @@ notes: - "This module creates a new top-level C(ovirt_quotas) fact, which contains a list of quotas." options: - datacenter: + data_center: description: - "Name of the datacenter where quota resides." required: true @@ -52,7 +52,7 @@ EXAMPLES = ''' # Gather facts about quota named C in Default datacenter: - ovirt_quotas_facts: - datacenter: Default + data_center: Default name: myquota - debug: var: ovirt_quotas @@ -81,7 +81,7 @@ from ansible.module_utils.ovirt import ( def main(): argument_spec = ovirt_facts_full_argument_spec( - datacenter=dict(required=True), + data_center=dict(required=True), name=dict(default=None), ) module = AnsibleModule(argument_spec) @@ -91,7 +91,7 @@ def main(): auth = module.params.pop('auth') connection = create_connection(auth) datacenters_service = connection.system_service().data_centers_service() - dc_name = module.params['datacenter'] + dc_name = module.params['data_center'] dc = search_by_name(datacenters_service, dc_name) if dc is None: raise Exception("Datacenter '%s' was not found." % dc_name)