From 31f1ffa2887262c5d8ecf3e4879884876091d10a Mon Sep 17 00:00:00 2001
From: Garrick He <garrick_he@dell.com>
Date: Tue, 1 Oct 2019 13:31:25 -0700
Subject: [PATCH 1/4] sFlow CLI template

* Add XML skeleton for the sFlow CLI
* Add actioner script
* Add renderer template

Signed-off-by: Garrick He <garrick_he@dell.com>
---
 src/CLI/actioner/sonic-cli-sflow.py           |  46 ++
 src/CLI/clitree/cli-xml/interface.xml         | 433 ++++--------------
 src/CLI/clitree/cli-xml/sflow.xml             |  42 ++
 src/CLI/renderer/templates/show_sflow.j2      |   9 +
 src/CLI/renderer/templates/show_sflow_intf.j2 |  10 +
 5 files changed, 189 insertions(+), 351 deletions(-)
 create mode 100755 src/CLI/actioner/sonic-cli-sflow.py
 create mode 100755 src/CLI/clitree/cli-xml/sflow.xml
 create mode 100755 src/CLI/renderer/templates/show_sflow.j2
 create mode 100755 src/CLI/renderer/templates/show_sflow_intf.j2

diff --git a/src/CLI/actioner/sonic-cli-sflow.py b/src/CLI/actioner/sonic-cli-sflow.py
new file mode 100755
index 0000000000..e49d9b7998
--- /dev/null
+++ b/src/CLI/actioner/sonic-cli-sflow.py
@@ -0,0 +1,46 @@
+#!/usr/bin/python
+import sys
+import time
+import json
+import ast
+import sonic_sflow_client
+from collections import OrderedDict
+from scripts.render_cli import show_cli_output
+
+
+import urllib3
+urllib3.disable_warnings()
+plugins = dict()
+
+
+def register(func):
+    """Register sdk client method as a plug-in"""
+    plugins[func.__name__] = func
+    return func
+
+def call_method(name, args):
+    method = plugins[name]
+    return method(args)
+
+def get_sflow():
+    pass
+
+def get_sflow_interface():
+    pass
+
+def run(func, args):
+
+    # create a body block
+    if (func.__name__ == 'get_sflow'):
+        sflow_info = {'sflow' : {'admin_state' : 'enabled', 'polling-interval' : 20, 'agent-id' : 'default'}}
+    else:
+	sflow_info = {}
+        sflow_info['sflow'] = {}
+        for i in range(30):
+            sflow_info['sflow']['Ethernet'+str(i)] = {'admin_state' : 'enabled', 'sampling_rate' : 4000}
+    show_cli_output(sys.argv[2], sflow_info)
+    return
+
+if __name__ == '__main__':
+    func = eval(sys.argv[1], globals(), {})
+    run(func, sys.argv[2:])
diff --git a/src/CLI/clitree/cli-xml/interface.xml b/src/CLI/clitree/cli-xml/interface.xml
index 0ded9aabfd..19e7cb7784 100644
--- a/src/CLI/clitree/cli-xml/interface.xml
+++ b/src/CLI/clitree/cli-xml/interface.xml
@@ -1,354 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2019 Dell, Inc.  
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---> 
-
-<CLISH_MODULE
-    xmlns="http://www.dellemc.com/sonic/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xsi:schemaLocation="http://www.dellemc.com/sonic/XMLSchema
-    http://www.dellemc.com/sonic/XMLSchema/clish.xsd"
-    >
-    <VIEW name="enable-view">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE CLISH_MODULE [
+<!ENTITY START_PORT_ID "1">
+<!ENTITY MAX_PORT_ID "32">
+<!ENTITY START_SUB_PORT_ID "1">
+<!ENTITY MAX_SUB_PORT_ID "4">
+<!ENTITY MAX_MTU "9276">
+]>
+<CLISH_MODULE xmlns="http://www.dellemc.com/sonic/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.dellemc.com/sonic/XMLSchema http://www.dellemc.com/sonic/XMLSchema/clish.xsd">
+  <VIEW name="enable-view">
     <!--show interface Ethernet <id> -->
-    <COMMAND
-         name="show interface"
-         help="Show Interface info"
-         >
-         <PARAM
-             name="if-subcommands"
-             help="Interface subcommands"
-             mode="switch"
-             ptype="SUBCOMMAND"
-             >
-             <PARAM
-                 name="counters"
-                 help="Counters for Physical Interfaces"
-                 ptype="SUBCOMMAND"
-                 mode="subcommand"
-                 >
-             </PARAM>
-             <PARAM
-                 name="Ethernet"
-                 help="Physical Interface"
-                 ptype="SUBCOMMAND"
-                 mode="subcommand"
-                 >
-                 <PARAM
-                    name="phy-if-id"
-                    help="Physical interface(Multiples of 4)"
-                    ptype="UINT"
-                    optional="true"
-                    >
-                 </PARAM>
-             </PARAM>
-             <PARAM
-                 name="status"
-                 help="Physical interfaces status"
-                 ptype="SUBCOMMAND"
-                 mode="subcommand"
-                 >
-             </PARAM>
-         </PARAM>
-   <ACTION>
-        if test "${if-subcommands}" = "status"; then&#xA;
-            python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_status.j2 ${__full_line}&#xA;
-        elif test "${if-subcommands}" = "counters"; then&#xA;
-            python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_counters.j2 ${__full_line}&#xA;
-        else&#xA;
-            if test "${phy-if-id}" = ""; then&#xA;
-                python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface.j2 ${__full_line}&#xA;
-            else&#xA;
-                python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces_interface Ethernet${phy-if-id} show_interface_id.j2 ${__full_line}&#xA;
-            fi&#xA;
-        fi
-   </ACTION>
-   </COMMAND>
-
-   <COMMAND
-       name="show vlan"
-       help="Show vlan commands"
-       ptype="SUBCOMMAND"
-       mode="subcommand"
-       >
-       <PARAM
-           name="id"
-           help="Vlan identifier"
-           ptype="VLAN_ID"
-           optional="true"
-           >
-       </PARAM>
-   <ACTION>
-       python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_vlan_interfaces_interface_ethernet_switched_vlan_state show_vlan.j2
-   </ACTION>
-   </COMMAND>
-
-   </VIEW>
-
-    <VIEW
-        name="configure-view"
-        >
-    <!-- interface commands -->
-    <COMMAND
-        name="interface"
-        help="Select an interface"
-        />
-
-    <COMMAND
-        name="interface Ethernet"
-        help="Select an interface"
-        view="configure-if-view"
-        viewid="iface=Ethernet${phy-if-name}"
-        >
-        <PARAM
-            name="phy-if-name"
-            help="Physical interface(Multiples of 4)"
-            ptype="UINT"
-            >
+    <COMMAND name="show interface" help="Show Interface info">
+      <PARAM name="if-subcommands" help="Interface subcommands" mode="switch" ptype="SUBCOMMAND">
+        <PARAM name="counters" help="Counters for Physical Interfaces" ptype="SUBCOMMAND" mode="subcommand"> </PARAM>
+        <PARAM name="Ethernet" help="Physical Interface" ptype="SUBCOMMAND" mode="subcommand">
+          <PARAM name="phy-if-id" help="Physical interface(Multiples of 4)" ptype="UINT" optional="true"> </PARAM>
         </PARAM>
