From 8a7b7122f7af2a6fae93158a80e9ec4828378ddd Mon Sep 17 00:00:00 2001 From: kcudnik Date: Fri, 20 Aug 2021 15:17:11 +0200 Subject: [PATCH] Remove dead code from SwitchBCM81724 --- vslib/SwitchBCM81724.cpp | 202 ++------------------------------------- vslib/SwitchBCM81724.h | 44 --------- 2 files changed, 6 insertions(+), 240 deletions(-) diff --git a/vslib/SwitchBCM81724.cpp b/vslib/SwitchBCM81724.cpp index 1a9af50d533b..4e160f98f277 100644 --- a/vslib/SwitchBCM81724.cpp +++ b/vslib/SwitchBCM81724.cpp @@ -68,29 +68,6 @@ sai_status_t SwitchBCM81724::initialize_default_objects( return SAI_STATUS_SUCCESS; } - -sai_status_t SwitchBCM81724::create_qos_queues_per_port( - _In_ sai_object_id_t port_id) -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::create_qos_queues() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::set_switch_mac_address() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - sai_status_t SwitchBCM81724::refresh_port_list( _In_ const sai_attr_metadata_t *meta) { @@ -162,7 +139,10 @@ sai_status_t SwitchBCM81724::set_switch_default_attributes() CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr)); attr.id = SAI_SWITCH_ATTR_FIRMWARE_MAJOR_VERSION; - strncpy((char *)&attr.value.chardata, "v0.1", sizeof(attr.value.chardata)); + + memset(attr.value.chardata, 0, sizeof(attr.value.chardata)); + + strcpy((char *)&attr.value.chardata, "v0.1"); // REMEMBER DO NOT EXCEED sizeof(chardata) CHECK_STATUS(set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr)); @@ -187,36 +167,9 @@ sai_status_t SwitchBCM81724::refresh_read_only( { switch (meta->attrid) { - case SAI_SWITCH_ATTR_CPU_PORT: - case SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID: - case SAI_SWITCH_ATTR_DEFAULT_VLAN_ID: - case SAI_SWITCH_ATTR_DEFAULT_STP_INST_ID: - case SAI_SWITCH_ATTR_DEFAULT_1Q_BRIDGE_ID: - return SAI_STATUS_NOT_IMPLEMENTED; - - case SAI_SWITCH_ATTR_ACL_ENTRY_MINIMUM_PRIORITY: - case SAI_SWITCH_ATTR_ACL_ENTRY_MAXIMUM_PRIORITY: - return SAI_STATUS_NOT_IMPLEMENTED; - - case SAI_SWITCH_ATTR_MAX_ACL_ACTION_COUNT: - case SAI_SWITCH_ATTR_ACL_STAGE_INGRESS: - case SAI_SWITCH_ATTR_ACL_STAGE_EGRESS: - return SAI_STATUS_NOT_IMPLEMENTED; - - case SAI_SWITCH_ATTR_NUMBER_OF_ECMP_GROUPS: - return SAI_STATUS_NOT_IMPLEMENTED; - case SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS: case SAI_SWITCH_ATTR_PORT_LIST: - return refresh_port_list(meta); - - case SAI_SWITCH_ATTR_QOS_MAX_NUMBER_OF_CHILDS_PER_SCHEDULER_GROUP: - return SAI_STATUS_NOT_IMPLEMENTED; - - case SAI_SWITCH_ATTR_AVAILABLE_SNAT_ENTRY: - case SAI_SWITCH_ATTR_AVAILABLE_DNAT_ENTRY: - case SAI_SWITCH_ATTR_AVAILABLE_DOUBLE_NAT_ENTRY: - return SAI_STATUS_NOT_IMPLEMENTED; + return refresh_port_list(meta); // TODO should implement, override and call on init create_ports case SAI_SWITCH_ATTR_DEFAULT_TRAP_GROUP: case SAI_SWITCH_ATTR_FIRMWARE_MAJOR_VERSION: @@ -228,22 +181,11 @@ sai_status_t SwitchBCM81724::refresh_read_only( { switch (meta->attrid) { - case SAI_PORT_ATTR_QOS_NUMBER_OF_QUEUES: - case SAI_PORT_ATTR_QOS_QUEUE_LIST: - return SAI_STATUS_NOT_IMPLEMENTED; - - case SAI_PORT_ATTR_NUMBER_OF_INGRESS_PRIORITY_GROUPS: - case SAI_PORT_ATTR_INGRESS_PRIORITY_GROUP_LIST: - return SAI_STATUS_NOT_IMPLEMENTED; - - case SAI_PORT_ATTR_QOS_NUMBER_OF_SCHEDULER_GROUPS: - case SAI_PORT_ATTR_QOS_SCHEDULER_GROUP_LIST: - return SAI_STATUS_NOT_IMPLEMENTED; - case SAI_PORT_ATTR_SUPPORTED_FEC_MODE: case SAI_PORT_ATTR_SUPPORTED_AUTO_NEG_MODE: case SAI_PORT_ATTR_REMOTE_ADVERTISED_FEC_MODE: case SAI_PORT_ATTR_ADVERTISED_FEC_MODE: + // TODO where is code that is doing refresh for those? return SAI_STATUS_SUCCESS; /* @@ -255,21 +197,6 @@ sai_status_t SwitchBCM81724::refresh_read_only( } } - if (meta->objecttype == SAI_OBJECT_TYPE_SCHEDULER_GROUP) - { - return SAI_STATUS_NOT_IMPLEMENTED; - } - - if (meta->objecttype == SAI_OBJECT_TYPE_BRIDGE && meta->attrid == SAI_BRIDGE_ATTR_PORT_LIST) - { - return SAI_STATUS_NOT_IMPLEMENTED; - } - - if (meta->objecttype == SAI_OBJECT_TYPE_VLAN && meta->attrid == SAI_VLAN_ATTR_MEMBER_LIST) - { - return SAI_STATUS_NOT_IMPLEMENTED; - } - if (meta->objecttype == SAI_OBJECT_TYPE_DEBUG_COUNTER && meta->attrid == SAI_DEBUG_COUNTER_ATTR_INDEX) { return SAI_STATUS_SUCCESS; // XXX not sure for gearbox @@ -296,48 +223,6 @@ sai_status_t SwitchBCM81724::refresh_read_only( return SAI_STATUS_NOT_IMPLEMENTED; } -sai_status_t SwitchBCM81724::create_default_vlan() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::create_cpu_port() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::create_default_1q_bridge() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::create_ports() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::create_default_virtual_router() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::create_default_stp_instance() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - sai_status_t SwitchBCM81724::create_default_trap_group() { SWSS_LOG_ENTER(); @@ -352,81 +237,6 @@ sai_status_t SwitchBCM81724::create_default_trap_group() return set(SAI_OBJECT_TYPE_SWITCH, m_switch_id, &attr); } -sai_status_t SwitchBCM81724::create_ingress_priority_groups_per_port( - _In_ sai_object_id_t port_id) -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::create_ingress_priority_groups() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::create_vlan_members() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::create_bridge_ports() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::set_acl_entry_min_prio() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::set_acl_capabilities() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::set_maximum_number_of_childs_per_scheduler_group() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::set_number_of_ecmp_groups() -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::refresh_bridge_port_list( - _In_ const sai_attr_metadata_t *meta, - _In_ sai_object_id_t bridge_id) -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - -sai_status_t SwitchBCM81724::refresh_vlan_member_list( - _In_ const sai_attr_metadata_t *meta, - _In_ sai_object_id_t vlan_id) -{ - SWSS_LOG_ENTER(); - - return SAI_STATUS_NOT_IMPLEMENTED; -} - sai_status_t SwitchBCM81724::warm_boot_initialize_objects() { SWSS_LOG_ENTER(); diff --git a/vslib/SwitchBCM81724.h b/vslib/SwitchBCM81724.h index d38b23e29f2c..2c07f41db6d7 100644 --- a/vslib/SwitchBCM81724.h +++ b/vslib/SwitchBCM81724.h @@ -27,57 +27,13 @@ namespace saivs virtual sai_status_t create_port_dependencies( _In_ sai_object_id_t port_id) override; - virtual sai_status_t create_qos_queues_per_port( - _In_ sai_object_id_t port_id) override; - - virtual sai_status_t create_qos_queues() override; - - virtual sai_status_t set_switch_mac_address() override; - - virtual sai_status_t create_default_vlan() override; - - virtual sai_status_t create_default_1q_bridge() override; - - virtual sai_status_t create_default_virtual_router() override; - - virtual sai_status_t create_default_stp_instance() override; - virtual sai_status_t create_default_trap_group() override; - virtual sai_status_t create_ingress_priority_groups_per_port( - _In_ sai_object_id_t port_id) override; - - virtual sai_status_t create_ingress_priority_groups() override; - - virtual sai_status_t create_vlan_members() override; - - virtual sai_status_t create_bridge_ports() override; - - virtual sai_status_t set_acl_entry_min_prio() override; - - virtual sai_status_t set_acl_capabilities() override; - - virtual sai_status_t set_maximum_number_of_childs_per_scheduler_group() override; - - virtual sai_status_t set_number_of_ecmp_groups() override; - - virtual sai_status_t create_cpu_port(); - - virtual sai_status_t create_ports(); - protected : // refresh virtual sai_status_t refresh_port_list( _In_ const sai_attr_metadata_t *meta) override; - virtual sai_status_t refresh_bridge_port_list( - _In_ const sai_attr_metadata_t *meta, - _In_ sai_object_id_t bridge_id) override; - - virtual sai_status_t refresh_vlan_member_list( - _In_ const sai_attr_metadata_t *meta, - _In_ sai_object_id_t vlan_id) override; - protected: virtual sai_status_t refresh_read_only(