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

UDF ACL impl #440

Merged
merged 2 commits into from
Jun 26, 2024
Merged

UDF ACL impl #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9038e24
UDF ACL impl
DanG100 Jun 25, 2024
0338ada
test fixes
DanG100 Jun 25, 2024
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
22 changes: 16 additions & 6 deletions dataplane/apigen/ccgen/ccgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,20 +318,23 @@ if (attr_list[i].id >= SAI_ACL_TABLE_ATTR_USER_DEFINED_FIELD_GROUP_MIN && attr_l
case createOp:
convertFn.AttrConvertInsert = `
if (attr_list[i].id >= SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN && attr_list[i].id < SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MAX) {
(*msg.mutable_user_defined_field_group_min())[attr_list[i].id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN].mutable_data_list()->mutable_list()->Add(attr_list[i].value.aclfield.data.u8list.list, attr_list[i].value.aclfield.data.u8list.list + attr_list[i].value.aclfield.data.u8list.count);
(*msg.mutable_user_defined_field_group_min())[attr_list[i].id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN].mutable_mask_list()->mutable_list()->Add(attr_list[i].value.aclfield.mask.u8list.list, attr_list[i].value.aclfield.mask.u8list.list + attr_list[i].value.aclfield.mask.u8list.count);
*(*msg.mutable_user_defined_field_group_min())[attr_list[i].id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN].mutable_data_u8list() = std::string(attr_list[i].value.aclfield.data.u8list.list, attr_list[i].value.aclfield.data.u8list.list + attr_list[i].value.aclfield.data.u8list.count);
*(*msg.mutable_user_defined_field_group_min())[attr_list[i].id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN].mutable_mask_u8list() = std::string(attr_list[i].value.aclfield.mask.u8list.list, attr_list[i].value.aclfield.mask.u8list.list + attr_list[i].value.aclfield.mask.u8list.count);
}`
case setAttrOp:
opFn.AttrConvertInsert = `
if (attr->id >= SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN && attr->id < SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MAX) {
(*req.mutable_user_defined_field_group_min())[attr->id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN].mutable_data_list()->mutable_list()->Add(attr->value.aclfield.data.u8list.list, attr->value.aclfield.data.u8list.list + attr->value.aclfield.data.u8list.count);
(*req.mutable_user_defined_field_group_min())[attr->id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN].mutable_mask_list()->mutable_list()->Add(attr->value.aclfield.mask.u8list.list, attr->value.aclfield.mask.u8list.list + attr->value.aclfield.mask.u8list.count);
*(*req.mutable_user_defined_field_group_min())[attr->id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN].mutable_data_u8list() = std::string(attr->value.aclfield.data.u8list.list, attr->value.aclfield.data.u8list.list + attr->value.aclfield.data.u8list.count);
*(*req.mutable_user_defined_field_group_min())[attr->id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN].mutable_mask_u8list() = std::string(attr->value.aclfield.mask.u8list.list, attr->value.aclfield.mask.u8list.list + attr->value.aclfield.mask.u8list.count);
}`
case getAttrOp:
opFn.AttrConvertInsert = `
if (attr_list[i].id >= SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN && attr_list[i].id < SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MAX) {
copy_list(attr_list[i].value.aclfield.data.u8list.list, resp.attr().user_defined_field_group_min().at(attr_list[i].id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN).data_list().list(), &attr_list[i].value.aclfield.data.u8list.count);
copy_list(attr_list[i].value.aclfield.mask.u8list.list, resp.attr().user_defined_field_group_min().at(attr_list[i].id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN).mask_list().list(), &attr_list[i].value.aclfield.mask.u8list.count);
auto acl_attr = resp.attr().user_defined_field_group_min().at(attr_list[i].id - SAI_ACL_ENTRY_ATTR_USER_DEFINED_FIELD_GROUP_MIN);
memcpy(attr_list[i].value.aclfield.data.u8list.list, acl_attr.data_u8list().data(), acl_attr.data_u8list().size());
memcpy(attr_list[i].value.aclfield.mask.u8list.list, acl_attr.mask_u8list().data(), acl_attr.mask_u8list().size());
attr_list[i].value.aclfield.data.u8list.count = acl_attr.data_u8list().size();
attr_list[i].value.aclfield.mask.u8list.count = acl_attr.mask_u8list().size();
}`
}
}
Expand Down Expand Up @@ -523,6 +526,13 @@ var typeToUnionAccessor = map[string]*unionAccessor{
protoAccessor: "oid",
aType: acl,
},
"sai_acl_field_data_t sai_u8_list_t": {
accessor: "u8list",
convertFromFunc: "convert_from_acl_field_data",
convertToFunc: "convert_to_acl_field_data_u8",
protoAccessor: "sai_u8_list_t",
aType: acl,
},
}

func protoFieldSetter(saiType, protoVar, protoField, varName string, info *docparser.SAIInfo) (*AttrSwitchSmt, error) {
Expand Down
2 changes: 2 additions & 0 deletions dataplane/apigen/protogen/protogen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,7 @@ message QOSMap {
bytes mask_mac = 4;
bytes mask_ip = 5;
Uint64List mask_list = 6;
bytes mask_u8list = 15;
};
oneof data {
bool data_bool = 7;
Expand All @@ -749,6 +750,7 @@ message QOSMap {
Uint64List data_list = 12;
AclIpType data_ip_type = 13;
uint64 data_oid = 14;
bytes data_u8list = 16;
};
}

Expand Down
2 changes: 2 additions & 0 deletions dataplane/apigen/protogen/protogen_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ message AclFieldData {
bytes mask_mac = 4;
bytes mask_ip = 5;
Uint64List mask_list = 6;
bytes mask_u8list = 15;
};
oneof data {
bool data_bool = 7;
Expand All @@ -80,6 +81,7 @@ message AclFieldData {
Uint64List data_list = 12;
AclIpType data_ip_type = 13;
uint64 data_oid = 14;
bytes data_u8list = 16;
};
}

Expand Down
Loading
Loading