From d9695c39471b7fb552ef5306a4cbc7aa868799cb Mon Sep 17 00:00:00 2001 From: r12f Date: Tue, 18 Jun 2024 21:39:43 +0000 Subject: [PATCH] Update spec to match latest code. --- dash-pipeline/SAI/specs/dash_eni.yaml | 15 ++--- .../SAI/specs/dash_outbound_ca_to_pa.yaml | 56 ++++++++++++------ .../SAI/specs/dash_routing_group.yaml | 12 ++-- dash-pipeline/SAI/specs/sai_spec.yaml | 58 +++++++++---------- 4 files changed, 83 insertions(+), 58 deletions(-) diff --git a/dash-pipeline/SAI/specs/dash_eni.yaml b/dash-pipeline/SAI/specs/dash_eni.yaml index c22ebbc8d..88e61d7f8 100644 --- a/dash-pipeline/SAI/specs/dash_eni.yaml +++ b/dash-pipeline/SAI/specs/dash_eni.yaml @@ -570,10 +570,11 @@ sai_apis: object_name: null allow_null: false valid_only: null - deprecated: null + deprecated: false + is_vlan: false - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute - name: SAI_ENI_ROUTING_GROUP_ID - description: Action parameter ROUTING_GROUP_ID + name: SAI_ENI_ATTR_ROUTING_GROUP_ID + description: Action parameter routing group id type: sai_object_id_t attr_value_field: u16 default: SAI_NULL_OBJECT_ID @@ -582,7 +583,6 @@ sai_apis: object_name: SAI_OBJECT_TYPE_ROUTING_GROUP allow_null: true valid_only: null - deprecated: null is_vlan: false deprecated: false stats: @@ -1572,7 +1572,8 @@ sai_apis: object_name: null allow_null: false valid_only: null - deprecated: null + deprecated: false + is_vlan: false - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute name: SAI_ENI_STAT_OUTBOUND_ROUTING_GROUP_MISS_DROP_PACKETS description: DASH ENI OUTBOUND_ROUTING_GROUP_MISS_DROP_PACKETS stat count @@ -1584,7 +1585,8 @@ sai_apis: object_name: null allow_null: false valid_only: null - deprecated: null + deprecated: false + is_vlan: false - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute name: SAI_ENI_STAT_OUTBOUND_ROUTING_GROUP_ADMIN_DOWN_DROP_PACKETS description: DASH ENI OUTBOUND_ROUTING_GROUP_ADMIN_DOWN_DROP_PACKETS stat count @@ -1596,7 +1598,6 @@ sai_apis: object_name: null allow_null: false valid_only: null - deprecated: null deprecated: false is_vlan: false p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta 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 31a6d21cf..ba629e440 100644 --- a/dash-pipeline/SAI/specs/dash_outbound_ca_to_pa.yaml +++ b/dash-pipeline/SAI/specs/dash_outbound_ca_to_pa.yaml @@ -163,10 +163,8 @@ sai_apis: object_name: null allow_null: false valid_only: null - deprecated: null + deprecated: true - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute - name: SAI_OUTBOUND_CA_TO_PA_ENTRY_OVERLAY_DIP - description: Action parameter OVERLAY_DIP name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_OVERLAY_DIP description: Action parameter overlay dip type: sai_ip_address_t @@ -190,10 +188,8 @@ sai_apis: object_name: null allow_null: false valid_only: null - deprecated: null + deprecated: true - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute - name: SAI_OUTBOUND_CA_TO_PA_ENTRY_DASH_ENCAPSULATION - description: Action parameter DASH_ENCAPSULATION name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_DASH_ENCAPSULATION description: Action parameter DASH encapsulation type: sai_dash_encapsulation_t @@ -259,6 +255,32 @@ 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_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: @@ -280,14 +302,14 @@ sai_apis: name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING id: 31441909 attr_param_id: - SAI_OUTBOUND_CA_TO_PA_ENTRY_UNDERLAY_DIP: 1 - SAI_OUTBOUND_CA_TO_PA_ENTRY_OVERLAY_SIP: 2 - SAI_OUTBOUND_CA_TO_PA_ENTRY_OVERLAY_SIP_MASK: 3 - SAI_OUTBOUND_CA_TO_PA_ENTRY_OVERLAY_DIP: 4 - SAI_OUTBOUND_CA_TO_PA_ENTRY_OVERLAY_DIP_MASK: 5 - SAI_OUTBOUND_CA_TO_PA_ENTRY_DASH_ENCAPSULATION: 6 - SAI_OUTBOUND_CA_TO_PA_ENTRY_TUNNEL_KEY: 7 - SAI_OUTBOUND_CA_TO_PA_ENTRY_METER_CLASS_OR: 8 - SAI_OUTBOUND_CA_TO_PA_ENTRY_DASH_TUNNEL_ID: 9 - SAI_OUTBOUND_CA_TO_PA_ENTRY_FLOW_RESIMULATION_REQUESTED: 10 - SAI_OUTBOUND_CA_TO_PA_ENTRY_ROUTING_ACTIONS_DISABLED_IN_FLOW_RESIMULATION: 11 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_UNDERLAY_DIP: 1 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_OVERLAY_SIP: 2 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_OVERLAY_SIP_MASK: 3 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_OVERLAY_DIP: 4 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_OVERLAY_DIP_MASK: 5 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_DASH_ENCAPSULATION: 6 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_TUNNEL_KEY: 7 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS_OR: 8 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_DASH_TUNNEL_ID: 9 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_FLOW_RESIMULATION_REQUESTED: 10 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ROUTING_ACTIONS_DISABLED_IN_FLOW_RESIMULATION: 11 diff --git a/dash-pipeline/SAI/specs/dash_routing_group.yaml b/dash-pipeline/SAI/specs/dash_routing_group.yaml index 3bdfd096e..0a1a81c5c 100644 --- a/dash-pipeline/SAI/specs/dash_routing_group.yaml +++ b/dash-pipeline/SAI/specs/dash_routing_group.yaml @@ -1,17 +1,18 @@ !!python/object:utils.sai_spec.sai_api_group.SaiApiGroup name: dash_routing_group -description: '' +description: DASH routing group +api_type: overlay sai_apis: - !!python/object:utils.sai_spec.sai_api.SaiApi name: routing_group - description: '' + description: routing group is_object: true enums: [] structs: [] attributes: - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute - name: SAI_ROUTING_GROUP_ADMIN_STATE - description: Action parameter ADMIN_STATE + name: SAI_ROUTING_GROUP_ATTR_ADMIN_STATE + description: Action parameter admin state type: bool attr_value_field: booldata default: 'false' @@ -20,7 +21,8 @@ sai_apis: object_name: null allow_null: false valid_only: null - deprecated: null + 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/sai_spec.yaml b/dash-pipeline/SAI/specs/sai_spec.yaml index 9d6925671..2caf7c21f 100644 --- a/dash-pipeline/SAI/specs/sai_spec.yaml +++ b/dash-pipeline/SAI/specs/sai_spec.yaml @@ -84,18 +84,6 @@ object_entries: objects: null valid_only: object_type == SAI_OBJECT_TYPE_VIP_ENTRY, enums: -- !!python/object:utils.sai_spec.sai_enum.SaiEnum - name: sai_dash_tunnel_dscp_mode_t - description: '' - members: - - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: PRESERVE_MODEL - description: '' - value: '0' - - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: PIPE_MODEL - description: '' - value: '1' - !!python/object:utils.sai_spec.sai_enum.SaiEnum name: sai_dash_direction_t description: '' @@ -113,29 +101,17 @@ enums: description: '' value: '2' - !!python/object:utils.sai_spec.sai_enum.SaiEnum - name: sai_dash_routing_actions_t + name: sai_dash_tunnel_dscp_mode_t description: '' members: - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: STATIC_ENCAP - description: '' - value: '1' - - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: NAT - description: '' - value: '2' - - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: NAT46 - description: '' - value: '4' - - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: NAT64 + name: PRESERVE_MODEL description: '' - value: '8' + value: '0' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: NAT_PORT + name: PIPE_MODEL description: '' - value: '16' + value: '1' - !!python/object:utils.sai_spec.sai_enum.SaiEnum name: sai_dash_ha_role_t description: '' @@ -176,6 +152,30 @@ enums: name: NVGRE description: '' value: '2' +- !!python/object:utils.sai_spec.sai_enum.SaiEnum + name: sai_dash_routing_actions_t + description: '' + members: + - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember + name: STATIC_ENCAP + description: '' + value: '1' + - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember + name: NAT + description: '' + value: '2' + - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember + name: NAT46 + description: '' + value: '4' + - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember + name: NAT64 + description: '' + value: '8' + - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember + name: NAT_PORT + description: '' + value: '16' port_extenstion: !!python/object:utils.sai_spec.sai_api_extension.SaiApiExtension attributes: [] stats: