sync from broadcom_sonic_4.x_share to dell_sonic_4.x_share - 0726 (#147)

* [JIRA SONIC-54751] Flex-DPB UMF changes - Rejecting config when max ports per pipe-line is reached. - Support some new modes in different formats - 1x50G-PAM and 1x50G-NRZ Signed-off-by: Prasanth Kunjum Veettil <[email protected]> Change-Id: I1305e237f000434f7c837d11b9977246df30efec * [JIRA SONIC-54751] FlexDPB - modifying the show interface breakout modes command to display the pipe. Signed-off-by: Prasanth Kunjum Veettil <[email protected]> Change-Id: Icadd5afd3729f65180a99cb8133fae47e090849c * [JIRA SONIC-54751] FlexDPB - Making the CLI output better when there are too many breakout modes. Signed-off-by: Prasanth Kunjum Veettil <[email protected]> Change-Id: I38ec87ef6025978dbd88d7d5a2fa9ff7209ac969 * [JIRA SONIC-54751] Flex-DPB UM Adding CLI "show interface breakout resources" Signed-off-by: Prasanth Kunjum Veettil <[email protected]> Change-Id: I8b9658b289557e0c708fa02f65e392b112c11609 * [JIRA SONIC-59502] User name field in not applicable cases should be displayed as Not Applicable instead of empty. Change-Id: Ie96be7eacf13a9ebe4c9e95abbd6a88f1e47533f * [JIRA SONIC-60245] Field to display the operational value of the session timeout in the output of the show authentication clients. Change-Id: Ieddba8ac30568d55197fe1ce172b8cc208ffdc30 * [JIRA SONIC-56405] Added support for pac configuration over range of interfaces. Change-Id: I0ce68fc2497fcc45fcd0c15d6113542967d974c2 * [JIRA SONIC-61478] KLISH: add 50G AN support Signed-off-by: Dante Su <[email protected]> Change-Id: If6c05a49f18469858b66c58cd456e7b4f6a3c0e0 * [JIRA SONIC-61803] GetTablePattern ExistKeysPattern API in DB Layer - Added Statistics Change-Id: I3732e78e13881842e9394a571788abe3ab1ac337 * [JIRA SONIC-61314] go.sum update Change-Id: I7576ffc6933f9727747d3463b022c23ad7def609 * [JIRA SONIC-61807] - Model Identity as enumeration Used Enum to represent identities This will allow swagger ui to show drop-down in case of parameters. Change-Id: I8e438545d0b28c9c2ee545a2704366da512b5c74 * [JIRA SONIC-60508]: ospf neighbor details template fix Change-Id: Iee1dbdc72e02a6d23e0dfac71220843be3730ddd * [JIRA SONIC-61879] PAC - Added required changes for config knobs dymanic_vlan_enable, vlan_assign_enable. Change-Id: Ib38db8f2e9917b4261fc709e1548ea78f0196453 * [JIRA SONIC-61168] Klish support for ND config commands Change-Id: I7227cb99ecf82bddac169c3b544bd28758f40c3b * [JIRA SONIC-61223] With user added explicit snooping configuration on Vlan, actioner has called PATCH with default value for the no form of the user configuration, this has resulted in running configuration showing default value when there is no explicit configuration for the default - Fixed actioner script to trigger DELETE for the snooping configuration instead of PATCH with the default values. - Fix added in l2mcmgrd to fill snooping configuration IPC message by reading redisDB update instead of keeping separate local cache for snooping configurations which comes before snooping enable. Change-Id: I3ace4e6eca5cb7608d48bb9e3a11bb1c4976e4d9 * [JIRA SONIC-61948] - Using oc-yang for dhcp snooping trusted port configuration in Klish Change-Id: I33c811e9316b552b08cdbc12489c73806f4e3e95 * [JIRA SONIC-54751] Flex DPB - PAM/NRZ generic lane count approach - System level max ports - Lane count notation translation, display, config display Signed-off-by: Prasanth Kunjum Veettil <[email protected]> Change-Id: If8b5429e732fce5342d960b0980a250f75a5ff8c * [JIRA SONIC-54751] Flex DPB - 20G speed support Signed-off-by: Prasanth Kunjum Veettil <[email protected]> Change-Id: I8a0f581c70c0aa6b30e76a64fe4262d44f828568 * [JIRA SONIC-62134] - Corrected the sag xml order to come after vrf config Change-Id: I0d463d9d16e014d39b343d14d36ff801019017d4 * [JIRA SONIC-61997] using escap_chars option to skip '\' for special chars Change-Id: I3b654ea105931c0e3605b84ed5db560cb5e13e95 * [JIRA SONIC-62061] validating tag field of SNMP_SERVER_TARGET entry, before using it Change-Id: I504812121a85e83693d00dae76d5321583b1b7a0 * [JIRA SONIC-61168] Klish support for show command Change-Id: Ia2e6d4d8b8ae598af3cdcdbbb051bcddc8625bbc * [JIRA SONIC-62420] Added changes to not format debug logs until its enabled to speed up execuction of actioners for ACL and FBS Change-Id: Ibbad404d7f6890d03b99d63f26f9ddd36eab728d * [JIRA SONIC-54751] Flex DPB - rename lane-count to total-lane-count Signed-off-by: Prasanth Kunjum Veettil <[email protected]> Change-Id: I2ecb8e0a5e6ca0ced86bb795ef2a98a155c25fdc * [JIRA SONIC-60841] The NTP client must support the "prefer" option and provide CLI for enabling it Change-Id: I724543e858a256032fa9d45a5982a4124266a859 * [JIRA SONIC-61168] Klish support for modifying help string associated with config commands to make it more descriptive Change-Id: I9377ef77a093c3b0ed5269a1df874965ae6a3298 * [JIRA SONIC-61879] PAC - Added required UI changes for Auth Fail Retry config command. Change-Id: Id66b4d31e6a509816f4d5b598c005b109397856e * [JIRA SONIC-60945] Show redirect ACL binding in show access-group CLI Change-Id: I56a2f7bce3a34eec51c4371210a4379ee8730589 * [JIRA SONIC-62672] Fix exception when per interface acl mode is enabled Change-Id: If924f71bc4e614ff948351a94a3a26b9ef18df6b * [JIRA SONIC-62796] SONIC_4.1.0 - KLISH CLI: Add 200G support to 'show interface advertise' Signed-off-by: Dante Su <[email protected]> Change-Id: Ic66c272a8bc8826480365eb5780ef4db2aa4f1ca * [JIRA SONIC-62847] Clish pre-exec hook * Added a new pre-exec hook, which gets called before executing the ACTION or CONFIG handlers * Hook function receives the current command context * Command execution is aborted if hook returns non-zero value * Added a skeleton implementation in clish plugin * Few utility functions for the future pre-hook implementation char *get_uname(clish_context_t *c) char *get_masked_line(clish_context_t *c) Change-Id: I44a0a5df4419fb51ad90ff9898db6b9534ef5eb1 * [JIRA SONIC-62732] [JIRA SONIC-62730] : 1.Fix jinja template to show proper state for helper strict lsa checking Change-Id: I313baac45137b46eab821fb5e17234ca365270a5 * [JIRA SONIC-62280] Added COA klish CLI changes. Change-Id: Ie7498ad7451763256641862da4d5ba12efdc750a * [JIRA SONIC-61879] Modified authentication fail retry default value to 1, made minor corrections in authmgr appl. Change-Id: I1cef51a96991d22a54e407c0b6dd60d0edef055c * [JIRA SONIC-62875] Fix processing of dynamic acls and redirect acls when per interface acl counter mode is enabled Change-Id: Ic8d3e0c8b16ac9785b8f9c687e603c3f8659cd77 * [JIRA SONIC-61950]: Dot1x/MAB timers config support Change-Id: I022b1d75b183e3028db5c083b1d70a971616a597 * [JIRA SONIC-62911] PTP 1-step and TH3 support - UMF changes Signed-off-by: Prasanth Kunjum Veettil <[email protected]> Change-Id: Ib46e89a9f82c73b8e8af5b53d479258f424a51f5 * [JIRA SONIC-63025] SONIC_4.1.0 - KLISH: add the missing link-training status support Signed-off-by: Dante Su <[email protected]> Change-Id: Icb05d69abd3a9042d5d2838868fcbde7871caf09 * [JIRA SONIC-63081] SONIC_4.1.0 - KLISH/YANG: Reverting SONIC-51042 to use float with precision 2 in DOM values Signed-off-by: Dante Su <[email protected]> Change-Id: I200df89d1dcc234965eb87a27b5c6df8e28c3f0a * [JIRA SONIC-62637] : 1. Added support for -:show ip ospf database opaque-link 2.Support opaque-link lsa summary for -:show ip ospf database Change-Id: I631ca9918bb90630420a94caed1603d673923e81 * [JIRA SONIC-62953] added check for security-nme key before accessing it. Change-Id: I5ff72ed7a4b183cf939455e2afba97d0f964d618 * [JIRA SONIC-63000] Portchannel min-links related changes Change-Id: I3ab9f27c8b6fe5266eddfc60295d0fa3bb806557 * [JIRA SONIC-63158] Kernel 5.10 does not support l3mdev cgroups, instead cgroups with BPF programs are used to achieve this. Since kernel vrf support now adds CGROUPS with BPF which iproute2 utils uses in ip vrf exec commands. Update SONiC scripts to "ip vrf exec" from cgexec. Change-Id: I8df96902b4d933462fa23cb14100caf5f432de6f * [JIRA SONIC-62104] SONIC_4.1.0 - EVPN Multihoming Task - KLISH system-mac and evpn ethernet segment Change-Id: Iad4153e21c9f67b0326aced909f7c9d07ef67429 * [JIRA SONIC-63064] SONIC_4.1.0 - EVPN Multihoming Task - mclag domain config checking Change-Id: I8bc1619034e37fd99fdbac8a096fbe51de0d85b3 * [JIRA SONIC-62780] SONIC_4.1.0 - Add interface Portchannel range support for system-mac configuration Change-Id: I10bec6d70e1eaff6af16de33c12f3dbc1aa47433 * [JIRA SONIC-63320] Added UI support for multi-vrf functionality of TAM collectors. Change-Id: Ie44af58c8aab48b54b43aa843ccf5ea7870db479 * [JIRA SONIC-63333] bgp clis - disable-ead-evi-rx, disable-ead-evi-tx, use-es-l3nhg Change-Id: I12470dbf82495e14cc3638e9b329897d5d9156f5 * [JIRA SONIC-63377] TCAM Keyprofile CLI Changes Few key-profile names are missing in TCAM CLI. Code changes has been done to add the missing key-profile names in TCAM CLI. Change-Id: I249cd34b6266e6c35e79b77d5fb9d95a0dccaf04 * [JIRA SONIC-63000] Portchannel fallback config updated related changes Change-Id: I9fb8885f8f055ffe7a8556788f1e8b50ac5fb73f * [JIRA SONIC-63408] - Fix CLI docgen issue Re-Enaled cli docgen made it to execute with python3 always Fixed unicode issues. Change-Id: I611133abbf0d389172768153e6e3fc2fa2f1b996 * [JIRA SONIC-63053] : 1.Add ospf gr prepartion status to ospf global state info 2.Fixed a template issue Change-Id: I0a875f2b7b520b535f564061eb92427be8db26dd * [JIRA SONIC-62082] Support for clearing evpn duplicate address based on IP address. Change-Id: I3f0ab0428cca4e37285ffa12416d7755cc4ce020 * [JIRA SONIC-63000] Portchannel fast-rate config updated related changes Change-Id: If154af9ada867067aee3b631170e1a7c815d9f05 * [JIRA SONIC-62800] Invoking new statistics detail URLs. Change-Id: I29290a17cc85223c6ba5f23f4d64cb9c29c08380 * [JIRA SONIC-63378] Fix ACL description update to not include double quotes, ACL subintf binding to use subintf index, added exception handling to prevent exception in 1 show running callback to impact other callbacks Change-Id: Ib796610c3fe4bfb1dee090518c564f2069e95d5c * [JIRA SONIC-62913] Unable to remove tacacs-server host and observing "% Error: Client is not authorized to perform this operation" Change-Id: I972174c64374ab198678e7722bcf8822cced1830 * [JIRA SONIC-63000] Fixing the show-configuration and show-running-configuration for the config updated related changes Change-Id: I2c4e4a5a02a3508e86d8111b7dd1a66db4caf548 * Fixing merge conflict Co-authored-by: sonicmergeuser <[email protected]> Co-authored-by: Prasanth Kunjum Veettil <[email protected]> Co-authored-by: Sravani Maddukuri <[email protected]> Co-authored-by: Shiva Kumar Boddula <[email protected]> Co-authored-by: Dante Su <[email protected]> Co-authored-by: Sonic Build <[email protected]> Co-authored-by: Arun Barboza <[email protected]> Co-authored-by: Sachin Holla <[email protected]> Co-authored-by: Faraaz <[email protected]> Co-authored-by: Ramachandran Sathianandan <[email protected]> Co-authored-by: sudhanshukumar22 <[email protected]> Co-authored-by: Ashok Krishnegowda <[email protected]> Co-authored-by: Akhilesh Samineni <[email protected]> Co-authored-by: suresh-rupanagudi <[email protected]> Co-authored-by: Lakshmi Sruthy <[email protected]> Co-authored-by: Abhishek Dharwadkar <[email protected]> Co-authored-by: Asha Behera <[email protected]> Co-authored-by: Rama Chandra Reddy Gaddam <[email protected]> Co-authored-by: madhukar-kamarapu <[email protected]> Co-authored-by: Preetham Singh <[email protected]> Co-authored-by: leeprecy <[email protected]> Co-authored-by: Mayank Maheshwari <[email protected]> Co-authored-by: karthik raj <[email protected]> Co-authored-by: Ashok Narayanasamy <[email protected]> Co-authored-by: Kishore Kunal <[email protected]> Co-authored-by: Phanindra TV <[email protected]> Co-authored-by: Prabhu Sreenivasan <[email protected]> Co-authored-by: SONiC Syncbot <[email protected]>
project-arlo · Jul 28, 2022 · 48733aa · 48733aa
1 parent fcebac0
commit 48733aa
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 32 deletions.
diff --git a/CLI/actioner/show_config_interface.py b/CLI/actioner/show_config_interface.py
@@ -190,18 +190,11 @@ def show_interface_portchannel(render_tables):
                 if ifname_key == portchannel["name"]:
                     cmd_str = "interface PortChannel " + ifname_key.lstrip(
                         "PortChannel")
-                    if "min_links" in portchannel:
-                        cmd_str += " min-links "
-                        cmd_str += str(portchannel["min_links"])
                     if "static" in portchannel:
                         if portchannel["static"]:
                             cmd_str += " mode on"
                         else:
                             cmd_str += " mode active"
-                    if "fallback" in portchannel and portchannel["fallback"]:
-                        cmd_str += " fallback"
-                    if "fast_rate" in portchannel and portchannel["fast_rate"]:
-                        cmd_str += " fast_rate"
 
     return "CB_SUCCESS", cmd_str
 
@@ -217,7 +210,18 @@ def show_if_lag_config(render_tables):
                 "sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST"]
             if "name" in portchannel:
                 if ifname_key == portchannel["name"]:
