From 6acf6d365cbdd2bac5b88be958f9df338de490bc Mon Sep 17 00:00:00 2001
From: Karthikeyan Ananthakrishnan <karthikeyan.ananthakrishnan@broadcom.com>
Date: Tue, 29 Oct 2019 03:50:55 -0700
Subject: [PATCH] [JIRA SONIC-9316]

KLISH Cli changes for supporting Arp & ND Suppress over Vxlan Tunnel.
Below link has more details of this feature & ongoing discussions with community.
https://github.com/Azure/SONiC/pull/437

Change-Id: Iefe006ad7803f34bb56730e0779076d67d40ffae
---
 models/yang/sonic/sonic-vxlan.yang    | 17 ++++++++++++++++-
 src/CLI/actioner/sonic-cli-vxlan.py   | 12 ++++++++++++
 src/CLI/clitree/cli-xml/interface.xml | 13 ++++++++++++-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/models/yang/sonic/sonic-vxlan.yang b/models/yang/sonic/sonic-vxlan.yang
index 2c962959d3..c0795d4e78 100644
--- a/models/yang/sonic/sonic-vxlan.yang
+++ b/models/yang/sonic/sonic-vxlan.yang
@@ -100,6 +100,21 @@ module sonic-vxlan {
 			}
 		}
 	 }
-	}
+     container SUPPRESS_VLAN_NEIGH {
+
+         list SUPPRESS_VLAN_NEIGH_LIST {
+             key "name";
+
+             leaf name {
+                 type string;
+             }
+             leaf suppress {
+                 type string;
+             }
+
+         }
+     }
+
+    }
 
 }
diff --git a/src/CLI/actioner/sonic-cli-vxlan.py b/src/CLI/actioner/sonic-cli-vxlan.py
index 3bcb1fe2ed..2a3703b5bd 100755
--- a/src/CLI/actioner/sonic-cli-vxlan.py
+++ b/src/CLI/actioner/sonic-cli-vxlan.py
@@ -40,6 +40,18 @@ def generate_body(func, args):
     elif func.__name__ == 'delete_sonic_vxlan_sonic_vxlan_vxlan_tunnel':
        #keypath = [ args[0][5:] ]
        keypath = []
+    elif func.__name__ == 'patch_list_sonic_vxlan_sonic_vxlan_suppress_vlan_neigh_suppress_vlan_neigh_list':
+       keypath = []
+       body = {
+         "sonic-vxlan:SUPPRESS_VLAN_NEIGH_LIST": [
+           {
+             "name": args[0],
+             "suppress": 'on'
+           }
+         ]
+       }
+    elif func.__name__ == 'delete_sonic_vxlan_sonic_vxlan_suppress_vlan_neigh_suppress_vlan_neigh_list':
+       keypath = [ args[0] ]
     elif func.__name__ == 'patch_list_sonic_vxlan_sonic_vxlan_evpn_nvo_evpn_nvo_list':
        keypath = []
        body = {
diff --git a/src/CLI/clitree/cli-xml/interface.xml b/src/CLI/clitree/cli-xml/interface.xml
index 985763cf2f..93e5825c56 100644
--- a/src/CLI/clitree/cli-xml/interface.xml
+++ b/src/CLI/clitree/cli-xml/interface.xml
@@ -562,7 +562,18 @@ limitations under the License.
             name="no mtu"
             help="Remove MTU of Vlan interface">
         <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${vlan_id} 9100 </ACTION>
-       </COMMAND>
+    </COMMAND>
+    <COMMAND
+        name="no neigh_suppress"
+        help="Disable Arp and ND Suppression">
+        <ACTION> python $SONIC_CLI_ROOT/sonic-cli-vxlan.py delete_sonic_vxlan_sonic_vxlan_suppress_vlan_neigh_suppress_vlan_neigh_list ${vlan_id} </ACTION>
+    </COMMAND>
+    <COMMAND
+        name="neigh_suppress"
+        help="Enable Arp and ND Suppression">
+       <ACTION> python $SONIC_CLI_ROOT/sonic-cli-vxlan.py patch_list_sonic_vxlan_sonic_vxlan_suppress_vlan_neigh_suppress_vlan_neigh_list ${vlan_id}
+        </ACTION>
+    </COMMAND>
        <COMMAND
             name="shutdown"
             help="Disable the Vlan interface">