Skip to content

Commit 6786660

Browse files
author
Shuotian Cheng
committed
saimeta: Add sai_acl_bind_point_t and SAI_ACL_TABLE_ATTR_BIND_POINT
1 parent 5c4d9d9 commit 6786660

File tree

2 files changed

+51
-4
lines changed

2 files changed

+51
-4
lines changed

meta/sai_meta_acl.cpp

+50
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@
1919
.conditions = { },\
2020
},
2121

22+
DEFINE_ENUM_VALUES(sai_acl_bind_point_t)
23+
{
24+
SAI_ACL_BIND_POINT_PORT,
25+
SAI_ACL_BIND_POINT_LAG,
26+
SAI_ACL_BIND_POINT_VLAN,
27+
SAI_ACL_BIND_POINT_ROUTER_INTF,
28+
SAI_ACL_BIND_POINT_SWITCH
29+
};
30+
2231
DEFINE_ENUM_VALUES(sai_acl_stage_t)
2332
{
2433
SAI_ACL_STAGE_INGRESS,
@@ -94,6 +103,31 @@ const char* metadata_sai_packet_color_t_enum_values_short_names[] = {
94103
const size_t metadata_sai_packet_color_t_enum_values_count = 3;
95104
DEFINE_ENUM_METADATA(sai_packet_color_t, 3);
96105

106+
const char metadata_sai_acl_bind_point_t_enum_name[] = "sai_acl_bind_point_t";
107+
const sai_acl_bind_point_t metadata_sai_acl_bind_point_t_enum_values[] = {
108+
SAI_ACL_BIND_POINT_PORT,
109+
SAI_ACL_BIND_POINT_LAG,
110+
SAI_ACL_BIND_POINT_VLAN,
111+
SAI_ACL_BIND_POINT_ROUTER_INTF,
112+
SAI_ACL_BIND_POINT_SWITCH
113+
};
114+
const char* metadata_sai_acl_bind_point_t_enum_values_names[] = {
115+
"SAI_ACL_BIND_POINT_PORT",
116+
"SAI_ACL_BIND_POINT_LAG",
117+
"SAI_ACL_BIND_POINT_VLAN",
118+
"SAI_ACL_BIND_POINT_ROUTER_INTF",
119+
"SAI_ACL_BIND_POINT_SWITCH"
120+
};
121+
const char* metadata_sai_acl_bind_point_t_enum_values_short_names[] = {
122+
"PORT",
123+
"LAG",
124+
"VLAN",
125+
"ROUTER_INTF",
126+
"SWITCH"
127+
};
128+
const size_t metadata_sai_acl_bind_point_t_enum_values_count = 4;
129+
DEFINE_ENUM_METADATA(sai_acl_bind_point_t, 4);
130+
97131
const char metadata_sai_acl_stage_t_enum_name[] = "sai_acl_stage_t";
98132
const sai_acl_stage_t metadata_sai_acl_stage_t_enum_values[] = {
99133
SAI_ACL_STAGE_INGRESS,
@@ -273,6 +307,22 @@ DEFINE_ENUM_METADATA(sai_acl_range_type_t, 5);
273307

274308
const sai_attr_metadata_t sai_acl_table_attr_metadata[] = {
275309

310+
{
311+
.objecttype = SAI_OBJECT_TYPE_ACL_TABLE,
312+
.attrid = SAI_ACL_TABLE_ATTR_BIND_POINT,
313+
.attridname = "SAI_ACL_TABLE_ATTR_BIND_POINT",
314+
.serializationtype = SAI_SERIALIZATION_TYPE_INT32,
315+
.flags = SAI_ATTR_FLAGS_MANDATORY_ON_CREATE | SAI_ATTR_FLAGS_CREATE_ONLY,
316+
.allowedobjecttypes = { },
317+
.allownullobjectid = false,
318+
.defaultvaluetype = SAI_DEFAULT_VALUE_TYPE_NONE,
319+
.defaultvalue = { },
320+
.enumtypestr = StringifyEnum ( sai_acl_bind_point_t ),
321+
.enumallowedvalues = ENUM_VALUES ( sai_acl_bind_point_t ),
322+
.enummetadata = &metadata_enum_sai_acl_bind_point_t,
323+
.conditions = { },
324+
},
325+
276326
{
277327
.objecttype = SAI_OBJECT_TYPE_ACL_TABLE,
278328
.attrid = SAI_ACL_TABLE_ATTR_STAGE,

meta/sai_meta_sanity.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -436,10 +436,7 @@ std::unordered_map<int32_t, std::unordered_map<int32_t, std::string>> get_attr_n
436436

437437
// TODO must be generated from headers
438438

439-
ATTR_MAP_SET(ACL_TABLE,SAI_ACL_TABLE_ATTR_STAGE);
440-
ATTR_MAP_SET(ACL_TABLE,SAI_ACL_TABLE_ATTR_PRIORITY);
441-
ATTR_MAP_SET(ACL_TABLE,SAI_ACL_TABLE_ATTR_SIZE);
442-
ATTR_MAP_SET(ACL_TABLE,SAI_ACL_TABLE_ATTR_GROUP_ID);
439+
ATTR_MAP_SET(ACL_TABLE,SAI_ACL_TABLE_ATTR_BIND_POINT);
443440
ATTR_MAP_SET(ACL_TABLE,SAI_ACL_TABLE_ATTR_STAGE);
444441
ATTR_MAP_SET(ACL_TABLE,SAI_ACL_TABLE_ATTR_PRIORITY);
445442
ATTR_MAP_SET(ACL_TABLE,SAI_ACL_TABLE_ATTR_SIZE);

0 commit comments

Comments
 (0)