-     <ACTION builtin="clish_nop"></ACTION>
-     </COMMAND>
-
-     <COMMAND
-         name="interface vlan"
-         help="Vlan Interface Configuration"
-         mode="subcommand"
-         ptype="SUBCOMMAND"
-         view="configure-vlan-view"
-         viewid="vlan_id=vlan${vlan-id}"
-         >
-         <PARAM
-             name="vlan-id"
-             help="Vlan identifier(1-4094)"
-             ptype="VLAN_ID"
-             >
-         </PARAM>
-     <ACTION builtin="clish_nop"></ACTION>
-     </COMMAND>
-
-     <!-- no interface commands -->
-     <COMMAND
-         name="no interface"
-         help="Delete interface"
-         >
-         <PARAM
-             name="if-subcommands"
-             help="Interface sub-commands"
-             mode="switch"
-             ptype="SUBCOMMAND"
-             >
-             <PARAM
-                name="vlan"
-                help="Delete vlan"
-                mode="subcommand"
-                ptype="SUBCOMMAND"
-                >
-                <PARAM
-                    name="vlan-id"
-                    help="Vlan identifier(1-4094)"
-                    ptype="VLAN_ID"
-                />
-             </PARAM>
-         </PARAM>
-     <ACTION builtin="clish_nop"></ACTION>
-     </COMMAND>
-     </VIEW>
-     <VIEW
-        name="configure-if-view"
-        prompt="${SYSTEM_NAME}(conf-if-${iface})# "
-        depth="2"
-        >
-        <!-- Inheritance -->
-        <NAMESPACE
-            ref="configure-view"
-            help="false"
-            completion="false"
-            />
-        <COMMAND
-            name="no"
-            help="Negate a command or set its defaults"
-            />
-        <COMMAND 
-            name="description"
-            help="Textual description">
-            <PARAM
-                name="desc"
-                help="Textual description of the interface"
-                ptype="STRING" />
-        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} ${desc} </ACTION>
-        </COMMAND>
-        <COMMAND
-            name="no description"
-            help="Remove description" >
-        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} "" </ACTION>
-        </COMMAND>
-        <COMMAND
-            name="mtu"
-            help="Configure MTU">
-            <PARAM
-                name="mtu"
-                help="MTU of the interface"
-                ptype="RANGE_MTU" />
-        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} ${mtu} </ACTION>
-        </COMMAND>
-        <COMMAND
-            name="no mtu"
-            help="Remove MTU">
-            <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} 9100 </ACTION>
-        </COMMAND>
-        <COMMAND 
-            name="shutdown"
-            help="Disable the interface">
-        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} False </ACTION>
-        </COMMAND>
-        <COMMAND 
-            name="no shutdown"
-            help="Enable the interface">
-        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} True </ACTION>
-        </COMMAND>
-
-        <COMMAND
-            name="switchport"
-            help="Configure switchport parameters"
-            >
-            <PARAM
-                name="switchport-subcommands"
-                help="Switchport subcommands"
-                ptype="SUBCOMMAND"
-                mode="switch"
-                >
-                <PARAM
-                    name="access"
-                    help="Set access mode characteristics of the interface"
-                    ptype="SUBCOMMAND"
-                    mode="subcommand"
-                    >
-                    <PARAM
-                        name="vlan"
-                        help="Set VLAN when interface is in access mode"
-                        ptype="SUBCOMMAND"
-                        mode="subcommand"
-                        >
-                        <PARAM
-                            name="vlan-id"
-                            help="VLAN ID of the VLAN when this port is in access mode"
-                            ptype="VLAN_ID"
-                            >
-                        </PARAM>
-                    </PARAM>
-                </PARAM>
-
-                <PARAM
-                    name="trunk"
-                    help="Configure trunking parameters on an interface"
-                    ptype="SUBCOMMAND"
-                    mode="subcommand"
-                    >
-                    <PARAM
-                        name="allowed"
-                        help="Configure trunking parameters on an interface"
-                        ptype="SUBCOMMAND"
-                        mode="subcommand"
-                        >
-                        <PARAM
-                            name="vlan"
-                            help="Configure trunking parameters on an interface"
-                            ptype="SUBCOMMAND"
-                            mode="subcommand"
-                            >
-                            <PARAM
-                                name="vlan-id"
-                                help="VLAN ID of the VLAN when this port is in trunk mode"
-                                ptype="VLAN_ID"
-                                >
-                            </PARAM>
-                        </PARAM>
-                    </PARAM>
-                </PARAM>
-          </PARAM>
-       <ACTION builtin="clish_nop"></ACTION>
-       </COMMAND>
-
-       <COMMAND 
-           name="no switchport"
-           help="Remove switchport parameters"
-           >
-           <PARAM
-               name="switchport-subcommands"
-               help="Switchport subcommands"
-               ptype="SUBCOMMAND"
-               mode="switch"
-               >
-               <PARAM
-                   name="access"
-                   help="Remove access mode characteristics of the interface"
-                   ptype="SUBCOMMAND"
-                   mode="subcommand"
-                   >
-                   <PARAM
-                       name="vlan"
-                       help="Remove VLAN when interface is in access mode"
-                       ptype="SUBCOMMAND"
-                       mode="subcommand"
-                       >
-                   </PARAM>
-               </PARAM>
-
-               <PARAM
-                    name="trunk"
-                    help="Remove trunking parameters on an interface"
-                    ptype="SUBCOMMAND"
-                    mode="subcommand"
-                    >
-                    <PARAM
-                        name="allowed"
-                        help="Remove trunking parameters on an interface"
-                        ptype="SUBCOMMAND"
-                        mode="subcommand"
-                        >
-                        <PARAM
-                            name="vlan"
-                            help="Remove trunking parameters on an interface"
-                            ptype="SUBCOMMAND"
-                            mode="subcommand"
-                            >
-                            <PARAM
-                                name="vlan-id"
-                                help="VLAN ID of the VLAN when this port is in trunk mode"
-                                ptype="VLAN_ID"
-                                >
-                            </PARAM>
-                        </PARAM>
-                    </PARAM>
-               </PARAM>
-           </PARAM>
-      <ACTION builtin="clish_nop"></ACTION>
-      </COMMAND>
-</VIEW>
-<VIEW
-     name="configure-vlan-view"
-     prompt="${SYSTEM_NAME}(conf-if-${vlan_id})# "
-     depth="2"
-     >
-        <!-- Inheritance -->
-     <NAMESPACE
-         ref="configure-view"
-         help="false"
-         completion="false"
-         />
-</VIEW>
+        <PARAM name="status" help="Physical interfaces status" ptype="SUBCOMMAND" mode="subcommand"> </PARAM>
+      </PARAM>
+      <ACTION> if test "${if-subcommands}" = "status"; then
+ python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_status.j2
+ elif test "${if-subcommands}" = "counters"; then
+ python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_counters.j2
+ else
+ if test "${phy-if-id}" = ""; then
+ python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface.j2
+ else
+ python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces_interface Ethernet${phy-if-id} show_interface_id.j2
+ fi
+ fi </ACTION>
+      <xi:include href="include/pipe.xml"/>
+    </COMMAND>
+  </VIEW>
+  <VIEW name="configure-view">
+    <COMMAND name="interface" help="Select an interface" view="configure-if-view" viewid="iface=Ethernet${phy-if-name}">
+      <PARAM name="Ethernet" help="Interface commands" mode="subcommand" ptype="SUBCOMMAND">
+        <PARAM name="phy-if-name" help="Physical interface(Multiples of 4)" ptype="UINT" view="configure-if-view" viewid="iface=Ethernet${phyifname}"/>
+      </PARAM>
+      <ACTION builtin="clish_nop"/>
+    </COMMAND>
+  </VIEW>
+  <VIEW name="configure-if-view" prompt="${SYSTEM_NAME}(conf-if-${iface})# " depth="2">
+    <NAMESPACE ref="hidden-view" help="false" completion="false"/>
+    <NAMESPACE ref="enable-view" help="false" completion="false"/>
+    <NAMESPACE ref="enable-view" help="true" prefix="do" completion="true"/>
+    <COMMAND name="exit" help="Exit from current mode" lock="false">
+            	  <ACTION builtin="clish_nested_up"/>
+  </COMMAND>
+    <COMMAND name="end" help="Exit to the exec Mode" view="enable-view"/>
+    <!-- Inheritance -->
+    <NAMESPACE ref="configure-view" help="false" completion="false"/>
+    <COMMAND name="no" help="Negate a command or set its defaults"/>
+    <COMMAND name="shutdown" help="Disable the interface">
+      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} False </ACTION>
+    </COMMAND>
+    <COMMAND name="no shutdown" help="Enable the interface">
+      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} True </ACTION>
+    </COMMAND>
+    <COMMAND name="description" help="Textual description">
+      <PARAM name="desc" help="Textual description of the interface" ptype="STRING"/>
+      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} ${desc} </ACTION>
+    </COMMAND>
+    <COMMAND name="no description" help="Remove description">
+      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} "" </ACTION>
+    </COMMAND>
+    <COMMAND name="mtu" help="Configure MTU">
+      <PARAM name="mtu" help="MTU of the interface" ptype="RANGE_MTU"/>
+      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} ${mtu} </ACTION>
+    </COMMAND>
+    <COMMAND name="no mtu" help="Remove MTU">
+      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} 9100 </ACTION>
+    </COMMAND>
+    <COMMAND name="sflow" help="enable sflow">
+      <PARAM name="sampling-rate" help="sFlow sampling rate" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+      	<PARAM name="rate" help="sampling rate" ptype="UINT"/>
+      </PARAM>
+      <PARAM name="admin-status" help="sFlow status for interface" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+      </PARAM>
+      <ACTION builtin="clish_nop"/>
+    </COMMAND>
+    <COMMAND name="no sflow" help="disable sflow">
+      <ACTION builtin="clish_nop"/>
+    </COMMAND>
+  </VIEW>
 </CLISH_MODULE>
