From e15b27742cebc4092af7d743c1350f09bd49bb96 Mon Sep 17 00:00:00 2001
From: Tejaswi Goel <Tejaswi_Goel@Dell.com>
Date: Wed, 25 Sep 2019 17:17:32 -0700
Subject: [PATCH] Changes in show port-channel command

Signed-off-by: Tejaswi Goel <Tejaswi_Goel@Dell.com>
---
 src/CLI/actioner/sonic-cli-if.py              | 78 +++++++++----------
 src/CLI/clitree/cli-xml/interface.xml         | 62 ++++++++-------
 src/CLI/clitree/cli-xml/sonic_types.xml       | 14 ++++
 .../renderer/templates/show_portchannel.j2    |  9 ++-
 .../renderer/templates/show_portchannel_id.j2 |  8 --
 5 files changed, 89 insertions(+), 82 deletions(-)
 delete mode 100644 src/CLI/renderer/templates/show_portchannel_id.j2

diff --git a/src/CLI/actioner/sonic-cli-if.py b/src/CLI/actioner/sonic-cli-if.py
index af02afcec8..5fe245442d 100755
--- a/src/CLI/actioner/sonic-cli-if.py
+++ b/src/CLI/actioner/sonic-cli-if.py
@@ -101,50 +101,44 @@ def run(func, args):
     if "PortChannel" in args[0] and func.__name__ == 'patch_openconfig_interfaces_interfaces_interface':
         return
 
-    dummy_data= {
-    "openconfig-interfaces:interface": [
-        {
-            "members": [
-                "Ethernet56",
-                "Ethernet60"
-            ], 
-            "min-links": 2,
-            "mtu": 9100,
-            "admin_status": "up",
-            "oper_status": "down",
-            "name": "PortChannel1"
-        },
-        {
-            "members": [],
-            "min-links": 1,
-            "mtu": 9100,
-            "admin_status": "up",
-            "oper_status": "down",
-            "name": "PortChannel2"
-        }, 
-        {
-            "members": [],
-            "min-links": 1,
-            "mtu": 9100, 
-            "admin_status": "up",
-            "oper_status": "down",
-            "name": "PortChannel3"
-        }
-    ]
-}
-
-    #show given port-channel details
-    if "PortChannel" in args[0] and func.__name__ == 'get_openconfig_if_aggregate_interfaces_interface_aggregation_state':
-        for dict in dummy_data['openconfig-interfaces:interface']:
-            if dict["name"] == "PortChannel3":
-                show_cli_output("show_portchannel_id.j2", dict)
-                return
-        print("%Error: Entry not found")
-        return
-
     #show port-channels summary
     if "PortChannel" in args[0] and func.__name__ == 'get_openconfig_interfaces_interfaces':
-        show_cli_output("show_portchannel.j2", dummy_data)
+
+        dummy_resp= {
+            "PORTCHANNEL": [
+                {
+                    "members": [
+                        "Ethernet56",
+                        "Ethernet60"
+                    ],
+                    "min-links": 2,
+                    "mtu": 9100,
+                    "admin_status": "up",
+                    "oper_status": "down",
+                    "name": "PortChannel1",
+                    "id": "1"
+                },
+                {
+                    "members": [],
+                    "min-links": 1,
+                    "mtu": 9100,
+                    "admin_status": "up",
+                    "oper_status": "down",
+                    "name": "PortChannel12",
+                    "id": "12"
+                },
+                {
+                    "members": [],
+                    "min-links": 1,
+                    "mtu": 9100, 
+                    "admin_status": "up",
+                    "oper_status": "down",
+                    "name": "PortChannel3",
+                    "id": "3"
+                }
+            ]
+        }
+        show_cli_output(args[1], dummy_resp)
         return
 
     #add members to port-channel
diff --git a/src/CLI/clitree/cli-xml/interface.xml b/src/CLI/clitree/cli-xml/interface.xml
index a72827413e..10cbe9398b 100644
--- a/src/CLI/clitree/cli-xml/interface.xml
+++ b/src/CLI/clitree/cli-xml/interface.xml
@@ -98,23 +98,15 @@ limitations under the License.
 
    <COMMAND
        name="show port-channel"
-       help="Show vlan commands"
+       help="LAG status and configuration"
        ptype="SUBCOMMAND"
