From 6b67cbdc59f06d5bc5dfd1d2b8b741510888f2a0 Mon Sep 17 00:00:00 2001 From: Riff Date: Thu, 18 Jul 2024 22:25:20 -0700 Subject: [PATCH] [dash-sai] Update the SAI specs to make it match with the latest merged SAI APIs (#600) Some SAI APIs are merged during the effort of enabling the SAI spec, hence updating the spec manually to make them match. --- .../SAI/specs/dash_outbound_ca_to_pa.yaml | 80 +++++++++---------- .../SAI/specs/dash_outbound_routing.yaml | 32 ++++---- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/dash-pipeline/SAI/specs/dash_outbound_ca_to_pa.yaml b/dash-pipeline/SAI/specs/dash_outbound_ca_to_pa.yaml index 8f917f1ee..685d7142e 100644 --- a/dash-pipeline/SAI/specs/dash_outbound_ca_to_pa.yaml +++ b/dash-pipeline/SAI/specs/dash_outbound_ca_to_pa.yaml @@ -111,6 +111,20 @@ sai_apis: or SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING is_vlan: false deprecated: false + - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute + name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_DASH_TUNNEL_ID + description: Action parameter DASH tunnel id + type: sai_object_id_t + attr_value_field: u16 + default: SAI_NULL_OBJECT_ID + isresourcetype: false + flags: CREATE_AND_SET + object_name: SAI_OBJECT_TYPE_DASH_TUNNEL + allow_null: true + valid_only: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_TUNNEL_MAPPING + or SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING + is_vlan: false + deprecated: false - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_FLOW_RESIMULATION_REQUESTED description: Action parameter flow re-simulation requested @@ -152,6 +166,19 @@ sai_apis: valid_only: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING is_vlan: false deprecated: false + - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute + name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_OVERLAY_SIP_MASK + description: Action parameter overlay sip mask + type: sai_ip_address_t + attr_value_field: ipaddr + default: 0.0.0.0 + isresourcetype: false + flags: CREATE_AND_SET + object_name: null + allow_null: false + valid_only: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING + is_vlan: false + deprecated: false - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_OVERLAY_DIP description: Action parameter overlay dip @@ -165,6 +192,19 @@ sai_apis: valid_only: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING is_vlan: false deprecated: false + - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute + name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_OVERLAY_DIP_MASK + description: Action parameter overlay dip mask + type: sai_ip_address_t + attr_value_field: ipaddr + default: 0.0.0.0 + isresourcetype: false + flags: CREATE_AND_SET + object_name: null + allow_null: false + valid_only: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING + is_vlan: false + deprecated: false - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_DASH_ENCAPSULATION description: Action parameter DASH encapsulation @@ -217,46 +257,6 @@ sai_apis: valid_only: null is_vlan: false deprecated: false - - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute - name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_DASH_TUNNEL_ID - description: Action parameter DASH tunnel id - type: sai_object_id_t - attr_value_field: u16 - default: SAI_NULL_OBJECT_ID - isresourcetype: false - flags: CREATE_AND_SET - object_name: SAI_OBJECT_TYPE_DASH_TUNNEL - allow_null: true - valid_only: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_TUNNEL_MAPPING - or SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING - is_vlan: false - deprecated: false - - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute - name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_OVERLAY_SIP_MASK - description: Action parameter overlay sip mask - type: sai_ip_address_t - attr_value_field: ipaddr - default: 0.0.0.0 - isresourcetype: false - flags: CREATE_AND_SET - object_name: null - allow_null: false - valid_only: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING - is_vlan: false - deprecated: false - - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute - name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_OVERLAY_DIP_MASK - description: Action parameter overlay dip mask - type: sai_ip_address_t - attr_value_field: ipaddr - default: 0.0.0.0 - isresourcetype: false - flags: CREATE_AND_SET - object_name: null - allow_null: false - valid_only: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION == SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING - is_vlan: false - deprecated: false stats: [] p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta tables: diff --git a/dash-pipeline/SAI/specs/dash_outbound_routing.yaml b/dash-pipeline/SAI/specs/dash_outbound_routing.yaml index ccfd0bd45..8b8f499a1 100644 --- a/dash-pipeline/SAI/specs/dash_outbound_routing.yaml +++ b/dash-pipeline/SAI/specs/dash_outbound_routing.yaml @@ -83,6 +83,22 @@ sai_apis: or SAI_OUTBOUND_ROUTING_ENTRY_ATTR_ACTION == SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET_DIRECT is_vlan: false deprecated: false + - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute + name: SAI_OUTBOUND_ROUTING_ENTRY_ATTR_DASH_TUNNEL_ID + description: Action parameter DASH tunnel id + type: sai_object_id_t + attr_value_field: u16 + default: SAI_NULL_OBJECT_ID + isresourcetype: false + flags: CREATE_AND_SET + object_name: SAI_OBJECT_TYPE_DASH_TUNNEL + allow_null: true + valid_only: SAI_OUTBOUND_ROUTING_ENTRY_ATTR_ACTION == SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET + or SAI_OUTBOUND_ROUTING_ENTRY_ATTR_ACTION == SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET_DIRECT + or SAI_OUTBOUND_ROUTING_ENTRY_ATTR_ACTION == SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_DIRECT + or SAI_OUTBOUND_ROUTING_ENTRY_ATTR_ACTION == SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_SERVICE_TUNNEL + is_vlan: false + deprecated: false - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute name: SAI_OUTBOUND_ROUTING_ENTRY_ATTR_METER_CLASS_OR description: Action parameter meter class or @@ -274,22 +290,6 @@ sai_apis: valid_only: null is_vlan: false deprecated: false - - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute - name: SAI_OUTBOUND_ROUTING_ENTRY_ATTR_DASH_TUNNEL_ID - description: Action parameter DASH tunnel id - type: sai_object_id_t - attr_value_field: u16 - default: SAI_NULL_OBJECT_ID - isresourcetype: false - flags: CREATE_AND_SET - object_name: SAI_OBJECT_TYPE_DASH_TUNNEL - allow_null: true - valid_only: SAI_OUTBOUND_ROUTING_ENTRY_ATTR_ACTION == SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET - or SAI_OUTBOUND_ROUTING_ENTRY_ATTR_ACTION == SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET_DIRECT - or SAI_OUTBOUND_ROUTING_ENTRY_ATTR_ACTION == SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_DIRECT - or SAI_OUTBOUND_ROUTING_ENTRY_ATTR_ACTION == SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_SERVICE_TUNNEL - is_vlan: false - deprecated: false stats: [] p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta tables: