Skip to content

[meta]: Enable validation for SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST #1856

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

Open
srodd-nexthop wants to merge 12 commits into
base: master
Choose a base branch
from
+97 −7
Open

[meta]: Enable validation for SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST #1856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
12393d8
u8_list validation handling
srodd-nexthop Apr 21, 2026
a2bdcfa
meta: clarify intent of u8_list validation case
srodd-nexthop May 12, 2026
bff2d9d
ci: retrigger pipeline
srodd-nexthop May 13, 2026
31dfa7c
tests: add UDF to aspell dictionary
srodd-nexthop May 13, 2026
9af843e
meta: drop UINT8_LIST serialize mask guard
srodd-nexthop May 13, 2026
3074f0d
ci: retrigger pipeline
srodd-nexthop May 13, 2026
1ea00a6
ci: retrigger pipeline
srodd-nexthop May 19, 2026
a763f41
ci: retrigger pipeline
srodd-nexthop May 19, 2026
66cb24c
tests: cover UINT8_LIST meta validation and populate paths
srodd-nexthop May 25, 2026
7b523bd
ci: retrigger pipeline
srodd-nexthop May 25, 2026
4e40e42
Merge remote-tracking branch 'origin/master' into srodd.nexthopai.udf
ronan-nexthop May 26, 2026
db93069
Merge remote-tracking branch 'origin/master' into srodd.nexthopai.udf
srodd-nexthop May 29, 2026
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
42 changes: 35 additions & 7 deletions meta/Meta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1953,7 +1953,9 @@ void Meta::meta_generic_validation_post_remove(
}
break;

// case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
// no object references to decrement for uint8 list
break;

// ACL ACTION

Expand Down Expand Up @@ -3620,7 +3622,13 @@ sai_status_t Meta::meta_generic_validation_create(
break;
}

// case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
// Used by UDF-backed ACL match fields (byte pattern + mask).
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
if (value.aclfield.enable)
{
VALIDATION_LIST(md, value.aclfield.data.u8list);
}
break;

// ACL ACTION

Expand Down Expand Up @@ -4273,7 +4281,12 @@ sai_status_t Meta::meta_generic_validation_set(
break;
}

// case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
if (value.aclfield.enable)
{
VALIDATION_LIST(md, value.aclfield.data.u8list);
}
break;

// ACL ACTION

Expand Down Expand Up @@ -4748,7 +4761,9 @@ sai_status_t Meta::meta_generic_validation_get(
VALIDATION_LIST(md, value.aclfield.data.objlist);
break;

// case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
VALIDATION_LIST(md, value.aclfield.data.u8list);
break;

// ACL ACTION

Expand Down Expand Up @@ -5017,7 +5032,12 @@ void Meta::meta_generic_validation_post_get(
meta_generic_validation_post_get_objlist(meta_key, md, switch_id, value.aclfield.data.objlist.count, value.aclfield.data.objlist.list);
break;

// case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST: (2 lists)
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
if (value.aclfield.enable)
{
VALIDATION_LIST_GET(md, value.aclfield.data.u8list);
}
break;

// ACL ACTION

Expand Down Expand Up @@ -5995,7 +6015,9 @@ void Meta::meta_generic_validation_post_create(
}
break;

// case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
// no object references to increment for uint8 list
break;

// ACL ACTION

Expand Down Expand Up @@ -6222,7 +6244,9 @@ void Meta::meta_generic_validation_post_set(
break;
}

// case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
// no object references to handle for uint8 list
break;

// ACL ACTION

Expand Down Expand Up @@ -7528,6 +7552,10 @@ void Meta::populate(
}
break;

case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT8_LIST:
// no object references in uint8 list
break;

case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_OBJECT_ID:
if (value.aclaction.enable)
{
Expand Down
1 change: 1 addition & 0 deletions tests/aspell.en.pws
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ TODO
TPID
TXSC
TestCase
UDF
tokenize
VID
VIDCOUNTER
Expand Down
47 changes: 47 additions & 0 deletions unittest/meta/TestLegacyOther.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,3 +1040,50 @@ TEST(Legacy, bulk_route_entry_create)
std::cout << "ms: " << (double)us.count()/1000 << " / " << n << "/" << object_count << std::endl;
}

TEST(Legacy, acl_entry_udf_uint8_list_field)
{
SWSS_LOG_ENTER();

clear_local();

sai_object_id_t switch_id = create_switch();
sai_object_id_t aclentry;
sai_object_id_t table_id = insert_dummy_object(SAI_OBJECT_TYPE_ACL_TABLE, switch_id);

uint8_t data[4] = {0x11, 0x22, 0x33, 0x44};
uint8_t mask[4] = {0xff, 0xff, 0xff, 0xff};

std::vector<sai_attribute_t> vattrs;

sai_attribute_t a_table;
memset(&a_table, 0, sizeof(a_table));
a_table.id = SAI_ACL_ENTRY_ATTR_TABLE_ID;
a_table.value.oid = table_id;
vattrs.push_back(a_table);

sai_attribute_t a_udf;
memset(&a_udf, 0, sizeof(a_udf));
a_udf.id = SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN;
a_udf.value.aclfield.enable = true;
a_udf.value.aclfield.data.u8list.count = 4;
a_udf.value.aclfield.data.u8list.list = data;
a_udf.value.aclfield.mask.u8list.count = 4;
a_udf.value.aclfield.mask.u8list.list = mask;
vattrs.push_back(a_udf);

auto status = g_meta->create(SAI_OBJECT_TYPE_ACL_ENTRY, &aclentry, switch_id,
(uint32_t)vattrs.size(), vattrs.data());
EXPECT_EQ(SAI_STATUS_SUCCESS, status);

status = g_meta->set(SAI_OBJECT_TYPE_ACL_ENTRY, aclentry, &a_udf);
EXPECT_EQ(SAI_STATUS_SUCCESS, status);

status = g_meta->get(SAI_OBJECT_TYPE_ACL_ENTRY, aclentry, 1, &a_udf);
EXPECT_EQ(SAI_STATUS_SUCCESS, status);

status = g_meta->remove(SAI_OBJECT_TYPE_ACL_ENTRY, aclentry);
EXPECT_EQ(SAI_STATUS_SUCCESS, status);

remove_switch(switch_id);
}

14 changes: 14 additions & 0 deletions unittest/meta/TestMeta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,6 +1739,20 @@ TEST(Meta, populate)
m.populate(dump);
}

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

swss::TableDump dump;

dump["SAI_OBJECT_TYPE_ACL_TABLE:oid:0x7000000000700"]["SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE"] = "true";
dump["SAI_OBJECT_TYPE_ACL_ENTRY:oid:0x8000000000701"]["SAI_ACL_ENTRY_ATTR_TABLE_ID"] = "oid:0x7000000000700";
dump["SAI_OBJECT_TYPE_ACL_ENTRY:oid:0x8000000000701"]["SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN"] =
"4:17,34,51,68&mask:4:0xff,0xff,0xff,0xff";

m.populate(dump);
}

TEST(Meta, bulkGetClearStats)
{
Meta m(std::make_shared<MetaTestSaiInterface>());
Expand Down
Loading