From b1a39989104c1fcb817b01271bf49384254e5348 Mon Sep 17 00:00:00 2001 From: Krishnan Sridharan Date: Thu, 25 Jul 2024 17:59:28 +0000 Subject: [PATCH] platform/marvell renaming to platform/marvell-prestera --- scripts/generate_dump | 64 +++++++++++++------------- tests/qos_config_input/0/qos_config.j2 | 2 +- tests/qos_config_input/1/qos_config.j2 | 2 +- tests/qos_config_input/qos_config.j2 | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/scripts/generate_dump b/scripts/generate_dump index 6011344fe3..59ea21fe88 100755 --- a/scripts/generate_dump +++ b/scripts/generate_dump @@ -1365,7 +1365,7 @@ collect_mellanox_dfw_dumps() { # Returns: # None ############################################################################### -save_marvellcmd() { +save_marvell_presteracmd() { trap 'handle_error $? $LINENO' ERR mkdir -p $LOGDIR/sdkdump @@ -1382,37 +1382,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" } ############################################################################### @@ -2169,8 +2169,8 @@ main() { collect_marvell_teralynx fi - if [ "$asic" = "marvell" ]; then - collect_marvell + if [ "$asic" = "marvell-prestera" ]; then + collect_marvell_prestera fi if [ "$asic" = "pensando" ]; then diff --git a/tests/qos_config_input/0/qos_config.j2 b/tests/qos_config_input/0/qos_config.j2 index e0336b3ef8..764e4a25ad 100644 --- a/tests/qos_config_input/0/qos_config.j2 +++ b/tests/qos_config_input/0/qos_config.j2 @@ -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'] -%} {%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%} diff --git a/tests/qos_config_input/1/qos_config.j2 b/tests/qos_config_input/1/qos_config.j2 index e0336b3ef8..764e4a25ad 100644 --- a/tests/qos_config_input/1/qos_config.j2 +++ b/tests/qos_config_input/1/qos_config.j2 @@ -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'] -%} {%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%} diff --git a/tests/qos_config_input/qos_config.j2 b/tests/qos_config_input/qos_config.j2 index b9b23f5aa7..1c939b9624 100644 --- a/tests/qos_config_input/qos_config.j2 +++ b/tests/qos_config_input/qos_config.j2 @@ -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'] -%} {%- set backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter'] -%}