+                    if "min_links" in portchannel:
+                        cmd_str += ";"
+                        cmd_str += "min-links "
+                        cmd_str += str(portchannel["min_links"])
+                    if "fast_rate" in portchannel and (portchannel["fast_rate"] == True):
+                        cmd_str += ";"
+                        cmd_str += "fast_rate"
+                    if "fallback" in portchannel and (portchannel["fallback"] == True):
+                        cmd_str += ";"
+                        cmd_str += "fallback"
                     if "graceful_shutdown_mode" in portchannel:
+                        cmd_str += ";"
                         if portchannel["graceful_shutdown_mode"] == "enable":
                             cmd_str += "graceful-shutdown"
                         if portchannel["graceful_shutdown_mode"] == "disable":

diff --git a/CLI/actioner/sonic_cli_acl.py b/CLI/actioner/sonic_cli_acl.py
@@ -305,7 +305,7 @@ def __create_acl_rule_l2(args):
             next_item += 2
         elif args[next_item] == 'remark':
             full_cmd = os.getenv('USER_COMMAND', None)
-            match = re.search('remark (["]?.*["]?)', full_cmd)
+            match = re.search('remark ["]?([^"]+)["]?', full_cmd)
             if match:
                 body["openconfig-acl:acl-entry"][0]["config"]['description'] = match.group(1)
             next_item = len(args)
