Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix argument_spec for modules that are using the old version #47693

Merged
merged 6 commits into from
Nov 5, 2018
Merged

Fix argument_spec for modules that are using the old version #47693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
916b683
Use correct argument spec
carchi8py Oct 26, 2018
bc49ebd
Fix issues
carchi8py Oct 26, 2018
156c9fe
Fix issues
carchi8py Oct 26, 2018
0d7b7a8
Fix issue
carchi8py Oct 26, 2018
9e15fa0
Fix argument spec
carchi8py Oct 26, 2018
648cdb8
fix newline issue
carchi8py Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 4 additions & 6 deletions lib/ansible/modules/storage/netapp/na_ontap_cluster_peer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
description:
- Create/Delete cluster peer relations on ONTAP
extends_documentation_fragment:
- netapp.ontap
- netapp.na_ontap
module: na_ontap_cluster_peer
options:
state:
Expand Down Expand Up @@ -57,7 +57,6 @@
'''

EXAMPLES = """

- name: Create cluster peer
na_ontap_cluster_peer:
state: present
Expand All @@ -68,7 +67,6 @@
username: "{{ netapp_username }}"
password: "{{ netapp_password }}"
dest_hostname: "{{ dest_netapp_hostname }}"

- name: Delete cluster peer
na_ontap_cluster_peer:
state: absent
Expand Down Expand Up @@ -99,7 +97,7 @@ class NetAppONTAPClusterPeer(object):

def __init__(self):

self.argument_spec = netapp_utils.ontap_sf_host_argument_spec()
self.argument_spec = netapp_utils.na_ontap_host_argument_spec()
self.argument_spec.update(dict(
state=dict(required=False, type='str', choices=['present', 'absent'], default='present'),
source_intercluster_lif=dict(required=False, type='str'),
Expand All @@ -125,14 +123,14 @@ def __init__(self):
if HAS_NETAPP_LIB is False:
self.module.fail_json(msg="the python NetApp-Lib module is required")
else:
self.server = netapp_utils.setup_ontap_zapi(module=self.module)
self.server = netapp_utils.setup_na_ontap_zapi(module=self.module)
# set destination server connection
self.module.params['hostname'] = self.parameters['dest_hostname']
if self.parameters.get('dest_username'):
self.module.params['username'] = self.parameters['dest_username']
if self.parameters.get('dest_password'):
self.module.params['password'] = self.parameters['dest_password']
self.dest_server = netapp_utils.setup_ontap_zapi(module=self.module)
self.dest_server = netapp_utils.setup_na_ontap_zapi(module=self.module)

def cluster_peer_get_iter(self, cluster):
"""
Expand Down
8 changes: 4 additions & 4 deletions lib/ansible/modules/storage/netapp/na_ontap_net_vlan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
module: na_ontap_net_vlan
short_description: NetApp ONTAP network VLAN
extends_documentation_fragment:
- netapp.ontap
- netapp.na_ontap
version_added: '2.6'
author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
description:
Expand Down Expand Up @@ -71,7 +71,7 @@ def __init__(self):
"""
Initializes the NetAppOntapVlan function
"""
self.argument_spec = netapp_utils.ontap_sf_host_argument_spec()
self.argument_spec = netapp_utils.na_ontap_host_argument_spec()
self.argument_spec.update(dict(
state=dict(required=False, choices=['present', 'absent'], default='present'),
parent_interface=dict(required=True, type='str'),
Expand All @@ -95,7 +95,7 @@ def __init__(self):
if HAS_NETAPP_LIB is False:
self.module.fail_json(msg="the python NetApp-Lib module is required")
else:
self.server = netapp_utils.setup_ontap_zapi(module=self.module)
self.server = netapp_utils.setup_na_ontap_zapi(module=self.module)
return

def create_vlan(self):
Expand Down Expand Up @@ -154,7 +154,7 @@ def apply(self):
changed = False
result = None
results = netapp_utils.get_cserver(self.server)
cserver = netapp_utils.setup_ontap_zapi(module=self.module, vserver=results)
cserver = netapp_utils.setup_na_ontap_zapi(module=self.module, vserver=results)
netapp_utils.ems_log_event("na_ontap_net_vlan", cserver)
existing_vlan = self.does_vlan_exist()
if existing_vlan:
Expand Down
6 changes: 3 additions & 3 deletions lib/ansible/modules/storage/netapp/na_ontap_snapmirror.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
description:
- Create/Delete/Initialize/Modify SnapMirror volume/vserver relationships
extends_documentation_fragment:
- netapp.ontap
- netapp.na_ontap
module: na_ontap_snapmirror
options:
state:
Expand Down Expand Up @@ -124,7 +124,7 @@ class NetAppONTAPSnapmirror(object):

def __init__(self):

self.argument_spec = netapp_utils.ontap_sf_host_argument_spec()
self.argument_spec = netapp_utils.na_ontap_host_argument_spec()
self.argument_spec.update(dict(
state=dict(required=False, type='str', choices=['present', 'absent'], default='present'),
source_vserver=dict(required=False, type='str'),
Expand Down Expand Up @@ -159,7 +159,7 @@ def __init__(self):
if HAS_NETAPP_LIB is False:
self.module.fail_json(msg="the python NetApp-Lib module is required")
else:
self.server = netapp_utils.setup_ontap_zapi(module=self.module)
self.server = netapp_utils.setup_na_ontap_zapi(module=self.module)

def snapmirror_get_iter(self):
"""
Expand Down
6 changes: 3 additions & 3 deletions lib/ansible/modules/storage/netapp/na_ontap_software_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
description:
- Update ONTAP software
extends_documentation_fragment:
- netapp.ontap
- netapp.na_ontap
module: na_ontap_software_update
options:
state:
Expand Down Expand Up @@ -77,7 +77,7 @@ class NetAppONTAPSoftwareUpdate(object):

def __init__(self):

self.argument_spec = netapp_utils.ontap_sf_host_argument_spec()
self.argument_spec = netapp_utils.na_ontap_host_argument_spec()
self.argument_spec.update(dict(
state=dict(required=False, type='str', choices=['present', 'absent'], default='present'),
node=dict(required=False, type='list'),
Expand All @@ -97,7 +97,7 @@ def __init__(self):
if HAS_NETAPP_LIB is False:
self.module.fail_json(msg="the python NetApp-Lib module is required")
else:
self.server = netapp_utils.setup_ontap_zapi(module=self.module)
self.server = netapp_utils.setup_na_ontap_zapi(module=self.module)

def cluster_image_get_iter(self):
"""
Expand Down
10 changes: 4 additions & 6 deletions lib/ansible/modules/storage/netapp/na_ontap_vserver_peer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
description:
- Create/Delete vserver peer
extends_documentation_fragment:
- netapp.ontap
- netapp.na_ontap
module: na_ontap_vserver_peer
options:
state:
Expand Down Expand Up @@ -54,7 +54,6 @@
'''

