Merge pull request #229 from e-sonic/merge-1108/broadcom_sonic_4.0.x_…

…share-to-dell_sonic_4.0.x_share sync from broadcom_sonic_4.0.x_share to dell_sonic_4.0.x_share - 1108
project-arlo · Nov 8, 2022 · 5ba2b52 · 5ba2b52
2 parents 94c9f3a + c157f73
commit 5ba2b52
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CLI/actioner/show_running_config_nd.py b/CLI/actioner/show_running_config_nd.py
@@ -71,7 +71,7 @@ def show_nd_running_intf_config(render_tables):
                 if "reachable-time" in nd_cfg_intf:
                     cmd_str += (nd_base_cmd + "reachable-time {}".format(
                         nd_cfg_intf["reachable-time"]) + cmd_end)
-                if "router-preference" in nd_cfg_intf and nd_cfg_intf["router-preference"] != "sonic-frr-nd:MEDIUM":
+                if "router-preference" in nd_cfg_intf:
                     cmd_str += (nd_base_cmd + "router-preference {}".format(
                         nd_cfg_intf["router-preference"].split(":")[1].lower()) + cmd_end)
 

diff --git a/CLI/actioner/sonic-cli-neighbors.py b/CLI/actioner/sonic-cli-neighbors.py
@@ -551,7 +551,7 @@ def set_radv_daemon(keypath, body, del_req):
 
 def set_radv_params(keypath, body, del_req):
     if del_req:
-        apiResponse = apiClient.delete(keypath)
+        apiResponse = apiClient.delete(keypath, deleteEmptyEntry=True)
     else:
         apiResponse = apiClient.patch(keypath, body)
 
@@ -819,7 +819,10 @@ def run(func, args):
         if error == True:
             print("% Error: " + error_str)
             return 
-        set_radv_params(keypath, body, False)
+        if "suppress-ra" in args or "ra-fast-retrans" in args:
+            set_radv_params(keypath, body, True)
+        else:
+            set_radv_params(keypath, body, False)
     elif (func == 'patch_frr_nd_no_cfg_param'):
         keypath, body, error, error_str = get_nd_param_keybody(func, args)
         if error == True:

diff --git a/CLI/clitree/macro/frr_nd_macro.xml b/CLI/clitree/macro/frr_nd_macro.xml
@@ -100,7 +100,7 @@
                 <PARAM name = "router-pref-option" help = "" ptype = "SUBCOMMAND" mode="switch">
                     <PARAM name = "high" help = "High default router preference" ptype = "SUBCOMMAND" mode="subcommand" dbpath="sonic-frr-nd:sonic-frr-nd/ND_CFG_MSG/ND_CFG_MSG_LIST/router-preference=sonic-frr-nd:HIGH"> </PARAM>
                     <PARAM name = "low" help = "Low default router preference" ptype = "SUBCOMMAND" mode="subcommand" dbpath="sonic-frr-nd:sonic-frr-nd/ND_CFG_MSG/ND_CFG_MSG_LIST/router-preference=sonic-frr-nd:LOW"> </PARAM>
-                    <PARAM name = "medium" help = "Medium default router preference (default)" ptype = "SUBCOMMAND" mode="subcommand" dbpath="sonic-frr-nd:sonic-frr-nd/ND_CFG_MSG/ND_CFG_MSG_LIST/router-preference=sonic-frr-nd:MEDIUM"> </PARAM>
+                    <PARAM name = "medium" help = "Medium default router preference" ptype = "SUBCOMMAND" mode="subcommand" dbpath="sonic-frr-nd:sonic-frr-nd/ND_CFG_MSG/ND_CFG_MSG_LIST/router-preference=sonic-frr-nd:MEDIUM"> </PARAM>
                 </PARAM>
             </PARAM>
         </PARAM>