@@ -457,7 +457,7 @@ def __create_acl_rule_ipv4_ipv6(args):
             next_item += 2
         elif args[next_item] == 'remark':
             full_cmd = os.getenv('USER_COMMAND', None)
-            match = re.search('remark (["]?.*["]?)', full_cmd)
+            match = re.search('remark ["]?([^"]+)["]?', full_cmd)
             if match:
                 body["openconfig-acl:acl-entry"][0]["config"]['description'] = match.group(1)
             next_item = len(args)
@@ -546,7 +546,7 @@ def __handle_interface_acl_bind_request(args):
             },
             "openconfig-acl:interface-ref": {
                 "config": {
-                    "interface": args[2]
+                    "interface": args[2].split(".")[0]
                 }
             },
             "openconfig-acl:ingress-acl-sets": {
@@ -568,7 +568,7 @@ def __handle_interface_acl_bind_request(args):
             },
             "openconfig-acl:interface-ref": {
                 "config": {
-                    "interface": args[2]
+                    "interface": args[2].split(".")[0]
                 }
             },
             "openconfig-acl:egress-acl-sets": {
@@ -584,6 +584,9 @@ def __handle_interface_acl_bind_request(args):
                 ]
             }}
 
+    if "." in args[2]:
+        body["openconfig-acl:interface-ref"]["config"]["subinterface"] = int(args[2].split(".")[1])
+
     log.log_debug(str(body))
     return acl_client.post(keypath, body)
 
