From db75ae2c81ded0875804ddc1569251c40e5e3481 Mon Sep 17 00:00:00 2001 From: ShaofengWu123 Date: Mon, 11 Nov 2024 09:45:52 +0000 Subject: [PATCH 1/2] add SaiVal derivative to underlay0_sip/dip and underlay1_sip/dip --- dash-pipeline/bmv2/stages/conntrack_lookup.p4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dash-pipeline/bmv2/stages/conntrack_lookup.p4 b/dash-pipeline/bmv2/stages/conntrack_lookup.p4 index c55f17da1..90ec911a2 100644 --- a/dash-pipeline/bmv2/stages/conntrack_lookup.p4 +++ b/dash-pipeline/bmv2/stages/conntrack_lookup.p4 @@ -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, From c3c448049dbd46265d26b521410f918e1a15a831 Mon Sep 17 00:00:00 2001 From: ShaofengWu123 Date: Mon, 11 Nov 2024 09:49:49 +0000 Subject: [PATCH 2/2] update spec --- dash-pipeline/SAI/specs/dash_flow.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dash-pipeline/SAI/specs/dash_flow.yaml b/dash-pipeline/SAI/specs/dash_flow.yaml index fdbdd73a6..b7ea10e0a 100644 --- a/dash-pipeline/SAI/specs/dash_flow.yaml +++ b/dash-pipeline/SAI/specs/dash_flow.yaml @@ -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 @@ -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 @@ -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 @@ -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