From 1b9cf85860bbc465dea25c0acf11f475f4252fcc Mon Sep 17 00:00:00 2001
From: saichint <saichint@cisco.com>
Date: Thu, 1 Nov 2018 22:53:23 -0700
Subject: [PATCH] Add new configuration for nxos_vxlan_vtep_vni (#47882)

* Add suppress_arp_disable

* review comments
---
 .../network/nxos/nxos_vxlan_vtep_vni.py       | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py b/lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py
index b456a574bed..1fa2c4246c6 100644
--- a/lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py
+++ b/lib/ansible/modules/network/nxos/nxos_vxlan_vtep_vni.py
@@ -67,6 +67,12 @@ options:
     description:
       - Suppress arp under layer 2 VNI.
     type: bool
+  suppress_arp_disable:
+    description:
+      - Overrides the global ARP suppression config.
+        This is available on NX-OS 9K series running 9.2.x or higher.
+    type: bool
+    version_added: "2.8"
   state:
     description:
       - Determines whether the config should be present or not
@@ -98,6 +104,7 @@ from ansible.module_utils.network.common.config import CustomNetworkConfig
 BOOL_PARAMS = [
     'assoc_vrf',
     'suppress_arp',
+    'suppress_arp_disable',
 ]
 PARAM_TO_DEFAULT_KEYMAP = {
     'multicast_group': '',
@@ -111,7 +118,8 @@ PARAM_TO_COMMAND_KEYMAP = {
     'ingress_replication': 'ingress-replication protocol',
     'multicast_group': 'mcast-group',
     'peer_list': 'peer-ip',
-    'suppress_arp': 'suppress-arp'
+    'suppress_arp': 'suppress-arp',
+    'suppress_arp_disable': 'suppress-arp disable',
 }
 
 
@@ -287,26 +295,28 @@ def main():
         multicast_group=dict(required=False, type='str'),
         peer_list=dict(required=False, type='list'),
         suppress_arp=dict(required=False, type='bool'),
+        suppress_arp_disable=dict(required=False, type='bool'),
         ingress_replication=dict(required=False, type='str', choices=['bgp', 'static', 'default']),
         state=dict(choices=['present', 'absent'], default='present', required=False),
     )
 
     argument_spec.update(nxos_argument_spec)
 
-    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
+    mutually_exclusive = [('suppress_arp', 'suppress_arp_disable'),
+                          ('assoc_vrf', 'multicast_group'),
+                          ('assoc_vrf', 'suppress_arp'),
+                          ('assoc_vrf', 'suppress_arp_disable'),
+                          ('assoc_vrf', 'ingress_replication')]
+    module = AnsibleModule(
+        argument_spec=argument_spec,
+        mutually_exclusive=mutually_exclusive,
+        supports_check_mode=True,
+    )
 
     warnings = list()
     check_args(module, warnings)
     result = {'changed': False, 'commands': [], 'warnings': warnings}
 
-    if module.params['assoc_vrf']:
-        mutually_exclusive_params = ['multicast_group',
-                                     'suppress_arp',
-                                     'ingress_replication']
-        for param in mutually_exclusive_params:
-            if module.params[param]:
-                module.fail_json(msg='assoc_vrf cannot be used with '
-                                     '{0} param'.format(param))
     if module.params['peer_list']:
         if module.params['peer_list'][0] != 'default' and module.params['ingress_replication'] != 'static':
             module.fail_json(msg='ingress_replication=static is required '