-       mode="subcommand"
-       >
-       <PARAM
-          name="lag-id"
-          help="PortChannel identifier"
-          ptype="UINT"
-          optional="true"
-          >
-       </PARAM>
-       <ACTION> 
-            if test "${lag-id}" = ""; then&#xA;
-                python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces PortChannel show_portchannel.j2&#xA;
-            else&#xA;
-                python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_if_aggregate_interfaces_interface_aggregation_state PortChannel${lag-id} show_portchannel_id.j2#xA;
-            fi
+       mode="subcommand" />
+    <COMMAND
+        name="show port-channel summary"
+        help="LAG status and configurationn"
+        mode="subcommand">
+       <ACTION>
+            python $SONIC_CLI_ROOT/sonic-cli-if.py get_openconfig_interfaces_interfaces PortChannel show_portchannel.j2
        </ACTION>
    </COMMAND>
 
@@ -163,7 +155,7 @@ limitations under the License.
 
     <COMMAND
         name="interface port-channel"
-        help="port-channel Interface Configuration"
+        help="Port channel Interface Configuration"
         mode="subcommand"
         ptype="SUBCOMMAND"
         view="configure-lag-view"
@@ -171,8 +163,8 @@ limitations under the License.
         >
         <PARAM
                 name="lag-id"
-                help="port-channel identifier(1-128)"
-                ptype="UINT"
+                help="PortChannel identifier(1-128)"
+                ptype="LAG_ID"
                 >
         </PARAM>
         <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_interfaces_interfaces_interface PortChannel${lag-id}</ACTION>
@@ -210,7 +202,7 @@ limitations under the License.
                 <PARAM
                     name="lag-id"
                     help="port-channel identifier(1-128)"
-                    ptype="UINT"
+                    ptype="LAG_ID"
                 />
              </PARAM>
          </PARAM>
@@ -261,14 +253,25 @@ limitations under the License.
             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="channel-group"
+        help="Configure port channel parameters"
+        ptype="SUBCOMMAND"
+        mode="subcommand"/>
+    <COMMAND
+        name="channel-group mode"
+        help="Set the LACP actor mode"
+        mode="subcommand"
+        ptype="SUBCOMMAND" />
         <COMMAND
-            name="channel-group"
-            help="Configure port channel parameters">
-	    <PARAM 
-                name="lag-id" 
+            name="channel-group mode active"
+            help="Channeling mode by default set to ACTIVE">
+            <PARAM
+                name="lag-id"
                 help="Specify a port channel number"
-                ptype="UINT" />
-	    <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_if_aggregate_interfaces_interface_ethernet_config_aggregate_id ${iface} ${lag-id} </ACTION>
+                ptype="LAG_ID"/>
+            <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_if_aggregate_interfaces_interface_ethernet_config_aggregate_id ${iface} ${lag-id} </ACTION>
         </COMMAND>
         <COMMAND
             name="no channel-group"
@@ -438,7 +441,7 @@ limitations under the License.
         <PARAM 
             name="min-links"
             help="Configure the minimum number of links in a port-channel"
-            ptype="UINT" />
+            ptype="MIN_LINK" />
         <ACTION>python $SONIC_CLI_ROOT/sonic-cli-if.py patch_openconfig_if_aggregate_interfaces_interface_aggregation_config_min_links ${po_id} ${min-links} </ACTION>
     </COMMAND>
     <COMMAND
@@ -463,10 +466,12 @@ limitations under the License.
     <COMMAND 
         name="shutdown"
         help="Disable the interface">
+     <ACTION builtin="clish_nop"></ACTION>
     </COMMAND>
     <COMMAND 
         name="no shutdown"
         help="Enable the interface">
+     <ACTION builtin="clish_nop"></ACTION>
     </COMMAND>
     <COMMAND
         name="ip"
@@ -477,7 +482,6 @@ limitations under the License.
         help="Interface Internet Protocol config commands"
         >
     </COMMAND>
-
     <COMMAND
         name="ip address"
         help="IP address" >
@@ -485,6 +489,7 @@ limitations under the License.
             name="addr"
             help="IP address with mask"
             ptype="IP_ADDR_MASK" />
+     <ACTION builtin="clish_nop"></ACTION>
     </COMMAND>
 
     <COMMAND