@@ -743,7 +746,7 @@ def set_acl_remark_request(args):
     keypath = cc.Path('/restconf/data/openconfig-acl:acl/acl-sets/acl-set={acl_name},{acl_type}/config/description',
                       acl_name=args[0], acl_type=args[1])
     full_cmd = os.getenv('USER_COMMAND', None)
-    match = re.search('remark (["]?.*["]?)', full_cmd)
+    match = re.search('remark ["]?([^"]+)["]?', full_cmd)
     if match:
         body = {"description": match.group(1)}
         return acl_client.patch(keypath, body)
@@ -755,7 +758,7 @@ def __set_acl_rule_remark(args):
         acl_name=args[0], acl_type=args[1], sequence_id=args[2])
 
     full_cmd = os.getenv('USER_COMMAND', None)
-    match = re.search('remark (["]?.*["]?)', full_cmd)
+    match = re.search('remark ["]?([^"]+)["]?', full_cmd)
     if match:
         body = {"description": match.group(1)}
 
@@ -1078,7 +1081,11 @@ def __parse_acl_entry(data, acl_entry, acl_type):
         pass
 
     try:
-        data[seq_id]['description'] = acl_entry['state']['description']
+        descr = acl_entry['state']['description']
+        if " " in descr and descr[0] != '"':
+            data[seq_id]['description'] = f'"{descr}"'
+        else:
+            data[seq_id]['description'] = descr
     except KeyError:
         pass
 