-
diff --git a/src/CLI/clitree/cli-xml/sflow.xml b/src/CLI/clitree/cli-xml/sflow.xml
new file mode 100755
index 0000000000..abc5e1ff71
--- /dev/null
+++ b/src/CLI/clitree/cli-xml/sflow.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE CLISH_MODULE [
+<!ENTITY START_PORT_ID "1">
+<!ENTITY MAX_PORT_ID "32">
+<!ENTITY START_SUB_PORT_ID "1">
+<!ENTITY MAX_SUB_PORT_ID "4">
+<!ENTITY MAX_MTU "9276">
+]>
+<CLISH_MODULE xmlns="http://www.dellemc.com/sonic/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.dellemc.com/sonic/XMLSchema http://www.dellemc.com/sonic/XMLSchema/clish.xsd">
+  <VIEW name="enable-view">
+    <COMMAND name="show sflow" help="Show sFlow information">
+      <ACTION> python $SONIC_CLI_ROOT/sonic-cli-sflow.py get_openconfig_lldp_lldp_interfaces show_sflow.j2 </ACTION>
+      <xi:include href="include/pipe.xml"/>
+    </COMMAND>
+    <COMMAND name="show sflow interface" help="Show sFlow interface information">
+      <ACTION> python $SONIC_CLI_ROOT/sonic-cli-sflow.py get_openconfig_lldp_lldp_interfaces show_sflow_intf.j2 </ACTION>
+      <xi:include href="include/pipe.xml"/>
+    </COMMAND>
+  </VIEW>
+  <VIEW name="configure-view">
+    <COMMAND name="sflow" help="enable sflow">
+      <PARAM name="collector" help="Collector name" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+      	<PARAM name="collector-name" help="Collector name" ptype="STRING"/>
+      	<PARAM name="collector-ip" help="Collector IP address" ptype="STRING"/>
+      	<PARAM name="collector-port" help="Collector port number" ptype="UINT" optional="true"/>
+      </PARAM>
+      <PARAM name="agent-id" help="Collector agent interface" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+      	<PARAM name="interface" help="Interface name" ptype="STRING"/>
+      </PARAM>
+      <ACTION builtin="clish_nop"/>
+      <PARAM name="polling-interval" help="Collector polling interval" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+      	<PARAM name="interval" help="Interval" ptype="UINT"/>
+      </PARAM>
+    </COMMAND>
+    <COMMAND name="no sflow" help="disable sflow">
+      <PARAM name="collector" help="Collector name" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+      	<PARAM name="collector-name" help="Collector name" ptype="STRING"/>
+      </PARAM>
+      <ACTION builtin="clish_nop"/>
+    </COMMAND>
+  </VIEW>
+</CLISH_MODULE>
diff --git a/src/CLI/renderer/templates/show_sflow.j2 b/src/CLI/renderer/templates/show_sflow.j2
new file mode 100755
index 0000000000..7bd2e9b378
--- /dev/null
+++ b/src/CLI/renderer/templates/show_sflow.j2
@@ -0,0 +1,9 @@
+{{'---------------------------------------------------------'}}
+{{'Global sFlow Information'.ljust(20)}}
+{{'---------------------------------------------------------'}}
+{% if json_output and 'sflow' in json_output -%}
+{% set sflow_info = json_output['sflow'] %}
+{{'	admin state: '}}{{sflow_info['admin_state']}}
+{{'	polling-interval: '}}{{sflow_info['polling-interval']}}
+{{'	agent-id: '}} {{sflow_info['agent-id']}}
+{% endif %}
diff --git a/src/CLI/renderer/templates/show_sflow_intf.j2 b/src/CLI/renderer/templates/show_sflow_intf.j2
new file mode 100755
index 0000000000..1499d30e78
--- /dev/null
+++ b/src/CLI/renderer/templates/show_sflow_intf.j2
@@ -0,0 +1,10 @@
+{{'-----------------------------------------------------------'}}
+{{'sFlow interface configurations'.ljust(20)}}
+{{'%40s'|format('Interface		Admin State		Sampling Rate')}}
+{% if json_output and 'sflow' in json_output -%}
+{% set sflow_info = json_output['sflow'] %}
+{% for intf, values in sflow_info.items() %}
+{{'%13s'|format(intf.ljust(10))}}		{{sflow_info[intf]['admin_state']}}			{{sflow_info[intf]['sampling_rate']}}
+{% endfor %}
+{% endif %}
+

From 23546dd2d93bd96f1500ca03232f712a4edf2308 Mon Sep 17 00:00:00 2001
From: Garrick He <garrick_he@dell.com>
Date: Tue, 1 Oct 2019 13:41:35 -0700
Subject: [PATCH 2/4] Fix interface.xml

* Fix some changes made in interface.xml

Signed-off-by: Garrick He <garrick_he@dell.com>
---
 src/CLI/clitree/cli-xml/interface.xml | 444 +++++++++++++++++++++-----
 1 file changed, 362 insertions(+), 82 deletions(-)

diff --git a/src/CLI/clitree/cli-xml/interface.xml b/src/CLI/clitree/cli-xml/interface.xml
index 19e7cb7784..47fc5e311c 100644
--- a/src/CLI/clitree/cli-xml/interface.xml
+++ b/src/CLI/clitree/cli-xml/interface.xml
@@ -1,85 +1,365 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE CLISH_MODULE [
-<!ENTITY START_PORT_ID "1">
-<!ENTITY MAX_PORT_ID "32">
-<!ENTITY START_SUB_PORT_ID "1">
-<!ENTITY MAX_SUB_PORT_ID "4">
-<!ENTITY MAX_MTU "9276">
-]>
-<CLISH_MODULE xmlns="http://www.dellemc.com/sonic/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.dellemc.com/sonic/XMLSchema http://www.dellemc.com/sonic/XMLSchema/clish.xsd">
-  <VIEW name="enable-view">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2019 Dell, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<CLISH_MODULE
+    xmlns="http://www.dellemc.com/sonic/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:schemaLocation="http://www.dellemc.com/sonic/XMLSchema
+    http://www.dellemc.com/sonic/XMLSchema/clish.xsd"
+    >
+    <VIEW name="enable-view">
     <!--show interface Ethernet <id> -->