@@ -495,6 +500,7 @@ limitations under the License.
             name="addr"
             help="IP address"
             ptype="IP_ADDR" />
+     <ACTION builtin="clish_nop"></ACTION>
     </COMMAND>
     </VIEW>
 </CLISH_MODULE>
diff --git a/src/CLI/clitree/cli-xml/sonic_types.xml b/src/CLI/clitree/cli-xml/sonic_types.xml
index 6b33089605..09a23fe5ef 100644
--- a/src/CLI/clitree/cli-xml/sonic_types.xml
+++ b/src/CLI/clitree/cli-xml/sonic_types.xml
@@ -41,6 +41,20 @@ limitations under the License.
         help=""
         />
     <!--=======================================================-->
+    <PTYPE
+        name="LAG_ID"
+        method="integer"
+        pattern="0..9999"
+        help=""
+        />
+    <!--=======================================================-->
+    <PTYPE
+        name="MIN_LINK"
+        method="integer"
+        pattern="1..255"
+        help=""
+        />
+    <!--=======================================================-->
     <PTYPE
         name="UNIT_ID"
         method="integer"
diff --git a/src/CLI/renderer/templates/show_portchannel.j2 b/src/CLI/renderer/templates/show_portchannel.j2
index a0f45a4e56..d1dba6e31e 100644
--- a/src/CLI/renderer/templates/show_portchannel.j2
+++ b/src/CLI/renderer/templates/show_portchannel.j2
@@ -1,9 +1,10 @@
 {% set just_var = 2 %}
+Flags:  D - Down
+        U - Up (port-channel)
 
-Flags: A - Active, Dw - Oper status down
 {{'----------------------------------------------------------------------------------------------------------------------------'}}
-{{'%-20s'|format("Port-Channel")}}{{'%-20s'|format("min-links")}}{{'%-20s'|format("Protocol")}}{{'%-15s'|format("MTU")}}{{'%-15s'|format("Admin")}}{{'%-15s'|format("port-members")}}
+{{'%-20s'|format("Group")}}{{'%-30s'|format("Port-Channel")}}{{'%-20s'|format("Type")}}{{'%-15s'|format("Protocol")}}{{'%-15s'|format("Member Ports")}}
 {{'----------------------------------------------------------------------------------------------------------------------------'}}
-{% for dict in json_output['openconfig-interfaces:interface'] %} 
-{{'%-20s'|format(dict['name']|string)}}{{'%-20s'|format(dict['min-links'])}}{{'%-20s'|format("LACP(A)(Dw)")}}{{'%-15s'|format(dict['mtu'])}}{{'%-15s'|format(dict['admin_status'])}}{{'%-15s'|format(dict['members']|string|replace("[", "")|replace("]", ""))}}
+{% for dict in json_output['PORTCHANNEL'] %}
+{{'%-20s'|format(dict['id']|string)}}{{'%-18s'|format(dict['name'])}}{{'%-12s'|format("(D)")}}{{'%-20s'|format("Eth")}}{{'%-15s'|format("LACP")}}{{'%-15s'|format(dict['members']|string|replace("[", "")|replace("]", ""))}}
 {% endfor %}
diff --git a/src/CLI/renderer/templates/show_portchannel_id.j2 b/src/CLI/renderer/templates/show_portchannel_id.j2
deleted file mode 100644
index 20ccd97758..0000000000
--- a/src/CLI/renderer/templates/show_portchannel_id.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-{% set just_var = 2 %}
-
-Flags: A - Active, Dw - Oper status down
-{{'----------------------------------------------------------------------------------------------------------------------------'}}
-{{'%-20s'|format("Port-Channel")}}{{'%-20s'|format("min-links")}}{{'%-20s'|format("Protocol")}}{{'%-15s'|format("MTU")}}{{'%-15s'|format("Admin")}}{{'%-15s'|format("port-members")}}
-{{'----------------------------------------------------------------------------------------------------------------------------'}}
-{% set dict = json_output %}
-{{'%-20s'|format(dict['name']|string)}}{{'%-20s'|format(dict['min-links'])}}{{'%-20s'|format("LACP(A)")}}{{'%-15s'|format(dict['mtu'])}}{{'%-15s'|format(dict['admin_status'])}}{{'%-15s'|format(dict['members']|string|replace("[", "")|replace("]", ""))}}