@@ -1117,7 +1124,11 @@ def __convert_oc_acl_set_to_user_fmt(acl_set, data):
     data[acl_type][acl_name]['rules'] = OrderedDict()
 
     try:
-        data[acl_type][acl_name]['description'] = acl_set['state']['description']
+        descr = acl_set['state']['description']
+        if " " in descr and descr[0] != '"':
+            data[acl_type][acl_name]['description'] = f'"{descr}"'
+        else:
+            data[acl_type][acl_name]['description'] = descr
     except KeyError:
         pass
 

diff --git a/CLI/actioner/sonic_cli_network_tools.py b/CLI/actioner/sonic_cli_network_tools.py
@@ -32,7 +32,7 @@ def do_cmd(args, func, vrfName):
 
     if len(vrfName) > 0:
         if vrfName.lower() == "mgmt":
-            cmd = "sudo cgexec -g l3mdev:" + vrfName + " " + func + " " + args
+            cmd = "sudo /usr/bin/ip vrf exec " + vrfName + " " + func + " " + args
         else:
             cmd = func + " " + intfSwitch + " " + vrfName + " " + args
     else:

diff --git a/CLI/actioner/sonic_cli_show_config.py b/CLI/actioner/sonic_cli_show_config.py
@@ -1038,7 +1038,10 @@ def render_cli_config(view_name="", view_keys={}):
             for module_cb in set(modules):
                 mod_name = inspect.getmodule(module_cb).__name__
                 DB_Cache[mod_name] = {}
-                module_cb(context, DB_Cache[mod_name])
+                try:
+                    module_cb(context, DB_Cache[mod_name])
+                except Exception as e:
+                    showrun_log(logging.ERROR, "Callback {} encountered exception {} ", module_cb, e)
     except Exception as e:
         showrun_log(logging.ERROR, "Exception {} ", e)
 