EXAMPLES = """

- name: Source vserver peer create
na_ontap_vserver_peer:
state: present
Expand All @@ -66,7 +65,6 @@
username: "{{ netapp_username }}"
password: "{{ netapp_password }}"
dest_hostname: "{{ netapp_dest_hostname }}"

- name: vserver peer delete
na_ontap_vserver_peer:
state: absent
Expand Down Expand Up @@ -96,7 +94,7 @@ class NetAppONTAPVserverPeer(object):

def __init__(self):

self.argument_spec = netapp_utils.ontap_sf_host_argument_spec()
self.argument_spec = netapp_utils.na_ontap_host_argument_spec()
self.argument_spec.update(dict(
state=dict(required=False, type='str', choices=['present', 'absent'], default='present'),
vserver=dict(required=True, type='str'),
Expand All @@ -122,14 +120,14 @@ def __init__(self):
if HAS_NETAPP_LIB is False:
self.module.fail_json(msg="the python NetApp-Lib module is required")
else:
self.server = netapp_utils.setup_ontap_zapi(module=self.module)
self.server = netapp_utils.setup_na_ontap_zapi(module=self.module)
if self.parameters.get('dest_hostname'):
self.module.params['hostname'] = self.parameters['dest_hostname']
if self.parameters.get('dest_username'):
self.module.params['username'] = self.parameters['dest_username']
if self.parameters.get('dest_password'):
self.module.params['password'] = self.parameters['dest_password']
self.dest_server = netapp_utils.setup_ontap_zapi(module=self.module)
self.dest_server = netapp_utils.setup_na_ontap_zapi(module=self.module)

def vserver_peer_get_iter(self):
"""
Expand Down