-    <COMMAND name="show interface" help="Show Interface info">
-      <PARAM name="if-subcommands" help="Interface subcommands" mode="switch" ptype="SUBCOMMAND">
-        <PARAM name="counters" help="Counters for Physical Interfaces" ptype="SUBCOMMAND" mode="subcommand"> </PARAM>
-        <PARAM name="Ethernet" help="Physical Interface" ptype="SUBCOMMAND" mode="subcommand">
-          <PARAM name="phy-if-id" help="Physical interface(Multiples of 4)" ptype="UINT" optional="true"> </PARAM>
+    <COMMAND
+         name="show interface"
+         help="Show Interface info"
+         >
+         <PARAM
+             name="if-subcommands"
+             help="Interface subcommands"
+             mode="switch"
+             ptype="SUBCOMMAND"
+             >
+             <PARAM
+                 name="counters"
+                 help="Counters for Physical Interfaces"
+                 ptype="SUBCOMMAND"
+                 mode="subcommand"
+                 >
+             </PARAM>
+             <PARAM
+                 name="Ethernet"
+                 help="Physical Interface"
+                 ptype="SUBCOMMAND"
+                 mode="subcommand"
+                 >
+                 <PARAM
+                    name="phy-if-id"
+                    help="Physical interface(Multiples of 4)"
+                    ptype="UINT"
+                    optional="true"
+                    >
+                 </PARAM>
+             </PARAM>
+             <PARAM
+                 name="status"
+                 help="Physical interfaces status"
+                 ptype="SUBCOMMAND"
+                 mode="subcommand"
+                 >
+             </PARAM>
+         </PARAM>
+   <ACTION>
+        if test "${if-subcommands}" = "status"; then&#xA;
+            python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_status.j2 ${__full_line}&#xA;
+        elif test "${if-subcommands}" = "counters"; then&#xA;
+            python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_counters.j2 ${__full_line}&#xA;
+        else&#xA;
+            if test "${phy-if-id}" = ""; then&#xA;
+                python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface.j2 ${__full_line}&#xA;
+            else&#xA;
+                python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces_interface Ethernet${phy-if-id} show_interface_id.j2 ${__full_line}&#xA;
+            fi&#xA;
+        fi
+   </ACTION>
+   </COMMAND>
+
+   <COMMAND
+       name="show vlan"
+       help="Show vlan commands"
+       ptype="SUBCOMMAND"
+       mode="subcommand"
+       >
+       <PARAM
+           name="id"
+           help="Vlan identifier"
+           ptype="VLAN_ID"
+           optional="true"
+           >
+       </PARAM>
+   <ACTION>
+       python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_vlan_interfaces_interface_ethernet_switched_vlan_state show_vlan.j2
+   </ACTION>
+   </COMMAND>
+
+   </VIEW>
+
+    <VIEW
+        name="configure-view"
+        >
+    <!-- interface commands -->
+    <COMMAND
+        name="interface"
+        help="Select an interface"
+        />
+
+    <COMMAND
+        name="interface Ethernet"
+        help="Select an interface"
+        view="configure-if-view"
+        viewid="iface=Ethernet${phy-if-name}"
+        >
+        <PARAM
+            name="phy-if-name"
+            help="Physical interface(Multiples of 4)"
+            ptype="UINT"
+            >
         </PARAM>
-        <PARAM name="status" help="Physical interfaces status" ptype="SUBCOMMAND" mode="subcommand"> </PARAM>
-      </PARAM>
-      <ACTION> if test "${if-subcommands}" = "status"; then
- python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_status.j2
- elif test "${if-subcommands}" = "counters"; then
- python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_counters.j2
- else
- if test "${phy-if-id}" = ""; then
- python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface.j2
- else
- python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces_interface Ethernet${phy-if-id} show_interface_id.j2
- fi
- fi </ACTION>
-      <xi:include href="include/pipe.xml"/>
-    </COMMAND>
-  </VIEW>
-  <VIEW name="configure-view">
-    <COMMAND name="interface" help="Select an interface" view="configure-if-view" viewid="iface=Ethernet${phy-if-name}">
-      <PARAM name="Ethernet" help="Interface commands" mode="subcommand" ptype="SUBCOMMAND">
-        <PARAM name="phy-if-name" help="Physical interface(Multiples of 4)" ptype="UINT" view="configure-if-view" viewid="iface=Ethernet${phyifname}"/>
-      </PARAM>
-      <ACTION builtin="clish_nop"/>
-    </COMMAND>
-  </VIEW>
-  <VIEW name="configure-if-view" prompt="${SYSTEM_NAME}(conf-if-${iface})# " depth="2">
-    <NAMESPACE ref="hidden-view" help="false" completion="false"/>
-    <NAMESPACE ref="enable-view" help="false" completion="false"/>
-    <NAMESPACE ref="enable-view" help="true" prefix="do" completion="true"/>
-    <COMMAND name="exit" help="Exit from current mode" lock="false">
-            	  <ACTION builtin="clish_nested_up"/>
-  </COMMAND>
-    <COMMAND name="end" help="Exit to the exec Mode" view="enable-view"/>
-    <!-- Inheritance -->
-    <NAMESPACE ref="configure-view" help="false" completion="false"/>
-    <COMMAND name="no" help="Negate a command or set its defaults"/>
-    <COMMAND name="shutdown" help="Disable the interface">
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} False </ACTION>
-    </COMMAND>
-    <COMMAND name="no shutdown" help="Enable the interface">
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} True </ACTION>
-    </COMMAND>
-    <COMMAND name="description" help="Textual description">
-      <PARAM name="desc" help="Textual description of the interface" ptype="STRING"/>
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} ${desc} </ACTION>
-    </COMMAND>
-    <COMMAND name="no description" help="Remove description">
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} "" </ACTION>
-    </COMMAND>
-    <COMMAND name="mtu" help="Configure MTU">
-      <PARAM name="mtu" help="MTU of the interface" ptype="RANGE_MTU"/>
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} ${mtu} </ACTION>
-    </COMMAND>
-    <COMMAND name="no mtu" help="Remove MTU">
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} 9100 </ACTION>
-    </COMMAND>
-    <COMMAND name="sflow" help="enable sflow">
-      <PARAM name="sampling-rate" help="sFlow sampling rate" ptype="SUBCOMMAND" mode="subcommand" optional="true">
-      	<PARAM name="rate" help="sampling rate" ptype="UINT"/>
-      </PARAM>
-      <PARAM name="admin-status" help="sFlow status for interface" ptype="SUBCOMMAND" mode="subcommand" optional="true">
-      </PARAM>
-      <ACTION builtin="clish_nop"/>
-    </COMMAND>
-    <COMMAND name="no sflow" help="disable sflow">
-      <ACTION builtin="clish_nop"/>
-    </COMMAND>
-  </VIEW>
+     <ACTION builtin="clish_nop"></ACTION>
+     </COMMAND>
+
+     <COMMAND
+         name="interface vlan"
+         help="Vlan Interface Configuration"
+         mode="subcommand"
+         ptype="SUBCOMMAND"
+         view="configure-vlan-view"
+         viewid="vlan_id=vlan${vlan-id}"
+         >
+         <PARAM
+             name="vlan-id"
+             help="Vlan identifier(1-4094)"
+             ptype="VLAN_ID"
+             >
+         </PARAM>
+     <ACTION builtin="clish_nop"></ACTION>
+     </COMMAND>
+
+     <!-- no interface commands -->
+     <COMMAND
+         name="no interface"
+         help="Delete interface"
+         >
+         <PARAM
+             name="if-subcommands"
+             help="Interface sub-commands"
+             mode="switch"
+             ptype="SUBCOMMAND"
+             >
+             <PARAM
+                name="vlan"
+                help="Delete vlan"
+                mode="subcommand"
+                ptype="SUBCOMMAND"
+                >
+                <PARAM
+                    name="vlan-id"
+                    help="Vlan identifier(1-4094)"
+                    ptype="VLAN_ID"
+                />
+             </PARAM>
+         </PARAM>
+     <ACTION builtin="clish_nop"></ACTION>
+     </COMMAND>
+     </VIEW>
+     <VIEW
+        name="configure-if-view"
+        prompt="${SYSTEM_NAME}(conf-if-${iface})# "
+        depth="2"
+        >
+        <!-- Inheritance -->
+        <NAMESPACE
+            ref="configure-view"
+            help="false"
+            completion="false"
+            />
+        <COMMAND
+            name="no"
+            help="Negate a command or set its defaults"
+            />
+        <COMMAND
+            name="description"
+            help="Textual description">
+            <PARAM
+                name="desc"
+                help="Textual description of the interface"
+                ptype="STRING" />
+        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} ${desc} </ACTION>
+        </COMMAND>
+        <COMMAND
+            name="no description"
+            help="Remove description" >
+        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} "" </ACTION>
+        </COMMAND>
+        <COMMAND
+            name="mtu"
+            help="Configure MTU">
+            <PARAM
+                name="mtu"
+                help="MTU of the interface"
+                ptype="RANGE_MTU" />
+        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} ${mtu} </ACTION>
+        </COMMAND>
+        <COMMAND
+            name="no mtu"
+            help="Remove MTU">
+            <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} 9100 </ACTION>
+        </COMMAND>
+        <COMMAND
+            name="shutdown"
+            help="Disable the interface">
+        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} False </ACTION>
+        </COMMAND>
+        <COMMAND
+            name="no shutdown"
+            help="Enable the interface">
+        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} True </ACTION>
+        </COMMAND>
+
+        <COMMAND
+            name="switchport"
+            help="Configure switchport parameters"
+            >
+            <PARAM
+                name="switchport-subcommands"
+                help="Switchport subcommands"
+                ptype="SUBCOMMAND"
+                mode="switch"
+                >
+                <PARAM
+                    name="access"
+                    help="Set access mode characteristics of the interface"
+                    ptype="SUBCOMMAND"
+                    mode="subcommand"
+                    >
+                    <PARAM
+                        name="vlan"
+                        help="Set VLAN when interface is in access mode"
+                        ptype="SUBCOMMAND"
+                        mode="subcommand"
+                        >
+                        <PARAM
+                            name="vlan-id"
+                            help="VLAN ID of the VLAN when this port is in access mode"
+                            ptype="VLAN_ID"
+                            >
+                        </PARAM>
+                    </PARAM>
+                </PARAM>
+
+                <PARAM
+                    name="trunk"
+                    help="Configure trunking parameters on an interface"
+                    ptype="SUBCOMMAND"
+                    mode="subcommand"
+                    >
+                    <PARAM
+                        name="allowed"
+                        help="Configure trunking parameters on an interface"
+                        ptype="SUBCOMMAND"
+                        mode="subcommand"
+                        >
+                        <PARAM
+                            name="vlan"
+                            help="Configure trunking parameters on an interface"
+                            ptype="SUBCOMMAND"
+                            mode="subcommand"
+                            >
+                            <PARAM
+                                name="vlan-id"
+                                help="VLAN ID of the VLAN when this port is in trunk mode"
+                                ptype="VLAN_ID"
+                                >
+                            </PARAM>
+                        </PARAM>
+                    </PARAM>
+                </PARAM>
+          </PARAM>
+       <ACTION builtin="clish_nop"></ACTION>
+       </COMMAND>
+       <COMMAND name="sflow" help="enable sflow">
+            <PARAM name="sampling-rate" help="sFlow sampling rate" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+                <PARAM name="rate" help="sampling rate" ptype="UINT"/>
+            </PARAM>
+            <PARAM name="admin-status" help="sFlow status for interface" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+            </PARAM>
+            <ACTION builtin="clish_nop"/>
+       </COMMAND>
+       <COMMAND name="no sflow" help="disable sflow">
+            <ACTION builtin="clish_nop"/>
+       </COMMAND>
+
+       <COMMAND
+           name="no switchport"
+           help="Remove switchport parameters"
+           >
+           <PARAM
+               name="switchport-subcommands"
+               help="Switchport subcommands"
+               ptype="SUBCOMMAND"
+               mode="switch"
+               >
+               <PARAM
+                   name="access"
+                   help="Remove access mode characteristics of the interface"
+                   ptype="SUBCOMMAND"
+                   mode="subcommand"
+                   >
+                   <PARAM
+                       name="vlan"
+                       help="Remove VLAN when interface is in access mode"
+                       ptype="SUBCOMMAND"
+                       mode="subcommand"
+                       >
+                   </PARAM>
+               </PARAM>
+
+               <PARAM
+                    name="trunk"
+                    help="Remove trunking parameters on an interface"
+                    ptype="SUBCOMMAND"
+                    mode="subcommand"
+                    >
+                    <PARAM
+                        name="allowed"
+                        help="Remove trunking parameters on an interface"
+                        ptype="SUBCOMMAND"
+                        mode="subcommand"
+                        >
+                        <PARAM
+                            name="vlan"
+                            help="Remove trunking parameters on an interface"
+                            ptype="SUBCOMMAND"
+                            mode="subcommand"
+                            >
+                            <PARAM
+                                name="vlan-id"
+                                help="VLAN ID of the VLAN when this port is in trunk mode"
+                                ptype="VLAN_ID"
+                                >
+                            </PARAM>
+                        </PARAM>
+                    </PARAM>
+               </PARAM>
+           </PARAM>
+      <ACTION builtin="clish_nop"></ACTION>
+      </COMMAND>
+</VIEW>
+<VIEW
+     name="configure-vlan-view"
+     prompt="${SYSTEM_NAME}(conf-if-${vlan_id})# "
+     depth="2"
+     >
+        <!-- Inheritance -->
+     <NAMESPACE
+         ref="configure-view"
+         help="false"
+         completion="false"
+         />
+</VIEW>
 </CLISH_MODULE>