diff --git a/CLI/actioner/sonic_cli_show_ospfv2.py b/CLI/actioner/sonic_cli_show_ospfv2.py
@@ -48,6 +48,24 @@ def generate_show_ip_ospf(vrf):
     else:
         print("% OSPF instance not found")
         return
+
+    keypath = cc.Path(
+        "/restconf/data/openconfig-network-instance:network-instances/network-instance={name}/protocols/protocol=OSPF,ospfv2/ospfv2/global/graceful-restart/state",
+        name=vrfName,
+    )
+    response = api.get(keypath)
+    if response.ok():
+        if response.content is not None:
+            # Get Command Output
+            api_response = response.content
+            if ("openconfig-network-instance:state" in api_response
+                    and api_response["openconfig-network-instance:state"] is
+                    not None):
+                api_response[
+                        "openconfig-network-instance:graceful_restart_state"] = api_response.pop(
+                                "openconfig-network-instance:state")
+                dlist.append(api_response)
+
     keypath = cc.Path(
         "/restconf/data/openconfig-network-instance:network-instances/network-instance={name}/protocols/protocol=OSPF,ospfv2/ospfv2/global/timers/spf/state",
         name=vrfName,

diff --git a/CLI/clitree/cli-xml/interface.xml b/CLI/clitree/cli-xml/interface.xml
@@ -1946,18 +1946,14 @@ limitations under the License.
     </COMMAND>
     <COMMAND
         name="min-links"
-        help="Configure min-links for the portchannel"
-        dbpath="sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST/min_links={min_links}">
+        help="Configure min-links for the portchannel">
       <PARAM name="min_links" help="Enter portchannel min-links value" ptype="RANGE_1_32" />
-      <ACTION builtin="clish_restcl">oper=PATCH url=/restconf/data/sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST=${po_name}/min_links body={"sonic-portch\
-      annel:min_links": ${min_links}}</ACTION>
+      <ACTION builtin="clish_restcl">oper=PATCH url=/restconf/data/sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST=${po_name}/min_links body={"sonic-portchannel:min_links": ${min_links}}</ACTION>
     </COMMAND>
     <COMMAND
         name="no min-links"
-        help="Configure default min-links for the portchannel"
-        dbpath="sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST/min_links={min_links}">
-      <ACTION builtin="clish_restcl">oper=PATCH url=/restconf/data/sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST=${po_name}/min_links body={"sonic-port\
-      channel:min_links": 1}
+        help="Configure default min-links for the portchannel">
+      <ACTION builtin="clish_restcl">oper=PATCH url=/restconf/data/sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST=${po_name}/min_links body={"sonic-portchannel:min_links": 1}
       </ACTION>
     </COMMAND>
 
@@ -1991,17 +1987,22 @@ limitations under the License.
 
     <COMMAND
         name="fallback"
-        help="Configure fallback mode for the portchannel"
-        dbpath="sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST/fallback=true">
+        help="Configure fallback mode for the portchannel">
       <ACTION builtin="clish_restcl">oper=PATCH url=/restconf/data/sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST=${po_name}/fallback body={"sonic-portchannel:fallback": true} </ACTION>
     </COMMAND>
     <COMMAND
         name="no fallback"
-        help="Reset fallback mode for the portchannel"
-        dbpath="sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST/fallback=false">
+        help="Reset fallback mode for the portchannel">
       <ACTION builtin="clish_restcl">oper=PATCH url=/restconf/data/sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST=${po_name}/fallback body={"sonic-portchannel:fallback": false} </ACTION>
     </COMMAND>
 
+    <COMMAND name="fast_rate" help="Configure LACP fast rate mode for the portchannel">
+      <ACTION builtin="clish_restcl">oper=PATCH url=/restconf/data/sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST=${po_name}/fast_rate body={"sonic-portchannel:fast_rate": true} </ACTION>
+    </COMMAND>
+    <COMMAND name="no fast_rate" help="Reset LACP fast rate mode for the portchannel">
+      <ACTION builtin="clish_restcl">oper=PATCH url=/restconf/data/sonic-portchannel:sonic-portchannel/PORTCHANNEL/PORTCHANNEL_LIST=${po_name}/fast_rate body={"sonic-portchannel:fast_rate": false} </ACTION>
+    </COMMAND>
+
     </VIEW> <!-- End of Configure View for PortChannel-->
 
     <VIEW

diff --git a/CLI/renderer/templates/show_ip_ospf.j2 b/CLI/renderer/templates/show_ip_ospf.j2
@@ -9,7 +9,7 @@
         'asbr_summary_lsa_checksum': "0", 'nssa_lsa_count': "0",'nssa_lsa_checksum': "0", 'opaque_link_lsa_count': "0", 'opaque_link_lsa_checksum': "0", 
         'opaque_area_lsa_count': "0", 'opaque_lsa_checksum': "0", 'areas_info': "", 'area_exists':"False", 'abrtype': 'None', 'vlink_count' : '0', 'stub_str':'',
         'shortcut_str': 'Default', 'sbit_str': 'no', 'stubAdvertisement': False,
-        'preShutdownEnabledSecs': 0, 'postShutdownEnabledSecs': 0 } %}
+        'preShutdownEnabledSecs': 0, 'postShutdownEnabledSecs': 0, 'grSupport': False, 'grPrepareInProgress': False} %}
 {% set ospf_global_list = json_output  %}
 {% for list_elem in ospf_global_list %}
 {% if 'vrfName' in list_elem  %}
