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

[DASH Flow] Add SaiVal derivative before some arguments of set_flow_entry_attr to make configuration easier #643

Merged
merged 2 commits into from
Nov 14, 2024
Merged

[DASH Flow] Add SaiVal derivative before some arguments of set_flow_entry_attr to make configuration easier #643

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
db75ae2
add SaiVal derivative to underlay0_sip/dip and underlay1_sip/dip
ShaofengWu123 Nov 11, 2024
c3c4480
update spec
ShaofengWu123 Nov 11, 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
24 changes: 12 additions & 12 deletions dash-pipeline/SAI/specs/dash_flow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,9 @@ sai_apis:
- !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
name: SAI_FLOW_ENTRY_ATTR_UNDERLAY0_SIP
description: Action parameter underlay0 sip
type: sai_uint32_t
attr_value_field: u32
default: '0'
type: sai_ip_address_t
attr_value_field: ipaddr
default: 0.0.0.0
isresourcetype: false
flags: CREATE_AND_SET
object_name: null
Expand All @@ -324,9 +324,9 @@ sai_apis:
- !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
name: SAI_FLOW_ENTRY_ATTR_UNDERLAY0_DIP
description: Action parameter underlay0 dip
type: sai_uint32_t
attr_value_field: u32
default: '0'
type: sai_ip_address_t
attr_value_field: ipaddr
default: 0.0.0.0
isresourcetype: false
flags: CREATE_AND_SET
object_name: null
Expand Down Expand Up @@ -363,9 +363,9 @@ sai_apis:
- !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
name: SAI_FLOW_ENTRY_ATTR_UNDERLAY1_SIP
description: Action parameter underlay1 sip
type: sai_uint32_t
attr_value_field: u32
default: '0'
type: sai_ip_address_t
attr_value_field: ipaddr
default: 0.0.0.0
isresourcetype: false
flags: CREATE_AND_SET
object_name: null
Expand All @@ -376,9 +376,9 @@ sai_apis:
- !!python/object:utils.sai_spec.sai_attribute.SaiAttribute
name: SAI_FLOW_ENTRY_ATTR_UNDERLAY1_DIP
description: Action parameter underlay1 dip
type: sai_uint32_t
attr_value_field: u32
default: '0'
type: sai_ip_address_t
attr_value_field: ipaddr
default: 0.0.0.0
isresourcetype: false
flags: CREATE_AND_SET
object_name: null
Expand Down
8 changes: 4 additions & 4 deletions dash-pipeline/bmv2/stages/conntrack_lookup.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,15 @@ control conntrack_lookup_stage(inout headers_t hdr, inout metadata_t meta) {

/* Flow encap related attributes */
bit<24> underlay0_vnet_id,
IPv4Address underlay0_sip,
IPv4Address underlay0_dip,
@SaiVal[type="sai_ip_address_t"] IPv4Address underlay0_sip,
@SaiVal[type="sai_ip_address_t"] IPv4Address underlay0_dip,
EthernetAddress underlay0_smac,
EthernetAddress underlay0_dmac,
@SaiVal[type="sai_dash_encapsulation_t"] dash_encapsulation_t underlay0_dash_encapsulation,

bit<24> underlay1_vnet_id,
IPv4Address underlay1_sip,
IPv4Address underlay1_dip,
@SaiVal[type="sai_ip_address_t"] IPv4Address underlay1_sip,
@SaiVal[type="sai_ip_address_t"] IPv4Address underlay1_dip,
EthernetAddress underlay1_smac,
EthernetAddress underlay1_dmac,
@SaiVal[type="sai_dash_encapsulation_t"] dash_encapsulation_t underlay1_dash_encapsulation,
Expand Down
Loading