+

From e412d8acaf23c62f0347c57f90142b5361a7c168 Mon Sep 17 00:00:00 2001
From: Garrick He <garrick_he@dell.com>
Date: Tue, 1 Oct 2019 13:41:35 -0700
Subject: [PATCH 3/4] Bugfixes

* Fix changes in interfaces.xml not picked up during merge
* Sort list of interfaces in display

Signed-off-by: Garrick He <garrick_he@dell.com>
---
 src/CLI/actioner/sonic-cli-sflow.py   |   3 +-
 src/CLI/clitree/cli-xml/interface.xml | 444 +++++++++++++++++++++-----
 src/CLI/clitree/cli-xml/sflow.xml     |  53 +--
 3 files changed, 397 insertions(+), 103 deletions(-)
 mode change 100755 => 100644 src/CLI/clitree/cli-xml/sflow.xml

diff --git a/src/CLI/actioner/sonic-cli-sflow.py b/src/CLI/actioner/sonic-cli-sflow.py
index e49d9b7998..7ac8ac4d5d 100755
--- a/src/CLI/actioner/sonic-cli-sflow.py
+++ b/src/CLI/actioner/sonic-cli-sflow.py
@@ -3,7 +3,6 @@
 import time
 import json
 import ast
-import sonic_sflow_client
 from collections import OrderedDict
 from scripts.render_cli import show_cli_output
 
@@ -35,7 +34,7 @@ def run(func, args):
         sflow_info = {'sflow' : {'admin_state' : 'enabled', 'polling-interval' : 20, 'agent-id' : 'default'}}
     else:
 	sflow_info = {}
-        sflow_info['sflow'] = {}
+        sflow_info['sflow'] = OrderedDict()
         for i in range(30):
             sflow_info['sflow']['Ethernet'+str(i)] = {'admin_state' : 'enabled', 'sampling_rate' : 4000}
     show_cli_output(sys.argv[2], sflow_info)
diff --git a/src/CLI/clitree/cli-xml/interface.xml b/src/CLI/clitree/cli-xml/interface.xml
index 19e7cb7784..47fc5e311c 100644
--- a/src/CLI/clitree/cli-xml/interface.xml
+++ b/src/CLI/clitree/cli-xml/interface.xml
@@ -1,85 +1,365 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE CLISH_MODULE [
-<!ENTITY START_PORT_ID "1">
-<!ENTITY MAX_PORT_ID "32">
-<!ENTITY START_SUB_PORT_ID "1">
-<!ENTITY MAX_SUB_PORT_ID "4">
-<!ENTITY MAX_MTU "9276">
-]>
-<CLISH_MODULE xmlns="http://www.dellemc.com/sonic/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.dellemc.com/sonic/XMLSchema http://www.dellemc.com/sonic/XMLSchema/clish.xsd">
-  <VIEW name="enable-view">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2019 Dell, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<CLISH_MODULE
+    xmlns="http://www.dellemc.com/sonic/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:schemaLocation="http://www.dellemc.com/sonic/XMLSchema
+    http://www.dellemc.com/sonic/XMLSchema/clish.xsd"
+    >
+    <VIEW name="enable-view">
     <!--show interface Ethernet <id> -->