@@ -28,6 +28,12 @@ VRF Name: {{list_elem['vrfName']}}
 {% if vars.update({'opaque_capability':'OpaqueCapability flag is disabled'}) %}{% endif -%}
 {% endif -%}
 {% endif -%}
+{% if 'openconfig-network-instance:graceful_restart_state' in list_elem and 'enabled' in list_elem['openconfig-network-instance:graceful_restart_state'] and list_elem['openconfig-network-instance:graceful_restart_state']['enabled'] == True %}
+{% if vars.update({'grSupport':list_elem['openconfig-network-instance:graceful_restart_state']['enabled']}) %}{% endif -%}
+{% endif -%}
+{% if 'openconfig-network-instance:graceful_restart_state' in list_elem and 'openconfig-ospfv2-ext:gr-prepare-in-progress' in list_elem['openconfig-network-instance:graceful_restart_state'] and list_elem['openconfig-network-instance:graceful_restart_state']['openconfig-ospfv2-ext:gr-prepare-in-progress'] == True %}
+{% if vars.update({'grPrepareInProgress':list_elem['openconfig-network-instance:graceful_restart_state']['openconfig-ospfv2-ext:gr-prepare-in-progress']}) %}{% endif -%}
+{% endif -%}
 {% if 'openconfig-network-instance:spf_state' in list_elem and 'openconfig-ospfv2-ext:throttle-delay' in list_elem['openconfig-network-instance:spf_state'] %}
 {% if vars.update({'throttle_delay':list_elem['openconfig-network-instance:spf_state']['openconfig-ospfv2-ext:throttle-delay']}) %}{% endif -%}
 {% endif -%}
@@ -113,6 +119,14 @@ VRF Name: {{list_elem['vrfName']}}
  This implementation conforms to RFC2328
  {{vars.ospf_rfc1583_compatible}}
  {{vars.opaque_capability}}
+{% if vars.grSupport == True %}
+ Graceful-Restart is enabled 
+{% else -%} 
+ Graceful-Restart is disabled
+{% endif -%}
+{% if vars.grPrepareInProgress == True %}
+ Graceful-Restart Prepare: in-progress
+{% endif -%}
 {% if vars.stubAdvertisement == True %}
  Stub router advertisement is configured
 {% endif -%}

diff --git a/CLI/renderer/templates/show_ip_ospf_database_opaque_link.j2 b/CLI/renderer/templates/show_ip_ospf_database_opaque_link.j2
@@ -56,6 +56,7 @@ VRF Name: {{list_elem['vrfName']}}
                                 {% if 'state' in lsa and 'length'   in lsa['state'] %}
   Length: {{lsa['state']['length']}}
                                 {% endif %}
+  {{' '}}
                             {% endfor %}
                         {% endif %}
                     {% endif %}

diff --git a/ham/hamd/etc/sonic/hamd/group-mapping b/ham/hamd/etc/sonic/hamd/group-mapping
@@ -12,5 +12,5 @@
 #    netoperator:operator
 #    0:operator
 
-admin:sudo,docker,redis,adm
-operator:docker
+admin:sudo,docker,redis,adm,admin
+operator:docker,operator