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

Jump to bottom

[dash-flow] Rename ENI_ADDR to ENI_MAC #617

Merged
merged 5 commits into from
Aug 29, 2024
Merged

[dash-flow] Rename ENI_ADDR to ENI_MAC #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
427f695
Rename ENI_ADDR
zhixiongniu Aug 29, 2024
45b4647
Rename ENI_ADDR
zhixiongniu Aug 29, 2024
a52074b
Update
zhixiongniu Aug 29, 2024
e611dc2
Update
zhixiongniu Aug 29, 2024
e269501
Update
zhixiongniu Aug 29, 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
2 changes: 1 addition & 1 deletion dash-pipeline/SAI/specs/dash_flow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sai_apis:
description: Action parameter DASH flow enabled key
type: sai_dash_flow_enabled_key_t
attr_value_field: s32
default: SAI_DASH_FLOW_ENABLED_KEY_ENI_ADDR
default: SAI_DASH_FLOW_ENABLED_KEY_ENI_MAC
isresourcetype: false
flags: CREATE_AND_SET
object_name: null
Expand Down
4 changes: 2 additions & 2 deletions dash-pipeline/SAI/specs/sai_spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ enums:
description: ''
members:
- !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember
name: ENI_ADDR
name: ENI_MAC
description: ''
value: '1'
- !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember
Expand Down Expand Up @@ -238,7 +238,7 @@ enums:
description: ''
value: '1'
- !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember
name: ENI_ADDR
name: ENI_MAC
description: ''
value: '2'
- !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember
Expand Down
4 changes: 2 additions & 2 deletions dash-pipeline/bmv2/dash_metadata.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ enum bit<16> dash_pipeline_stage_t {
};

enum bit<16> dash_flow_enabled_key_t {
ENI_ADDR = (1 << 0),
ENI_MAC = (1 << 0),
VNI = (1 << 1),
PROTOCOL = (1 << 2),
SRC_IP = (1 << 3),
Expand Down Expand Up @@ -100,7 +100,7 @@ enum bit<16> dash_flow_entry_bulk_get_session_filter_key_t
{
INVAILD = 0,
FLOW_TABLE_ID = 1,
ENI_ADDR = 2,
ENI_MAC = 2,
IP_PROTOCOL = 3,
SRC_IP_ADDR = 4,
DST_IP_ADDR = 5,
Expand Down
2 changes: 1 addition & 1 deletion dash-pipeline/bmv2/stages/conntrack_lookup.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ control conntrack_lookup_stage(inout headers_t hdr, inout metadata_t meta) {
apply {
flow_table.apply();

if (meta.conntrack_data.flow_table.flow_enabled_key & dash_flow_enabled_key_t.ENI_ADDR != 0) {
if (meta.conntrack_data.flow_table.flow_enabled_key & dash_flow_enabled_key_t.ENI_MAC != 0) {
meta.conntrack_data.flow_key.eni_mac = meta.eni_addr;
}

Expand Down
4 changes: 2 additions & 2 deletions documentation/dataplane/dash-flow-api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ typedef enum _sai_dash_flow_enabled_key_t
{
SAI_DASH_FLOW_ENABLED_KEY_NONE = 0,

SAI_DASH_FLOW_ENABLED_KEY_ENI_ADDR = 1 << 1,
SAI_DASH_FLOW_ENABLED_KEY_ENI_MAC = 1 << 1,

SAI_DASH_FLOW_ENABLED_KEY_VNI = 1 << 2,

Expand Down Expand Up @@ -517,7 +517,7 @@ uint32_t attr_count = 3;
sai_attribute_t attr_list[3];
attr_list[0].id = SAI_FLOW_TABLE_ATTR_DASH_FLOW_ENABLED_KEY;
attr_list[0].value = SAI_DASH_FLOW_ENABLED_KEY_PROTOCOL |
SAI_DASH_FLOW_ENABLED_KEY_ENI_ADDR |
SAI_DASH_FLOW_ENABLED_KEY_ENI_MAC |
SAI_DASH_FLOW_ENABLED_KEY_VNI |
SAI_DASH_FLOW_ENABLED_KEY_SRC_IP |
SAI_DASH_FLOW_ENABLED_KEY_DST_IP |
Expand Down
Loading