From 98da0e6c99f4e62398fb1e99f7eba99dd5fbfba2 Mon Sep 17 00:00:00 2001
From: Chris Archibald <carchi@netapp.com>
Date: Tue, 11 Jun 2019 07:26:40 -0700
Subject: [PATCH] Bug Fixes for na_ontap_interface  (#57363)

* bug fixes

* bug fix
---
 .../storage/netapp/na_ontap_interface.py      | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/ansible/modules/storage/netapp/na_ontap_interface.py b/lib/ansible/modules/storage/netapp/na_ontap_interface.py
index de14c57c989..bf889ebf886 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_interface.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_interface.py
@@ -128,6 +128,7 @@ EXAMPLES = '''
         is_auto_revert: true
         address: 10.10.10.10
         netmask: 255.255.255.0
+        force_subnet_association: false
         vserver: svm1
         hostname: "{{ netapp_hostname }}"
         username: "{{ netapp_username }}"
@@ -183,6 +184,11 @@ class NetAppOntapInterface(object):
 
         self.module = AnsibleModule(
             argument_spec=self.argument_spec,
+            mutually_exclusive=[
+                ['subnet_name', 'address'],
+                ['subnet_name', 'netmask']
+            ],
+
             supports_check_mode=True
         )
         self.na_helper = NetAppModule()
@@ -194,7 +200,7 @@ class NetAppOntapInterface(object):
         else:
             self.server = netapp_utils.setup_na_ontap_zapi(module=self.module)
 
-    def get_interface(self, interface_name=None):
+    def get_interface(self):
         """
         Return details about the interface
         :param:
@@ -203,11 +209,10 @@ class NetAppOntapInterface(object):
         :return: Details about the interface. None if not found.
         :rtype: dict
         """
-        if interface_name is None:
-            interface_name = self.parameters['interface_name']
         interface_info = netapp_utils.zapi.NaElement('net-interface-get-iter')
         interface_attributes = netapp_utils.zapi.NaElement('net-interface-info')
-        interface_attributes.add_new_child('interface-name', interface_name)
+        interface_attributes.add_new_child('interface-name', self.parameters['interface_name'])
+        interface_attributes.add_new_child('vserver', self.parameters['vserver'])
         query = netapp_utils.zapi.NaElement('query')
         query.add_child_elem(interface_attributes)
         interface_info.add_child_elem(query)
@@ -234,7 +239,8 @@ class NetAppOntapInterface(object):
                 return_value['firewall_policy'] = interface_attributes['firewall-policy']
         return return_value
 
-    def set_options(self, options, parameters):
+    @staticmethod
+    def set_options(options, parameters):
         """ set attributes for create or modify """
         if parameters.get('home_port') is not None:
             options['home-port'] = parameters['home_port']
@@ -303,7 +309,7 @@ class NetAppOntapInterface(object):
             if node is not None:
                 self.parameters['home_node'] = node
         # validate if mandatory parameters are present for create
-        if not keys.issubset(set(self.parameters.keys())):
+        if not keys.issubset(set(self.parameters.keys())) and self.parameters.get('subnet_name') is None:
             self.module.fail_json(msg='Error: Missing one or more required parameters for creating interface: %s'
                                       % ', '.join(keys))
         # if role is intercluster, protocol cannot be specified
@@ -313,15 +319,19 @@ class NetAppOntapInterface(object):
 
     def create_interface(self):
         ''' calling zapi to create interface '''
-        required_keys = set(['role', 'address', 'home_port', 'netmask'])
-        data_protocols_obj = self.set_protocol_option(required_keys)
+        required_keys = set(['role', 'home_port'])
+        data_protocols_obj = None
+        if self.parameters.get('subnet_name') is None:
+            required_keys.add('address')
+            required_keys.add('netmask')
+            data_protocols_obj = self.set_protocol_option(required_keys)
         self.validate_create_parameters(required_keys)
 
         options = {'interface-name': self.parameters['interface_name'],
                    'role': self.parameters['role'],
                    'home-node': self.parameters.get('home_node'),
                    'vserver': self.parameters['vserver']}
-        self.set_options(options, self.parameters)
+        NetAppOntapInterface.set_options(options, self.parameters)
         interface_create = netapp_utils.zapi.NaElement.create_node_with_children('net-interface-create', **options)
         if data_protocols_obj is not None:
             interface_create.add_child_elem(data_protocols_obj)
@@ -353,7 +363,7 @@ class NetAppOntapInterface(object):
         options = {'interface-name': self.parameters['interface_name'],
                    'vserver': self.parameters['vserver']
                    }
-        self.set_options(options, modify)
+        NetAppOntapInterface.set_options(options, modify)
         interface_modify = netapp_utils.zapi.NaElement.create_node_with_children('net-interface-modify', **options)
         try:
             self.server.invoke_successfully(interface_modify, enable_tunneling=True)