Merge pull request #7 from e-sonic/bugfix/SNC-16409-merging-issue-and…

…-fix-for-SRC Fixing the merging issues and fix for SRC not displaying the default groups for RP config
project-arlo · Feb 2, 2022 · f92d29e · f92d29e
2 parents ee2483e + d118888
commit f92d29e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CLI/actioner/show_config_pim.py b/CLI/actioner/show_config_pim.py
@@ -68,6 +68,8 @@ def show_pim_ipv4_gbl(render_tables):
                 cmd_str = (vrf_inst_cmd_prfx + " prefix-list " +
                            vrf_inst["prefix-list-name"])
                 cmd_list += cmd_str + cmd_delimiter
-
+            else:
+                cmd_str = vrf_inst_cmd_prfx
+                cmd_list += cmd_str + cmd_delimiter
 
     return "CB_SUCCESS", cmd_list
diff --git a/CLI/clitree/cli-xml/pim.xml b/CLI/clitree/cli-xml/pim.xml
@@ -152,7 +152,7 @@ limitations under the License.
                     </PARAM>
                 </PARAM>
             </PARAM>
-            <ACTION builtin="clish_pyobj">sonic_cli_pim show_pim_config vrf:${vrf-name} ssm:${ssm} rpf:${rpf} topology:${topology} rp:${rp} rpGroupAddr:${rp-grp-addr} grpAddr:${grp-addr} srcAddr:${src-addr} nbr:${nbr} nbrAddr:${nbr-addr} ifName:${ifName} interface:${interface} rpmapping:${mapping  assert:${assert}
+            <ACTION builtin="clish_pyobj">sonic_cli_pim show_pim_config vrf:${vrf-name} ssm:${ssm} rpf:${rpf} topology:${topology} rp:${rp} rpGroupAddr:${rp-grp-addr} grpAddr:${grp-addr} srcAddr:${src-addr} nbr:${nbr} nbrAddr:${nbr-addr} ifName:${ifName} interface:${interface} rpmapping:${mapping} assert:${assert}
             </ACTION>
             <DOCGEN>
                  <DESCRIPTION>