-    <COMMAND name="show interface" help="Show Interface info">
-      <PARAM name="if-subcommands" help="Interface subcommands" mode="switch" ptype="SUBCOMMAND">
-        <PARAM name="counters" help="Counters for Physical Interfaces" ptype="SUBCOMMAND" mode="subcommand"> </PARAM>
-        <PARAM name="Ethernet" help="Physical Interface" ptype="SUBCOMMAND" mode="subcommand">
-          <PARAM name="phy-if-id" help="Physical interface(Multiples of 4)" ptype="UINT" optional="true"> </PARAM>
+    <COMMAND
+         name="show interface"
+         help="Show Interface info"
+         >
+         <PARAM
+             name="if-subcommands"
+             help="Interface subcommands"
+             mode="switch"
+             ptype="SUBCOMMAND"
+             >
+             <PARAM
+                 name="counters"
+                 help="Counters for Physical Interfaces"
+                 ptype="SUBCOMMAND"
+                 mode="subcommand"
+                 >
+             </PARAM>
+             <PARAM
+                 name="Ethernet"
+                 help="Physical Interface"
+                 ptype="SUBCOMMAND"
+                 mode="subcommand"
+                 >
+                 <PARAM
+                    name="phy-if-id"
+                    help="Physical interface(Multiples of 4)"
+                    ptype="UINT"
+                    optional="true"
+                    >
+                 </PARAM>
+             </PARAM>
+             <PARAM
+                 name="status"
+                 help="Physical interfaces status"
+                 ptype="SUBCOMMAND"
+                 mode="subcommand"
+                 >
+             </PARAM>
+         </PARAM>
+   <ACTION>
+        if test "${if-subcommands}" = "status"; then&#xA;
+            python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_status.j2 ${__full_line}&#xA;
+        elif test "${if-subcommands}" = "counters"; then&#xA;
+            python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_counters.j2 ${__full_line}&#xA;
+        else&#xA;
+            if test "${phy-if-id}" = ""; then&#xA;
+                python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface.j2 ${__full_line}&#xA;
+            else&#xA;
+                python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces_interface Ethernet${phy-if-id} show_interface_id.j2 ${__full_line}&#xA;
+            fi&#xA;
+        fi
+   </ACTION>
+   </COMMAND>
+
+   <COMMAND
+       name="show vlan"
+       help="Show vlan commands"
+       ptype="SUBCOMMAND"
+       mode="subcommand"
+       >
+       <PARAM
+           name="id"
+           help="Vlan identifier"
+           ptype="VLAN_ID"
+           optional="true"
+           >
+       </PARAM>
+   <ACTION>
+       python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_vlan_interfaces_interface_ethernet_switched_vlan_state show_vlan.j2
+   </ACTION>
+   </COMMAND>
+
+   </VIEW>
+
+    <VIEW
+        name="configure-view"
+        >
+    <!-- interface commands -->
+    <COMMAND
+        name="interface"
+        help="Select an interface"
+        />
+
+    <COMMAND
+        name="interface Ethernet"
+        help="Select an interface"
+        view="configure-if-view"
+        viewid="iface=Ethernet${phy-if-name}"
+        >
+        <PARAM
+            name="phy-if-name"
+            help="Physical interface(Multiples of 4)"
+            ptype="UINT"
+            >
         </PARAM>
-        <PARAM name="status" help="Physical interfaces status" ptype="SUBCOMMAND" mode="subcommand"> </PARAM>
-      </PARAM>
-      <ACTION> if test "${if-subcommands}" = "status"; then
- python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_status.j2
- elif test "${if-subcommands}" = "counters"; then
- python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface_counters.j2
- else
- if test "${phy-if-id}" = ""; then
- python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces show_interface.j2
- else
- python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces_interface Ethernet${phy-if-id} show_interface_id.j2
- fi
- fi </ACTION>
-      <xi:include href="include/pipe.xml"/>
-    </COMMAND>
-  </VIEW>
-  <VIEW name="configure-view">
-    <COMMAND name="interface" help="Select an interface" view="configure-if-view" viewid="iface=Ethernet${phy-if-name}">
-      <PARAM name="Ethernet" help="Interface commands" mode="subcommand" ptype="SUBCOMMAND">
-        <PARAM name="phy-if-name" help="Physical interface(Multiples of 4)" ptype="UINT" view="configure-if-view" viewid="iface=Ethernet${phyifname}"/>
-      </PARAM>
-      <ACTION builtin="clish_nop"/>
-    </COMMAND>
-  </VIEW>
-  <VIEW name="configure-if-view" prompt="${SYSTEM_NAME}(conf-if-${iface})# " depth="2">
-    <NAMESPACE ref="hidden-view" help="false" completion="false"/>
-    <NAMESPACE ref="enable-view" help="false" completion="false"/>
-    <NAMESPACE ref="enable-view" help="true" prefix="do" completion="true"/>
-    <COMMAND name="exit" help="Exit from current mode" lock="false">
-            	  <ACTION builtin="clish_nested_up"/>
-  </COMMAND>
-    <COMMAND name="end" help="Exit to the exec Mode" view="enable-view"/>
-    <!-- Inheritance -->
-    <NAMESPACE ref="configure-view" help="false" completion="false"/>
-    <COMMAND name="no" help="Negate a command or set its defaults"/>
-    <COMMAND name="shutdown" help="Disable the interface">
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} False </ACTION>
-    </COMMAND>
-    <COMMAND name="no shutdown" help="Enable the interface">
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} True </ACTION>
-    </COMMAND>
-    <COMMAND name="description" help="Textual description">
-      <PARAM name="desc" help="Textual description of the interface" ptype="STRING"/>
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} ${desc} </ACTION>
-    </COMMAND>
-    <COMMAND name="no description" help="Remove description">
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} "" </ACTION>
-    </COMMAND>
-    <COMMAND name="mtu" help="Configure MTU">
-      <PARAM name="mtu" help="MTU of the interface" ptype="RANGE_MTU"/>
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} ${mtu} </ACTION>
-    </COMMAND>
-    <COMMAND name="no mtu" help="Remove MTU">
-      <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} 9100 </ACTION>
-    </COMMAND>
-    <COMMAND name="sflow" help="enable sflow">
-      <PARAM name="sampling-rate" help="sFlow sampling rate" ptype="SUBCOMMAND" mode="subcommand" optional="true">
-      	<PARAM name="rate" help="sampling rate" ptype="UINT"/>
-      </PARAM>
-      <PARAM name="admin-status" help="sFlow status for interface" ptype="SUBCOMMAND" mode="subcommand" optional="true">
-      </PARAM>
-      <ACTION builtin="clish_nop"/>
-    </COMMAND>
-    <COMMAND name="no sflow" help="disable sflow">
-      <ACTION builtin="clish_nop"/>
-    </COMMAND>
-  </VIEW>
+     <ACTION builtin="clish_nop"></ACTION>
+     </COMMAND>
+
+     <COMMAND
+         name="interface vlan"
+         help="Vlan Interface Configuration"
+         mode="subcommand"
+         ptype="SUBCOMMAND"
+         view="configure-vlan-view"
+         viewid="vlan_id=vlan${vlan-id}"
+         >
+         <PARAM
+             name="vlan-id"
+             help="Vlan identifier(1-4094)"
+             ptype="VLAN_ID"
+             >
+         </PARAM>
+     <ACTION builtin="clish_nop"></ACTION>
+     </COMMAND>
+
+     <!-- no interface commands -->
+     <COMMAND
+         name="no interface"
+         help="Delete interface"
+         >
+         <PARAM
+             name="if-subcommands"
+             help="Interface sub-commands"
+             mode="switch"
+             ptype="SUBCOMMAND"
+             >
+             <PARAM
+                name="vlan"
+                help="Delete vlan"
+                mode="subcommand"
+                ptype="SUBCOMMAND"
+                >
+                <PARAM
+                    name="vlan-id"
+                    help="Vlan identifier(1-4094)"
+                    ptype="VLAN_ID"
+                />
+             </PARAM>
+         </PARAM>
+     <ACTION builtin="clish_nop"></ACTION>
+     </COMMAND>
+     </VIEW>
+     <VIEW
+        name="configure-if-view"
+        prompt="${SYSTEM_NAME}(conf-if-${iface})# "
+        depth="2"
+        >
+        <!-- Inheritance -->
+        <NAMESPACE
+            ref="configure-view"
+            help="false"
+            completion="false"
+            />
+        <COMMAND
+            name="no"
+            help="Negate a command or set its defaults"
+            />
+        <COMMAND
+            name="description"
+            help="Textual description">
+            <PARAM
+                name="desc"
+                help="Textual description of the interface"
+                ptype="STRING" />
+        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} ${desc} </ACTION>
+        </COMMAND>
+        <COMMAND
+            name="no description"
+            help="Remove description" >
+        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_description ${iface} "" </ACTION>
+        </COMMAND>
+        <COMMAND
+            name="mtu"
+            help="Configure MTU">
+            <PARAM
+                name="mtu"
+                help="MTU of the interface"
+                ptype="RANGE_MTU" />
+        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} ${mtu} </ACTION>
+        </COMMAND>
+        <COMMAND
+            name="no mtu"
+            help="Remove MTU">
+            <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_mtu ${iface} 9100 </ACTION>
+        </COMMAND>
+        <COMMAND
+            name="shutdown"
+            help="Disable the interface">
+        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} False </ACTION>
+        </COMMAND>
+        <COMMAND
+            name="no shutdown"
+            help="Enable the interface">
+        <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface_config_enabled ${iface} True </ACTION>
+        </COMMAND>
+
+        <COMMAND
+            name="switchport"
+            help="Configure switchport parameters"
+            >
+            <PARAM
+                name="switchport-subcommands"
+                help="Switchport subcommands"
+                ptype="SUBCOMMAND"
+                mode="switch"
+                >
+                <PARAM
+                    name="access"
+                    help="Set access mode characteristics of the interface"
+                    ptype="SUBCOMMAND"
+                    mode="subcommand"
+                    >
+                    <PARAM
+                        name="vlan"
+                        help="Set VLAN when interface is in access mode"
+                        ptype="SUBCOMMAND"
+                        mode="subcommand"
+                        >
+                        <PARAM
+                            name="vlan-id"
+                            help="VLAN ID of the VLAN when this port is in access mode"
+                            ptype="VLAN_ID"
+                            >
+                        </PARAM>
+                    </PARAM>
+                </PARAM>
+
+                <PARAM
+                    name="trunk"
+                    help="Configure trunking parameters on an interface"
+                    ptype="SUBCOMMAND"
+                    mode="subcommand"
+                    >
+                    <PARAM
+                        name="allowed"
+                        help="Configure trunking parameters on an interface"
+                        ptype="SUBCOMMAND"
+                        mode="subcommand"
+                        >
+                        <PARAM
+                            name="vlan"
+                            help="Configure trunking parameters on an interface"
+                            ptype="SUBCOMMAND"
+                            mode="subcommand"
+                            >
+                            <PARAM
+                                name="vlan-id"
+                                help="VLAN ID of the VLAN when this port is in trunk mode"
+                                ptype="VLAN_ID"
+                                >
+                            </PARAM>
+                        </PARAM>
+                    </PARAM>
+                </PARAM>
+          </PARAM>
+       <ACTION builtin="clish_nop"></ACTION>
+       </COMMAND>
+       <COMMAND name="sflow" help="enable sflow">
+            <PARAM name="sampling-rate" help="sFlow sampling rate" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+                <PARAM name="rate" help="sampling rate" ptype="UINT"/>
+            </PARAM>
+            <PARAM name="admin-status" help="sFlow status for interface" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+            </PARAM>
+            <ACTION builtin="clish_nop"/>
+       </COMMAND>
+       <COMMAND name="no sflow" help="disable sflow">
+            <ACTION builtin="clish_nop"/>
+       </COMMAND>
+
+       <COMMAND
+           name="no switchport"
+           help="Remove switchport parameters"
+           >
+           <PARAM
+               name="switchport-subcommands"
+               help="Switchport subcommands"
+               ptype="SUBCOMMAND"
+               mode="switch"
+               >
+               <PARAM
+                   name="access"
+                   help="Remove access mode characteristics of the interface"
+                   ptype="SUBCOMMAND"
+                   mode="subcommand"
+                   >
+                   <PARAM
+                       name="vlan"
+                       help="Remove VLAN when interface is in access mode"
+                       ptype="SUBCOMMAND"
+                       mode="subcommand"
+                       >
+                   </PARAM>
+               </PARAM>
+
+               <PARAM
+                    name="trunk"
+                    help="Remove trunking parameters on an interface"
+                    ptype="SUBCOMMAND"
+                    mode="subcommand"
+                    >
+                    <PARAM
+                        name="allowed"
+                        help="Remove trunking parameters on an interface"
+                        ptype="SUBCOMMAND"
+                        mode="subcommand"
+                        >
+                        <PARAM
+                            name="vlan"
+                            help="Remove trunking parameters on an interface"
+                            ptype="SUBCOMMAND"
+                            mode="subcommand"
+                            >
+                            <PARAM
+                                name="vlan-id"
+                                help="VLAN ID of the VLAN when this port is in trunk mode"
+                                ptype="VLAN_ID"
+                                >
+                            </PARAM>
+                        </PARAM>
+                    </PARAM>
+               </PARAM>
+           </PARAM>
+      <ACTION builtin="clish_nop"></ACTION>
+      </COMMAND>
+</VIEW>
+<VIEW
+     name="configure-vlan-view"
+     prompt="${SYSTEM_NAME}(conf-if-${vlan_id})# "
+     depth="2"
+     >
+        <!-- Inheritance -->
+     <NAMESPACE
+         ref="configure-view"
+         help="false"
+         completion="false"
+         />
+</VIEW>
 </CLISH_MODULE>
