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

Wrong Setup function was being used, which could result in failure if new global options were used. #52862

Merged
merged 5 commits into from
Mar 4, 2019
Merged

Wrong Setup function was being used, which could result in failure if new global options were used. #52862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8dcea8
Revert "changes to clusteR"
carchi8py Dec 10, 2018
1f257f7
Revert "Revert "changes to clusteR""
carchi8py Feb 15, 2019
5c014ef
Revert "changes to clusteR"
carchi8py Dec 10, 2018
c3a4c49
Revert "Revert "changes to clusteR""
carchi8py Feb 15, 2019
af2c8ef
Fix setup bug
carchi8py Feb 22, 2019
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
2 changes: 1 addition & 1 deletion lib/ansible/modules/storage/netapp/na_ontap_autosupport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,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 set_playbook_zapi_key_map(self):
self.na_helper.zapi_string_keys = {
Expand Down
3 changes: 1 addition & 2 deletions lib/ansible/modules/storage/netapp/na_ontap_flexcache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,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,
vserver=self.parameters['vserver'])
self.server = netapp_utils.setup_na_ontap_zapi(module=self.module, vserver=self.parameters['vserver'])

def add_parameter_to_dict(self, adict, name, key=None, tostr=False):
''' add defined parameter (not None) to adict using key '''
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/modules/storage/netapp/na_ontap_job_schedule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def autosupport_log(self):
:return: 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_job_schedule", cserver)

def apply(self):
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -269,7 +269,7 @@ def set_source_cluster_connection(self):
if self.parameters.get('source_password'):
self.module.params['password'] = self.parameters['source_password']
self.module.params['hostname'] = self.parameters['source_hostname']
self.source_server = netapp_utils.setup_ontap_zapi(module=self.module)
self.source_server = netapp_utils.setup_na_ontap_zapi(module=self.module)

def delete_snapmirror(self):
"""
Expand Down