Skip to content

Commit

Permalink
Improve code coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
@Junchao-Mellanox
Junchao-Mellanox committed Aug 1, 2022
1 parent 2f827da commit 36267a0
Show file tree
Hide file tree
Showing 7 changed files with 182 additions and 4 deletions.
19 changes: 17 additions & 2 deletions lib/ClientServerSai.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,15 @@ sai_status_t ClientServerSai::bulkGetStats(
SWSS_LOG_ENTER();
REDIS_CHECK_API_INITIALIZED();

return SAI_STATUS_NOT_IMPLEMENTED;
return m_sai->bulkGetStats(switchId,
object_type,
object_count,
object_key,
number_of_counters,
counter_ids,
mode,
object_statuses,
counters);
}

sai_status_t ClientServerSai::bulkClearStats(
Expand All @@ -329,7 +337,14 @@ sai_status_t ClientServerSai::bulkClearStats(
SWSS_LOG_ENTER();
REDIS_CHECK_API_INITIALIZED();

return SAI_STATUS_NOT_IMPLEMENTED;
return m_sai->bulkClearStats(switchId,
object_type,
object_count,
object_key,
number_of_counters,
counter_ids,
mode,
object_statuses);
}

// BULK QUAD OID
Expand Down
23 changes: 21 additions & 2 deletions lib/ServerSai.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,19 @@ sai_status_t ServerSai::bulkGetStats(
_Inout_ sai_status_t *object_statuses,
_Out_ uint64_t *counters)
{
MUTEX();
SWSS_LOG_ENTER();
REDIS_CHECK_API_INITIALIZED();

return SAI_STATUS_NOT_IMPLEMENTED;
return m_sai->bulkGetStats(switchId,
object_type,
object_count,
object_key,
number_of_counters,
counter_ids,
mode,
object_statuses,
counters);
}

sai_status_t ServerSai::bulkClearStats(
Expand All @@ -343,9 +353,18 @@ sai_status_t ServerSai::bulkClearStats(
_In_ sai_stats_mode_t mode,
_Inout_ sai_status_t *object_statuses)
{
MUTEX();
SWSS_LOG_ENTER();
REDIS_CHECK_API_INITIALIZED();

return SAI_STATUS_NOT_IMPLEMENTED;
return m_sai->bulkClearStats(switchId,
object_type,
object_count,
object_key,
number_of_counters,
counter_ids,
mode,
object_statuses);
}

// BULK QUAD OID
Expand Down
45 changes: 45 additions & 0 deletions unittest/lib/TestClientServerSai.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,48 @@ TEST(ClientServerSai, logSet)

EXPECT_EQ(SAI_STATUS_SUCCESS, css->logSet(SAI_API_PORT, SAI_LOG_LEVEL_NOTICE));
}

TEST(ClientServerSai, bulkGetClearStats)
{
auto css = std::make_shared<ClientServerSai>();

EXPECT_EQ(SAI_STATUS_FAILURE, css->bulkGetStats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_READ,
nullptr,
nullptr));

EXPECT_EQ(SAI_STATUS_FAILURE, css->bulkClearStats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_CLEAR,
nullptr));

EXPECT_EQ(SAI_STATUS_SUCCESS, css->initialize(0, &test_services));

EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, css->bulkGetStats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_READ,
nullptr,
nullptr));

EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, css->bulkClearStats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_CLEAR,
nullptr));
}
27 changes: 27 additions & 0 deletions unittest/lib/TestContext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,30 @@ TEST(Context, populateMetadata)

ctx->populateMetadata(0x212121212212121L);
}

TEST(Context, bulkGetClearStats)
{
auto recorder = std::make_shared<Recorder>();

auto cc = std::make_shared<ContextConfig>(0, "syncd", "ASIC_DB", "COUNTERS_DB","FLEX_DB", "STATE_DB");

auto ctx = std::make_shared<Context>(cc, recorder,handle_notification);

EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, ctx->m_redisSai->bulkGetStats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_READ,
nullptr,
nullptr));
EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, ctx->m_redisSai->bulkClearStats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_CLEAR,
nullptr));
}
25 changes: 25 additions & 0 deletions unittest/lib/test_sai_redis_interfacequery.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,28 @@ TEST(libsairedis, sai_query_stats_capability)
{
EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, sai_query_stats_capability(0,SAI_OBJECT_TYPE_NULL,0));
}

TEST(libsairedis, sai_bulk_object_get_stats)
{
EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, sai_bulk_object_get_stats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_READ,
nullptr,
nullptr));
}

TEST(libsairedis, sai_bulk_object_clear_stats)
{
EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, sai_bulk_object_clear_stats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_CLEAR,
nullptr));
}
22 changes: 22 additions & 0 deletions unittest/meta/TestMeta.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1056,3 +1056,25 @@ TEST(Meta, populate)

m.populate(dump);
}

TEST(Meta, bulkGetClearStats)
{
Meta m(std::make_shared<MetaTestSaiInterface>());
EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, m->bulkGetStats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_READ,
nullptr,
nullptr));
EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, m->bulkClearStats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_CLEAR,
nullptr));
}
25 changes: 25 additions & 0 deletions unittest/vslib/test_sai_vs_interfacequery.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,28 @@ TEST(libsaivs, sai_switch_id_query)
{
EXPECT_EQ(SAI_NULL_OBJECT_ID, sai_switch_id_query(SAI_NULL_OBJECT_ID));
}

TEST(libsaivs, sai_bulk_object_get_stats)
{
EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, sai_bulk_object_get_stats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_READ,
nullptr,
nullptr));
}

TEST(libsaivs, sai_bulk_object_clear_stats)
{
EXPECT_EQ(SAI_STATUS_NOT_IMPLEMENTED, sai_bulk_object_clear_stats(SAI_NULL_OBJECT_ID,
SAI_OBJECT_TYPE_PORT,
0,
nullptr,
0,
nullptr,
SAI_STATS_MODE_BULK_CLEAR,
nullptr));
}

0 comments on commit 36267a0

Please sign in to comment.