cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bug fix (#60140)

Browse source
This commit is contained in:
Chris Archibald 2019-08-06 14:53:29 -07:00 committed by ansibot
parent d651bda123
commit 5673482460
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/storage/netapp/na_ontap_interface.py
View file

@ -267,9 +267,12 @@ class NetAppOntapInterface(object):
data_protocols_obj = netapp_utils.zapi.NaElement('data-protocols') data_protocols_obj = netapp_utils.zapi.NaElement('data-protocols')
for protocol in self.parameters.get('protocols'): for protocol in self.parameters.get('protocols'):
if protocol.lower() in ['fc-nvme', 'fcp']: if protocol.lower() in ['fc-nvme', 'fcp']:
required_keys.remove('address') if 'address' in required_keys:
required_keys.remove('home_port') required_keys.remove('address')
required_keys.remove('netmask') if 'home_port' in required_keys:
required_keys.remove('home_port')
if 'netmask' in required_keys:
required_keys.remove('netmask')
not_required_params = set(['address', 'netmask', 'firewall_policy']) not_required_params = set(['address', 'netmask', 'firewall_policy'])
if not not_required_params.isdisjoint(set(self.parameters.keys())): if not not_required_params.isdisjoint(set(self.parameters.keys())):
self.module.fail_json(msg='Error: Following parameters for creating interface are not supported' self.module.fail_json(msg='Error: Following parameters for creating interface are not supported'
@ -324,7 +327,7 @@ class NetAppOntapInterface(object):
if self.parameters.get('subnet_name') is None: if self.parameters.get('subnet_name') is None:
required_keys.add('address') required_keys.add('address')
required_keys.add('netmask') required_keys.add('netmask')
data_protocols_obj = self.set_protocol_option(required_keys) data_protocols_obj = self.set_protocol_option(required_keys)
self.validate_create_parameters(required_keys) self.validate_create_parameters(required_keys)
options = {'interface-name': self.parameters['interface_name'], options = {'interface-name': self.parameters['interface_name'],