Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

platform renaming for innovium #3474

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions scripts/generate_dump
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ collect_mellanox_dfw_dumps() {
# Returns:
# None
###############################################################################
save_marvellcmd() {
save_marvell_presteracmd() {
trap 'handle_error $? $LINENO' ERR

mkdir -p $LOGDIR/sdkdump
Expand All @@ -1364,37 +1364,37 @@ save_marvellcmd() {
# Returns:
# None
###############################################################################
collect_marvell() {
collect_marvell_prestera() {
trap 'handle_error $? $LINENO' ERR

save_marvellcmd "show version" "CPSS_version"
save_marvellcmd "debug-mode;xps-api call xpsDataIntegrityDumpSerInfo all" "SER_table"
save_marvellcmd "show traffic cpu rx statistic device 0" "CPU_stat"
save_marvellcmd "show interfaces status all" "INTERFACE_config"
save_marvellcmd "show port monitor" "PORT_mirror"
save_marvellcmd "show vlan device 0" "VLAN_table"
save_marvellcmd "show ip route device 0" "IP_route"
save_marvellcmd "show ipv6 route device 0" "IPV6_route"
save_marvellcmd "show ip route_fdb device 0" "IP_forward_route"
save_marvellcmd "show ipv6 route_fdb device 0" "IPV6_forward_route"
save_marvellcmd "show ip next-hop device 0" "NH_table"
save_marvellcmd "show mac address-table device 0" "MAC_forward"
save_marvellcmd "show mac address-table count device 0" "MAC_count"
save_marvellcmd "show tail-drop-allocated buffers all" "Tail_drop"
save_marvellcmd "show policy device 0" "POLICER_table"
save_marvellcmd "show system policy-tcam utilization device 0" "Policy_count"
save_marvellcmd "show access-list device 0 pcl-id 0 format ingress_udb_30" "UDB30_acl"
save_marvellcmd "show access-list device 0 pcl-id 0 format ingress_udb_60" "UDB60_acl"
save_marvellcmd "debug-mode;show drop counters 0" "Drop_count"
save_marvellcmd "debug-mode;dump all registers" "REGISTER_table"
save_marvellcmd "debug-mode;dump all tables0" "HW_table_0"
save_marvellcmd "debug-mode;dump all tables1" "HW_table_1"
save_marvellcmd "debug-mode;dump all tables2" "HW_table_2"
save_marvellcmd "debug-mode;dump all tables3" "HW_table_3"
save_marvellcmd "debug-mode;dump all tables4" "HW_table_4"
save_marvellcmd "debug-mode;dump all tables5" "HW_table_5"
save_marvellcmd "debug-mode;dump all tables6" "HW_table_6"
save_marvellcmd "debug-mode;dump all tables7" "HW_table_7"
save_marvell_presteracmd "show version" "CPSS_version"
save_marvell_presteracmd "debug-mode;xps-api call xpsDataIntegrityDumpSerInfo all" "SER_table"
save_marvell_presteracmd "show traffic cpu rx statistic device 0" "CPU_stat"
save_marvell_presteracmd "show interfaces status all" "INTERFACE_config"
save_marvell_presteracmd "show port monitor" "PORT_mirror"
save_marvell_presteracmd "show vlan device 0" "VLAN_table"
save_marvell_presteracmd "show ip route device 0" "IP_route"
save_marvell_presteracmd "show ipv6 route device 0" "IPV6_route"
save_marvell_presteracmd "show ip route_fdb device 0" "IP_forward_route"
save_marvell_presteracmd "show ipv6 route_fdb device 0" "IPV6_forward_route"
save_marvell_presteracmd "show ip next-hop device 0" "NH_table"
save_marvell_presteracmd "show mac address-table device 0" "MAC_forward"
save_marvell_presteracmd "show mac address-table count device 0" "MAC_count"
save_marvell_presteracmd "show tail-drop-allocated buffers all" "Tail_drop"
save_marvell_presteracmd "show policy device 0" "POLICER_table"
save_marvell_presteracmd "show system policy-tcam utilization device 0" "Policy_count"
save_marvell_presteracmd "show access-list device 0 pcl-id 0 format ingress_udb_30" "UDB30_acl"
save_marvell_presteracmd "show access-list device 0 pcl-id 0 format ingress_udb_60" "UDB60_acl"
save_marvell_presteracmd "debug-mode;show drop counters 0" "Drop_count"
save_marvell_presteracmd "debug-mode;dump all registers" "REGISTER_table"
save_marvell_presteracmd "debug-mode;dump all tables0" "HW_table_0"
save_marvell_presteracmd "debug-mode;dump all tables1" "HW_table_1"
save_marvell_presteracmd "debug-mode;dump all tables2" "HW_table_2"
save_marvell_presteracmd "debug-mode;dump all tables3" "HW_table_3"
save_marvell_presteracmd "debug-mode;dump all tables4" "HW_table_4"
save_marvell_presteracmd "debug-mode;dump all tables5" "HW_table_5"
save_marvell_presteracmd "debug-mode;dump all tables6" "HW_table_6"
save_marvell_presteracmd "debug-mode;dump all tables7" "HW_table_7"
}

###############################################################################
Expand Down Expand Up @@ -1613,15 +1613,15 @@ collect_cisco_8000() {
}

##############################################################################
# collect_innovium
# collect_marvell_teralynx
# Globals:
# None
# Arguments:
# None
# Retuens:
# None
##############################################################################
collect_innovium() {
collect_marvell_teralynx() {
save_cmd "ivmcmd 'show techsupport -i /innovium/show_techsupport_infile'" "show_techsupport_op_ifcs.log"
save_cmd "ivmcmd 'show techsupport -i /innovium/show_techsupport_infile_iSAI'" "show_techsupport_op_iSAI.log"
}
Expand Down Expand Up @@ -2102,12 +2102,12 @@ main() {
collect_nvidia_bluefield
fi

if [ "$asic" = "innovium" ]; then
collect_innovium
if [ "$asic" = "marvell-teralynx" ]; then
collect_marvell_teralynx
fi

if [ "$asic" = "marvell" ]; then
collect_marvell
if [ "$asic" = "marvell-prestera" ]; then
collect_marvell_prestera
fi


Expand Down
2 changes: 1 addition & 1 deletion tests/qos_config_input/0/qos_config.j2
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{%- set port_names_active = port_names_list_active | join(',') -%}


{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell-prestera'] -%}
{%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%}


Expand Down
2 changes: 1 addition & 1 deletion tests/qos_config_input/1/qos_config.j2
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{%- set port_names_active = port_names_list_active | join(',') -%}


{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell-prestera'] -%}
{%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%}


Expand Down
2 changes: 1 addition & 1 deletion tests/qos_config_input/qos_config.j2
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{%- set port_names_active = port_names_list_active | join(',') -%}


{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell'] -%}
{%- set pfc_to_pg_map_supported_asics = ['mellanox', 'barefoot', 'marvell-prestera'] -%}
{%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%}


Expand Down
Loading