Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

validation support for SAI_ATTR_VALUE_TYPE_JSON #1152

Merged
merged 7 commits into from
Nov 29, 2022
Merged

validation support for SAI_ATTR_VALUE_TYPE_JSON #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f04bd20
validation support for SAI_ATTR_VALUE_TYPE_JSON
svshah-intel Nov 16, 2022
95b1e62
add sairedis-lib and vslib tests for generic programmable
svshah-intel Nov 17, 2022
766a3c2
add sairedis-lib and vslib tests for generic programmable
svshah-intel Nov 17, 2022
984e5da
check if meta-test covers generic programmable
svshah-intel Nov 17, 2022
4cfde95
check if meta-test covers generic programmable
svshah-intel Nov 17, 2022
96d75f5
check if meta-test covers generic programmable
svshah-intel Nov 17, 2022
bb15f79
check if meta-test covers generic programmable
svshah-intel Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions meta/Meta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3680,6 +3680,7 @@ void Meta::meta_generic_validation_post_remove(
case SAI_ATTR_VALUE_TYPE_INT32_RANGE:
case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
case SAI_ATTR_VALUE_TYPE_SEGMENT_LIST:
case SAI_ATTR_VALUE_TYPE_JSON:
// no special action required
break;

Expand Down Expand Up @@ -4928,6 +4929,10 @@ sai_status_t Meta::meta_generic_validation_create(
VALIDATION_LIST(md, value.segmentlist);
break;

case SAI_ATTR_VALUE_TYPE_JSON:
VALIDATION_LIST(md, value.json.json);
break;

case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:

if (value.u32range.min > value.u32range.max)
Expand Down Expand Up @@ -5581,6 +5586,10 @@ sai_status_t Meta::meta_generic_validation_set(
VALIDATION_LIST(md, value.segmentlist);
break;

case SAI_ATTR_VALUE_TYPE_JSON:
VALIDATION_LIST(md, value.json.json);
break;

case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:

if (value.u32range.min > value.u32range.max)
Expand Down Expand Up @@ -5992,6 +6001,10 @@ sai_status_t Meta::meta_generic_validation_get(
VALIDATION_LIST(md, value.segmentlist);
break;

case SAI_ATTR_VALUE_TYPE_JSON:
VALIDATION_LIST(md, value.json.json);
break;

case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:
case SAI_ATTR_VALUE_TYPE_INT32_RANGE:
// primitives
Expand Down Expand Up @@ -6238,6 +6251,10 @@ void Meta::meta_generic_validation_post_get(
VALIDATION_LIST_GET(md, value.segmentlist);
break;

case SAI_ATTR_VALUE_TYPE_JSON:
VALIDATION_LIST_GET(md, value.json.json);
break;

case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:

if (value.u32range.min > value.u32range.max)
Expand Down Expand Up @@ -7136,6 +7153,7 @@ void Meta::meta_generic_validation_post_create(
case SAI_ATTR_VALUE_TYPE_INT32_RANGE:
case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
case SAI_ATTR_VALUE_TYPE_SEGMENT_LIST:
case SAI_ATTR_VALUE_TYPE_JSON:
// no special action required
break;

Expand Down Expand Up @@ -7376,6 +7394,7 @@ void Meta::meta_generic_validation_post_set(
case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
case SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY:
case SAI_ATTR_VALUE_TYPE_SEGMENT_LIST:
case SAI_ATTR_VALUE_TYPE_JSON:
// no special action required
break;

Expand Down
1 change: 1 addition & 0 deletions unittest/lib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ testslibsairedis_SOURCES = main_libsairedis.cpp \
test_sai_redis_debug_counter.cpp \
test_sai_redis_dtel.cpp \
test_sai_redis_fdb.cpp \
test_sai_redis_generic_programmable.cpp \
test_sai_redis_ipmc.cpp \
test_sai_redis_l2mc.cpp \
test_sai_redis_l2mcgroup.cpp \
Expand Down
23 changes: 23 additions & 0 deletions unittest/lib/test_sai_redis_generic_programmable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#include <gtest/gtest.h>

extern "C" {
#include "sai.h"
}

#include "swss/logger.h"

TEST(libsairedis, generic_programmable)
{
sai_generic_programmable_api_t *api = nullptr;

sai_api_query(SAI_API_GENERIC_PROGRAMMABLE, (void**)&api);

EXPECT_NE(api, nullptr);

sai_object_id_t obj_id;

EXPECT_NE(SAI_STATUS_SUCCESS, api->create_generic_programmable(&obj_id,0,0,0));
EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_generic_programmable(0));
EXPECT_NE(SAI_STATUS_SUCCESS, api->set_generic_programmable_attribute(0,0));
EXPECT_NE(SAI_STATUS_SUCCESS, api->get_generic_programmable_attribute(0,0,0));
}
40 changes: 40 additions & 0 deletions unittest/meta/TestMeta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,46 @@ TEST(Meta, meta_validate_stats)
EXPECT_EQ(SAI_STATUS_INVALID_PARAMETER, m.call_meta_validate_stats(SAI_OBJECT_TYPE_VIRTUAL_ROUTER, vrId, 2, counter_ids, counters, SAI_STATS_MODE_READ));
}

TEST(Meta, quad_generic_programmable_entry)
{
Meta m(std::make_shared<MetaTestSaiInterface>());

sai_object_id_t switchId = 0;

sai_attribute_t attr;

attr.id = SAI_SWITCH_ATTR_INIT_SWITCH;
attr.value.booldata = true;

EXPECT_EQ(SAI_STATUS_SUCCESS, m.create(SAI_OBJECT_TYPE_SWITCH, &switchId, SAI_NULL_OBJECT_ID, 1, &attr));

std::string table_name = "test_table";
std::string json_value = "test_json";

sai_attribute_t attrs[2];
attrs[0].id = SAI_GENERIC_PROGRAMMABLE_ATTR_OBJECT_NAME;
attrs[0].value.s8list.count = (uint32_t)table_name.size();
attrs[0].value.s8list.list = (int8_t *)const_cast<char *>(table_name.c_str());

attrs[1].id = SAI_GENERIC_PROGRAMMABLE_ATTR_ENTRY;
attrs[1].value.s8list.count = (uint32_t)json_value.size();
attrs[1].value.s8list.list = (int8_t *)const_cast<char *>(json_value.c_str());

sai_object_id_t objId = 0;
EXPECT_EQ(SAI_STATUS_SUCCESS, m.create(SAI_OBJECT_TYPE_GENERIC_PROGRAMMABLE, &objId, switchId, 2, attrs));

attr.id = SAI_GENERIC_PROGRAMMABLE_ATTR_ENTRY;
attr.value.s8list.count = (uint32_t)json_value.size();
attr.value.s8list.list = (int8_t *)const_cast<char *>(json_value.c_str());
EXPECT_EQ(SAI_STATUS_SUCCESS, m.set(SAI_OBJECT_TYPE_GENERIC_PROGRAMMABLE, objId, &attr));

attr.id = SAI_GENERIC_PROGRAMMABLE_ATTR_ENTRY;
EXPECT_EQ(SAI_STATUS_SUCCESS, m.get(SAI_OBJECT_TYPE_GENERIC_PROGRAMMABLE, objId, 1, &attr));

EXPECT_EQ(SAI_STATUS_SUCCESS, m.remove(SAI_OBJECT_TYPE_GENERIC_PROGRAMMABLE, objId));
}


TEST(Meta, quad_my_sid_entry)
{
Meta m(std::make_shared<MetaTestSaiInterface>());
Expand Down
1 change: 1 addition & 0 deletions unittest/vslib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ testslibsaivs_SOURCES = main_libsaivs.cpp \
test_sai_vs_debug_counter.cpp \
test_sai_vs_dtel.cpp \
test_sai_vs_fdb.cpp \
test_sai_vs_generic_programmable.cpp \
test_sai_vs_ipmc.cpp \
test_sai_vs_l2mc.cpp \
test_sai_vs_l2mcgroup.cpp \
Expand Down
23 changes: 23 additions & 0 deletions unittest/vslib/test_sai_vs_generic_programmable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#include <gtest/gtest.h>

extern "C" {
#include "sai.h"
}

#include "swss/logger.h"

TEST(libsaivs, generic_programmable)
{
sai_generic_programmable_api_t *api = nullptr;

sai_api_query(SAI_API_GENERIC_PROGRAMMABLE, (void**)&api);

EXPECT_NE(api, nullptr);

sai_object_id_t obj_id;

EXPECT_NE(SAI_STATUS_SUCCESS, api->create_generic_programmable(&obj_id,0,0,0));
EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_generic_programmable(0));
EXPECT_NE(SAI_STATUS_SUCCESS, api->set_generic_programmable_attribute(0,0));
EXPECT_NE(SAI_STATUS_SUCCESS, api->get_generic_programmable_attribute(0,0,0));
}