Skip to content

Commit a3d1345

Browse files
saksarav-nokiasaksarav-nokia
authored
[gendump] Add Support to dump BCM-DNX commands (#1813)
In generate_dump script, the function collect_broadcom tries to dump BCM XGS commands even in DNX switchs and error message is printed, hence generate_dump command fails. Modified the collect_broadcom function to check for BCM family and dump the DNX commands if the family is DNX. Signed-off-by: Sakthivadivu Saravanaraj [email protected] What I did Modified the generate_dump script to dump the corresponding Broadcom diag shell commands based on Broadcom asic family. How I did it Modified the collect_broadcom function in generate_dump to get the Broadcom asic family by extracting the "version" command output as per Broadcom's suggestion and dump the Broadcom DNX commands if the Broadcom asic is DNX family. If it is not DNX family, dump the existing XGS commands. How to verify it Ran sonic cli command "sudo generate_dump " in DNX platform and XGS platform and verified that the tgz files are created with all the information dumped by generate_dump script. Previous command output (if the output of a command-line utility has changed) New command output (if the output of a command-line utility has changed)
1 parent bb185d5 commit a3d1345

File tree

1 file changed

+68
-22
lines changed

1 file changed

+68
-22
lines changed

‎scripts/generate_dump

Lines changed: 68 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -985,28 +985,74 @@ collect_broadcom() {
985985
save_bcmcmd_all_ns "-t5 version" "broadcom.version"
986986
save_bcmcmd_all_ns "-t5 soc" "broadcom.soc"
987987
save_bcmcmd_all_ns "-t5 ps" "broadcom.ps"
988-
save_bcmcmd_all_ns "\"l3 nat_ingress show\"" "broadcom.nat.ingress"
989-
save_bcmcmd_all_ns "\"l3 nat_egress show\"" "broadcom.nat.egress"
990-
save_bcmcmd_all_ns "\"ipmc table show\"" "broadcom.ipmc"
991-
save_bcmcmd_all_ns "\"multicast show\"" "broadcom.multicast"
992-
save_bcmcmd_all_ns "\"conf show\"" "conf.summary"
993-
save_bcmcmd_all_ns "\"fp show\"" "fp.summary"
994-
save_bcmcmd_all_ns "\"pvlan show\"" "pvlan.summary"
995-
save_bcmcmd_all_ns "\"l2 show\"" "l2.summary"
996-
save_bcmcmd_all_ns "\"l3 intf show\"" "l3.intf.summary"
997-
save_bcmcmd_all_ns "\"l3 defip show\"" "l3.defip.summary"
998-
save_bcmcmd_all_ns "\"l3 l3table show\"" "l3.l3table.summary"
999-
save_bcmcmd_all_ns "\"l3 egress show\"" "l3.egress.summary"
1000-
save_bcmcmd_all_ns "\"l3 ecmp egress show\"" "l3.ecmp.egress.summary"
1001-
save_bcmcmd_all_ns "\"l3 multipath show\"" "l3.multipath.summary"
1002-
save_bcmcmd_all_ns "\"l3 ip6host show\"" "l3.ip6host.summary"
1003-
save_bcmcmd_all_ns "\"l3 ip6route show\"" "l3.ip6route.summary"
1004-
save_bcmcmd_all_ns "\"mc show\"" "multicast.summary"
1005-
save_bcmcmd_all_ns "\"cstat *\"" "cstat.summary"
1006-
save_bcmcmd_all_ns "\"mirror show\"" "mirror.summary"
1007-
save_bcmcmd_all_ns "\"mirror dest show\"" "mirror.dest.summary"
1008-
save_bcmcmd_all_ns "\"port *\"" "port.summary"
1009-
save_bcmcmd_all_ns "\"d chg my_station_tcam\"" "mystation.tcam.summary"
988+
if [ -e /usr/share/sonic/device/${platform}/platform_asic ]; then
989+
bcm_family=`cat /usr/share/sonic/device/${platform}/platform_asic`
990+
else
991+
echo "'/usr/share/sonic/device/${platform}/platform_asic' does not exist" > /tmp/error
992+
save_file /tmp/error sai false
993+
return
994+
fi
995+
996+
if [ "$bcm_family" == "broadcom-dnx" ]; then
997+
save_bcmcmd_all_ns "\"l2 show\"" "l2.summary"
998+
save_bcmcmd_all_ns "\"field group list\"" "fpgroup.list.summary"
999+
total_fp_groups=34
1000+
for (( fp_grp=0; fp_grp<$total_fp_groups; fp_grp++ ))
1001+
do
1002+
save_bcmcmd_all_ns "\"field group info group=$fp_grp\"" "fpgroup$fp_grp.info.summary"
1003+
done
1004+
save_bcmcmd_all_ns "\"dbal table dump table=IPV4_UNICAST_PRIVATE_LPM_FORWARD\"" "l3.ipv4.lpm.summary"
1005+
save_bcmcmd_all_ns "\"dbal table dump table=IPV6_UNICAST_PRIVATE_LPM_FORWARD\"" "l3.ipv6.lpm.summary"
1006+
save_bcmcmd_all_ns "\"dbal table dump table=IPV4_UNICAST_PRIVATE_HOST\"" "l3.ipv4.host.summary"
1007+
save_bcmcmd_all_ns "\"dbal table dump table=IPV6_UNICAST_PRIVATE_HOST\"" "l3.ipv6.host.summary"
1008+
save_bcmcmd_all_ns "\"dbal table dump table=SUPER_FEC_1ST_HIERARCHY\"" "l3.egress.fec.summary"
1009+
save_bcmcmd_all_ns "\"dbal table dump table=ECMP_TABLE\"" "ecmp.table.summary"
1010+
save_bcmcmd_all_ns "\"dbal table dump table=ECMP_GROUP_PROFILE_TABLE\"" "ecmp.group.summary"
1011+
save_bcmcmd_all_ns "\"dbal table dump table=ING_VSI_INFO_DB\"" "ing.vsi.summary"
1012+
save_bcmcmd_all_ns "\"dbal table dump table=L3_MY_MAC_DA_PREFIXES\"" "l3.mymac.summary"
1013+
save_bcmcmd_all_ns "\"dbal table dump table=INGRESS_VLAN_MEMBERSHIP\"" "ing.vlan.summary"
1014+
save_bcmcmd_all_ns "\"dbal table dump table=LOCAL_SBC_IN_LIF_MATCH_INFO_SW\"" "sbc.inlif.summary"
1015+
save_bcmcmd_all_ns "\"dbal table dump table=SNIF_COMMAND_TABLE\"" "snif.command.summary"
1016+
save_bcmcmd_all_ns "\"port mgmt dump full\"" "port.mgmt.summary"
1017+
save_bcmcmd_all_ns "\"tm lag\"" "tm.lag.summary"
1018+
save_bcmcmd_all_ns "\"pp info fec\"" "pp.fec.summary"
1019+
save_bcmcmd_all_ns "\"nif sts\"" "nif.sts.summary"
1020+
save_bcmcmd_all_ns "\"port pm info\"" "port.pm.summary"
1021+
save_bcmcmd_all_ns "\"conf show\"" "conf.show.summary"
1022+
save_bcmcmd_all_ns "\"show counters\"" "show.counters.summary"
1023+
save_bcmcmd_all_ns "\"diag counter g\"" "diag.counter.summary"
1024+
save_bcmcmd_all_ns "\"tm ing q map\"" "tm.ingress.qmap.summary"
1025+
save_bcmcmd_all_ns "\"tm ing vsq resources\"" "tm.ing.vsq.res.summary"
1026+
for group in {a..f}
1027+
do
1028+
save_bcmcmd_all_ns "\"tm ing vsq non g=$group\"" "tm.ing.vsq.non.group-$group.summary"
1029+
done
1030+
save_bcmcmd_all_ns "\"fabric connectivity\"" "fabric.connect.summary"
1031+
save_bcmcmd_all_ns "\"port status\"" "port.status.summary"
1032+
else
1033+
save_bcmcmd_all_ns "\"l3 nat_ingress show\"" "broadcom.nat.ingress"
1034+
save_bcmcmd_all_ns "\"l3 nat_egress show\"" "broadcom.nat.egress"
1035+
save_bcmcmd_all_ns "\"ipmc table show\"" "broadcom.ipmc"
1036+
save_bcmcmd_all_ns "\"multicast show\"" "broadcom.multicast"
1037+
save_bcmcmd_all_ns "\"conf show\"" "conf.summary"
1038+
save_bcmcmd_all_ns "\"fp show\"" "fp.summary"
1039+
save_bcmcmd_all_ns "\"pvlan show\"" "pvlan.summary"
1040+
save_bcmcmd_all_ns "\"l2 show\"" "l2.summary"
1041+
save_bcmcmd_all_ns "\"l3 intf show\"" "l3.intf.summary"
1042+
save_bcmcmd_all_ns "\"l3 defip show\"" "l3.defip.summary"
1043+
save_bcmcmd_all_ns "\"l3 l3table show\"" "l3.l3table.summary"
1044+
save_bcmcmd_all_ns "\"l3 egress show\"" "l3.egress.summary"
1045+
save_bcmcmd_all_ns "\"l3 ecmp egress show\"" "l3.ecmp.egress.summary"
1046+
save_bcmcmd_all_ns "\"l3 multipath show\"" "l3.multipath.summary"
1047+
save_bcmcmd_all_ns "\"l3 ip6host show\"" "l3.ip6host.summary"
1048+
save_bcmcmd_all_ns "\"l3 ip6route show\"" "l3.ip6route.summary"
1049+
save_bcmcmd_all_ns "\"mc show\"" "multicast.summary"
1050+
save_bcmcmd_all_ns "\"cstat *\"" "cstat.summary"
1051+
save_bcmcmd_all_ns "\"mirror show\"" "mirror.summary"
1052+
save_bcmcmd_all_ns "\"mirror dest show\"" "mirror.dest.summary"
1053+
save_bcmcmd_all_ns "\"port *\"" "port.summary"
1054+
save_bcmcmd_all_ns "\"d chg my_station_tcam\"" "mystation.tcam.summary"
1055+
fi
10101056

10111057
copy_from_masic_docker "syncd" "/var/log/diagrun.log" "/var/log/diagrun.log"
10121058
copy_from_masic_docker "syncd" "/var/log/bcm_diag_post" "/var/log/bcm_diag_post"

0 commit comments

Comments
 (0)