+
diff --git a/src/CLI/clitree/cli-xml/sflow.xml b/src/CLI/clitree/cli-xml/sflow.xml
old mode 100755
new mode 100644
index abc5e1ff71..95dfb5ff67
--- a/src/CLI/clitree/cli-xml/sflow.xml
+++ b/src/CLI/clitree/cli-xml/sflow.xml
@@ -1,22 +1,37 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE CLISH_MODULE [
-<!ENTITY START_PORT_ID "1">
-<!ENTITY MAX_PORT_ID "32">
-<!ENTITY START_SUB_PORT_ID "1">
-<!ENTITY MAX_SUB_PORT_ID "4">
-<!ENTITY MAX_MTU "9276">
-]>
-<CLISH_MODULE xmlns="http://www.dellemc.com/sonic/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:schemaLocation="http://www.dellemc.com/sonic/XMLSchema http://www.dellemc.com/sonic/XMLSchema/clish.xsd">
-  <VIEW name="enable-view">
-    <COMMAND name="show sflow" help="Show sFlow information">
-      <ACTION> python $SONIC_CLI_ROOT/sonic-cli-sflow.py get_openconfig_lldp_lldp_interfaces show_sflow.j2 </ACTION>
-      <xi:include href="include/pipe.xml"/>
-    </COMMAND>
-    <COMMAND name="show sflow interface" help="Show sFlow interface information">
-      <ACTION> python $SONIC_CLI_ROOT/sonic-cli-sflow.py get_openconfig_lldp_lldp_interfaces show_sflow_intf.j2 </ACTION>
-      <xi:include href="include/pipe.xml"/>
-    </COMMAND>
-  </VIEW>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Copyright 2019 Dell, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<CLISH_MODULE
+    xmlns="http://www.dellemc.com/sonic/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:schemaLocation="http://www.dellemc.com/sonic/XMLSchema
+    http://www.dellemc.com/sonic/XMLSchema/clish.xsd"
+    >
+
+<VIEW name="enable-view">
+   <COMMAND name="show sflow" help="Show sFlow information">
+         <ACTION> python $SONIC_CLI_ROOT/sonic-cli-sflow.py get_sflow show_sflow.j2 </ACTION>
+   </COMMAND>
+   <COMMAND name="show sflow interface" help="Show sFlow interface information">
+         <ACTION> python $SONIC_CLI_ROOT/sonic-cli-sflow.py get_sflow_interface show_sflow_intf.j2 </ACTION>
+   </COMMAND>
+</VIEW>
   <VIEW name="configure-view">
     <COMMAND name="sflow" help="enable sflow">
       <PARAM name="collector" help="Collector name" ptype="SUBCOMMAND" mode="subcommand" optional="true">

From 3701f8144fa4bb957858f404fc88790794bea551 Mon Sep 17 00:00:00 2001
From: Garrick He <garrick_he@dell.com>
Date: Thu, 3 Oct 2019 14:29:24 -0700
Subject: [PATCH 4/4] Add missing sFlow configuration commands

* Add missing sFlow configuration commands
* Updated some CLIs to follow CLISH guidelines

