From d54977f297301f972e2839d526d8130a5f66e893 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Mon, 27 Nov 2017 20:09:59 +0000 Subject: [PATCH 1/7] update to use SAI 1.2 branch --- .gitmodules | 1 + SAI | 2 +- lib/inc/sai_redis.h | 2 +- lib/inc/sairedis.h | 24 +-- lib/src/sai_redis_bridge.cpp | 57 +++++++ lib/src/sai_redis_fdb.cpp | 16 +- lib/src/sai_redis_generic_create.cpp | 2 +- lib/src/sai_redis_generic_get.cpp | 2 +- lib/src/sai_redis_generic_get_stats.cpp | 18 ++- lib/src/sai_redis_generic_remove.cpp | 2 +- lib/src/sai_redis_generic_set.cpp | 2 +- lib/src/sai_redis_interfacequery.cpp | 4 +- lib/src/sai_redis_lag.cpp | 4 +- lib/src/sai_redis_nexthopgroup.cpp | 4 +- lib/src/sai_redis_notifications.cpp | 2 +- lib/src/sai_redis_port.cpp | 20 +++ lib/src/sai_redis_route.cpp | 57 ++++--- lib/src/sai_redis_stp.cpp | 4 +- lib/src/sai_redis_switch.cpp | 2 +- lib/src/sai_redis_tunnel.cpp | 18 +++ lib/src/sai_redis_vlan.cpp | 4 +- meta/Makefile.am | 3 +- meta/sai_meta.cpp | 45 ++---- meta/{saiserialize.h => sai_serialize.h} | 6 + meta/saiattributelist.cpp | 2 +- meta/saiattributelist.h | 2 +- meta/saiserialize.cpp | 181 +++-------------------- meta/tests.cpp | 91 +----------- saidiscovery/saidiscovery.cpp | 11 +- saidump/saidump.cpp | 2 +- saiplayer/saiplayer.cpp | 17 +-- saisdkdump/saisdkdump.cpp | 4 +- syncd/syncd.cpp | 9 +- syncd/syncd.h | 2 +- syncd/syncd_applyview.cpp | 22 +-- syncd/syncd_hard_reinit.cpp | 4 +- syncd/syncd_notifications.cpp | 6 +- syncd/tests.cpp | 31 ++-- vslib/inc/sai_vs_state.h | 2 +- vslib/inc/sai_vs_switch_BCM56850.h | 2 +- vslib/inc/sai_vs_switch_MLNX2700.h | 2 +- vslib/src/sai_vs_bridge.cpp | 57 +++++++ vslib/src/sai_vs_generic_get.cpp | 2 +- vslib/src/sai_vs_hostintf.cpp | 2 +- vslib/src/sai_vs_interfacequery.cpp | 4 +- vslib/src/sai_vs_lag.cpp | 4 +- vslib/src/sai_vs_nexthopgroup.cpp | 4 +- vslib/src/sai_vs_port.cpp | 35 +++++ vslib/src/sai_vs_route.cpp | 64 ++++++++ vslib/src/sai_vs_stp.cpp | 4 +- vslib/src/sai_vs_tunnel.cpp | 31 ++++ vslib/src/sai_vs_vlan.cpp | 4 +- vslib/src/tests.cpp | 9 +- 53 files changed, 491 insertions(+), 420 deletions(-) rename meta/{saiserialize.h => sai_serialize.h} (97%) diff --git a/.gitmodules b/.gitmodules index bff8c07148..8c5bd9358c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,4 @@ path = SAI url = https://github.com/opencomputeproject/SAI.git ignore = dirty + branch = v1.2 diff --git a/SAI b/SAI index cc90505b2b..0d945a0e62 160000 --- a/SAI +++ b/SAI @@ -1 +1 @@ -Subproject commit cc90505b2bce567cacc7f0369a3eb0513cb780df +Subproject commit 0d945a0e621301273a2c47e8e1c82dfd90f60e86 diff --git a/lib/inc/sai_redis.h b/lib/inc/sai_redis.h index bf9c60459e..09b68388a7 100644 --- a/lib/inc/sai_redis.h +++ b/lib/inc/sai_redis.h @@ -61,7 +61,7 @@ extern volatile bool g_useTempView; extern volatile bool g_asicInitViewMode; extern volatile bool g_logrotate; -extern service_method_table_t g_services; +extern sai_service_method_table_t g_services; extern std::shared_ptr g_asicState; extern std::shared_ptr g_redisGetConsumer; extern std::shared_ptr g_redisNotifications; diff --git a/lib/inc/sairedis.h b/lib/inc/sairedis.h index a655d13062..88409e8aad 100644 --- a/lib/inc/sairedis.h +++ b/lib/inc/sairedis.h @@ -133,7 +133,7 @@ typedef enum _sai_redis_switch_attr_t * @param[in] attr_count List of attr_count. Caller passes the number * of attribute for each object to create. * @param[in] attr_list List of attributes for every object. - * @param[in] type Bulk operation type. + * @param[in] mode Bulk operation error handling mode * @param[out] object_statuses List of status for every object. Caller needs to * allocate the buffer * @@ -147,7 +147,7 @@ sai_status_t sai_bulk_create_route_entry( _In_ const sai_route_entry_t *route_entry, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t *const *attr_list, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses); /** @@ -155,7 +155,7 @@ sai_status_t sai_bulk_create_route_entry( * * @param[in] object_count Number of objects to remove * @param[in] route_entry List of objects to remove - * @param[in] type Bulk operation type. + * @param[in] mode Bulk operation error handling mode * @param[out] object_statuses List of status for every object. Caller needs to * allocate the buffer * @@ -167,7 +167,7 @@ sai_status_t sai_bulk_create_route_entry( sai_status_t sai_bulk_remove_route_entry( _In_ uint32_t object_count, _In_ const sai_route_entry_t *route_entry, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses); /** @@ -176,7 +176,7 @@ sai_status_t sai_bulk_remove_route_entry( * @param[in] object_count Number of objects to set attribute * @param[in] route_entry List of objects to set attribute * @param[in] attr_list List of attributes to set on objects, one attribute per object - * @param[in] type Bulk operation type. + * @param[in] mode Bulk operation error handling mode * @param[out] object_statuses List of status for every object. Caller needs to * allocate the buffer * @@ -189,7 +189,7 @@ sai_status_t sai_bulk_set_route_entry_attribute( _In_ uint32_t object_count, _In_ const sai_route_entry_t *route_entry, _In_ const sai_attribute_t *attr_list, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses); /** @@ -200,7 +200,7 @@ sai_status_t sai_bulk_set_route_entry_attribute( * @param[in] attr_count List of attr_count. Caller passes the number * of attribute for each object to get * @param[inout] attr_list List of attributes to set on objects, one attribute per object - * @param[in] type Bulk operation type + * @param[in] mode Bulk operation error handling mode * @param[out] object_statuses List of status for every object. Caller needs to * allocate the buffer * @@ -214,7 +214,7 @@ sai_status_t sai_bulk_get_route_entry_attribute( _In_ const sai_route_entry_t *route_entry, _In_ const uint32_t *attr_count, _Inout_ sai_attribute_t **attr_list, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses); sai_status_t sai_bulk_create_next_hop_group_members( @@ -222,14 +222,14 @@ sai_status_t sai_bulk_create_next_hop_group_members( _In_ uint32_t object_count, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t *const *attrs, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_object_id_t *object_id, _Out_ sai_status_t *object_statuses); sai_status_t sai_bulk_remove_next_hop_group_members( _In_ uint32_t object_count, _In_ const sai_object_id_t *object_id, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses); sai_status_t sai_bulk_create_fdb_entry( @@ -237,12 +237,12 @@ sai_status_t sai_bulk_create_fdb_entry( _In_ const sai_fdb_entry_t *fdb_entry, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t *const *attr_list, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses); sai_status_t sai_bulk_remove_fdb_entry( _In_ uint32_t object_count, _In_ const sai_fdb_entry_t *fdb_entry, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses); #endif // __SAIREDIS__ diff --git a/lib/src/sai_redis_bridge.cpp b/lib/src/sai_redis_bridge.cpp index 1bd6ef64c1..0303a23809 100644 --- a/lib/src/sai_redis_bridge.cpp +++ b/lib/src/sai_redis_bridge.cpp @@ -1,10 +1,67 @@ #include "sai_redis.h" +sai_status_t redis_get_bridge_stats( + _In_ sai_object_id_t bridge_id, + _In_ uint32_t number_of_counters, + _In_ const sai_bridge_stat_t *counter_ids, + _Out_ uint64_t *counters) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + +sai_status_t redis_clear_bridge_stats( + _In_ sai_object_id_t bridge_id, + _In_ uint32_t number_of_counters, + _In_ const sai_bridge_stat_t *counter_ids) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + +sai_status_t redis_get_bridge_port_stats( + _In_ sai_object_id_t bridge_port_id, + _In_ uint32_t number_of_counters, + _In_ const sai_bridge_port_stat_t *counter_ids, + _Out_ uint64_t *counters) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + +sai_status_t redis_clear_bridge_port_stats( + _In_ sai_object_id_t bridge_port_id, + _In_ uint32_t number_of_counters, + _In_ const sai_bridge_port_stat_t *counter_ids) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + REDIS_GENERIC_QUAD(BRIDGE,bridge); REDIS_GENERIC_QUAD(BRIDGE_PORT,bridge_port); const sai_bridge_api_t redis_bridge_api = { REDIS_GENERIC_QUAD_API(bridge) + + redis_get_bridge_stats, + redis_clear_bridge_stats, + REDIS_GENERIC_QUAD_API(bridge_port) + + redis_get_bridge_port_stats, + redis_clear_bridge_port_stats, }; diff --git a/lib/src/sai_redis_fdb.cpp b/lib/src/sai_redis_fdb.cpp index abea6954f5..f2c7cdd0e7 100644 --- a/lib/src/sai_redis_fdb.cpp +++ b/lib/src/sai_redis_fdb.cpp @@ -1,5 +1,5 @@ #include "sai_redis.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" sai_status_t internal_redis_flush_fdb_entries( @@ -144,7 +144,7 @@ sai_status_t sai_bulk_create_fdb_entry( _In_ const sai_fdb_entry_t *fdb_entry, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t *const *attr_list, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { std::lock_guard lock(g_apimutex); @@ -179,16 +179,16 @@ sai_status_t sai_bulk_create_fdb_entry( return SAI_STATUS_INVALID_PARAMETER; } - switch (type) + switch (mode) { - case SAI_BULK_OP_TYPE_STOP_ON_ERROR: - case SAI_BULK_OP_TYPE_INGORE_ERROR: + case SAI_BULK_OP_ERROR_MODE_STOP_ON_ERROR: + case SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR: // ok break; default: - SWSS_LOG_ERROR("invalid bulk operation type %d", type); + SWSS_LOG_ERROR("invalid bulk operation mode %d", mode); return SAI_STATUS_INVALID_PARAMETER; } @@ -233,7 +233,7 @@ sai_status_t sai_bulk_create_fdb_entry( idx, serialized_object_ids[idx].c_str()); - if (type == SAI_BULK_OP_TYPE_STOP_ON_ERROR) + if (mode == SAI_BULK_OP_ERROR_MODE_STOP_ON_ERROR) { SWSS_LOG_NOTICE("stop on error since previous operation failed"); break; @@ -256,7 +256,7 @@ sai_status_t sai_bulk_create_fdb_entry( sai_status_t sai_bulk_remove_fdb_entry( _In_ uint32_t object_count, _In_ const sai_fdb_entry_t *fdb_entry, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { std::lock_guard lock(g_apimutex); diff --git a/lib/src/sai_redis_generic_create.cpp b/lib/src/sai_redis_generic_create.cpp index 50acbdb14b..30e34cc75c 100644 --- a/lib/src/sai_redis_generic_create.cpp +++ b/lib/src/sai_redis_generic_create.cpp @@ -1,5 +1,5 @@ #include "sai_redis.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" bool switch_ids[MAX_SWITCHES] = {}; diff --git a/lib/src/sai_redis_generic_get.cpp b/lib/src/sai_redis_generic_get.cpp index 0f8a2dcc4a..a36e1005d0 100644 --- a/lib/src/sai_redis_generic_get.cpp +++ b/lib/src/sai_redis_generic_get.cpp @@ -1,5 +1,5 @@ #include "sai_redis.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" sai_status_t internal_redis_get_process( diff --git a/lib/src/sai_redis_generic_get_stats.cpp b/lib/src/sai_redis_generic_get_stats.cpp index 685e3052f7..a5723d2765 100644 --- a/lib/src/sai_redis_generic_get_stats.cpp +++ b/lib/src/sai_redis_generic_get_stats.cpp @@ -1,5 +1,5 @@ #include "sai_redis.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" sai_status_t internal_redis_get_stats_process( _In_ sai_object_type_t object_type, @@ -54,6 +54,13 @@ struct stat_traits static constexpr serialize_stat serialize_stat_fn = sai_serialize_port_stat; }; +template <> +struct stat_traits +{ + typedef std::string (*serialize_stat)(sai_port_pool_stat_t); + static constexpr serialize_stat serialize_stat_fn = sai_serialize_port_pool_stat; +}; + template <> struct stat_traits { @@ -68,6 +75,13 @@ struct stat_traits static constexpr serialize_stat serialize_stat_fn = sai_serialize_ingress_priority_group_stat; }; +template <> +struct stat_traits +{ + typedef std::string (*serialize_stat)(sai_tunnel_stat_t); + static constexpr serialize_stat serialize_stat_fn = sai_serialize_tunnel_stat; +}; + template std::vector serialize_counter_id_list( @@ -213,5 +227,7 @@ sai_status_t redis_generic_get_stats( _Out_ uint64_t *counter_list); \ DECLARE_REDIS_GENERIC_GET_STATS(port); +DECLARE_REDIS_GENERIC_GET_STATS(port_pool); DECLARE_REDIS_GENERIC_GET_STATS(queue); DECLARE_REDIS_GENERIC_GET_STATS(ingress_priority_group); +DECLARE_REDIS_GENERIC_GET_STATS(tunnel); diff --git a/lib/src/sai_redis_generic_remove.cpp b/lib/src/sai_redis_generic_remove.cpp index e3dea205d0..ec04749093 100644 --- a/lib/src/sai_redis_generic_remove.cpp +++ b/lib/src/sai_redis_generic_remove.cpp @@ -1,5 +1,5 @@ #include "sai_redis.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" sai_status_t internal_redis_generic_remove( diff --git a/lib/src/sai_redis_generic_set.cpp b/lib/src/sai_redis_generic_set.cpp index bdc4289463..33fb35b8f8 100644 --- a/lib/src/sai_redis_generic_set.cpp +++ b/lib/src/sai_redis_generic_set.cpp @@ -1,5 +1,5 @@ #include "sai_redis.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" sai_status_t internal_redis_generic_set( diff --git a/lib/src/sai_redis_interfacequery.cpp b/lib/src/sai_redis_interfacequery.cpp index 9da6ff415c..4287a7c9d2 100644 --- a/lib/src/sai_redis_interfacequery.cpp +++ b/lib/src/sai_redis_interfacequery.cpp @@ -6,7 +6,7 @@ std::mutex g_apimutex; -service_method_table_t g_services; +sai_service_method_table_t g_services; bool g_apiInitialized = false; volatile bool g_run = false; @@ -95,7 +95,7 @@ void ntf_thread() sai_status_t sai_api_initialize( _In_ uint64_t flags, - _In_ const service_method_table_t* services) + _In_ const sai_service_method_table_t* services) { std::lock_guard lock(g_apimutex); diff --git a/lib/src/sai_redis_lag.cpp b/lib/src/sai_redis_lag.cpp index 39892a3aa3..96e2ca218c 100644 --- a/lib/src/sai_redis_lag.cpp +++ b/lib/src/sai_redis_lag.cpp @@ -5,7 +5,7 @@ sai_status_t redis_bulk_object_create_lag( _In_ uint32_t object_count, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t **attrs, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_object_id_t *object_id, _Out_ sai_status_t *object_statuses) { @@ -19,7 +19,7 @@ sai_status_t redis_bulk_object_create_lag( sai_status_t redis_bulk_object_remove_lag( _In_ uint32_t object_count, _In_ const sai_object_id_t *object_id, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { MUTEX(); diff --git a/lib/src/sai_redis_nexthopgroup.cpp b/lib/src/sai_redis_nexthopgroup.cpp index e75fbe4bf1..1c266d70bc 100644 --- a/lib/src/sai_redis_nexthopgroup.cpp +++ b/lib/src/sai_redis_nexthopgroup.cpp @@ -5,7 +5,7 @@ sai_status_t sai_bulk_create_next_hop_group_members( _In_ uint32_t object_count, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t *const *attrs, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_object_id_t *object_id, _Out_ sai_status_t *object_statuses) { @@ -20,7 +20,7 @@ sai_status_t sai_bulk_create_next_hop_group_members( sai_status_t sai_bulk_remove_next_hop_group_members( _In_ uint32_t object_count, _In_ const sai_object_id_t *object_id, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { MUTEX(); diff --git a/lib/src/sai_redis_notifications.cpp b/lib/src/sai_redis_notifications.cpp index c4e873b693..3273205ab4 100644 --- a/lib/src/sai_redis_notifications.cpp +++ b/lib/src/sai_redis_notifications.cpp @@ -1,5 +1,5 @@ #include "sai_redis.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" /* diff --git a/lib/src/sai_redis_port.cpp b/lib/src/sai_redis_port.cpp index a3f962d572..dae79038ee 100644 --- a/lib/src/sai_redis_port.cpp +++ b/lib/src/sai_redis_port.cpp @@ -22,9 +22,24 @@ sai_status_t redis_clear_port_all_stats( return SAI_STATUS_NOT_IMPLEMENTED; } +sai_status_t redis_clear_port_pool_stats( + _In_ sai_object_id_t port_pool_id, + _In_ uint32_t number_of_counters, + _In_ const sai_port_pool_stat_t *counter_ids) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + + REDIS_GENERIC_QUAD(PORT,port); +REDIS_GENERIC_QUAD(PORT_POOL,port_pool); REDIS_GENERIC_GET_STATS(PORT, port); +REDIS_GENERIC_GET_STATS(PORT_POOL, port_pool); const sai_port_api_t redis_port_api = { @@ -33,4 +48,9 @@ const sai_port_api_t redis_port_api = { redis_get_port_stats, redis_clear_port_stats, redis_clear_port_all_stats, + + REDIS_GENERIC_QUAD_API(port_pool) + + redis_get_port_pool_stats, + redis_clear_port_pool_stats }; diff --git a/lib/src/sai_redis_route.cpp b/lib/src/sai_redis_route.cpp index ab33720c29..348e1a4a64 100644 --- a/lib/src/sai_redis_route.cpp +++ b/lib/src/sai_redis_route.cpp @@ -1,21 +1,8 @@ #include "sai_redis.h" #include "sairedis.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" -REDIS_GENERIC_QUAD_ENTRY(ROUTE_ENTRY,route_entry); - -const sai_route_api_t redis_route_api = { - - REDIS_GENERIC_QUAD_API(route_entry) - - // TODO: uncomment block after SAI 1.2 - // sai_bulk_create_route_entry, - // sai_bulk_remove_route_entry, - // sai_bulk_set_route_entry_attribute, - // sai_bulk_get_route_entry_attribute -}; - sai_status_t redis_dummy_create_route_entry( _In_ const sai_route_entry_t *route_entry, _In_ uint32_t attr_count, @@ -38,7 +25,7 @@ sai_status_t sai_bulk_create_route_entry( _In_ const sai_route_entry_t *route_entry, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t *const *attr_list, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { std::lock_guard lock(g_apimutex); @@ -73,16 +60,16 @@ sai_status_t sai_bulk_create_route_entry( return SAI_STATUS_INVALID_PARAMETER; } - switch (type) + switch (mode) { - case SAI_BULK_OP_TYPE_STOP_ON_ERROR: - case SAI_BULK_OP_TYPE_INGORE_ERROR: + case SAI_BULK_OP_ERROR_MODE_STOP_ON_ERROR: + case SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR: // ok break; default: - SWSS_LOG_ERROR("invalid bulk operation type %d", type); + SWSS_LOG_ERROR("invalid bulk operation mode %d", mode); return SAI_STATUS_INVALID_PARAMETER; } @@ -127,7 +114,7 @@ sai_status_t sai_bulk_create_route_entry( idx, serialized_object_ids[idx].c_str()); - if (type == SAI_BULK_OP_TYPE_STOP_ON_ERROR) + if (mode == SAI_BULK_OP_ERROR_MODE_STOP_ON_ERROR) { SWSS_LOG_NOTICE("stop on error since previous operation failed"); break; @@ -150,7 +137,7 @@ sai_status_t sai_bulk_create_route_entry( sai_status_t sai_bulk_remove_route_entry( _In_ uint32_t object_count, _In_ const sai_route_entry_t *route_entry, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { std::lock_guard lock(g_apimutex); @@ -194,7 +181,7 @@ sai_status_t sai_bulk_set_route_entry_attribute( _In_ uint32_t object_count, _In_ const sai_route_entry_t *route_entry, _In_ const sai_attribute_t *attr_list, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { std::lock_guard lock(g_apimutex); @@ -222,17 +209,16 @@ sai_status_t sai_bulk_set_route_entry_attribute( return SAI_STATUS_INVALID_PARAMETER; } - switch (type) + switch (mode) { - case SAI_BULK_OP_TYPE_STOP_ON_ERROR: - case SAI_BULK_OP_TYPE_INGORE_ERROR: + case SAI_BULK_OP_ERROR_MODE_STOP_ON_ERROR: + case SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR: // ok break; default: - SWSS_LOG_ERROR("invalid bulk operation type %d", type); - + SWSS_LOG_ERROR("invalid bulk operation mode %d", mode); return SAI_STATUS_INVALID_PARAMETER; } @@ -275,7 +261,7 @@ sai_status_t sai_bulk_set_route_entry_attribute( idx, serialized_object_ids[idx].c_str()); - if (type == SAI_BULK_OP_TYPE_STOP_ON_ERROR) + if (mode == SAI_BULK_OP_ERROR_MODE_STOP_ON_ERROR) { SWSS_LOG_NOTICE("stop on error since previous operation failed"); break; @@ -299,7 +285,7 @@ sai_status_t sai_bulk_get_route_entry_attribute( _In_ const sai_route_entry_t *route_entry, _In_ const uint32_t *attr_count, _Inout_ sai_attribute_t **attr_list, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { std::lock_guard lock(g_apimutex); @@ -308,3 +294,16 @@ sai_status_t sai_bulk_get_route_entry_attribute( return SAI_STATUS_NOT_IMPLEMENTED; } + +REDIS_GENERIC_QUAD_ENTRY(ROUTE_ENTRY,route_entry); + +const sai_route_api_t redis_route_api = { + + REDIS_GENERIC_QUAD_API(route_entry) + + // TODO: upstream signiture fix to SAI repo + (sai_bulk_create_route_entry_fn)sai_bulk_create_route_entry, + sai_bulk_remove_route_entry, + sai_bulk_set_route_entry_attribute, + sai_bulk_get_route_entry_attribute, +}; diff --git a/lib/src/sai_redis_stp.cpp b/lib/src/sai_redis_stp.cpp index beefc7a2f4..c4a02dd3df 100644 --- a/lib/src/sai_redis_stp.cpp +++ b/lib/src/sai_redis_stp.cpp @@ -5,7 +5,7 @@ sai_status_t redis_create_stp_ports( _In_ uint32_t object_count, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t **attrs, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_object_id_t *object_id, _Out_ sai_status_t *object_statuses) { @@ -19,7 +19,7 @@ sai_status_t redis_create_stp_ports( sai_status_t redis_remove_stp_ports( _In_ uint32_t object_count, _In_ const sai_object_id_t *object_id, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { MUTEX(); diff --git a/lib/src/sai_redis_switch.cpp b/lib/src/sai_redis_switch.cpp index 744272d4d5..502635a11a 100644 --- a/lib/src/sai_redis_switch.cpp +++ b/lib/src/sai_redis_switch.cpp @@ -1,7 +1,7 @@ #include "sai_redis.h" #include "sairedis.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include diff --git a/lib/src/sai_redis_tunnel.cpp b/lib/src/sai_redis_tunnel.cpp index 654afd5d5e..05fdf00c60 100644 --- a/lib/src/sai_redis_tunnel.cpp +++ b/lib/src/sai_redis_tunnel.cpp @@ -1,14 +1,32 @@ #include "sai_redis.h" +sai_status_t redis_clear_tunnel_stats( + _In_ sai_object_id_t tunnel_id, + _In_ uint32_t number_of_counters, + _In_ const sai_tunnel_stat_t *counter_ids) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + + REDIS_GENERIC_QUAD(TUNNEL_MAP,tunnel_map); REDIS_GENERIC_QUAD(TUNNEL,tunnel); REDIS_GENERIC_QUAD(TUNNEL_TERM_TABLE_ENTRY,tunnel_term_table_entry); REDIS_GENERIC_QUAD(TUNNEL_MAP_ENTRY,tunnel_map_entry); +REDIS_GENERIC_GET_STATS(TUNNEL, tunnel); const sai_tunnel_api_t redis_tunnel_api = { REDIS_GENERIC_QUAD_API(tunnel_map) REDIS_GENERIC_QUAD_API(tunnel) + + redis_get_tunnel_stats, + redis_clear_tunnel_stats, + REDIS_GENERIC_QUAD_API(tunnel_term_table_entry) REDIS_GENERIC_QUAD_API(tunnel_map_entry) }; diff --git a/lib/src/sai_redis_vlan.cpp b/lib/src/sai_redis_vlan.cpp index 9f39ad9244..12ab0bf740 100644 --- a/lib/src/sai_redis_vlan.cpp +++ b/lib/src/sai_redis_vlan.cpp @@ -5,7 +5,7 @@ sai_status_t redis_create_vlan_members( _In_ uint32_t object_count, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t **attrs, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_object_id_t *object_id, _Out_ sai_status_t *object_statuses) { @@ -19,7 +19,7 @@ sai_status_t redis_create_vlan_members( sai_status_t redis_remove_vlan_members( _In_ uint32_t object_count, _In_ const sai_object_id_t *object_id, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { MUTEX(); diff --git a/meta/Makefile.am b/meta/Makefile.am index ef26d0d22f..842b3ed885 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -61,7 +61,8 @@ WARN = \ libsaimeta_la_SOURCES = \ ../SAI/meta/saimetadata.c \ - ../SAI/meta/saimetadatautils.c + ../SAI/meta/saimetadatautils.c \ + ../SAI/meta/saiserialize.c libsaimeta_la_CFLAGS = $(DBGFLAGS) $(WARN) diff --git a/meta/sai_meta.cpp b/meta/sai_meta.cpp index 3e0fce1a98..c8577a4d09 100644 --- a/meta/sai_meta.cpp +++ b/meta/sai_meta.cpp @@ -1,6 +1,6 @@ #include "sai_meta.h" #include "sai_extra.h" -#include "saiserialize.h" +#include "sai_serialize.h" #include #include @@ -53,7 +53,7 @@ sai_status_t meta_unittests_allow_readonly_set_once( return SAI_STATUS_FAILURE; } - if (!HAS_FLAG_READ_ONLY(md->flags)) + if (!SAI_HAS_FLAG_READ_ONLY(md->flags)) { SWSS_LOG_ERROR("attribute %s is not marked as READ_ONLY", md->attridname); return SAI_STATUS_FAILURE; @@ -709,7 +709,7 @@ std::string construct_key( const sai_attribute_value_t& value = attr->value; - if (!HAS_FLAG_KEY(md.flags)) + if (!SAI_HAS_FLAG_KEY(md.flags)) { continue; } @@ -1059,14 +1059,14 @@ sai_status_t meta_generic_validation_create( attrs[attr->id] = attr; - if (HAS_FLAG_READ_ONLY(md.flags)) + if (SAI_HAS_FLAG_READ_ONLY(md.flags)) { META_LOG_ERROR(md, "attr is read only and cannot be created"); return SAI_STATUS_INVALID_PARAMETER; } - if (HAS_FLAG_KEY(md.flags)) + if (SAI_HAS_FLAG_KEY(md.flags)) { haskeys = true; @@ -1083,9 +1083,9 @@ sai_status_t meta_generic_validation_create( { const char* chardata = value.chardata; - size_t len = strnlen(chardata, HOSTIF_NAME_SIZE); + size_t len = strnlen(chardata, SAI_HOSTIF_NAME_SIZE); - if (len == HOSTIF_NAME_SIZE) + if (len == SAI_HOSTIF_NAME_SIZE) { META_LOG_ERROR(md, "host interface name is too long"); @@ -1302,9 +1302,6 @@ sai_status_t meta_generic_validation_create( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: VALIDATION_LIST(md, value.qosmap); break; - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: - VALIDATION_LIST(md, value.tunnelmap); - break; case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: @@ -1425,7 +1422,7 @@ sai_status_t meta_generic_validation_create( { const sai_attr_metadata_t& md = *mdp; - if (!HAS_FLAG_MANDATORY_ON_CREATE(md.flags)) + if (!SAI_HAS_FLAG_MANDATORY_ON_CREATE(md.flags)) { continue; } @@ -1734,7 +1731,7 @@ sai_status_t meta_generic_validation_set( META_LOG_DEBUG(md, "(set)"); - if (HAS_FLAG_READ_ONLY(md.flags)) + if (SAI_HAS_FLAG_READ_ONLY(md.flags)) { if (meta_unittests_get_and_erase_set_readonly_flag(md)) { @@ -1748,14 +1745,14 @@ sai_status_t meta_generic_validation_set( } } - if (HAS_FLAG_CREATE_ONLY(md.flags)) + if (SAI_HAS_FLAG_CREATE_ONLY(md.flags)) { META_LOG_ERROR(md, "attr is create only and cannot be modified"); return SAI_STATUS_INVALID_PARAMETER; } - if (HAS_FLAG_KEY(md.flags)) + if (SAI_HAS_FLAG_KEY(md.flags)) { META_LOG_ERROR(md, "attr is key and cannot be modified"); @@ -1980,9 +1977,6 @@ sai_status_t meta_generic_validation_set( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: VALIDATION_LIST(md, value.qosmap); break; - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: - VALIDATION_LIST(md, value.tunnelmap); - break; case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: @@ -2350,9 +2344,6 @@ sai_status_t meta_generic_validation_get( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: VALIDATION_LIST(md, value.qosmap); break; - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: - VALIDATION_LIST(md, value.tunnelmap); - break; case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: case SAI_ATTR_VALUE_TYPE_INT32_RANGE: @@ -2566,7 +2557,7 @@ void meta_generic_validation_post_create( const sai_attr_metadata_t& md = *mdp; - if (HAS_FLAG_KEY(md.flags)) + if (SAI_HAS_FLAG_KEY(md.flags)) { haskeys = true; META_LOG_DEBUG(md, "attr is key"); @@ -2673,7 +2664,6 @@ void meta_generic_validation_post_create( case SAI_ATTR_VALUE_TYPE_UINT32_LIST: case SAI_ATTR_VALUE_TYPE_INT32_LIST: case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: case SAI_ATTR_VALUE_TYPE_INT32_RANGE: // no special action required @@ -2808,7 +2798,6 @@ void meta_generic_validation_post_remove( case SAI_ATTR_VALUE_TYPE_UINT32_LIST: case SAI_ATTR_VALUE_TYPE_INT32_LIST: case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: case SAI_ATTR_VALUE_TYPE_INT32_RANGE: // no special action required @@ -2877,7 +2866,7 @@ void meta_generic_validation_post_set( * if there is default value and if it's const. */ - if (!HAS_FLAG_READ_ONLY(md.flags) && md.allowedobjecttypeslength) // md.isoidattribute) + if (!SAI_HAS_FLAG_READ_ONLY(md.flags) && md.allowedobjecttypeslength) // md.isoidattribute) { if ((get_object_previous_attr(meta_key, md) == NULL) && (md.defaultvaluetype != SAI_DEFAULT_VALUE_TYPE_CONST && @@ -3059,7 +3048,6 @@ void meta_generic_validation_post_set( case SAI_ATTR_VALUE_TYPE_UINT32_LIST: case SAI_ATTR_VALUE_TYPE_INT32_LIST: case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: case SAI_ATTR_VALUE_TYPE_INT32_RANGE: // no special action required @@ -3098,7 +3086,7 @@ void meta_generic_validation_post_get_objlist( * whether default value is present and it's const NULL. */ - if (!HAS_FLAG_READ_ONLY(md.flags) && md.allowedobjecttypeslength) // md.isoidattribute) + if (!SAI_HAS_FLAG_READ_ONLY(md.flags) && md.allowedobjecttypeslength) // md.isoidattribute) { if (get_object_previous_attr(meta_key, md) == NULL) { @@ -3355,9 +3343,6 @@ void meta_generic_validation_post_get( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: VALIDATION_LIST_GET(md, value.qosmap); break; - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: - VALIDATION_LIST_GET(md, value.tunnelmap); - break; case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: @@ -4650,8 +4635,10 @@ sai_status_t meta_sai_get_stats_oid( _In_ sai_get_generic_stats_fn get); DECLARE_META_GET_STATS_OID(port); +DECLARE_META_GET_STATS_OID(port_pool); DECLARE_META_GET_STATS_OID(queue); DECLARE_META_GET_STATS_OID(ingress_priority_group); +DECLARE_META_GET_STATS_OID(tunnel); // NOTIFICATIONS diff --git a/meta/saiserialize.h b/meta/sai_serialize.h similarity index 97% rename from meta/saiserialize.h rename to meta/sai_serialize.h index b7922f4249..bef3691ab6 100644 --- a/meta/saiserialize.h +++ b/meta/sai_serialize.h @@ -72,12 +72,18 @@ std::string sai_serialize_common_api( std::string sai_serialize_port_stat( _In_ const sai_port_stat_t counter); +std::string sai_serialize_port_pool_stat( + _In_ const sai_port_pool_stat_t counter); + std::string sai_serialize_queue_stat( _In_ const sai_queue_stat_t counter); std::string sai_serialize_ingress_priority_group_stat( _In_ const sai_ingress_priority_group_stat_t counter); +std::string sai_serialize_tunnel_stat( + _In_ const sai_tunnel_stat_t counter); + std::string sai_serialize_queue_attr( _In_ const sai_queue_attr_t attr); diff --git a/meta/saiattributelist.cpp b/meta/saiattributelist.cpp index fcbaabe143..7e2d44e8ad 100644 --- a/meta/saiattributelist.cpp +++ b/meta/saiattributelist.cpp @@ -1,6 +1,6 @@ #include "saiattributelist.h" #include "sai_meta.h" -#include "saiserialize.h" +#include "sai_serialize.h" SaiAttributeList::SaiAttributeList( _In_ const sai_object_type_t object_type, diff --git a/meta/saiattributelist.h b/meta/saiattributelist.h index f5a311059d..4fad3f51a6 100644 --- a/meta/saiattributelist.h +++ b/meta/saiattributelist.h @@ -9,7 +9,7 @@ #include "swss/table.h" #include "swss/logger.h" #include "sai.h" -#include "saiserialize.h" +#include "sai_serialize.h" #include "string.h" class SaiAttributeList diff --git a/meta/saiserialize.cpp b/meta/saiserialize.cpp index 56a7010a40..10c9a1ec12 100644 --- a/meta/saiserialize.cpp +++ b/meta/saiserialize.cpp @@ -1,4 +1,4 @@ -#include "saiserialize.h" +#include "sai_serialize.h" #include "meta/sai_meta.h" #include "swss/tokenize.h" #include "swss/json.hpp" @@ -239,9 +239,6 @@ sai_status_t transfer_attribute( RETURN_ON_ERROR(transfer_list(src_attr.value.qosmap, dst_attr.value.qosmap, countOnly)); break; - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: - RETURN_ON_ERROR(transfer_list(src_attr.value.tunnelmap, dst_attr.value.tunnelmap, countOnly)); - break; /* ACL FIELD DATA */ @@ -709,13 +706,7 @@ std::string sai_serialize_fdb_entry( j["switch_id"] = sai_serialize_object_id(fdb_entry.switch_id); j["mac"] = sai_serialize_mac(fdb_entry.mac_address); -#if true - j["vlan"] = sai_serialize_vlan_id(fdb_entry.vlan_id); - j["bridge_type"] = sai_serialize_enum(fdb_entry.bridge_type, &sai_metadata_enum_sai_fdb_entry_bridge_type_t); - j["bridge_id"] = sai_serialize_object_id(fdb_entry.bridge_id); -#else - j["bvid"] = sai_serialize_object_id(fdb_entry.bvid); -#endif + j["bvid"] = sai_serialize_object_id(fdb_entry.bv_id); return j.dump(); } @@ -728,6 +719,14 @@ std::string sai_serialize_port_stat( return sai_serialize_enum(counter, &sai_metadata_enum_sai_port_stat_t); } +std::string sai_serialize_port_pool_stat( + _In_ const sai_port_pool_stat_t counter) +{ + SWSS_LOG_ENTER(); + + return sai_serialize_enum(counter, &sai_metadata_enum_sai_port_pool_stat_t); +} + std::string sai_serialize_queue_stat( _In_ const sai_queue_stat_t counter) { @@ -744,6 +743,14 @@ std::string sai_serialize_ingress_priority_group_stat( return sai_serialize_enum(counter, &sai_metadata_enum_sai_ingress_priority_group_stat_t); } +std::string sai_serialize_tunnel_stat( + _In_ const sai_tunnel_stat_t counter) +{ + SWSS_LOG_ENTER(); + + return sai_serialize_enum(counter, &sai_metadata_enum_sai_tunnel_stat_t); +} + std::string sai_serialize_queue_attr( _In_ const sai_queue_attr_t attr) { @@ -985,65 +992,6 @@ std::string sai_serialize_qos_map_list( return j.dump(); } -json sai_serialize_tunnel_map_params( - _In_ const sai_tunnel_map_params_t& params) -{ - SWSS_LOG_ENTER(); - - json j; - - j["oecn"] = params.oecn; - j["uecn"] = params.uecn; - j["vni"] = params.vni_id; - j["vlan"] = sai_serialize_vlan_id(params.vlan_id); - - return j; -} - -json sai_serialize_tunnel_map( - _In_ const sai_tunnel_map_t& tunnelmap) -{ - SWSS_LOG_ENTER(); - - json j; - - j["key"] = sai_serialize_tunnel_map_params(tunnelmap.key); - j["value"] = sai_serialize_tunnel_map_params(tunnelmap.value);; - - return j; -} - -std::string sai_serialize_tunnel_map_list( - _In_ const sai_tunnel_map_list_t& tunnelmap, - _In_ bool countOnly) -{ - SWSS_LOG_ENTER(); - - json j; - - j["count"] = tunnelmap.count; - - if (tunnelmap.list == NULL || countOnly) - { - j["list"] = nullptr; - - return j.dump(); - } - - json arr = json::array(); - - for (uint32_t i = 0; i < tunnelmap.count; ++i) - { - json item = sai_serialize_tunnel_map(tunnelmap.list[i]); - - arr.push_back(item); - } - - j["list"] = arr; - - return j.dump(); -} - template std::string sai_serialize_range( _In_ const T& range) @@ -1269,9 +1217,6 @@ std::string sai_serialize_attr_value( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: return sai_serialize_qos_map_list(attr.value.qosmap, countOnly); - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: - return sai_serialize_tunnel_map_list(attr.value.tunnelmap, countOnly); - // ACL FIELD DATA case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_BOOL: @@ -1862,70 +1807,6 @@ void sai_deserialize_qos_map_list( } } -void sai_deserialize_tunnel_map_params( - _In_ const json& j, - _Out_ sai_tunnel_map_params_t& params) -{ - SWSS_LOG_ENTER(); - - SWSS_LOG_DEBUG("%s", j.dump().c_str()); - - params.oecn = j["oecn"]; - params.uecn = j["uecn"]; - params.vni_id = j["vni"]; - - sai_deserialize_vlan_id(j["vlan"], params.vlan_id); -} - -void sai_deserialize_tunnel_map( - _In_ const json& j, - _Out_ sai_tunnel_map_t& tunnelmap) -{ - SWSS_LOG_ENTER(); - - sai_deserialize_tunnel_map_params(j["key"], tunnelmap.key); - sai_deserialize_tunnel_map_params(j["value"], tunnelmap.value); -} - -void sai_deserialize_tunnel_map_list( - _In_ const std::string& s, - _Out_ sai_tunnel_map_list_t& tunnelmap, - _In_ bool countOnly) -{ - SWSS_LOG_ENTER(); - - json j = json::parse(s); - - tunnelmap.count = j["count"]; - - if (countOnly) - { - return; - } - - if (j["list"] == nullptr) - { - tunnelmap.list = NULL; - return; - } - - json arr = j["list"]; - - if (arr.size() != (size_t)tunnelmap.count) - { - SWSS_LOG_THROW("tunnel map count mismatch %lu vs %u", arr.size(), tunnelmap.count); - } - - tunnelmap.list = sai_alloc_n_of_ptr_type(tunnelmap.count, tunnelmap.list); - - for (uint32_t i = 0; i < tunnelmap.count; ++i) - { - const json& item = arr[i]; - - sai_deserialize_tunnel_map(item, tunnelmap.list[i]); - } -} - void sai_deserialize_ipv6( _In_ const std::string& s, _Out_ sai_ip6_t& ipaddr) @@ -2242,9 +2123,6 @@ void sai_deserialize_attr_value( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: return sai_deserialize_qos_map_list(s, attr.value.qosmap, countOnly); - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: - return sai_deserialize_tunnel_map_list(s, attr.value.tunnelmap, countOnly); - // ACL FIELD DATA case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_BOOL: @@ -2396,17 +2274,6 @@ void sai_deserialize_vlan_id( sai_deserialize_number(s, vlan_id); } -#if true -void sai_deserialize_fdb_entry_bridge_type( - _In_ const std::string& s, - _Out_ sai_fdb_entry_bridge_type_t& fdb_entry_bridge_type) -{ - SWSS_LOG_ENTER(); - - sai_deserialize_enum(s, &sai_metadata_enum_sai_fdb_entry_bridge_type_t, (int32_t&)fdb_entry_bridge_type); -} -#endif - void sai_deserialize_fdb_entry( _In_ const std::string &s, _Out_ sai_fdb_entry_t &fdb_entry) @@ -2417,13 +2284,7 @@ void sai_deserialize_fdb_entry( sai_deserialize_object_id(j["switch_id"], fdb_entry.switch_id); sai_deserialize_mac(j["mac"], fdb_entry.mac_address); -#if true - sai_deserialize_vlan_id(j["vlan"], fdb_entry.vlan_id); - sai_deserialize_fdb_entry_bridge_type(j["bridge_type"], fdb_entry.bridge_type); - sai_deserialize_object_id(j["bridge_id"], fdb_entry.bridge_id); -#else - sai_deserialize_object_id(j["bvid"], fdb_entry.bvid); -#endif + sai_deserialize_object_id(j["bvid"], fdb_entry.bv_id); } void sai_deserialize_neighbor_entry( @@ -2699,10 +2560,6 @@ void sai_deserialize_free_attribute_value( sai_free_list(attr.value.qosmap); break; - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: - sai_free_list(attr.value.tunnelmap); - break; - /* ACL FIELD DATA */ case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_BOOL: diff --git a/meta/tests.cpp b/meta/tests.cpp index ff1819755a..b267d4af83 100644 --- a/meta/tests.cpp +++ b/meta/tests.cpp @@ -1,6 +1,6 @@ #include "sai_meta.h" #include "sai_extra.h" -#include "saiserialize.h" +#include "sai_serialize.h" #include #include @@ -747,8 +747,7 @@ void test_fdb_entry_create() fdb_entry.switch_id = switch_id; sai_object_id_t bridge_id = create_dummy_object_id(SAI_OBJECT_TYPE_BRIDGE, switch_id); object_reference_insert(bridge_id); - //fdb_entry.bvid = bridge_id; - fdb_entry.bridge_id = bridge_id; + fdb_entry.bv_id = bridge_id; sai_object_id_t port = create_dummy_object_id(SAI_OBJECT_TYPE_BRIDGE_PORT, switch_id); object_reference_insert(port); @@ -854,8 +853,7 @@ void test_fdb_entry_remove() fdb_entry.switch_id = switch_id; sai_object_id_t bridge_id = create_dummy_object_id(SAI_OBJECT_TYPE_BRIDGE, switch_id); object_reference_insert(bridge_id); - //fdb_entry.bvid= bridge_id; - fdb_entry.bridge_id = bridge_id; + fdb_entry.bv_id= bridge_id; sai_object_id_t port = create_dummy_object_id(SAI_OBJECT_TYPE_BRIDGE_PORT,switch_id); object_reference_insert(port); @@ -996,8 +994,7 @@ void test_fdb_entry_get() sai_object_id_t bridge_id = create_dummy_object_id(SAI_OBJECT_TYPE_BRIDGE, switch_id); object_reference_insert(bridge_id); - //fdb_entry.bvid = bridge_id; - fdb_entry.bridge_id = bridge_id; + fdb_entry.bv_id = bridge_id; // TODO we should use CREATE for this sai_object_meta_key_t meta_key_fdb = { .objecttype = SAI_OBJECT_TYPE_FDB_ENTRY, .objectkey = { .key = { .fdb_entry = fdb_entry } } }; @@ -1072,8 +1069,7 @@ void test_fdb_entry_flow() sai_object_id_t bridge_id = create_dummy_object_id(SAI_OBJECT_TYPE_BRIDGE, switch_id); object_reference_insert(bridge_id); - //fdb_entry.bvid= bridge_id; - fdb_entry.bridge_id = bridge_id; + fdb_entry.bv_id= bridge_id; sai_object_id_t lag = create_dummy_object_id(SAI_OBJECT_TYPE_BRIDGE_PORT,switch_id); object_reference_insert(lag); @@ -2391,12 +2387,6 @@ void test_route_entry_set() status = meta_sai_set_route_entry(&route_entry, &attr, &dummy_success_sai_set_route_entry); META_ASSERT_SUCCESS(status); - SWSS_LOG_NOTICE("correct trap priority"); - attr.id = SAI_ROUTE_ENTRY_ATTR_TRAP_PRIORITY; - attr.value.u8 = 12; - status = meta_sai_set_route_entry(&route_entry, &attr, &dummy_success_sai_set_route_entry); - META_ASSERT_SUCCESS(status); - SWSS_LOG_NOTICE("correct next hop"); attr.id = SAI_ROUTE_ENTRY_ATTR_NEXT_HOP_ID; attr.value.oid = hop; @@ -2498,11 +2488,6 @@ void test_route_entry_get() status = meta_sai_get_route_entry(&route_entry, 1, &attr, &dummy_success_sai_get_route_entry); META_ASSERT_SUCCESS(status); - SWSS_LOG_NOTICE("correct trap prio"); - attr.id = SAI_ROUTE_ENTRY_ATTR_TRAP_PRIORITY; - status = meta_sai_get_route_entry(&route_entry, 1, &attr, &dummy_success_sai_get_route_entry); - META_ASSERT_SUCCESS(status); - SWSS_LOG_NOTICE("correct next hop"); attr.id = SAI_ROUTE_ENTRY_ATTR_NEXT_HOP_ID; status = meta_sai_get_route_entry(&route_entry, 1, &attr, &dummy_success_sai_get_route_entry); @@ -2603,12 +2588,6 @@ void test_route_entry_flow() status = meta_sai_set_route_entry(&route_entry, &attr, &dummy_success_sai_set_route_entry); META_ASSERT_SUCCESS(status); - SWSS_LOG_NOTICE("correct trap priority"); - attr.id = SAI_ROUTE_ENTRY_ATTR_TRAP_PRIORITY; - attr.value.u8 = 12; - status = meta_sai_set_route_entry(&route_entry, &attr, &dummy_success_sai_set_route_entry); - META_ASSERT_SUCCESS(status); - SWSS_LOG_NOTICE("correct next hop"); attr.id = SAI_ROUTE_ENTRY_ATTR_NEXT_HOP_ID; attr.value.oid = hop; @@ -2628,11 +2607,6 @@ void test_route_entry_flow() status = meta_sai_get_route_entry(&route_entry, 1, &attr, &dummy_success_sai_get_route_entry); META_ASSERT_SUCCESS(status); - SWSS_LOG_NOTICE("correct trap prio"); - attr.id = SAI_ROUTE_ENTRY_ATTR_TRAP_PRIORITY; - status = meta_sai_get_route_entry(&route_entry, 1, &attr, &dummy_success_sai_get_route_entry); - META_ASSERT_SUCCESS(status); - SWSS_LOG_NOTICE("correct next hop"); attr.id = SAI_ROUTE_ENTRY_ATTR_NEXT_HOP_ID; status = meta_sai_get_route_entry(&route_entry, 1, &attr, &dummy_success_sai_get_route_entry); @@ -4011,60 +3985,6 @@ void test_serialize_qos_map() ASSERT_TRUE(l.value.color, SAI_PACKET_COLOR_GREEN); } -void test_serialize_tunnel_map() -{ - SWSS_LOG_ENTER(); - - clear_local(); - meta_init_db(); - - sai_attribute_t attr; - const sai_attr_metadata_t* meta; - std::string s; - - attr.id = SAI_TUNNEL_MAP_ATTR_MAP_TO_VALUE_LIST; - - sai_tunnel_map_t tm = { - .key = { .oecn = 1, .uecn = 2, .vlan_id = 3, .vni_id = 4 }, - .value = { .oecn = 11, .uecn = 22, .vlan_id = 33, .vni_id = 44 } }; - - attr.value.tunnelmap.count = 1; - attr.value.tunnelmap.list = &tm; - - meta = sai_metadata_get_attr_metadata(SAI_OBJECT_TYPE_TUNNEL_MAP, attr.id); - - s = sai_serialize_attr_value(*meta, attr); - - std::string ret = "{\"count\":1,\"list\":[{\"key\":{\"oecn\":1,\"uecn\":2,\"vlan\":\"3\",\"vni\":4},\"value\":{\"oecn\":11,\"uecn\":22,\"vlan\":\"33\",\"vni\":44}}]}"; - - ASSERT_TRUE(s, ret); - - s = sai_serialize_attr_value(*meta, attr, true); - - std::string ret2 = "{\"count\":1,\"list\":null}"; - ASSERT_TRUE(s, ret2); - - // deserialize - - memset(&attr, 0, sizeof(attr)); - - sai_deserialize_attr_value(ret, *meta, attr); - - ASSERT_TRUE(attr.value.tunnelmap.count, 1); - - auto &l = attr.value.tunnelmap.list[0]; - - ASSERT_TRUE(l.key.oecn, 1); - ASSERT_TRUE(l.key.uecn, 2); - ASSERT_TRUE(l.key.vlan_id, 3); - ASSERT_TRUE(l.key.vni_id, 4); - - ASSERT_TRUE(l.value.oecn, 11); - ASSERT_TRUE(l.value.uecn, 22); - ASSERT_TRUE(l.value.vlan_id, 33); - ASSERT_TRUE(l.value.vni_id, 44); -} - template void deserialize_number( _In_ const std::string& s, @@ -4169,7 +4089,6 @@ int main() test_serialize_oid_list(); test_serialize_acl_action(); test_serialize_qos_map(); - test_serialize_tunnel_map(); // attributes tests diff --git a/saidiscovery/saidiscovery.cpp b/saidiscovery/saidiscovery.cpp index 226aa8b0d5..c55e3500d4 100644 --- a/saidiscovery/saidiscovery.cpp +++ b/saidiscovery/saidiscovery.cpp @@ -10,7 +10,7 @@ extern "C" { } #include "swss/logger.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include #include @@ -388,7 +388,7 @@ int profile_get_next_value( return 0; } -service_method_table_t test_services = { +sai_service_method_table_t test_services = { profile_get_value, profile_get_next_value }; @@ -405,7 +405,7 @@ void check_mandatory_attributes( { auto md = info->attrmetadata[idx]; - if (!HAS_FLAG_MANDATORY_ON_CREATE(md->flags)) + if (!SAI_HAS_FLAG_MANDATORY_ON_CREATE(md->flags)) { continue; } @@ -578,7 +578,7 @@ int main(int argc, char **argv) handleProfileMap(gOptions.profileMapFile); - sai_status_t status = sai_api_initialize(0, (service_method_table_t*)&test_services); + sai_status_t status = sai_api_initialize(0, (sai_service_method_table_t*)&test_services); if (status != SAI_STATUS_SUCCESS) { @@ -593,7 +593,8 @@ int main(int argc, char **argv) sai_log_set((sai_api_t)api, gOptions.saiApiLogLevel); } - sai_metadata_apis_query(sai_api_query); + sai_apis_t apis; + sai_metadata_apis_query(sai_api_query, &apis); sai_object_id_t switch_id; diff --git a/saidump/saidump.cpp b/saidump/saidump.cpp index c2fe214d54..434ee558f6 100644 --- a/saidump/saidump.cpp +++ b/saidump/saidump.cpp @@ -5,7 +5,7 @@ extern "C" { } #include "swss/table.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "sairedis.h" #include diff --git a/saiplayer/saiplayer.cpp b/saiplayer/saiplayer.cpp index bc351d71a5..9321b19f41 100644 --- a/saiplayer/saiplayer.cpp +++ b/saiplayer/saiplayer.cpp @@ -6,7 +6,7 @@ extern "C" { #include "sai.h" } -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" #include "swss/logger.h" #include "swss/tokenize.h" @@ -52,7 +52,7 @@ int test_profile_get_next_value ( return -1; } -const service_method_table_t test_services = { +const sai_service_method_table_t test_services = { test_profile_get_value, test_profile_get_next_value }; @@ -315,10 +315,6 @@ void match_list_lengths( CHECK_LIST(value.qosmap); break; - case SAI_ATTR_VALUE_TYPE_TUNNEL_MAP_LIST: - CHECK_LIST(value.tunnelmap); - break; - case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_OBJECT_LIST: CHECK_LIST(value.aclfield.data.objlist); break; @@ -458,7 +454,7 @@ sai_status_t handle_fdb( sai_deserialize_fdb_entry(str_object_id, fdb_entry); fdb_entry.switch_id = translate_local_to_redis(fdb_entry.switch_id); - fdb_entry.bridge_id = translate_local_to_redis(fdb_entry.bridge_id); + fdb_entry.bv_id = translate_local_to_redis(fdb_entry.bv_id); switch (api) { @@ -914,7 +910,7 @@ sai_status_t handle_bulk_route( (uint32_t)routes.size(), routes.data(), attrs.data(), - SAI_BULK_OP_TYPE_INGORE_ERROR, // TODO we need to get that from recording + SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, // TODO we need to get that from recording statuses.data()); if (status != SAI_STATUS_SUCCESS) @@ -1377,9 +1373,10 @@ int main(int argc, char **argv) sai_metadata_log = &sai_meta_log_syncd; #pragma GCC diagnostic pop - EXIT_ON_ERROR(sai_api_initialize(0, (const service_method_table_t *)&test_services)); + EXIT_ON_ERROR(sai_api_initialize(0, (const sai_service_method_table_t *)&test_services)); - sai_metadata_apis_query(sai_api_query); + sai_apis_t apis; + sai_metadata_apis_query(sai_api_query, &apis); sai_attribute_t attr; diff --git a/saisdkdump/saisdkdump.cpp b/saisdkdump/saisdkdump.cpp index bd4d3b6445..0ca7be6ca8 100644 --- a/saisdkdump/saisdkdump.cpp +++ b/saisdkdump/saisdkdump.cpp @@ -56,7 +56,7 @@ int profile_get_next_value( return -1; } -service_method_table_t test_services = { +sai_service_method_table_t test_services = { profile_get_value, profile_get_next_value }; @@ -117,7 +117,7 @@ int main(int argc, char **argv) SWSS_LOG_INFO("The dump file is not specified, generated \"%s\" file name", fileName.c_str()); } - sai_status_t status = sai_api_initialize(0, (service_method_table_t*)&test_services); + sai_status_t status = sai_api_initialize(0, (sai_service_method_table_t*)&test_services); if (status != SAI_STATUS_SUCCESS) { exit_with_sai_failure("Failed to initialize SAI api", status); diff --git a/syncd/syncd.cpp b/syncd/syncd.cpp index ebafa6a30c..7671efdd62 100644 --- a/syncd/syncd.cpp +++ b/syncd/syncd.cpp @@ -837,7 +837,7 @@ void snoop_get_response( break; } - if (HAS_FLAG_READ_ONLY(meta->flags)) + if (SAI_HAS_FLAG_READ_ONLY(meta->flags)) { /* * If value is read only, we skip it, since after syncd restart we @@ -1013,7 +1013,7 @@ int profile_get_next_value( return 0; } -service_method_table_t test_services = { +sai_service_method_table_t test_services = { profile_get_value, profile_get_next_value }; @@ -3282,7 +3282,7 @@ int syncd_main(int argc, char **argv) gProfileMap[SAI_KEY_BOOT_TYPE] = std::to_string(options.startType); - sai_status_t status = sai_api_initialize(0, (service_method_table_t*)&test_services); + sai_status_t status = sai_api_initialize(0, (sai_service_method_table_t*)&test_services); if (status != SAI_STATUS_SUCCESS) { @@ -3290,7 +3290,8 @@ int syncd_main(int argc, char **argv) return EXIT_FAILURE; } - int failed = sai_metadata_apis_query(sai_api_query); + sai_apis_t apis; + int failed = sai_metadata_apis_query(sai_api_query, &apis); if (failed > 0) { diff --git a/syncd/syncd.h b/syncd/syncd.h index e2600a2a17..b827c0c924 100644 --- a/syncd/syncd.h +++ b/syncd/syncd.h @@ -25,7 +25,7 @@ extern "C" { #include "sai.h" } -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" #include "swss/redisclient.h" #include "swss/dbconnector.h" diff --git a/syncd/syncd_applyview.cpp b/syncd/syncd_applyview.cpp index ae9a5b2f63..522a70dac0 100644 --- a/syncd/syncd_applyview.cpp +++ b/syncd/syncd_applyview.cpp @@ -2122,7 +2122,7 @@ int findAllChildsInDependencyTreeCount( auto &meta = member->attrmetadata; - if (HAS_FLAG_READ_ONLY(meta->flags)) + if (SAI_HAS_FLAG_READ_ONLY(meta->flags)) { /* * Skip read only attributes. @@ -2393,7 +2393,7 @@ std::shared_ptr findCurrentBestMatchForGenericObject( const sai_attr_metadata_t* meta = attr.second->getAttrMetadata(); - if (HAS_FLAG_CREATE_ONLY(meta->flags) && currentObj->hasAttr(attrId)) + if (SAI_HAS_FLAG_CREATE_ONLY(meta->flags) && currentObj->hasAttr(attrId)) { has_different_create_only_attr = true; @@ -3064,7 +3064,7 @@ void bringNonRemovableObjectToDefaultState( const auto &meta = attr->getAttrMetadata(); - if (!HAS_FLAG_CREATE_AND_SET(meta->flags)) + if (!SAI_HAS_FLAG_CREATE_AND_SET(meta->flags)) { SWSS_LOG_THROW("attribute %s is not CREATE_AND_SET, bug?", meta->attridname); } @@ -3436,7 +3436,7 @@ void setAttributeOnCurrentObject( const auto meta = inattr->getAttrMetadata(); - if (!HAS_FLAG_CREATE_AND_SET(meta->flags)) + if (!SAI_HAS_FLAG_CREATE_AND_SET(meta->flags)) { SWSS_LOG_THROW("can't set attribute %s on current object %s:%s since it's not CREATE_AND_SET", meta->attridname, @@ -4015,7 +4015,7 @@ bool performObjectSetTransition( * value on current best match object. */ - if (HAS_FLAG_CREATE_AND_SET(meta->flags)) + if (SAI_HAS_FLAG_CREATE_AND_SET(meta->flags)) { SWSS_LOG_DEBUG("Attr %s can be updated from %s to %s", meta->attridname, @@ -4093,14 +4093,14 @@ bool performObjectSetTransition( * safe to make SET operation. * * XXX previously we had (meta->flags == SAI_ATTR_FLAGS_CREATE_AND_SET) - * If it's not conditional current HAS_FLAG should not matter. But it + * If it's not conditional current SAI_HAS_FLAG should not matter. But it * can also be mandatory on create but this does not matter since if * it's mandatory on create then current object already exists co we can * still perform update on this attribute because it was passed during * creation. */ - if (HAS_FLAG_CREATE_AND_SET(meta->flags) && !conditional) + if (SAI_HAS_FLAG_CREATE_AND_SET(meta->flags) && !conditional) { SWSS_LOG_INFO("Missing current attr %s can be set to %s", meta->attridname, @@ -4121,7 +4121,7 @@ bool performObjectSetTransition( if (currentBestMatch->getObjectStatus() == SAI_OBJECT_STATUS_MATCHED) { - if (HAS_FLAG_CREATE_ONLY(meta->flags)) + if (SAI_HAS_FLAG_CREATE_ONLY(meta->flags)) { /* * Attribute is create only attribute on matched object. This @@ -4239,10 +4239,10 @@ bool performObjectSetTransition( bool conditional = meta->isconditional; - if (conditional || HAS_FLAG_MANDATORY_ON_CREATE(meta->flags)) + if (conditional || SAI_HAS_FLAG_MANDATORY_ON_CREATE(meta->flags)) { if (currentBestMatch->getObjectStatus() == SAI_OBJECT_STATUS_MATCHED && - HAS_FLAG_CREATE_AND_SET(meta->flags)) + SAI_HAS_FLAG_CREATE_AND_SET(meta->flags)) { if (meta->objecttype == SAI_OBJECT_TYPE_SCHEDULER_GROUP && meta->attrid == SAI_SCHEDULER_GROUP_ATTR_SCHEDULER_PROFILE_ID) @@ -4321,7 +4321,7 @@ bool performObjectSetTransition( if (currentBestMatch->getObjectStatus() == SAI_OBJECT_STATUS_MATCHED) { - if (HAS_FLAG_CREATE_ONLY(meta->flags)) + if (SAI_HAS_FLAG_CREATE_ONLY(meta->flags)) { /* * Attribute is create only attribute on matched object. This diff --git a/syncd/syncd_hard_reinit.cpp b/syncd/syncd_hard_reinit.cpp index fe83d9373d..a63123dc61 100644 --- a/syncd/syncd_hard_reinit.cpp +++ b/syncd/syncd_hard_reinit.cpp @@ -379,7 +379,7 @@ void processSwitches() { auto meta = sai_metadata_get_attr_metadata(SAI_OBJECT_TYPE_SWITCH, attrList[idx].id); - if (HAS_FLAG_MANDATORY_ON_CREATE(meta->flags) || HAS_FLAG_CREATE_ONLY(meta->flags)) + if (SAI_HAS_FLAG_MANDATORY_ON_CREATE(meta->flags) || SAI_HAS_FLAG_CREATE_ONLY(meta->flags)) { /* * If attribute is mandatory on create or create only, we need @@ -722,7 +722,7 @@ sai_object_id_t processSingleVid( continue; } - if (HAS_FLAG_CREATE_ONLY(meta->flags)) + if (SAI_HAS_FLAG_CREATE_ONLY(meta->flags)) { /* * If we will be performing this on default existing created diff --git a/syncd/syncd_notifications.cpp b/syncd/syncd_notifications.cpp index a5aac1b8ff..d28f40249f 100644 --- a/syncd/syncd_notifications.cpp +++ b/syncd/syncd_notifications.cpp @@ -89,8 +89,7 @@ void redisPutFdbEntryToAsicView( std::string key = ASIC_STATE_TABLE + (":" + strObjectType + ":" + strFdbEntry); if (fdb->fdb_entry.switch_id == SAI_NULL_OBJECT_ID || - // fdb->fdb_entry.bridge_id == SAI_NULL_OBJECT_ID || // TODO later use bv_id - sai_metadata_get_fdb_entry_bridge_type_name(fdb->fdb_entry.bridge_type) == NULL) + fdb->fdb_entry.bv_id == SAI_NULL_OBJECT_ID) { SWSS_LOG_WARN("skipped to put int db: %s", strFdbEntry.c_str()); return; @@ -269,8 +268,7 @@ void process_on_fdb_event( fdb->fdb_entry.switch_id = translate_rid_to_vid(fdb->fdb_entry.switch_id, SAI_NULL_OBJECT_ID); - // TODO later it should be bv_id - fdb->fdb_entry.bridge_id = translate_rid_to_vid(fdb->fdb_entry.bridge_id, fdb->fdb_entry.switch_id); + fdb->fdb_entry.bv_id = translate_rid_to_vid(fdb->fdb_entry.bv_id, fdb->fdb_entry.switch_id); translate_rid_to_vid_list(SAI_OBJECT_TYPE_FDB_ENTRY, fdb->fdb_entry.switch_id, fdb->attr_count, fdb->attr); diff --git a/syncd/tests.cpp b/syncd/tests.cpp index 83b9a8aded..2ec17aeaf8 100644 --- a/syncd/tests.cpp +++ b/syncd/tests.cpp @@ -10,7 +10,7 @@ extern "C" { #include "swss/redisreply.h" #include "sairedis.h" #include "sai_redis.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "syncd.h" #include @@ -85,7 +85,7 @@ static int profile_get_next_value( return -1; } -static service_method_table_t test_services = { +static sai_service_method_table_t test_services = { profile_get_value, profile_get_next_value }; @@ -97,7 +97,7 @@ void test_sai_initialize() // NOTE: this is just testing whether test application will // link against libsairedis, this api requires running redis db // with enabled unix socket - sai_status_t status = sai_api_initialize(0, (service_method_table_t*)&test_services); + sai_status_t status = sai_api_initialize(0, (sai_service_method_table_t*)&test_services); // Mock the SAI api test_next_hop_group_api.create_next_hop_group_member = test_create_next_hop_group_member; @@ -259,7 +259,7 @@ void test_bulk_next_hop_group_member_create() std::vector statuses(count); std::vector object_id(count); sai_bulk_create_next_hop_group_members(switch_id, count, nhgm_attrs_count.data(), nhgm_attrs_array.data() - , SAI_BULK_OP_TYPE_INGORE_ERROR, object_id.data(), statuses.data()); + , SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, object_id.data(), statuses.data()); ASSERT_SUCCESS("Failed to bulk create nhgm"); for (size_t j = 0; j < statuses.size(); j++) { @@ -279,7 +279,7 @@ void test_bulk_next_hop_group_member_create() assert(created_attrs[1].value.oid == nhgm_attrs[i][1].value.oid); } - status = sai_bulk_remove_next_hop_group_members(count, object_id.data(), SAI_BULK_OP_TYPE_INGORE_ERROR, statuses.data()); + status = sai_bulk_remove_next_hop_group_members(count, object_id.data(), SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, statuses.data()); ASSERT_SUCCESS("Failed to bulk remove nhgm"); } @@ -339,13 +339,18 @@ void test_bulk_fdb_create() std::string bridge_port_key = sai_serialize_object_meta_key(meta_key_bridge_port); ObjectAttrHash[bridge_port_key] = { }; + // bridge + sai_object_id_t bridge = create_dummy_object_id(SAI_OBJECT_TYPE_BRIDGE); + object_reference_insert(bridge); + sai_object_meta_key_t meta_key_bridge = { .objecttype = SAI_OBJECT_TYPE_BRIDGE, .objectkey = { .key = { .object_id = bridge } } }; + std::string bridge_key = sai_serialize_object_meta_key(meta_key_bridge); + ObjectAttrHash[bridge_key] = { }; + sai_fdb_entry_t fdb_entry; fdb_entry.switch_id = switch_id; memset(fdb_entry.mac_address, 0, sizeof(sai_mac_t)); fdb_entry.mac_address[0] = 0xD; - fdb_entry.bridge_type = SAI_FDB_ENTRY_BRIDGE_TYPE_1Q; - fdb_entry.vlan_id = (unsigned short)(1011 + i); - fdb_entry.bridge_id = SAI_NULL_OBJECT_ID; + fdb_entry.bv_id = bridge; fdbs.push_back(fdb_entry); @@ -375,7 +380,7 @@ void test_bulk_fdb_create() std::vector statuses(count); status = sai_bulk_create_fdb_entry(count, fdbs.data(), fdb_attrs_count.data(), fdb_attrs_array.data() - , SAI_BULK_OP_TYPE_INGORE_ERROR, statuses.data()); + , SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, statuses.data()); ASSERT_SUCCESS("Failed to create fdb"); for (size_t j = 0; j < statuses.size(); j++) { @@ -384,7 +389,7 @@ void test_bulk_fdb_create() } // Remove route entry - status = sai_bulk_remove_fdb_entry(count, fdbs.data(), SAI_BULK_OP_TYPE_INGORE_ERROR, statuses.data()); + status = sai_bulk_remove_fdb_entry(count, fdbs.data(), SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, statuses.data()); ASSERT_SUCCESS("Failed to bulk remove route entry"); } @@ -474,7 +479,7 @@ void test_bulk_route_set() std::vector statuses(count); status = sai_bulk_create_route_entry(count, routes.data(), route_attrs_count.data(), route_attrs_array.data() - , SAI_BULK_OP_TYPE_INGORE_ERROR, statuses.data()); + , SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, statuses.data()); ASSERT_SUCCESS("Failed to create route"); for (size_t j = 0; j < statuses.size(); j++) { @@ -507,7 +512,7 @@ void test_bulk_route_set() count, routes.data(), attrs.data(), - SAI_BULK_OP_TYPE_INGORE_ERROR, + SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, statuses.data()); ASSERT_SUCCESS("Failed to bulk set route"); @@ -523,7 +528,7 @@ void test_bulk_route_set() // if after consume we get pop we get expectd parameters // Remove route entry - status = sai_bulk_remove_route_entry(count, routes.data(), SAI_BULK_OP_TYPE_INGORE_ERROR, statuses.data()); + status = sai_bulk_remove_route_entry(count, routes.data(), SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, statuses.data()); ASSERT_SUCCESS("Failed to bulk remove route entry"); } diff --git a/vslib/inc/sai_vs_state.h b/vslib/inc/sai_vs_state.h index 3dcb76ed0f..e70386be6a 100644 --- a/vslib/inc/sai_vs_state.h +++ b/vslib/inc/sai_vs_state.h @@ -2,7 +2,7 @@ #define __SAI_VS_STATE__ #include "meta/sai_meta.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" #include "swss/selectableevent.h" diff --git a/vslib/inc/sai_vs_switch_BCM56850.h b/vslib/inc/sai_vs_switch_BCM56850.h index dd8926045b..091f43d68d 100644 --- a/vslib/inc/sai_vs_switch_BCM56850.h +++ b/vslib/inc/sai_vs_switch_BCM56850.h @@ -2,7 +2,7 @@ #define __SAI_VS_SWITCH_BCM56850__ #include "meta/sai_meta.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" void init_switch_BCM56850( diff --git a/vslib/inc/sai_vs_switch_MLNX2700.h b/vslib/inc/sai_vs_switch_MLNX2700.h index 39b26144a7..9b1e2f32a2 100644 --- a/vslib/inc/sai_vs_switch_MLNX2700.h +++ b/vslib/inc/sai_vs_switch_MLNX2700.h @@ -2,7 +2,7 @@ #define __SAI_VS_SWITCH_MLNX2700__ #include "meta/sai_meta.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include "meta/saiattributelist.h" void init_switch_MLNX2700( diff --git a/vslib/src/sai_vs_bridge.cpp b/vslib/src/sai_vs_bridge.cpp index 7caf294455..bd2b94d385 100644 --- a/vslib/src/sai_vs_bridge.cpp +++ b/vslib/src/sai_vs_bridge.cpp @@ -1,11 +1,68 @@ #include "sai_vs.h" #include "sai_vs_internal.h" +sai_status_t vs_get_bridge_stats( + _In_ sai_object_id_t bridge_id, + _In_ uint32_t number_of_counters, + _In_ const sai_bridge_stat_t *counter_ids, + _Out_ uint64_t *counters) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + +sai_status_t vs_clear_bridge_stats( + _In_ sai_object_id_t bridge_id, + _In_ uint32_t number_of_counters, + _In_ const sai_bridge_stat_t *counter_ids) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + +sai_status_t vs_get_bridge_port_stats( + _In_ sai_object_id_t bridge_port_id, + _In_ uint32_t number_of_counters, + _In_ const sai_bridge_port_stat_t *counter_ids, + _Out_ uint64_t *counters) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + +sai_status_t vs_clear_bridge_port_stats( + _In_ sai_object_id_t bridge_port_id, + _In_ uint32_t number_of_counters, + _In_ const sai_bridge_port_stat_t *counter_ids) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + VS_GENERIC_QUAD(BRIDGE,bridge); VS_GENERIC_QUAD(BRIDGE_PORT,bridge_port); const sai_bridge_api_t vs_bridge_api = { VS_GENERIC_QUAD_API(bridge) + + vs_get_bridge_stats, + vs_clear_bridge_stats, + VS_GENERIC_QUAD_API(bridge_port) + + vs_get_bridge_port_stats, + vs_clear_bridge_port_stats, }; diff --git a/vslib/src/sai_vs_generic_get.cpp b/vslib/src/sai_vs_generic_get.cpp index b5b5f9db17..85f3a4a3ac 100644 --- a/vslib/src/sai_vs_generic_get.cpp +++ b/vslib/src/sai_vs_generic_get.cpp @@ -85,7 +85,7 @@ sai_status_t internal_vs_generic_get( sai_status_t status; - if (HAS_FLAG_READ_ONLY(meta->flags)) + if (SAI_HAS_FLAG_READ_ONLY(meta->flags)) { /* * Read only attributes may require recalculation. diff --git a/vslib/src/sai_vs_hostintf.cpp b/vslib/src/sai_vs_hostintf.cpp index fedf7e0c6d..74ce12a1bc 100644 --- a/vslib/src/sai_vs_hostintf.cpp +++ b/vslib/src/sai_vs_hostintf.cpp @@ -2,7 +2,7 @@ #include "sai_vs_internal.h" #include "sai_vs_state.h" -#include "meta/saiserialize.h" +#include "meta/sai_serialize.h" #include #include diff --git a/vslib/src/sai_vs_interfacequery.cpp b/vslib/src/sai_vs_interfacequery.cpp index 959f9a761a..329bd821db 100644 --- a/vslib/src/sai_vs_interfacequery.cpp +++ b/vslib/src/sai_vs_interfacequery.cpp @@ -283,7 +283,7 @@ void fdbAgingThreadProc() * * We could use this table to choose switch vendor. */ -static service_method_table_t g_service_method_table; +static sai_service_method_table_t g_service_method_table; void clear_local_state() { @@ -312,7 +312,7 @@ void clear_local_state() sai_status_t sai_api_initialize( _In_ uint64_t flags, - _In_ const service_method_table_t *service_method_table) + _In_ const sai_service_method_table_t *service_method_table) { MUTEX(); diff --git a/vslib/src/sai_vs_lag.cpp b/vslib/src/sai_vs_lag.cpp index 810fc98499..1ceebdf40d 100644 --- a/vslib/src/sai_vs_lag.cpp +++ b/vslib/src/sai_vs_lag.cpp @@ -6,7 +6,7 @@ sai_status_t vs_bulk_object_create_lag( _In_ uint32_t object_count, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t **attrs, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_object_id_t *object_id, _Out_ sai_status_t *object_statuses) { @@ -20,7 +20,7 @@ sai_status_t vs_bulk_object_create_lag( sai_status_t vs_bulk_object_remove_lag( _In_ uint32_t object_count, _In_ const sai_object_id_t *object_id, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { MUTEX(); diff --git a/vslib/src/sai_vs_nexthopgroup.cpp b/vslib/src/sai_vs_nexthopgroup.cpp index d511b09adf..81661fb8a3 100644 --- a/vslib/src/sai_vs_nexthopgroup.cpp +++ b/vslib/src/sai_vs_nexthopgroup.cpp @@ -6,7 +6,7 @@ sai_status_t vs_bulk_object_create_next_hop_group_members( _In_ uint32_t object_count, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t **attrs, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_object_id_t *object_id, _Out_ sai_status_t *object_statuses) { @@ -20,7 +20,7 @@ sai_status_t vs_bulk_object_create_next_hop_group_members( sai_status_t vs_bulk_object_remove_next_hop_group_members( _In_ uint32_t object_count, _In_ const sai_object_id_t *object_id, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { MUTEX(); diff --git a/vslib/src/sai_vs_port.cpp b/vslib/src/sai_vs_port.cpp index ccf243d545..71a3a44fb0 100644 --- a/vslib/src/sai_vs_port.cpp +++ b/vslib/src/sai_vs_port.cpp @@ -7,6 +7,8 @@ sai_status_t vs_get_port_stats( _In_ const sai_port_stat_t *counter_ids, _Out_ uint64_t *counters) { + MUTEX(); + SWSS_LOG_ENTER(); return SAI_STATUS_NOT_IMPLEMENTED; @@ -34,7 +36,35 @@ sai_status_t vs_clear_port_all_stats( return SAI_STATUS_NOT_IMPLEMENTED; } +sai_status_t vs_get_port_pool_stats( + _In_ sai_object_id_t port_pool_id, + _In_ uint32_t number_of_counters, + _In_ const sai_port_pool_stat_t *counter_ids, + _Out_ uint64_t *counters) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + + +sai_status_t vs_clear_port_pool_stats( + _In_ sai_object_id_t port_pool_id, + _In_ uint32_t number_of_counters, + _In_ const sai_port_pool_stat_t *counter_ids) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + + VS_GENERIC_QUAD(PORT,port); +VS_GENERIC_QUAD(PORT_POOL,port_pool); const sai_port_api_t vs_port_api = { @@ -43,4 +73,9 @@ const sai_port_api_t vs_port_api = { vs_get_port_stats, vs_clear_port_stats, vs_clear_port_all_stats, + + VS_GENERIC_QUAD_API(port_pool) + + vs_get_port_pool_stats, + vs_clear_port_pool_stats }; diff --git a/vslib/src/sai_vs_route.cpp b/vslib/src/sai_vs_route.cpp index ec33184b39..da09ef9001 100644 --- a/vslib/src/sai_vs_route.cpp +++ b/vslib/src/sai_vs_route.cpp @@ -1,9 +1,73 @@ #include "sai_vs.h" #include "sai_vs_internal.h" +sai_status_t vs_bulk_create_route_entry( + _In_ uint32_t object_count, + _In_ const sai_route_entry_t *route_entry, + _In_ const uint32_t *attr_count, + _In_ const sai_attribute_t *const *attr_list, + _In_ sai_bulk_op_error_mode_t mode, + _Out_ sai_status_t *object_statuses) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + +sai_status_t vs_bulk_remove_route_entry( + _In_ uint32_t object_count, + _In_ const sai_route_entry_t *route_entry, + _In_ sai_bulk_op_error_mode_t mode, + _Out_ sai_status_t *object_statuses) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + +sai_status_t vs_bulk_set_route_entry_attribute( + _In_ uint32_t object_count, + _In_ const sai_route_entry_t *route_entry, + _In_ const sai_attribute_t *attr_list, + _In_ sai_bulk_op_error_mode_t mode, + _Out_ sai_status_t *object_statuses) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + +sai_status_t vs_bulk_get_route_entry_attribute( + _In_ uint32_t object_count, + _In_ const sai_route_entry_t *route_entry, + _In_ const uint32_t *attr_count, + _Inout_ sai_attribute_t **attr_list, + _In_ sai_bulk_op_error_mode_t mode, + _Out_ sai_status_t *object_statuses) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + + VS_GENERIC_QUAD_ENTRY(ROUTE_ENTRY,route_entry); const sai_route_api_t vs_route_api = { VS_GENERIC_QUAD_API(route_entry) + + // TODO: upstream signiture fix to SAI repo + (sai_bulk_create_route_entry_fn)vs_bulk_create_route_entry, + vs_bulk_remove_route_entry, + vs_bulk_set_route_entry_attribute, + vs_bulk_get_route_entry_attribute, }; diff --git a/vslib/src/sai_vs_stp.cpp b/vslib/src/sai_vs_stp.cpp index d9a3d487da..e6198d2952 100644 --- a/vslib/src/sai_vs_stp.cpp +++ b/vslib/src/sai_vs_stp.cpp @@ -6,7 +6,7 @@ sai_status_t vs_create_stp_ports( _In_ uint32_t object_count, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t **attrs, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_object_id_t *object_id, _Out_ sai_status_t *object_statuses) { @@ -20,7 +20,7 @@ sai_status_t vs_create_stp_ports( sai_status_t vs_remove_stp_ports( _In_ uint32_t object_count, _In_ const sai_object_id_t *object_id, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { MUTEX(); diff --git a/vslib/src/sai_vs_tunnel.cpp b/vslib/src/sai_vs_tunnel.cpp index 15dbfa7573..3d0197022c 100644 --- a/vslib/src/sai_vs_tunnel.cpp +++ b/vslib/src/sai_vs_tunnel.cpp @@ -1,6 +1,33 @@ #include "sai_vs.h" #include "sai_vs_internal.h" +sai_status_t vs_get_tunnel_stats( + _In_ sai_object_id_t tunnel_id, + _In_ uint32_t number_of_counters, + _In_ const sai_tunnel_stat_t *counter_ids, + _Out_ uint64_t *counters) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + + +sai_status_t vs_clear_tunnel_stats( + _In_ sai_object_id_t tunnel_id, + _In_ uint32_t number_of_counters, + _In_ const sai_tunnel_stat_t *counter_ids) +{ + MUTEX(); + + SWSS_LOG_ENTER(); + + return SAI_STATUS_NOT_IMPLEMENTED; +} + + VS_GENERIC_QUAD(TUNNEL_MAP,tunnel_map); VS_GENERIC_QUAD(TUNNEL,tunnel); VS_GENERIC_QUAD(TUNNEL_TERM_TABLE_ENTRY,tunnel_term_table_entry); @@ -10,6 +37,10 @@ VS_GENERIC_QUAD(TUNNEL_MAP_ENTRY,tunnel_map_entry); const sai_tunnel_api_t vs_tunnel_api = { VS_GENERIC_QUAD_API(tunnel_map) VS_GENERIC_QUAD_API(tunnel) + + vs_get_tunnel_stats, + vs_clear_tunnel_stats, + VS_GENERIC_QUAD_API(tunnel_term_table_entry) VS_GENERIC_QUAD_API(tunnel_map_entry) }; diff --git a/vslib/src/sai_vs_vlan.cpp b/vslib/src/sai_vs_vlan.cpp index d456390487..5ca05fbd22 100644 --- a/vslib/src/sai_vs_vlan.cpp +++ b/vslib/src/sai_vs_vlan.cpp @@ -6,7 +6,7 @@ sai_status_t vs_create_vlan_members( _In_ uint32_t object_count, _In_ const uint32_t *attr_count, _In_ const sai_attribute_t **attrs, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_object_id_t *object_id, _Out_ sai_status_t *object_statuses) { @@ -20,7 +20,7 @@ sai_status_t vs_create_vlan_members( sai_status_t vs_remove_vlan_members( _In_ uint32_t object_count, _In_ const sai_object_id_t *object_id, - _In_ sai_bulk_op_type_t type, + _In_ sai_bulk_op_error_mode_t mode, _Out_ sai_status_t *object_statuses) { MUTEX(); diff --git a/vslib/src/tests.cpp b/vslib/src/tests.cpp index 8473f99b65..9d97ee1f19 100644 --- a/vslib/src/tests.cpp +++ b/vslib/src/tests.cpp @@ -9,7 +9,7 @@ #include "swss/schema.h" #include "swss/notificationproducer.h" -#include "../../meta/saiserialize.h" +#include "../../meta/sai_serialize.h" extern "C" { #include @@ -57,7 +57,7 @@ int profile_get_next_value( return -1; } -service_method_table_t test_services = { +sai_service_method_table_t test_services = { profile_get_value, profile_get_next_value }; @@ -246,9 +246,10 @@ int main() swss::Logger::getInstance().setMinPrio(swss::Logger::SWSS_NOTICE); - SUCCESS(sai_api_initialize(0, (service_method_table_t*)&test_services)); + SUCCESS(sai_api_initialize(0, (sai_service_method_table_t*)&test_services)); - sai_metadata_apis_query(sai_api_query); + sai_apis_t apis; + sai_metadata_apis_query(sai_api_query, &apis); //swss::Logger::getInstance().setMinPrio(swss::Logger::SWSS_INFO); From 5e3a0687b87ec9aa885c269edebca4705bf9d76d Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Wed, 17 Jan 2018 03:33:47 +0000 Subject: [PATCH 2/7] update SAI header to include libsaithrift build --- SAI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SAI b/SAI index 0d945a0e62..09d5ced0ed 160000 --- a/SAI +++ b/SAI @@ -1 +1 @@ -Subproject commit 0d945a0e621301273a2c47e8e1c82dfd90f60e86 +Subproject commit 09d5ced0ed668d0174e1a11e4795d82933c080bd From cec3e49df4c810ee71274152b7afa4bc33397d68 Mon Sep 17 00:00:00 2001 From: Volodymyr Samotiy Date: Thu, 18 Jan 2018 11:40:00 +0200 Subject: [PATCH 3/7] Add support of SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST attribute (#2) Signed-off-by: Volodymyr Samotiy --- meta/sai_meta.cpp | 15 +++++ meta/saiserialize.cpp | 126 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/meta/sai_meta.cpp b/meta/sai_meta.cpp index c8577a4d09..f5686a0157 100644 --- a/meta/sai_meta.cpp +++ b/meta/sai_meta.cpp @@ -1302,6 +1302,9 @@ sai_status_t meta_generic_validation_create( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: VALIDATION_LIST(md, value.qosmap); break; + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: + VALIDATION_LIST(md, value.aclresource); + break; case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: @@ -1977,6 +1980,9 @@ sai_status_t meta_generic_validation_set( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: VALIDATION_LIST(md, value.qosmap); break; + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: + VALIDATION_LIST(md, value.aclresource); + break; case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: @@ -2344,6 +2350,9 @@ sai_status_t meta_generic_validation_get( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: VALIDATION_LIST(md, value.qosmap); break; + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: + VALIDATION_LIST(md, value.aclresource); + break; case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: case SAI_ATTR_VALUE_TYPE_INT32_RANGE: @@ -2666,6 +2675,7 @@ void meta_generic_validation_post_create( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: case SAI_ATTR_VALUE_TYPE_INT32_RANGE: + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: // no special action required break; @@ -2800,6 +2810,7 @@ void meta_generic_validation_post_remove( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: case SAI_ATTR_VALUE_TYPE_INT32_RANGE: + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: // no special action required break; @@ -3050,6 +3061,7 @@ void meta_generic_validation_post_set( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: case SAI_ATTR_VALUE_TYPE_INT32_RANGE: + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: // no special action required break; @@ -3343,6 +3355,9 @@ void meta_generic_validation_post_get( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: VALIDATION_LIST_GET(md, value.qosmap); break; + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: + VALIDATION_LIST_GET(md, value.aclresource); + break; case SAI_ATTR_VALUE_TYPE_UINT32_RANGE: diff --git a/meta/saiserialize.cpp b/meta/saiserialize.cpp index 10c9a1ec12..c5386bdea8 100644 --- a/meta/saiserialize.cpp +++ b/meta/saiserialize.cpp @@ -239,6 +239,10 @@ sai_status_t transfer_attribute( RETURN_ON_ERROR(transfer_list(src_attr.value.qosmap, dst_attr.value.qosmap, countOnly)); break; + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: + RETURN_ON_ERROR(transfer_list(src_attr.value.aclresource, dst_attr.value.aclresource, countOnly)); + break; + /* ACL FIELD DATA */ @@ -992,6 +996,49 @@ std::string sai_serialize_qos_map_list( return j.dump(); } +json sai_serialize_acl_resource( + _In_ const sai_acl_resource_t& aclresource) +{ + json j; + + j["stage"] = sai_serialize_enum(aclresource.stage, &sai_metadata_enum_sai_acl_stage_t); + j["bind_point"] = sai_serialize_enum(aclresource.bind_point, &sai_metadata_enum_sai_acl_bind_point_type_t); + j["avail_num"] = sai_serialize_number(aclresource.avail_num); + + return j; +} + +std::string sai_serialize_acl_resource_list( + _In_ const sai_acl_resource_list_t& aclresource, + _In_ bool countOnly) +{ + SWSS_LOG_ENTER(); + + json j; + + j["count"] = aclresource.count; + + if (aclresource.list == NULL || countOnly) + { + j["list"] = nullptr; + + return j.dump(); + } + + json arr = json::array(); + + for (uint32_t i = 0; i < aclresource.count; ++i) + { + json item = sai_serialize_acl_resource(aclresource.list[i]); + + arr.push_back(item); + } + + j["list"] = arr; + + return j.dump(); +} + template std::string sai_serialize_range( _In_ const T& range) @@ -1217,6 +1264,9 @@ std::string sai_serialize_attr_value( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: return sai_serialize_qos_map_list(attr.value.qosmap, countOnly); + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: + return sai_serialize_acl_resource_list(attr.value.aclresource, countOnly); + // ACL FIELD DATA case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_BOOL: @@ -1807,6 +1857,75 @@ void sai_deserialize_qos_map_list( } } +void sai_deserialize_acl_stage( + _In_ const std::string& s, + _Out_ sai_acl_stage_t& stage) +{ + SWSS_LOG_ENTER(); + + sai_deserialize_enum(s, &sai_metadata_enum_sai_acl_stage_t, (int32_t&)stage); +} + +void sai_deserialize_acl_bind_point( + _In_ const std::string& s, + _Out_ sai_acl_bind_point_type_t& bind_point) +{ + SWSS_LOG_ENTER(); + + sai_deserialize_enum(s, &sai_metadata_enum_sai_acl_bind_point_type_t, (int32_t&)bind_point); +} + +void sai_deserialize_acl_resource( + _In_ const json& j, + _Out_ sai_acl_resource_t& aclresource) +{ + SWSS_LOG_ENTER(); + + sai_deserialize_acl_stage(j["stage"], aclresource.stage); + sai_deserialize_acl_bind_point(j["bind_point"], aclresource.bind_point); + sai_deserialize_number(j["avail_num"], aclresource.avail_num); +} + +void sai_deserialize_acl_resource_list( + _In_ const std::string& s, + _Out_ sai_acl_resource_list_t& aclresource, + _In_ bool countOnly) +{ + SWSS_LOG_ENTER(); + + json j = json::parse(s); + + aclresource.count = j["count"]; + + if (countOnly) + { + return; + } + + if (j["list"] == nullptr) + { + aclresource.list = NULL; + return; + } + + json arr = j["list"]; + + if (arr.size() != (size_t)aclresource.count) + { + SWSS_LOG_ERROR("acl resource count mismatch %lu vs %u", arr.size(), aclresource.count); + throw std::runtime_error("acl resource count mismatch"); + } + + aclresource.list = sai_alloc_n_of_ptr_type(aclresource.count, aclresource.list); + + for (uint32_t i = 0; i < aclresource.count; ++i) + { + const json& item = arr[i]; + + sai_deserialize_acl_resource(item, aclresource.list[i]); + } +} + void sai_deserialize_ipv6( _In_ const std::string& s, _Out_ sai_ip6_t& ipaddr) @@ -2123,6 +2242,9 @@ void sai_deserialize_attr_value( case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST: return sai_deserialize_qos_map_list(s, attr.value.qosmap, countOnly); + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: + return sai_deserialize_acl_resource_list(s, attr.value.aclresource, countOnly); + // ACL FIELD DATA case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_BOOL: @@ -2560,6 +2682,10 @@ void sai_deserialize_free_attribute_value( sai_free_list(attr.value.qosmap); break; + case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST: + sai_free_list(attr.value.aclresource); + break; + /* ACL FIELD DATA */ case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_BOOL: From b235fc9d52d2015f479863923609a8b217248e7d Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Thu, 1 Feb 2018 10:01:07 -0800 Subject: [PATCH 4/7] change vlan_id to bv_id for fdb flush notifications --- syncd/syncd_notifications.cpp | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/syncd/syncd_notifications.cpp b/syncd/syncd_notifications.cpp index d28f40249f..4b3fc9606e 100644 --- a/syncd/syncd_notifications.cpp +++ b/syncd/syncd_notifications.cpp @@ -104,7 +104,7 @@ void redisPutFdbEntryToAsicView( if (fdb->event_type == SAI_FDB_EVENT_FLUSHED) { - sai_vlan_id_t vlan_id = fdb->fdb_entry.vlan_id; + sai_object_id_t bv_id = fdb->fdb_entry.bv_id; sai_object_id_t port_oid = 0; bool port_oid_found = false; @@ -123,18 +123,16 @@ void redisPutFdbEntryToAsicView( return; } - if (!port_oid && !vlan_id) + if (!port_oid && !bv_id) { /* we got a flush all fdb event here */ /* example of a flush all fdb event */ /* [{ "fdb_entry":"{ - \"bridge_id\":\"oid:0x0\", - \"bridge_type\":\"SAI_FDB_ENTRY_BRIDGE_TYPE_1Q\", + \"bv_id\":\"oid:0x0\", \"mac\":\"00:00:00:00:00:00\", - \"switch_id\":\"oid:0x21000000000000\", - \"vlan\":\"0\"}", + \"switch_id\":\"oid:0x21000000000000\"}", "fdb_event":"SAI_FDB_EVENT_FLUSHED", "list":[ {"id":"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID","value":"oid:0x0"}, @@ -164,7 +162,7 @@ void redisPutFdbEntryToAsicView( } } } - else if( port_oid && !vlan_id ) + else if (port_oid && !bv_id) { /* we got a flush port fdb event here */ /* not supported yet, this is a place holder */ @@ -172,11 +170,9 @@ void redisPutFdbEntryToAsicView( /* [{ "fdb_entry":"{ - \"bridge_id\":\"oid:0x0\", - \"bridge_type\":\"SAI_FDB_ENTRY_BRIDGE_TYPE_1Q\", + \"bv_id\":\"oid:0x0\", \"mac\":\"00:00:00:00:00:00\", - \"switch_id\":\"oid:0x21000000000000\", - \"vlan\":\"0\"}", + \"switch_id\":\"oid:0x21000000000000\"}", "fdb_event":"SAI_FDB_EVENT_FLUSHED", "list":[ {"id":"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID","value":"oid:0x3a0000000009cf"}, @@ -185,9 +181,9 @@ void redisPutFdbEntryToAsicView( ] }] */ - SWSS_LOG_ERROR("received a flush port fdb event, port_oid = %lu, vlan_id = %hd, unsupported", port_oid, vlan_id); + SWSS_LOG_ERROR("received a flush port fdb event, port_oid = 0x%lx, bv_id = 0x%lx, unsupported", port_oid, bv_id); } - else if(!port_oid && vlan_id) + else if (!port_oid && bv_id) { /* we got a flush vlan fdb event here */ /* not supported yet, this is a place holder */ @@ -195,11 +191,9 @@ void redisPutFdbEntryToAsicView( /* [{ "fdb_entry":"{ - \"bridge_id\":\"oid:0x0\", - \"bridge_type\":\"SAI_FDB_ENTRY_BRIDGE_TYPE_1Q\", + \"bridge_id\":\"oid:0x23000000000000\", \"mac\":\"00:00:00:00:00:00\", - \"switch_id\":\"oid:0x21000000000000\", - \"vlan\":\"1000\"}", + \"switch_id\":\"oid:0x21000000000000\"}", "fdb_event":"SAI_FDB_EVENT_FLUSHED", "list":[ {"id":"SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID","value":"oid:0x0"}, @@ -208,12 +202,12 @@ void redisPutFdbEntryToAsicView( ] }] */ - SWSS_LOG_ERROR("received a flush vlan fdb event, port_oid = %lu, vlan_id = %hd, unsupported", port_oid, vlan_id); + SWSS_LOG_ERROR("received a flush vlan fdb event, port_oid = 0x%lx, bv_id = 0x%lx, unsupported", port_oid, bv_id); } else { - SWSS_LOG_ERROR("received a flush fdb event, port_oid = %lu, vlan_id = %hd, unsupported", port_oid, vlan_id); + SWSS_LOG_ERROR("received a flush fdb event, port_oid = 0x%lx, bv_id = 0x%lx, unsupported", port_oid, bv_id); } return; From 50a706268338c8609fa781a450543e8b3ded436c Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Fri, 9 Feb 2018 19:34:41 +0000 Subject: [PATCH 5/7] change vlan_id to bv_id for fdb learning --- tests/brcm/full.rec | 18 ++--- tests/brcm/full_nhg_bug.rec | 2 +- tests/brcm/full_nhg_bug_prio_flow_bug.rec | 2 +- .../full_nhg_bug_trap_group_create_fail.rec | 2 +- tests/brcm/full_no_queue.rec | 18 ++--- tests/brcm/full_no_queue_no_ipg.rec | 18 ++--- ...full_no_queue_no_ipg_no_buffer_pfofile.rec | 6 +- .../full_queue_bug_null_buffer_profile.rec | 18 ++--- tests/brcm/full_second.rec | 18 ++--- tests/brcm/full_second_no_bridge.rec | 18 ++--- tests/mlnx/empty_sw.rec | 2 +- tests/mlnx/full.rec | 22 +++--- tests/mlnx/full_nhg_member.rec | 6 +- tests/mlnx/full_no_hostif_entry.rec | 22 +++--- tests/mlnx/full_no_hostif_entry_second.rec | 22 +++--- tests/mlnx/full_syncd_dies.rec | 22 +++--- tests/mlnx/full_to_crash.rec | 2 +- vslib/inc/sai_vs_state.h | 4 +- vslib/src/sai_vs_hostintf.cpp | 75 ++++++++++++------- 19 files changed, 159 insertions(+), 138 deletions(-) diff --git a/tests/brcm/full.rec b/tests/brcm/full.rec index 8e56a217e3..7d67a024f1 100644 --- a/tests/brcm/full.rec +++ b/tests/brcm/full.rec @@ -1,15 +1,15 @@ 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec 2017-06-14.01:55:46.543987|a|INIT_VIEW 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS -2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50 +2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50 2017-06-14.01:55:46.558259|s|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=00:11:11:11:11:11 2017-06-14.01:55:46.559177|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 2017-06-14.01:56:05.500382|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000022 2017-06-14.01:56:05.501109|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a3|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000022|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK 2017-06-14.01:56:05.508992|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-06-14.01:56:05.516398|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-06-14.01:56:05.520538|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-06-14.01:56:05.525938|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x1000000000002,oid:0x1000000000003,oid:0x1000000000004,oid:0x1000000000005,oid:0x1000000000006,oid:0x1000000000007,oid:0x1000000000008,oid:0x1000000000009,oid:0x100000000000a,oid:0x100000000000b,oid:0x100000000000c,oid:0x100000000000d,oid:0x100000000000e,oid:0x100000000000f,oid:0x1000000000010,oid:0x1000000000011,oid:0x1000000000012,oid:0x1000000000013,oid:0x1000000000014,oid:0x1000000000015,oid:0x1000000000016,oid:0x1000000000017,oid:0x1000000000018,oid:0x1000000000019,oid:0x100000000001a,oid:0x100000000001b,oid:0x100000000001c,oid:0x100000000001d,oid:0x100000000001e,oid:0x100000000001f,oid:0x1000000000020,oid:0x1000000000021 2017-06-14.01:56:05.527212|g|SAI_OBJECT_TYPE_PORT:oid:0x1000000000002|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0 @@ -5348,9 +5348,9 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 2017-06-14.01:56:34.473539|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000044|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.475407|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000045|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.477022|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000008e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 @@ -5447,7 +5447,7 @@ 2017-06-14.01:56:34.600428|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000529|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.601188|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000553|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.603197|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057d|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 2017-06-14.01:56:34.606008|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000048|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.606683|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000092|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.607356|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a0000000000bc|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 @@ -5480,8 +5480,8 @@ 2017-06-14.01:56:34.639098|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000052a|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.639964|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000554|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.641601|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 2017-06-14.01:56:34.647623|s|SAI_OBJECT_TYPE_QUEUE:oid:0x1500000000006f|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.648669|s|SAI_OBJECT_TYPE_QUEUE:oid:0x15000000000099|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.649906|s|SAI_OBJECT_TYPE_QUEUE:oid:0x150000000000c3|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 diff --git a/tests/brcm/full_nhg_bug.rec b/tests/brcm/full_nhg_bug.rec index fdc52a9392..c67bb28e05 100644 --- a/tests/brcm/full_nhg_bug.rec +++ b/tests/brcm/full_nhg_bug.rec @@ -1,7 +1,7 @@ 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec 2017-06-14.01:55:46.543987|a|INIT_VIEW 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS -2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50 +2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50 2017-06-14.01:56:40.192374|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP:oid:0x5000000000628|SAI_NEXT_HOP_GROUP_ATTR_TYPE=SAI_NEXT_HOP_GROUP_TYPE_ECMP 2017-06-14.01:56:06.151337|a|APPLY_VIEW 2017-06-14.01:56:06.156740|A|SAI_STATUS_SUCCESS diff --git a/tests/brcm/full_nhg_bug_prio_flow_bug.rec b/tests/brcm/full_nhg_bug_prio_flow_bug.rec index 571e8c8078..a8e8520470 100644 --- a/tests/brcm/full_nhg_bug_prio_flow_bug.rec +++ b/tests/brcm/full_nhg_bug_prio_flow_bug.rec @@ -1,7 +1,7 @@ 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec 2017-06-14.01:55:46.543987|a|INIT_VIEW 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS -2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50 +2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50 2017-06-14.01:56:05.520538|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-06-14.01:56:05.525938|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x1000000000002,oid:0x1000000000003,oid:0x1000000000004,oid:0x1000000000005,oid:0x1000000000006,oid:0x1000000000007,oid:0x1000000000008,oid:0x1000000000009,oid:0x100000000000a,oid:0x100000000000b,oid:0x100000000000c,oid:0x100000000000d,oid:0x100000000000e,oid:0x100000000000f,oid:0x1000000000010,oid:0x1000000000011,oid:0x1000000000012,oid:0x1000000000013,oid:0x1000000000014,oid:0x1000000000015,oid:0x1000000000016,oid:0x1000000000017,oid:0x1000000000018,oid:0x1000000000019,oid:0x100000000001a,oid:0x100000000001b,oid:0x100000000001c,oid:0x100000000001d,oid:0x100000000001e,oid:0x100000000001f,oid:0x1000000000020,oid:0x1000000000021 2017-06-14.01:56:24.727586|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000002|SAI_PORT_ATTR_PRIORITY_FLOW_CONTROL=24 diff --git a/tests/brcm/full_nhg_bug_trap_group_create_fail.rec b/tests/brcm/full_nhg_bug_trap_group_create_fail.rec index 98789fde77..b1e13dadf5 100644 --- a/tests/brcm/full_nhg_bug_trap_group_create_fail.rec +++ b/tests/brcm/full_nhg_bug_trap_group_create_fail.rec @@ -1,7 +1,7 @@ 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec 2017-06-14.01:55:46.543987|a|INIT_VIEW 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS -2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50 +2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50 2017-06-14.01:56:21.570181|c|SAI_OBJECT_TYPE_POLICER:oid:0x120000000005fb|SAI_POLICER_ATTR_CBS=600|SAI_POLICER_ATTR_CIR=600|SAI_POLICER_ATTR_METER_TYPE=SAI_METER_TYPE_PACKETS|SAI_POLICER_ATTR_MODE=SAI_POLICER_MODE_SR_TCM|SAI_POLICER_ATTR_RED_PACKET_ACTION=SAI_PACKET_ACTION_DROP 2017-06-14.01:56:21.567734|c|SAI_OBJECT_TYPE_HOSTIF_TRAP_GROUP:oid:0x110000000005fa|SAI_HOSTIF_TRAP_GROUP_ATTR_QUEUE=4|SAI_HOSTIF_TRAP_GROUP_ATTR_POLICER=oid:0x120000000005fb 2017-06-14.01:56:06.151337|a|APPLY_VIEW diff --git a/tests/brcm/full_no_queue.rec b/tests/brcm/full_no_queue.rec index 08b9297af4..36d0f2c18c 100644 --- a/tests/brcm/full_no_queue.rec +++ b/tests/brcm/full_no_queue.rec @@ -1,15 +1,15 @@ 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec 2017-06-14.01:55:46.543987|a|INIT_VIEW 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS -2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50 +2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50 2017-06-14.01:55:46.558259|s|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=00:11:11:11:11:11 2017-06-14.01:55:46.559177|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 2017-06-14.01:56:05.500382|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000022 2017-06-14.01:56:05.501109|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a3|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000022|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK 2017-06-14.01:56:05.508992|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-06-14.01:56:05.516398|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-06-14.01:56:05.520538|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-06-14.01:56:05.525938|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x1000000000002,oid:0x1000000000003,oid:0x1000000000004,oid:0x1000000000005,oid:0x1000000000006,oid:0x1000000000007,oid:0x1000000000008,oid:0x1000000000009,oid:0x100000000000a,oid:0x100000000000b,oid:0x100000000000c,oid:0x100000000000d,oid:0x100000000000e,oid:0x100000000000f,oid:0x1000000000010,oid:0x1000000000011,oid:0x1000000000012,oid:0x1000000000013,oid:0x1000000000014,oid:0x1000000000015,oid:0x1000000000016,oid:0x1000000000017,oid:0x1000000000018,oid:0x1000000000019,oid:0x100000000001a,oid:0x100000000001b,oid:0x100000000001c,oid:0x100000000001d,oid:0x100000000001e,oid:0x100000000001f,oid:0x1000000000020,oid:0x1000000000021 2017-06-14.01:56:05.527212|g|SAI_OBJECT_TYPE_PORT:oid:0x1000000000002|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0 @@ -5348,9 +5348,9 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 2017-06-14.01:56:34.473539|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000044|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.475407|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000045|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.477022|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000008e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 @@ -5447,7 +5447,7 @@ 2017-06-14.01:56:34.600428|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000529|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.601188|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000553|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.603197|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057d|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 2017-06-14.01:56:34.606008|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000048|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.606683|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000092|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.607356|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a0000000000bc|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 @@ -5480,8 +5480,8 @@ 2017-06-14.01:56:34.639098|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000052a|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.639964|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000554|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.641601|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 2017-06-14.01:56:40.192374|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP:oid:0x5000000000628|SAI_NEXT_HOP_GROUP_ATTR_TYPE=SAI_NEXT_HOP_GROUP_TYPE_ECMP 2017-06-14.01:56:40.195490|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MEMBER:oid:0x2d000000000629|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID=oid:0x5000000000628|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID=oid:0x40000000005ed 2017-06-14.01:56:40.197125|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MEMBER:oid:0x2d00000000062a|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID=oid:0x5000000000628|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID=oid:0x40000000005f3 diff --git a/tests/brcm/full_no_queue_no_ipg.rec b/tests/brcm/full_no_queue_no_ipg.rec index 24e0eaf441..2546bc83ac 100644 --- a/tests/brcm/full_no_queue_no_ipg.rec +++ b/tests/brcm/full_no_queue_no_ipg.rec @@ -1,15 +1,15 @@ 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec 2017-06-14.01:55:46.543987|a|INIT_VIEW 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS -2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50 +2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50 2017-06-14.01:55:46.558259|s|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=00:11:11:11:11:11 2017-06-14.01:55:46.559177|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 2017-06-14.01:56:05.500382|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000022 2017-06-14.01:56:05.501109|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a3|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000022|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK 2017-06-14.01:56:05.508992|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-06-14.01:56:05.516398|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-06-14.01:56:05.520538|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-06-14.01:56:05.525938|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x1000000000002,oid:0x1000000000003,oid:0x1000000000004,oid:0x1000000000005,oid:0x1000000000006,oid:0x1000000000007,oid:0x1000000000008,oid:0x1000000000009,oid:0x100000000000a,oid:0x100000000000b,oid:0x100000000000c,oid:0x100000000000d,oid:0x100000000000e,oid:0x100000000000f,oid:0x1000000000010,oid:0x1000000000011,oid:0x1000000000012,oid:0x1000000000013,oid:0x1000000000014,oid:0x1000000000015,oid:0x1000000000016,oid:0x1000000000017,oid:0x1000000000018,oid:0x1000000000019,oid:0x100000000001a,oid:0x100000000001b,oid:0x100000000001c,oid:0x100000000001d,oid:0x100000000001e,oid:0x100000000001f,oid:0x1000000000020,oid:0x1000000000021 2017-06-14.01:56:05.527212|g|SAI_OBJECT_TYPE_PORT:oid:0x1000000000002|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0 @@ -5220,12 +5220,12 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 2017-06-14.01:56:40.192374|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP:oid:0x5000000000628|SAI_NEXT_HOP_GROUP_ATTR_TYPE=SAI_NEXT_HOP_GROUP_TYPE_ECMP 2017-06-14.01:56:40.195490|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MEMBER:oid:0x2d000000000629|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID=oid:0x5000000000628|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID=oid:0x40000000005ed 2017-06-14.01:56:40.197125|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MEMBER:oid:0x2d00000000062a|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID=oid:0x5000000000628|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID=oid:0x40000000005f3 diff --git a/tests/brcm/full_no_queue_no_ipg_no_buffer_pfofile.rec b/tests/brcm/full_no_queue_no_ipg_no_buffer_pfofile.rec index 9b212096b6..cc67e2e187 100644 --- a/tests/brcm/full_no_queue_no_ipg_no_buffer_pfofile.rec +++ b/tests/brcm/full_no_queue_no_ipg_no_buffer_pfofile.rec @@ -1,15 +1,15 @@ 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec 2017-06-14.01:55:46.543987|a|INIT_VIEW 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS -2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50 +2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50 2017-06-14.01:55:46.558259|s|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=00:11:11:11:11:11 2017-06-14.01:55:46.559177|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 2017-06-14.01:56:05.500382|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000022 2017-06-14.01:56:05.501109|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a3|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000022|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK 2017-06-14.01:56:05.508992|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-06-14.01:56:05.516398|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-06-14.01:56:05.520538|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-06-14.01:56:05.525938|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x1000000000002,oid:0x1000000000003,oid:0x1000000000004,oid:0x1000000000005,oid:0x1000000000006,oid:0x1000000000007,oid:0x1000000000008,oid:0x1000000000009,oid:0x100000000000a,oid:0x100000000000b,oid:0x100000000000c,oid:0x100000000000d,oid:0x100000000000e,oid:0x100000000000f,oid:0x1000000000010,oid:0x1000000000011,oid:0x1000000000012,oid:0x1000000000013,oid:0x1000000000014,oid:0x1000000000015,oid:0x1000000000016,oid:0x1000000000017,oid:0x1000000000018,oid:0x1000000000019,oid:0x100000000001a,oid:0x100000000001b,oid:0x100000000001c,oid:0x100000000001d,oid:0x100000000001e,oid:0x100000000001f,oid:0x1000000000020,oid:0x1000000000021 2017-06-14.01:56:05.527212|g|SAI_OBJECT_TYPE_PORT:oid:0x1000000000002|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0 diff --git a/tests/brcm/full_queue_bug_null_buffer_profile.rec b/tests/brcm/full_queue_bug_null_buffer_profile.rec index 9094beb12f..320f21af98 100644 --- a/tests/brcm/full_queue_bug_null_buffer_profile.rec +++ b/tests/brcm/full_queue_bug_null_buffer_profile.rec @@ -1,14 +1,14 @@ 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec 2017-06-14.01:55:46.543987|a|INIT_VIEW 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS -2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50 +2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50 2017-06-14.01:55:46.558259|s|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=00:11:11:11:11:11 2017-06-14.01:55:46.559177|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 2017-06-14.01:56:05.500382|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000022 2017-06-14.01:56:05.508992|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-06-14.01:56:05.516398|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-06-14.01:56:05.520538|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-06-14.01:56:05.525938|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x1000000000002,oid:0x1000000000003,oid:0x1000000000004,oid:0x1000000000005,oid:0x1000000000006,oid:0x1000000000007,oid:0x1000000000008,oid:0x1000000000009,oid:0x100000000000a,oid:0x100000000000b,oid:0x100000000000c,oid:0x100000000000d,oid:0x100000000000e,oid:0x100000000000f,oid:0x1000000000010,oid:0x1000000000011,oid:0x1000000000012,oid:0x1000000000013,oid:0x1000000000014,oid:0x1000000000015,oid:0x1000000000016,oid:0x1000000000017,oid:0x1000000000018,oid:0x1000000000019,oid:0x100000000001a,oid:0x100000000001b,oid:0x100000000001c,oid:0x100000000001d,oid:0x100000000001e,oid:0x100000000001f,oid:0x1000000000020,oid:0x1000000000021 2017-06-14.01:56:06.071181|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ECMP_GROUPS=91 @@ -287,12 +287,12 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 2017-06-14.01:56:34.647623|s|SAI_OBJECT_TYPE_QUEUE:oid:0x1500000000006f|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.648669|s|SAI_OBJECT_TYPE_QUEUE:oid:0x15000000000099|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.649906|s|SAI_OBJECT_TYPE_QUEUE:oid:0x150000000000c3|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 diff --git a/tests/brcm/full_second.rec b/tests/brcm/full_second.rec index bce1b74862..3d99d94134 100644 --- a/tests/brcm/full_second.rec +++ b/tests/brcm/full_second.rec @@ -1,15 +1,15 @@ 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec 2017-06-14.01:55:46.543987|a|INIT_VIEW 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS -2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50 +2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50 2017-06-14.01:55:46.558259|s|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=00:11:11:11:11:11 2017-06-14.01:55:46.559177|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 2017-06-14.01:56:05.500382|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000022 2017-06-14.01:56:05.501109|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a3|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000022|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK 2017-06-14.01:56:05.508992|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-06-14.01:56:05.516398|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-06-14.01:56:05.520538|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-06-14.01:56:05.525938|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x1000000000002,oid:0x1000000000003,oid:0x1000000000004,oid:0x1000000000005,oid:0x1000000000006,oid:0x1000000000007,oid:0x1000000000008,oid:0x1000000000009,oid:0x100000000000a,oid:0x100000000000b,oid:0x100000000000c,oid:0x100000000000d,oid:0x100000000000e,oid:0x100000000000f,oid:0x1000000000010,oid:0x1000000000011,oid:0x1000000000012,oid:0x1000000000013,oid:0x1000000000014,oid:0x1000000000015,oid:0x1000000000016,oid:0x1000000000017,oid:0x1000000000018,oid:0x1000000000019,oid:0x100000000001a,oid:0x100000000001b,oid:0x100000000001c,oid:0x100000000001d,oid:0x100000000001e,oid:0x100000000001f,oid:0x1000000000020,oid:0x1000000000021 2017-06-14.01:56:05.527212|g|SAI_OBJECT_TYPE_PORT:oid:0x1000000000002|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0 @@ -5060,9 +5060,9 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 2017-06-14.01:56:34.473539|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000044|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.475407|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000045|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.477022|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000008e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 @@ -5159,7 +5159,7 @@ 2017-06-14.01:56:34.600428|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000529|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.601188|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000553|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.603197|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057d|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 2017-06-14.01:56:34.606008|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000048|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.606683|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000092|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.607356|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a0000000000bc|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 @@ -5192,8 +5192,8 @@ 2017-06-14.01:56:34.639098|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000052a|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.639964|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000554|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.641601|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 2017-06-14.01:56:34.647623|s|SAI_OBJECT_TYPE_QUEUE:oid:0x1500000000006f|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.648669|s|SAI_OBJECT_TYPE_QUEUE:oid:0x15000000000099|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.649906|s|SAI_OBJECT_TYPE_QUEUE:oid:0x150000000000c3|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 diff --git a/tests/brcm/full_second_no_bridge.rec b/tests/brcm/full_second_no_bridge.rec index 1c22400b66..4e37a62f01 100644 --- a/tests/brcm/full_second_no_bridge.rec +++ b/tests/brcm/full_second_no_bridge.rec @@ -1,15 +1,15 @@ 2017-06-14.01:55:46.541806|#|recording on: ./sairedis.2017-06-14.01:55:46.541389.rec 2017-06-14.01:55:46.543987|a|INIT_VIEW 2017-06-14.01:55:46.551164|A|SAI_STATUS_SUCCESS -2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x417b50 +2017-06-14.01:55:46.555975|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x417890|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x4179f0|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x417b50 2017-06-14.01:55:46.558259|s|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=00:11:11:11:11:11 2017-06-14.01:55:46.559177|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 2017-06-14.01:56:05.500382|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000022 2017-06-14.01:56:05.501109|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a3|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000022|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK 2017-06-14.01:56:05.508992|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-06-14.01:56:05.516398|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-06-14.01:56:05.516767|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-06-14.01:56:05.519973|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-06-14.01:56:05.520538|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-06-14.01:56:05.525938|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x1000000000002,oid:0x1000000000003,oid:0x1000000000004,oid:0x1000000000005,oid:0x1000000000006,oid:0x1000000000007,oid:0x1000000000008,oid:0x1000000000009,oid:0x100000000000a,oid:0x100000000000b,oid:0x100000000000c,oid:0x100000000000d,oid:0x100000000000e,oid:0x100000000000f,oid:0x1000000000010,oid:0x1000000000011,oid:0x1000000000012,oid:0x1000000000013,oid:0x1000000000014,oid:0x1000000000015,oid:0x1000000000016,oid:0x1000000000017,oid:0x1000000000018,oid:0x1000000000019,oid:0x100000000001a,oid:0x100000000001b,oid:0x100000000001c,oid:0x100000000001d,oid:0x100000000001e,oid:0x100000000001f,oid:0x1000000000020,oid:0x1000000000021 2017-06-14.01:56:05.527212|g|SAI_OBJECT_TYPE_PORT:oid:0x1000000000002|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0 @@ -5058,9 +5058,9 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 2017-06-14.01:56:34.473539|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000044|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.475407|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000045|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.477022|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000008e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 @@ -5157,7 +5157,7 @@ 2017-06-14.01:56:34.600428|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000529|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.601188|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000553|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.603197|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057d|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 2017-06-14.01:56:34.606008|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000048|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.606683|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000092|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.607356|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a0000000000bc|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 @@ -5190,8 +5190,8 @@ 2017-06-14.01:56:34.639098|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000052a|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.639964|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000554|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.641601|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 2017-06-14.01:56:34.647623|s|SAI_OBJECT_TYPE_QUEUE:oid:0x1500000000006f|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.648669|s|SAI_OBJECT_TYPE_QUEUE:oid:0x15000000000099|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.649906|s|SAI_OBJECT_TYPE_QUEUE:oid:0x150000000000c3|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 diff --git a/tests/mlnx/empty_sw.rec b/tests/mlnx/empty_sw.rec index 2a76e7584e..e1acfe360d 100644 --- a/tests/mlnx/empty_sw.rec +++ b/tests/mlnx/empty_sw.rec @@ -1,6 +1,6 @@ 2017-05-13.20:47:13.432144|#|recording to: sairedis.2017-05-13.20:47:13.431964.rec 2017-05-13.20:47:13.435733|a|INIT_VIEW 2017-05-13.20:47:13.439887|A|SAI_STATUS_SUCCESS -2017-05-13.20:47:13.443079|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x1 +2017-05-13.20:47:13.443079|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x1 2017-05-13.20:47:24.881973|a|APPLY_VIEW 2017-05-13.20:47:24.883499|A|SAI_STATUS_SUCCESS diff --git a/tests/mlnx/full.rec b/tests/mlnx/full.rec index 64be9e73c0..ce38db6c34 100644 --- a/tests/mlnx/full.rec +++ b/tests/mlnx/full.rec @@ -1,7 +1,7 @@ 2017-05-11.01:43:51.003662|#|recording to: sairedis.2017-05-11.01:43:51.003467.rec 2017-05-11.01:43:51.004710|a|INIT_VIEW 2017-05-11.01:43:51.008012|A|SAI_STATUS_SUCCESS -2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 +2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 2017-05-11.01:43:51.010796|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=01:00:00:00:00:00 2017-05-11.01:44:02.229733|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=7C:FE:90:5E:6A:80 2017-05-11.01:44:02.229827|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 @@ -9,8 +9,8 @@ 2017-05-11.01:44:02.231175|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a0|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000002|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK 2017-05-11.01:44:02.233014|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-05-11.01:44:02.250340|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-05-11.01:44:02.250435|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-05-11.01:44:02.251154|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-05-11.01:44:02.250435|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-05-11.01:44:02.251154|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-05-11.01:44:02.251258|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-05-11.01:44:02.252737|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x100000000011a,oid:0x100000000013e,oid:0x1000000000162,oid:0x1000000000186,oid:0x10000000001aa,oid:0x10000000001ce,oid:0x10000000001f2,oid:0x1000000000216,oid:0x100000000023a,oid:0x100000000025e,oid:0x1000000000282,oid:0x10000000002a6,oid:0x10000000002ca,oid:0x10000000002ee,oid:0x1000000000312,oid:0x1000000000336,oid:0x100000000035a,oid:0x100000000037e,oid:0x10000000003a2,oid:0x10000000003c6,oid:0x10000000003ea,oid:0x100000000040e,oid:0x1000000000432,oid:0x1000000000456,oid:0x100000000047a,oid:0x100000000049e,oid:0x10000000004c2,oid:0x10000000004e6,oid:0x100000000050a,oid:0x100000000052e,oid:0x1000000000552,oid:0x1000000000576 2017-05-11.01:44:02.252963|g|SAI_OBJECT_TYPE_PORT:oid:0x100000000011a|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0 @@ -950,14 +950,14 @@ 2017-05-11.01:44:19.271245|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000049e|SAI_PORT_ATTR_ADMIN_STATE=true 2017-05-11.01:44:19.272875|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000601|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=7291456|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-05-11.01:44:19.274126|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000602|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=8254464|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=4096 -2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616 -2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 +2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=4096 +2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616 +2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 2017-05-11.01:44:19.295693|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000552|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.295879|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000576|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.296033|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000050a|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 diff --git a/tests/mlnx/full_nhg_member.rec b/tests/mlnx/full_nhg_member.rec index 2885dc7027..dcf72646b1 100644 --- a/tests/mlnx/full_nhg_member.rec +++ b/tests/mlnx/full_nhg_member.rec @@ -1,13 +1,13 @@ 2017-05-11.01:43:51.003662|#|recording to: sairedis.2017-05-11.01:43:51.003467.rec 2017-05-11.01:43:51.004710|a|INIT_VIEW 2017-05-11.01:43:51.008012|A|SAI_STATUS_SUCCESS -2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 +2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 2017-05-11.01:44:02.229827|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 2017-05-11.01:44:02.230913|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000002 2017-05-11.01:44:02.233014|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-05-11.01:44:02.250340|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-05-11.01:44:02.250435|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-05-11.01:44:02.251154|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-05-11.01:44:02.250435|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-05-11.01:44:02.251154|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-05-11.01:44:02.251258|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-05-11.01:44:02.252737|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x100000000011a,oid:0x100000000013e,oid:0x1000000000162,oid:0x1000000000186,oid:0x10000000001aa,oid:0x10000000001ce,oid:0x10000000001f2,oid:0x1000000000216,oid:0x100000000023a,oid:0x100000000025e,oid:0x1000000000282,oid:0x10000000002a6,oid:0x10000000002ca,oid:0x10000000002ee,oid:0x1000000000312,oid:0x1000000000336,oid:0x100000000035a,oid:0x100000000037e,oid:0x10000000003a2,oid:0x10000000003c6,oid:0x10000000003ea,oid:0x100000000040e,oid:0x1000000000432,oid:0x1000000000456,oid:0x100000000047a,oid:0x100000000049e,oid:0x10000000004c2,oid:0x10000000004e6,oid:0x100000000050a,oid:0x100000000052e,oid:0x1000000000552,oid:0x1000000000576 2017-05-11.01:44:02.506421|c|SAI_OBJECT_TYPE_ROUTE_ENTRY:{"dest":"0.0.0.0/0","switch_id":"oid:0x21000000000000","vr":"oid:0x3000000000002"}|SAI_ROUTE_ENTRY_ATTR_PACKET_ACTION=SAI_PACKET_ACTION_DROP diff --git a/tests/mlnx/full_no_hostif_entry.rec b/tests/mlnx/full_no_hostif_entry.rec index 5e32f49064..8734c0c4fc 100644 --- a/tests/mlnx/full_no_hostif_entry.rec +++ b/tests/mlnx/full_no_hostif_entry.rec @@ -1,7 +1,7 @@ 2017-05-11.01:43:51.003662|#|recording to: sairedis.2017-05-11.01:43:51.003467.rec 2017-05-11.01:43:51.004710|a|INIT_VIEW 2017-05-11.01:43:51.008012|A|SAI_STATUS_SUCCESS -2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 +2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 2017-05-11.01:43:51.010796|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=01:00:00:00:00:00 2017-05-11.01:44:02.229733|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=7C:FE:90:5E:6A:80 2017-05-11.01:44:02.229827|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 @@ -9,8 +9,8 @@ 2017-05-11.01:44:02.231175|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a0|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000002|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK 2017-05-11.01:44:02.233014|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-05-11.01:44:02.250340|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-05-11.01:44:02.250435|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-05-11.01:44:02.251154|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-05-11.01:44:02.250435|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-05-11.01:44:02.251154|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-05-11.01:44:02.251258|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-05-11.01:44:02.252737|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x100000000011a,oid:0x100000000013e,oid:0x1000000000162,oid:0x1000000000186,oid:0x10000000001aa,oid:0x10000000001ce,oid:0x10000000001f2,oid:0x1000000000216,oid:0x100000000023a,oid:0x100000000025e,oid:0x1000000000282,oid:0x10000000002a6,oid:0x10000000002ca,oid:0x10000000002ee,oid:0x1000000000312,oid:0x1000000000336,oid:0x100000000035a,oid:0x100000000037e,oid:0x10000000003a2,oid:0x10000000003c6,oid:0x10000000003ea,oid:0x100000000040e,oid:0x1000000000432,oid:0x1000000000456,oid:0x100000000047a,oid:0x100000000049e,oid:0x10000000004c2,oid:0x10000000004e6,oid:0x100000000050a,oid:0x100000000052e,oid:0x1000000000552,oid:0x1000000000576 2017-05-11.01:44:02.252963|g|SAI_OBJECT_TYPE_PORT:oid:0x100000000011a|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0 @@ -949,14 +949,14 @@ 2017-05-11.01:44:19.271245|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000049e|SAI_PORT_ATTR_ADMIN_STATE=true 2017-05-11.01:44:19.272875|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000601|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=7291456|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-05-11.01:44:19.274126|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000602|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=8254464|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=4096 -2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616 -2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 +2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=4096 +2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616 +2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 2017-05-11.01:44:19.295693|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000552|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.295879|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000576|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.296033|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000050a|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 diff --git a/tests/mlnx/full_no_hostif_entry_second.rec b/tests/mlnx/full_no_hostif_entry_second.rec index 72a30875ec..1914134cc9 100644 --- a/tests/mlnx/full_no_hostif_entry_second.rec +++ b/tests/mlnx/full_no_hostif_entry_second.rec @@ -1,7 +1,7 @@ 2017-05-11.01:43:51.003662|#|recording to: sairedis.2017-05-11.01:43:51.003467.rec 2017-05-11.01:43:51.004710|a|INIT_VIEW 2017-05-11.01:43:51.008012|A|SAI_STATUS_SUCCESS -2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 +2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 2017-05-11.01:43:51.010796|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=01:00:00:00:00:00 2017-05-11.01:44:02.229733|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=7C:FE:90:5E:6A:80 2017-05-11.01:44:02.229827|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 @@ -9,8 +9,8 @@ 2017-05-11.01:44:02.231175|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a0|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000002|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK 2017-05-11.01:44:02.233014|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-05-11.01:44:02.250340|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-05-11.01:44:02.250435|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-05-11.01:44:02.251154|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-05-11.01:44:02.250435|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-05-11.01:44:02.251154|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-05-11.01:44:02.251258|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-05-11.01:44:02.252737|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x100000000011a,oid:0x100000000013e,oid:0x1000000000162,oid:0x1000000000186,oid:0x10000000001aa,oid:0x10000000001ce,oid:0x10000000001f2,oid:0x1000000000216,oid:0x100000000023a,oid:0x100000000025e,oid:0x1000000000282,oid:0x10000000002a6,oid:0x10000000002ca,oid:0x10000000002ee,oid:0x1000000000312,oid:0x1000000000336,oid:0x100000000035a,oid:0x100000000037e,oid:0x10000000003a2,oid:0x10000000003c6,oid:0x10000000003ea,oid:0x100000000040e,oid:0x1000000000432,oid:0x1000000000456,oid:0x100000000047a,oid:0x100000000049e,oid:0x10000000004c2,oid:0x10000000004e6,oid:0x100000000050a,oid:0x100000000052e,oid:0x1000000000552,oid:0x1000000000576 2017-05-11.01:44:02.252963|g|SAI_OBJECT_TYPE_PORT:oid:0x100000000011a|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0 @@ -657,14 +657,14 @@ 2017-05-11.01:44:19.271245|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000049e|SAI_PORT_ATTR_ADMIN_STATE=true 2017-05-11.01:44:19.272875|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000601|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=7291456|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-05-11.01:44:19.274126|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000602|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=8254464|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=4096 -2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616 -2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 +2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=4096 +2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616 +2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 2017-05-11.01:44:19.295693|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000552|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.295879|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000576|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.296033|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000050a|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 diff --git a/tests/mlnx/full_syncd_dies.rec b/tests/mlnx/full_syncd_dies.rec index aa753bba70..4388891c59 100644 --- a/tests/mlnx/full_syncd_dies.rec +++ b/tests/mlnx/full_syncd_dies.rec @@ -1,7 +1,7 @@ 2017-05-11.01:43:51.003662|#|recording to: sairedis.2017-05-11.01:43:51.003467.rec 2017-05-11.01:43:51.004710|a|INIT_VIEW 2017-05-11.01:43:51.008012|A|SAI_STATUS_SUCCESS -2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 +2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 2017-05-11.01:43:51.010796|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=01:00:00:00:00:00 2017-05-11.01:44:02.229733|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_SRC_MAC_ADDRESS=7C:FE:90:5E:6A:80 2017-05-11.01:44:02.229827|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 @@ -9,8 +9,8 @@ 2017-05-11.01:44:02.231175|c|SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x60000000005a0|SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID=oid:0x3000000000002|SAI_ROUTER_INTERFACE_ATTR_TYPE=SAI_ROUTER_INTERFACE_TYPE_LOOPBACK 2017-05-11.01:44:02.233014|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_CPU_PORT=oid:0x0 2017-05-11.01:44:02.250340|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_CPU_PORT=oid:0x1000000000001 -2017-05-11.01:44:02.250435|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_NUMBER=1 -2017-05-11.01:44:02.251154|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_NUMBER=32 +2017-05-11.01:44:02.250435|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=1 +2017-05-11.01:44:02.251154|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_NUMBER_OF_ACTIVE_PORTS=32 2017-05-11.01:44:02.251258|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 2017-05-11.01:44:02.252737|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x100000000011a,oid:0x100000000013e,oid:0x1000000000162,oid:0x1000000000186,oid:0x10000000001aa,oid:0x10000000001ce,oid:0x10000000001f2,oid:0x1000000000216,oid:0x100000000023a,oid:0x100000000025e,oid:0x1000000000282,oid:0x10000000002a6,oid:0x10000000002ca,oid:0x10000000002ee,oid:0x1000000000312,oid:0x1000000000336,oid:0x100000000035a,oid:0x100000000037e,oid:0x10000000003a2,oid:0x10000000003c6,oid:0x10000000003ea,oid:0x100000000040e,oid:0x1000000000432,oid:0x1000000000456,oid:0x100000000047a,oid:0x100000000049e,oid:0x10000000004c2,oid:0x10000000004e6,oid:0x100000000050a,oid:0x100000000052e,oid:0x1000000000552,oid:0x1000000000576 2017-05-11.01:44:02.252963|g|SAI_OBJECT_TYPE_PORT:oid:0x100000000011a|SAI_PORT_ATTR_HW_LANE_LIST=4:0,0,0,0 @@ -949,14 +949,14 @@ 2017-05-11.01:44:19.271245|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000049e|SAI_PORT_ATTR_ADMIN_STATE=true 2017-05-11.01:44:19.272875|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000601|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=7291456|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-05-11.01:44:19.274126|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000602|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=8254464|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=1518 -2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=4096 -2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616 -2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 -2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_BUFFER_SIZE=0 +2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=4096 +2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616 +2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 2017-05-11.01:44:19.295693|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000552|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.295879|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000576|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.296033|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000050a|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 diff --git a/tests/mlnx/full_to_crash.rec b/tests/mlnx/full_to_crash.rec index 4f020975e9..515dc6df7f 100644 --- a/tests/mlnx/full_to_crash.rec +++ b/tests/mlnx/full_to_crash.rec @@ -1,7 +1,7 @@ 2017-05-11.01:43:51.003662|#|recording to: sairedis.2017-05-11.01:43:51.003467.rec 2017-05-11.01:43:51.004710|a|INIT_VIEW 2017-05-11.01:43:51.008012|A|SAI_STATUS_SUCCESS -2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 +2017-05-11.01:43:51.010010|c|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_INIT_SWITCH=true|SAI_SWITCH_ATTR_FDB_EVENT_NOTIFY=0x415000|SAI_SWITCH_ATTR_PORT_STATE_CHANGE_NOTIFY=0x415160|SAI_SWITCH_ATTR_SWITCH_SHUTDOWN_REQUEST_NOTIFY=0x4152c0 2017-05-11.01:44:02.229827|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x0 2017-05-11.01:44:02.230913|G|SAI_STATUS_SUCCESS|SAI_SWITCH_ATTR_DEFAULT_VIRTUAL_ROUTER_ID=oid:0x3000000000002 2017-05-11.01:44:02.251258|g|SAI_OBJECT_TYPE_SWITCH:oid:0x21000000000000|SAI_SWITCH_ATTR_PORT_LIST=32:oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0,oid:0x0 diff --git a/vslib/inc/sai_vs_state.h b/vslib/inc/sai_vs_state.h index e70386be6a..da3b194e5b 100644 --- a/vslib/inc/sai_vs_state.h +++ b/vslib/inc/sai_vs_state.h @@ -107,6 +107,8 @@ typedef struct _fdb_info_t { sai_object_id_t port_id; + sai_vlan_id_t vlan_id; + sai_object_id_t bridge_port_id; sai_fdb_entry_t fdb_entry; @@ -123,7 +125,7 @@ typedef struct _fdb_info_t if (res > 0) return false; - return fdb_entry.vlan_id < other.fdb_entry.vlan_id; + return vlan_id < other.vlan_id; } bool operator() (const _fdb_info_t& lhs, const _fdb_info_t & rhs) const diff --git a/vslib/src/sai_vs_hostintf.cpp b/vslib/src/sai_vs_hostintf.cpp index 74ce12a1bc..f3b305a70e 100644 --- a/vslib/src/sai_vs_hostintf.cpp +++ b/vslib/src/sai_vs_hostintf.cpp @@ -65,21 +65,6 @@ void processFdbInfo( data.fdb_entry = fi.fdb_entry; - if (data.fdb_entry.bridge_type == SAI_FDB_ENTRY_BRIDGE_TYPE_1Q) - { - // since this is only valid for 1D - data.fdb_entry.bridge_id = SAI_NULL_OBJECT_ID; - } - else if (data.fdb_entry.bridge_type == SAI_FDB_ENTRY_BRIDGE_TYPE_1D) - { - // since this is only valid for 1Q - data.fdb_entry.vlan_id = 0; - } - else - { - SWSS_LOG_ERROR("unknown bridge type %d", data.fdb_entry.bridge_type); - } - data.attr_count = 2; data.attr = attrs; @@ -111,17 +96,18 @@ void processFdbInfo( } } -void findBridgeForPort( +void findBridgeVlanForPortVlan( _In_ sai_object_id_t port_id, - _Inout_ sai_object_id_t &bridge_id, - _Inout_ sai_object_id_t &bridge_port_id, - _Inout_ sai_fdb_entry_bridge_type_t &bridge_type) + _In_ sai_vlan_id_t vlan_id, + _Inout_ sai_object_id_t &bv_id, + _Inout_ sai_object_id_t &bridge_port_id) { SWSS_LOG_ENTER(); - bridge_id = SAI_NULL_OBJECT_ID; + bv_id = SAI_NULL_OBJECT_ID; bridge_port_id = SAI_NULL_OBJECT_ID; - bridge_type = SAI_FDB_ENTRY_BRIDGE_TYPE_1Q; + + sai_object_id_t bridge_id; /* * The bridge port lookup process is two steps: @@ -137,7 +123,7 @@ void findBridgeForPort( * received on the bridge port. * * XXX: this is not whats happening here, we are just looking for any - * bridge id (as in our case this is shorcut, we will remove all bridge ports + * bridge id (as in our case this is shortcut, we will remove all bridge ports * when we will use router interface based port/lag and no bridge * will be found. */ @@ -173,6 +159,8 @@ void findBridgeForPort( bridge_port_id = bpid; + // XXX: need to also check the vlan_id match if the bridge port type is subport + SWSS_LOG_DEBUG("found bridge port %s for port %s", sai_serialize_object_id(bridge_port_id).c_str(), sai_serialize_object_id(port_id).c_str()); @@ -201,11 +189,42 @@ void findBridgeForPort( break; } - bridge_type = (sai_fdb_entry_bridge_type_t)attr.value.s32; - SWSS_LOG_DEBUG("bridge %s type is %d", sai_serialize_object_id(bridge_id).c_str(), - bridge_type); + attr.value.s32); + + if (attr.value.s32 == SAI_BRIDGE_TYPE_1D) + { + bv_id = bridge_id; + } + else + { + auto &objectHash2 = g_switch_state_map.at(switch_id)->objectHash.at(SAI_OBJECT_TYPE_VLAN); + + // iterate via all vlans to find match on vlan id + + for (auto it2 = objectHash2.begin(); it2 != objectHash2.end(); ++it2) + { + sai_object_id_t vlan_oid; + + sai_deserialize_object_id(it2->first, vlan_oid); + + attr.id = SAI_VLAN_ATTR_VLAN_ID; + + status = vs_generic_get(SAI_OBJECT_TYPE_VLAN, vlan_oid, 1, &attr); + + if (status != SAI_STATUS_SUCCESS) + { + continue; + } + + if (vlan_id == attr.value.u16) + { + bv_id = vlan_oid; + break; + } + } + } break; } @@ -444,7 +463,7 @@ void process_packet_for_fdb_event( fdb_info_t fi; fi.port_id = info->portid; - fi.fdb_entry.vlan_id = vlan_id; + fi.vlan_id = vlan_id; memcpy(fi.fdb_entry.mac_address, eh->h_source, sizeof(sai_mac_t)); @@ -469,9 +488,9 @@ void process_packet_for_fdb_event( fi.timestamp = frametime; fi.fdb_entry.switch_id = sai_switch_id_query(info->portid); - findBridgeForPort(info->portid, fi.fdb_entry.bridge_id, fi.bridge_port_id, fi.fdb_entry.bridge_type); + findBridgeVlanForPortVlan(info->portid, vlan_id, fi.fdb_entry.bv_id, fi.bridge_port_id); - if (fi.fdb_entry.bridge_id == SAI_NULL_OBJECT_ID) + if (fi.fdb_entry.bv_id == SAI_NULL_OBJECT_ID) { // bridge was not found, skip mac learning return; From c9b9aeb5d63c50bfb25fce53e6735ec6ca83afb3 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Wed, 21 Feb 2018 02:19:39 +0000 Subject: [PATCH 6/7] [submodule]: update SAI header to v1.2.3 --- SAI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SAI b/SAI index 09d5ced0ed..c754414df9 160000 --- a/SAI +++ b/SAI @@ -1 +1 @@ -Subproject commit 09d5ced0ed668d0174e1a11e4795d82933c080bd +Subproject commit c754414df96345c2b1fd08e8e22578abace28c28 From bda2a573fd9653750c9e6dc84efc3b7493affa7a Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Wed, 21 Feb 2018 12:49:14 +0000 Subject: [PATCH 7/7] fix unit test failure due to missing mandatory attriutes --- meta/saiserialize.cpp | 2 ++ tests/brcm/full.rec | 12 ++++++------ tests/brcm/full_no_queue.rec | 12 ++++++------ tests/brcm/full_no_queue_no_ipg.rec | 12 ++++++------ .../brcm/full_queue_bug_null_buffer_profile.rec | 12 ++++++------ tests/brcm/full_second.rec | 12 ++++++------ tests/brcm/full_second_no_bridge.rec | 12 ++++++------ tests/mlnx/full_no_hostif_entry.rec | 16 ++++++++-------- tests/mlnx/full_no_hostif_entry_second.rec | 16 ++++++++-------- 9 files changed, 54 insertions(+), 52 deletions(-) diff --git a/meta/saiserialize.cpp b/meta/saiserialize.cpp index c5386bdea8..a6d52aa201 100644 --- a/meta/saiserialize.cpp +++ b/meta/saiserialize.cpp @@ -999,6 +999,8 @@ std::string sai_serialize_qos_map_list( json sai_serialize_acl_resource( _In_ const sai_acl_resource_t& aclresource) { + SWSS_LOG_ENTER(); + json j; j["stage"] = sai_serialize_enum(aclresource.stage, &sai_metadata_enum_sai_acl_stage_t); diff --git a/tests/brcm/full.rec b/tests/brcm/full.rec index 7d67a024f1..fde7a6af7e 100644 --- a/tests/brcm/full.rec +++ b/tests/brcm/full.rec @@ -5348,9 +5348,9 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-06-14.01:56:34.473539|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000044|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.475407|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000045|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.477022|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000008e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 @@ -5447,7 +5447,7 @@ 2017-06-14.01:56:34.600428|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000529|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.601188|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000553|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.603197|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057d|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 2017-06-14.01:56:34.606008|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000048|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.606683|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000092|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.607356|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a0000000000bc|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 @@ -5480,8 +5480,8 @@ 2017-06-14.01:56:34.639098|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000052a|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.639964|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000554|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.641601|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-06-14.01:56:34.647623|s|SAI_OBJECT_TYPE_QUEUE:oid:0x1500000000006f|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.648669|s|SAI_OBJECT_TYPE_QUEUE:oid:0x15000000000099|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.649906|s|SAI_OBJECT_TYPE_QUEUE:oid:0x150000000000c3|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 diff --git a/tests/brcm/full_no_queue.rec b/tests/brcm/full_no_queue.rec index 36d0f2c18c..67cf4288af 100644 --- a/tests/brcm/full_no_queue.rec +++ b/tests/brcm/full_no_queue.rec @@ -5348,9 +5348,9 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-06-14.01:56:34.473539|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000044|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.475407|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000045|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.477022|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000008e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 @@ -5447,7 +5447,7 @@ 2017-06-14.01:56:34.600428|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000529|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.601188|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000553|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.603197|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057d|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 2017-06-14.01:56:34.606008|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000048|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.606683|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000092|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.607356|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a0000000000bc|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 @@ -5480,8 +5480,8 @@ 2017-06-14.01:56:34.639098|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000052a|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.639964|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000554|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.641601|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-06-14.01:56:40.192374|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP:oid:0x5000000000628|SAI_NEXT_HOP_GROUP_ATTR_TYPE=SAI_NEXT_HOP_GROUP_TYPE_ECMP 2017-06-14.01:56:40.195490|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MEMBER:oid:0x2d000000000629|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID=oid:0x5000000000628|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID=oid:0x40000000005ed 2017-06-14.01:56:40.197125|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MEMBER:oid:0x2d00000000062a|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID=oid:0x5000000000628|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID=oid:0x40000000005f3 diff --git a/tests/brcm/full_no_queue_no_ipg.rec b/tests/brcm/full_no_queue_no_ipg.rec index 2546bc83ac..3055ebd848 100644 --- a/tests/brcm/full_no_queue_no_ipg.rec +++ b/tests/brcm/full_no_queue_no_ipg.rec @@ -5220,12 +5220,12 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-06-14.01:56:40.192374|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP:oid:0x5000000000628|SAI_NEXT_HOP_GROUP_ATTR_TYPE=SAI_NEXT_HOP_GROUP_TYPE_ECMP 2017-06-14.01:56:40.195490|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MEMBER:oid:0x2d000000000629|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID=oid:0x5000000000628|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID=oid:0x40000000005ed 2017-06-14.01:56:40.197125|c|SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MEMBER:oid:0x2d00000000062a|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID=oid:0x5000000000628|SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID=oid:0x40000000005f3 diff --git a/tests/brcm/full_queue_bug_null_buffer_profile.rec b/tests/brcm/full_queue_bug_null_buffer_profile.rec index 320f21af98..53246d6363 100644 --- a/tests/brcm/full_queue_bug_null_buffer_profile.rec +++ b/tests/brcm/full_queue_bug_null_buffer_profile.rec @@ -287,12 +287,12 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-06-14.01:56:34.647623|s|SAI_OBJECT_TYPE_QUEUE:oid:0x1500000000006f|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.648669|s|SAI_OBJECT_TYPE_QUEUE:oid:0x15000000000099|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.649906|s|SAI_OBJECT_TYPE_QUEUE:oid:0x150000000000c3|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 diff --git a/tests/brcm/full_second.rec b/tests/brcm/full_second.rec index 3d99d94134..d15e67e544 100644 --- a/tests/brcm/full_second.rec +++ b/tests/brcm/full_second.rec @@ -5060,9 +5060,9 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-06-14.01:56:34.473539|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000044|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.475407|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000045|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.477022|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000008e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 @@ -5159,7 +5159,7 @@ 2017-06-14.01:56:34.600428|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000529|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.601188|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000553|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.603197|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057d|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 2017-06-14.01:56:34.606008|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000048|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.606683|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000092|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.607356|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a0000000000bc|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 @@ -5192,8 +5192,8 @@ 2017-06-14.01:56:34.639098|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000052a|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.639964|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000554|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.641601|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-06-14.01:56:34.647623|s|SAI_OBJECT_TYPE_QUEUE:oid:0x1500000000006f|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.648669|s|SAI_OBJECT_TYPE_QUEUE:oid:0x15000000000099|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.649906|s|SAI_OBJECT_TYPE_QUEUE:oid:0x150000000000c3|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 diff --git a/tests/brcm/full_second_no_bridge.rec b/tests/brcm/full_second_no_bridge.rec index 4e37a62f01..8e727ef357 100644 --- a/tests/brcm/full_second_no_bridge.rec +++ b/tests/brcm/full_second_no_bridge.rec @@ -5058,9 +5058,9 @@ 2017-06-14.01:56:34.445579|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x1800000000061f|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_INGRESS 2017-06-14.01:56:34.449948|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000620|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_STATIC|SAI_BUFFER_POOL_ATTR_SIZE=113664|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-06-14.01:56:34.453554|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000621|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=5491712|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 -2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.460343|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000622|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000620|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.466216|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000623|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061e|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.471663|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000624|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061f|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-06-14.01:56:34.473539|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000044|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.475407|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000045|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 2017-06-14.01:56:34.477022|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000008e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000624 @@ -5157,7 +5157,7 @@ 2017-06-14.01:56:34.600428|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000529|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.601188|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000553|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 2017-06-14.01:56:34.603197|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057d|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000623 -2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432 +2017-06-14.01:56:34.605075|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000625|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061c|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=113664|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=76800|SAI_BUFFER_PROFILE_ATTR_XON_TH=18432|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 2017-06-14.01:56:34.606008|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000048|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.606683|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000092|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.607356|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a0000000000bc|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 @@ -5190,8 +5190,8 @@ 2017-06-14.01:56:34.639098|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000052a|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.639964|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a000000000554|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 2017-06-14.01:56:34.641601|s|SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP:oid:0x1a00000000057e|SAI_INGRESS_PRIORITY_GROUP_ATTR_BUFFER_PROFILE=oid:0x19000000000625 -2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 +2017-06-14.01:56:34.643791|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000626|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x1800000000061d|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_STATIC|SAI_BUFFER_PROFILE_ATTR_SHARED_STATIC_TH=10000 +2017-06-14.01:56:34.645336|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000627|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000621|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-06-14.01:56:34.647623|s|SAI_OBJECT_TYPE_QUEUE:oid:0x1500000000006f|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.648669|s|SAI_OBJECT_TYPE_QUEUE:oid:0x15000000000099|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 2017-06-14.01:56:34.649906|s|SAI_OBJECT_TYPE_QUEUE:oid:0x150000000000c3|SAI_QUEUE_ATTR_BUFFER_PROFILE_ID=oid:0x19000000000622 diff --git a/tests/mlnx/full_no_hostif_entry.rec b/tests/mlnx/full_no_hostif_entry.rec index 8734c0c4fc..95d8416a36 100644 --- a/tests/mlnx/full_no_hostif_entry.rec +++ b/tests/mlnx/full_no_hostif_entry.rec @@ -949,14 +949,14 @@ 2017-05-11.01:44:19.271245|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000049e|SAI_PORT_ATTR_ADMIN_STATE=true 2017-05-11.01:44:19.272875|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000601|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=7291456|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-05-11.01:44:19.274126|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000602|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=8254464|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 -2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 -2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=4096 -2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616 -2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 -2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 -2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=4096|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-05-11.01:44:19.295693|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000552|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.295879|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000576|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.296033|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000050a|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 diff --git a/tests/mlnx/full_no_hostif_entry_second.rec b/tests/mlnx/full_no_hostif_entry_second.rec index 1914134cc9..54dbd7d308 100644 --- a/tests/mlnx/full_no_hostif_entry_second.rec +++ b/tests/mlnx/full_no_hostif_entry_second.rec @@ -657,14 +657,14 @@ 2017-05-11.01:44:19.271245|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000049e|SAI_PORT_ATTR_ADMIN_STATE=true 2017-05-11.01:44:19.272875|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000601|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=7291456|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS 2017-05-11.01:44:19.274126|c|SAI_OBJECT_TYPE_BUFFER_POOL:oid:0x18000000000602|SAI_BUFFER_POOL_ATTR_THRESHOLD_MODE=SAI_BUFFER_POOL_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_POOL_ATTR_SIZE=8254464|SAI_BUFFER_POOL_ATTR_TYPE=SAI_BUFFER_POOL_TYPE_EGRESS -2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 -2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 -2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518 -2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=4096 -2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616 -2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 -2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 -2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0 +2017-05-11.01:44:19.276257|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000603|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.283354|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000604|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.285295|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000605|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=1518|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.287290|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000606|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=4096|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.289138|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000607|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x180000000005ff|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=67430|SAI_BUFFER_PROFILE_ATTR_XOFF_TH=31814|SAI_BUFFER_PROFILE_ATTR_XON_TH=35616|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.290912|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000608|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000600|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.291955|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x19000000000609|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000601|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 +2017-05-11.01:44:19.294741|c|SAI_OBJECT_TYPE_BUFFER_PROFILE:oid:0x1900000000060a|SAI_BUFFER_PROFILE_ATTR_POOL_ID=oid:0x18000000000602|SAI_BUFFER_PROFILE_ATTR_RESERVED_BUFFER_SIZE=0|SAI_BUFFER_PROFILE_ATTR_THRESHOLD_MODE=SAI_BUFFER_PROFILE_THRESHOLD_MODE_DYNAMIC|SAI_BUFFER_PROFILE_ATTR_SHARED_DYNAMIC_TH=1 2017-05-11.01:44:19.295693|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000552|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.295879|s|SAI_OBJECT_TYPE_PORT:oid:0x1000000000576|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604 2017-05-11.01:44:19.296033|s|SAI_OBJECT_TYPE_PORT:oid:0x100000000050a|SAI_PORT_ATTR_QOS_INGRESS_BUFFER_PROFILE_LIST=2:oid:0x19000000000603,oid:0x19000000000604