Signed-off-by: Garrick He <garrick_he@dell.com>
---
 src/CLI/clitree/cli-xml/interface.xml | 26 ++++++----
 src/CLI/clitree/cli-xml/sflow.xml     | 74 +++++++++++++++++----------
 2 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/src/CLI/clitree/cli-xml/interface.xml b/src/CLI/clitree/cli-xml/interface.xml
index 1de96dd859..d429b75669 100644
--- a/src/CLI/clitree/cli-xml/interface.xml
+++ b/src/CLI/clitree/cli-xml/interface.xml
@@ -365,18 +365,22 @@ limitations under the License.
           </PARAM>
        <ACTION builtin="clish_nop"></ACTION>
        </COMMAND>
-       <COMMAND name="sflow" help="enable sflow">
-            <PARAM name="sampling-rate" help="sFlow sampling rate" ptype="SUBCOMMAND" mode="subcommand" optional="true">
+       <COMMAND name="sflow" help="interface sFlow settings"/>
+            <COMMAND name="sflow sampling-rate" help="Set sampling-rate" ptype="SUBCOMMAND" mode="subcommand">
                 <PARAM name="rate" help="sampling rate" ptype="UINT"/>
-            </PARAM>
-            <PARAM name="admin-status" help="sFlow status for interface" ptype="SUBCOMMAND" mode="subcommand" optional="true">
-            </PARAM>
-            <ACTION builtin="clish_nop"/>
-       </COMMAND>
-       <COMMAND name="no sflow" help="disable sflow">
-            <ACTION builtin="clish_nop"/>
-       </COMMAND>
-
+            	<ACTION builtin="clish_nop"/>
+            </COMMAND>
+            <COMMAND name="sflow enable" help="enable sflow" ptype="SUBCOMMAND" mode="subcommand">
+            	<ACTION builtin="clish_nop"/>
+            </COMMAND>
+       <COMMAND name="no sflow" help="disable sflow"/>
+            <COMMAND name="no sflow sampling-rate" help="set sampling rate to default" ptype="SUBCOMMAND" mode="subcommand">
+                <PARAM name="rate" help="sampling rate" ptype="UINT"/>
+            	<ACTION builtin="clish_nop"/>
+            </COMMAND>
+            <COMMAND name="no sflow enable" help="disable sFlow" ptype="SUBCOMMAND" mode="subcommand">
+            	<ACTION builtin="clish_nop"/>
+            </COMMAND>
        <COMMAND
            name="no switchport"
            help="Remove switchport parameters"
diff --git a/src/CLI/clitree/cli-xml/sflow.xml b/src/CLI/clitree/cli-xml/sflow.xml
index 95dfb5ff67..167badea2f 100644
--- a/src/CLI/clitree/cli-xml/sflow.xml
+++ b/src/CLI/clitree/cli-xml/sflow.xml
@@ -23,35 +23,53 @@ limitations under the License.
     xsi:schemaLocation="http://www.dellemc.com/sonic/XMLSchema
     http://www.dellemc.com/sonic/XMLSchema/clish.xsd"
     >
-
-<VIEW name="enable-view">
-   <COMMAND name="show sflow" help="Show sFlow information">
-         <ACTION> python $SONIC_CLI_ROOT/sonic-cli-sflow.py get_sflow show_sflow.j2 </ACTION>
-   </COMMAND>
-   <COMMAND name="show sflow interface" help="Show sFlow interface information">
-         <ACTION> python $SONIC_CLI_ROOT/sonic-cli-sflow.py get_sflow_interface show_sflow_intf.j2 </ACTION>
-   </COMMAND>
-</VIEW>
-  <VIEW name="configure-view">
-    <COMMAND name="sflow" help="enable sflow">
-      <PARAM name="collector" help="Collector name" ptype="SUBCOMMAND" mode="subcommand" optional="true">
-      	<PARAM name="collector-name" help="Collector name" ptype="STRING"/>
-      	<PARAM name="collector-ip" help="Collector IP address" ptype="STRING"/>
-      	<PARAM name="collector-port" help="Collector port number" ptype="UINT" optional="true"/>
-      </PARAM>
-      <PARAM name="agent-id" help="Collector agent interface" ptype="SUBCOMMAND" mode="subcommand" optional="true">
-      	<PARAM name="interface" help="Interface name" ptype="STRING"/>
-      </PARAM>
-      <ACTION builtin="clish_nop"/>
-      <PARAM name="polling-interval" help="Collector polling interval" ptype="SUBCOMMAND" mode="subcommand" optional="true">
-      	<PARAM name="interval" help="Interval" ptype="UINT"/>
-      </PARAM>
+  <VIEW name="enable-view">
+    <COMMAND name="show sflow" help="Show sFlow information">
+      <ACTION> python $SONIC_CLI_ROOT/sonic-cli-sflow.py get_sflow show_sflow.j2 </ACTION>
+      <xi:include href="include/pipe.xml"/>
     </COMMAND>
-    <COMMAND name="no sflow" help="disable sflow">
-      <PARAM name="collector" help="Collector name" ptype="SUBCOMMAND" mode="subcommand" optional="true">
-      	<PARAM name="collector-name" help="Collector name" ptype="STRING"/>
-      </PARAM>
-      <ACTION builtin="clish_nop"/>
+    <COMMAND name="show sflow interface" help="Show sFlow interface information">
+      <ACTION> python $SONIC_CLI_ROOT/sonic-cli-sflow.py get_sflow_interface show_sflow_intf.j2 </ACTION>
+      <xi:include href="include/pipe.xml"/>
     </COMMAND>
   </VIEW>
+  <VIEW name="configure-view">
+    <COMMAND name="sflow" help="sFlow Configurations"/>
+      <COMMAND name="sflow collector" help="Collector name" ptype="SUBCOMMAND" mode="subcommand">
+        <PARAM name="collector-name" help="Collector name" ptype="STRING"/>
+        <PARAM name="collector-ip" help="Collector IP address" ptype="STRING"/>
+        <PARAM name="collector-port" help="Collector port number" ptype="UINT" optional="true"/>
+        <ACTION builtin="clish_nop"/>
+      </COMMAND>
+      <COMMAND name="sflow enable" help="Enable sFlow" ptype="SUBCOMMAND" mode="subcommand">
+        <ACTION builtin="clish_nop"/>
+      </COMMAND>
+      <COMMAND name="sflow agent-id" help="Collector agent interface" ptype="SUBCOMMAND" mode="subcommand">
+        <PARAM name="interface" help="Interface name" ptype="STRING"/>
+        <ACTION builtin="clish_nop"/>
+      </COMMAND>
+      <COMMAND name="sflow polling-interval" help="Collector polling interval" ptype="SUBCOMMAND" mode="subcommand">
+        <PARAM name="interval" help="Interval" ptype="UINT"/>
+        <ACTION builtin="clish_nop"/>
+      </COMMAND>
+
+      <COMMAND name="no sflow" help="Negate sFlow configurations"/>
+      <COMMAND name="no sflow collector" help="Remove a collector" ptype="SUBCOMMAND" mode="subcommand">
+        <PARAM name="collector-name" help="Collector name" ptype="STRING"/>
+        <PARAM name="collector-ip" help="Collector IP address" ptype="STRING"/>
+        <PARAM name="collector-port" help="Collector port number" ptype="UINT" optional="true"/>
+        <ACTION builtin="clish_nop"/>
+      </COMMAND>
+      <COMMAND name="no sflow enable" help="Disable sFlow" ptype="SUBCOMMAND" mode="subcommand">
+        <ACTION builtin="clish_nop"/>
+      </COMMAND>
+      <COMMAND name="no sflow agent-id" help="Set default agent-id" ptype="SUBCOMMAND" mode="subcommand">
+        <PARAM name="interface" help="Interface name" ptype="STRING"/>
+        <ACTION builtin="clish_nop"/>
+      </COMMAND>
+      <COMMAND name="no sflow polling-interval" help="Set default polling interval" ptype="SUBCOMMAND" mode="subcommand">
+        <PARAM name="interval" help="Interval" ptype="UINT"/>
+        <ACTION builtin="clish_nop"/>
+      </COMMAND>
+  </VIEW>
 </CLISH_MODULE>