From 6af1ef42b183df685adf8f58b8f3eda68c5edbd4 Mon Sep 17 00:00:00 2001 From: r12f Date: Sun, 2 Jun 2024 01:49:57 +0000 Subject: [PATCH] Update SAI spec. --- dash-pipeline/SAI/specs/dash_acl.yaml | 131 +++++++++++++++++- .../SAI/specs/dash_direction_lookup.yaml | 9 ++ dash-pipeline/SAI/specs/dash_eni.yaml | 19 +++ dash-pipeline/SAI/specs/dash_ha.yaml | 18 +++ .../SAI/specs/dash_inbound_routing.yaml | 32 ++++- dash-pipeline/SAI/specs/dash_meter.yaml | 27 ++++ .../SAI/specs/dash_outbound_ca_to_pa.yaml | 43 +++++- .../SAI/specs/dash_outbound_routing.yaml | 72 +++++++++- .../SAI/specs/dash_pa_validation.yaml | 9 ++ dash-pipeline/SAI/specs/dash_tunnel.yaml | 57 ++++++++ dash-pipeline/SAI/specs/dash_vip.yaml | 9 ++ dash-pipeline/SAI/specs/dash_vnet.yaml | 9 ++ dash-pipeline/SAI/specs/route.yaml | 11 ++ dash-pipeline/SAI/specs/sai_spec.yaml | 67 ++++----- 14 files changed, 470 insertions(+), 43 deletions(-) create mode 100644 dash-pipeline/SAI/specs/dash_tunnel.yaml diff --git a/dash-pipeline/SAI/specs/dash_acl.yaml b/dash-pipeline/SAI/specs/dash_acl.yaml index 9203b9acd..c3167dd27 100644 --- a/dash-pipeline/SAI/specs/dash_acl.yaml +++ b/dash-pipeline/SAI/specs/dash_acl.yaml @@ -22,6 +22,15 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 50200087 + actions: + default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: default + id: 25655048 + attr_param_id: {} - !!python/object:utils.sai_spec.sai_api.SaiApi name: dash_acl_rule description: '' @@ -38,15 +47,15 @@ sai_apis: - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE description: '' - value: '0' + value: '1' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_DASH_ACL_RULE_ACTION_DENY description: '' - value: '0' + value: '2' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE description: '' - value: '0' + value: '3' structs: [] attributes: - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute @@ -98,3 +107,119 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 41950136 + actions: + SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT + id: 32161567 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE + id: 20706700 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY + id: 28146588 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE + id: 31424218 + attr_param_id: {} + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 43016664 + actions: + SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT + id: 32161567 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE + id: 20706700 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY + id: 28146588 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE + id: 31424218 + attr_param_id: {} + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 49695908 + actions: + SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT + id: 32161567 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE + id: 20706700 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY + id: 28146588 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE + id: 31424218 + attr_param_id: {} + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 49209582 + actions: + SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT + id: 18858683 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE + id: 24263137 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY + id: 29962337 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE + id: 26077229 + attr_param_id: {} + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 36478314 + actions: + SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT + id: 18858683 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE + id: 24263137 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY + id: 29962337 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE + id: 26077229 + attr_param_id: {} + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 39012793 + actions: + SAI_DASH_ACL_RULE_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT + id: 18858683 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_PERMIT_AND_CONTINUE + id: 24263137 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY + id: 29962337 + attr_param_id: {} + SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DASH_ACL_RULE_ACTION_DENY_AND_CONTINUE + id: 26077229 + attr_param_id: {} diff --git a/dash-pipeline/SAI/specs/dash_direction_lookup.yaml b/dash-pipeline/SAI/specs/dash_direction_lookup.yaml index f0bcf2869..c86c48a26 100644 --- a/dash-pipeline/SAI/specs/dash_direction_lookup.yaml +++ b/dash-pipeline/SAI/specs/dash_direction_lookup.yaml @@ -40,3 +40,12 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 44703784 + actions: + SAI_DIRECTION_LOOKUP_ENTRY_ACTION_SET_OUTBOUND_DIRECTION: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_DIRECTION_LOOKUP_ENTRY_ACTION_SET_OUTBOUND_DIRECTION + id: 17408972 + attr_param_id: {} diff --git a/dash-pipeline/SAI/specs/dash_eni.yaml b/dash-pipeline/SAI/specs/dash_eni.yaml index 69aa2df26..681fcd4b1 100644 --- a/dash-pipeline/SAI/specs/dash_eni.yaml +++ b/dash-pipeline/SAI/specs/dash_eni.yaml @@ -52,6 +52,16 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 36648123 + actions: + SAI_ENI_ETHER_ADDRESS_MAP_ENTRY_ACTION_SET_ENI: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_ENI_ETHER_ADDRESS_MAP_ENTRY_ACTION_SET_ENI + id: 24618133 + attr_param_id: + SAI_ENI_ETHER_ADDRESS_MAP_ENTRY_ENI_ID: 1 - !!python/object:utils.sai_spec.sai_api.SaiApi name: eni description: '' @@ -1428,3 +1438,12 @@ sai_apis: allow_null: false valid_only: null deprecated: null + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 45859274 + actions: + default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: default + id: 27167550 + attr_param_id: {} diff --git a/dash-pipeline/SAI/specs/dash_ha.yaml b/dash-pipeline/SAI/specs/dash_ha.yaml index 89815406f..d3de42be4 100644 --- a/dash-pipeline/SAI/specs/dash_ha.yaml +++ b/dash-pipeline/SAI/specs/dash_ha.yaml @@ -358,6 +358,15 @@ sai_apis: allow_null: false valid_only: null deprecated: null + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 45319666 + actions: + default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: default + id: 21324178 + attr_param_id: {} - !!python/object:utils.sai_spec.sai_api.SaiApi name: ha_scope description: '' @@ -426,3 +435,12 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 49681752 + actions: + default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: default + id: 25507507 + attr_param_id: {} diff --git a/dash-pipeline/SAI/specs/dash_inbound_routing.yaml b/dash-pipeline/SAI/specs/dash_inbound_routing.yaml index b4cb8e784..263215a35 100644 --- a/dash-pipeline/SAI/specs/dash_inbound_routing.yaml +++ b/dash-pipeline/SAI/specs/dash_inbound_routing.yaml @@ -18,15 +18,15 @@ sai_apis: - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_INBOUND_ROUTING_ENTRY_ACTION_TUNNEL_DECAP_PA_VALIDATE description: '' - value: '0' + value: '1' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_INBOUND_ROUTING_ENTRY_ACTION_VXLAN_DECAP description: '' - value: '0' + value: '2' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_INBOUND_ROUTING_ENTRY_ACTION_VXLAN_DECAP_PA_VALIDATE description: '' - value: '0' + value: '3' structs: - !!python/object:utils.sai_spec.sai_struct.SaiStruct name: sai_inbound_routing_entry_entry_t @@ -112,3 +112,29 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 38920290 + actions: + SAI_INBOUND_ROUTING_ENTRY_ACTION_TUNNEL_DECAP: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_INBOUND_ROUTING_ENTRY_ACTION_TUNNEL_DECAP + id: 22253429 + attr_param_id: + SAI_INBOUND_ROUTING_ENTRY_METER_CLASS_OR: 1 + SAI_INBOUND_ROUTING_ENTRY_METER_CLASS_AND: 2 + SAI_INBOUND_ROUTING_ENTRY_ACTION_TUNNEL_DECAP_PA_VALIDATE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_INBOUND_ROUTING_ENTRY_ACTION_TUNNEL_DECAP_PA_VALIDATE + id: 27987616 + attr_param_id: + SAI_INBOUND_ROUTING_ENTRY_SRC_VNET_ID: 1 + SAI_INBOUND_ROUTING_ENTRY_METER_CLASS_OR: 2 + SAI_INBOUND_ROUTING_ENTRY_METER_CLASS_AND: 3 + SAI_INBOUND_ROUTING_ENTRY_ACTION_VXLAN_DECAP: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_INBOUND_ROUTING_ENTRY_ACTION_VXLAN_DECAP + id: 32581635 + attr_param_id: {} + SAI_INBOUND_ROUTING_ENTRY_ACTION_VXLAN_DECAP_PA_VALIDATE: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_INBOUND_ROUTING_ENTRY_ACTION_VXLAN_DECAP_PA_VALIDATE + id: 22711915 + attr_param_id: {} diff --git a/dash-pipeline/SAI/specs/dash_meter.yaml b/dash-pipeline/SAI/specs/dash_meter.yaml index 9fd7df0ec..79f57238a 100644 --- a/dash-pipeline/SAI/specs/dash_meter.yaml +++ b/dash-pipeline/SAI/specs/dash_meter.yaml @@ -34,6 +34,15 @@ sai_apis: allow_null: false valid_only: null deprecated: null + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 45482818 + actions: + default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: default + id: 21630451 + attr_param_id: {} - !!python/object:utils.sai_spec.sai_api.SaiApi name: meter_policy description: '' @@ -54,6 +63,15 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 40733610 + actions: + default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: default + id: 20564717 + attr_param_id: {} - !!python/object:utils.sai_spec.sai_api.SaiApi name: meter_rule description: '' @@ -98,3 +116,12 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 44484556 + actions: + default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: default + id: 19652160 + attr_param_id: {} 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 b1b1a8bff..149354f6c 100644 --- a/dash-pipeline/SAI/specs/dash_outbound_ca_to_pa.yaml +++ b/dash-pipeline/SAI/specs/dash_outbound_ca_to_pa.yaml @@ -18,7 +18,7 @@ sai_apis: - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING description: '' - value: '0' + value: '1' structs: - !!python/object:utils.sai_spec.sai_struct.SaiStruct name: sai_outbound_ca_to_pa_entry_entry_t @@ -193,4 +193,45 @@ sai_apis: allow_null: false valid_only: null deprecated: null + - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute + name: SAI_OUTBOUND_CA_TO_PA_ENTRY_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: null + deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 43335456 + actions: + SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_TUNNEL_MAPPING: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_TUNNEL_MAPPING + id: 25614729 + attr_param_id: + SAI_OUTBOUND_CA_TO_PA_ENTRY_UNDERLAY_DIP: 1 + SAI_OUTBOUND_CA_TO_PA_ENTRY_OVERLAY_DMAC: 2 + SAI_OUTBOUND_CA_TO_PA_ENTRY_USE_DST_VNET_VNI: 3 + SAI_OUTBOUND_CA_TO_PA_ENTRY_METER_CLASS_OR: 4 + SAI_OUTBOUND_CA_TO_PA_ENTRY_DASH_TUNNEL_ID: 5 + SAI_OUTBOUND_CA_TO_PA_ENTRY_FLOW_RESIMULATION_REQUESTED: 6 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ROUTING_ACTIONS_DISABLED_IN_FLOW_RESIMULATION: 7 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_PRIVATE_LINK_MAPPING: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + 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_DIP: 3 + SAI_OUTBOUND_CA_TO_PA_ENTRY_DASH_ENCAPSULATION: 4 + SAI_OUTBOUND_CA_TO_PA_ENTRY_TUNNEL_KEY: 5 + SAI_OUTBOUND_CA_TO_PA_ENTRY_METER_CLASS_OR: 6 + SAI_OUTBOUND_CA_TO_PA_ENTRY_DASH_TUNNEL_ID: 7 + SAI_OUTBOUND_CA_TO_PA_ENTRY_FLOW_RESIMULATION_REQUESTED: 8 + SAI_OUTBOUND_CA_TO_PA_ENTRY_ROUTING_ACTIONS_DISABLED_IN_FLOW_RESIMULATION: 9 diff --git a/dash-pipeline/SAI/specs/dash_outbound_routing.yaml b/dash-pipeline/SAI/specs/dash_outbound_routing.yaml index c97f30b36..c2e8f8bc9 100644 --- a/dash-pipeline/SAI/specs/dash_outbound_routing.yaml +++ b/dash-pipeline/SAI/specs/dash_outbound_routing.yaml @@ -18,19 +18,19 @@ sai_apis: - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET_DIRECT description: '' - value: '0' + value: '1' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_DIRECT description: '' - value: '0' + value: '2' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_SERVICE_TUNNEL description: '' - value: '0' + value: '3' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember name: SAI_OUTBOUND_ROUTING_ENTRY_ACTION_DROP description: '' - value: '0' + value: '4' structs: - !!python/object:utils.sai_spec.sai_struct.SaiStruct name: sai_outbound_routing_entry_entry_t @@ -241,4 +241,68 @@ sai_apis: allow_null: false valid_only: null deprecated: null + - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute + name: SAI_OUTBOUND_ROUTING_ENTRY_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: null + deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 44010720 + actions: + SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET + id: 21392322 + attr_param_id: + SAI_OUTBOUND_ROUTING_ENTRY_DST_VNET_ID: 1 + SAI_OUTBOUND_ROUTING_ENTRY_DASH_TUNNEL_ID: 2 + SAI_OUTBOUND_ROUTING_ENTRY_METER_CLASS_OR: 3 + SAI_OUTBOUND_ROUTING_ENTRY_METER_CLASS_AND: 4 + SAI_OUTBOUND_ROUTING_ENTRY_ROUTING_ACTIONS_DISABLED_IN_FLOW_RESIMULATION: 5 + SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET_DIRECT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET_DIRECT + id: 24813914 + attr_param_id: + SAI_OUTBOUND_ROUTING_ENTRY_DST_VNET_ID: 1 + SAI_OUTBOUND_ROUTING_ENTRY_DASH_TUNNEL_ID: 2 + SAI_OUTBOUND_ROUTING_ENTRY_OVERLAY_IP: 4 + SAI_OUTBOUND_ROUTING_ENTRY_METER_CLASS_OR: 5 + SAI_OUTBOUND_ROUTING_ENTRY_METER_CLASS_AND: 6 + SAI_OUTBOUND_ROUTING_ENTRY_ROUTING_ACTIONS_DISABLED_IN_FLOW_RESIMULATION: 7 + SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_DIRECT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_DIRECT + id: 31102279 + attr_param_id: + SAI_OUTBOUND_ROUTING_ENTRY_DASH_TUNNEL_ID: 1 + SAI_OUTBOUND_ROUTING_ENTRY_METER_CLASS_OR: 2 + SAI_OUTBOUND_ROUTING_ENTRY_METER_CLASS_AND: 3 + SAI_OUTBOUND_ROUTING_ENTRY_ROUTING_ACTIONS_DISABLED_IN_FLOW_RESIMULATION: 4 + SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_SERVICE_TUNNEL: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_SERVICE_TUNNEL + id: 26982790 + attr_param_id: + SAI_OUTBOUND_ROUTING_ENTRY_OVERLAY_DIP: 2 + SAI_OUTBOUND_ROUTING_ENTRY_OVERLAY_DIP_MASK: 4 + SAI_OUTBOUND_ROUTING_ENTRY_OVERLAY_SIP: 6 + SAI_OUTBOUND_ROUTING_ENTRY_OVERLAY_SIP_MASK: 8 + SAI_OUTBOUND_ROUTING_ENTRY_UNDERLAY_DIP: 10 + SAI_OUTBOUND_ROUTING_ENTRY_UNDERLAY_SIP: 12 + SAI_OUTBOUND_ROUTING_ENTRY_DASH_ENCAPSULATION: 13 + SAI_OUTBOUND_ROUTING_ENTRY_TUNNEL_KEY: 14 + SAI_OUTBOUND_ROUTING_ENTRY_DASH_TUNNEL_ID: 15 + SAI_OUTBOUND_ROUTING_ENTRY_METER_CLASS_OR: 16 + SAI_OUTBOUND_ROUTING_ENTRY_METER_CLASS_AND: 17 + SAI_OUTBOUND_ROUTING_ENTRY_ROUTING_ACTIONS_DISABLED_IN_FLOW_RESIMULATION: 18 + SAI_OUTBOUND_ROUTING_ENTRY_ACTION_DROP: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_OUTBOUND_ROUTING_ENTRY_ACTION_DROP + id: 18759588 + attr_param_id: {} diff --git a/dash-pipeline/SAI/specs/dash_pa_validation.yaml b/dash-pipeline/SAI/specs/dash_pa_validation.yaml index 2c3f9ba6c..88240ff6d 100644 --- a/dash-pipeline/SAI/specs/dash_pa_validation.yaml +++ b/dash-pipeline/SAI/specs/dash_pa_validation.yaml @@ -58,3 +58,12 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 35526612 + actions: + SAI_PA_VALIDATION_ENTRY_ACTION_PERMIT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_PA_VALIDATION_ENTRY_ACTION_PERMIT + id: 32591400 + attr_param_id: {} diff --git a/dash-pipeline/SAI/specs/dash_tunnel.yaml b/dash-pipeline/SAI/specs/dash_tunnel.yaml new file mode 100644 index 000000000..6d7c225aa --- /dev/null +++ b/dash-pipeline/SAI/specs/dash_tunnel.yaml @@ -0,0 +1,57 @@ +!!python/object:utils.sai_spec.sai_api_group.SaiApiGroup +name: dash_tunnel +description: '' +sai_apis: +- !!python/object:utils.sai_spec.sai_api.SaiApi + name: dash_tunnel + description: '' + is_object: true + enums: [] + structs: [] + attributes: + - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute + name: SAI_DASH_TUNNEL_DIP + description: Action parameter DIP + 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: null + deprecated: null + - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute + name: SAI_DASH_TUNNEL_DASH_ENCAPSULATION + description: Action parameter DASH_ENCAPSULATION + type: sai_dash_encapsulation_t + attr_value_field: s32 + default: SAI_DASH_ENCAPSULATION_VXLAN + isresourcetype: false + flags: CREATE_AND_SET + object_name: null + allow_null: false + valid_only: null + deprecated: null + - !!python/object:utils.sai_spec.sai_attribute.SaiAttribute + name: SAI_DASH_TUNNEL_TUNNEL_KEY + description: Action parameter TUNNEL_KEY + type: sai_uint32_t + attr_value_field: u32 + default: '0' + isresourcetype: false + flags: CREATE_AND_SET + object_name: null + allow_null: false + valid_only: null + deprecated: null + stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 44400659 + actions: + default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: default + id: 27891720 + attr_param_id: {} diff --git a/dash-pipeline/SAI/specs/dash_vip.yaml b/dash-pipeline/SAI/specs/dash_vip.yaml index b97418a0b..79472acec 100644 --- a/dash-pipeline/SAI/specs/dash_vip.yaml +++ b/dash-pipeline/SAI/specs/dash_vip.yaml @@ -52,3 +52,12 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 45245089 + actions: + SAI_VIP_ENTRY_ACTION_ACCEPT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_VIP_ENTRY_ACTION_ACCEPT + id: 26041632 + attr_param_id: {} diff --git a/dash-pipeline/SAI/specs/dash_vnet.yaml b/dash-pipeline/SAI/specs/dash_vnet.yaml index 297c8365e..ef055b4ae 100644 --- a/dash-pipeline/SAI/specs/dash_vnet.yaml +++ b/dash-pipeline/SAI/specs/dash_vnet.yaml @@ -22,3 +22,12 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 49590243 + actions: + default: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: default + id: 20510911 + attr_param_id: {} diff --git a/dash-pipeline/SAI/specs/route.yaml b/dash-pipeline/SAI/specs/route.yaml index a8a76551a..802138137 100644 --- a/dash-pipeline/SAI/specs/route.yaml +++ b/dash-pipeline/SAI/specs/route.yaml @@ -76,3 +76,14 @@ sai_apis: valid_only: null deprecated: null stats: [] + p4_meta: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4Meta + tables: + - !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaTable + id: 49279256 + actions: + SAI_ROUTE_ENTRY_ACTION_PKT_ACT: !!python/object:utils.sai_spec.sai_api_p4_meta.SaiApiP4MetaAction + name: SAI_ROUTE_ENTRY_ACTION_PKT_ACT + id: 32404057 + attr_param_id: + SAI_ROUTE_ENTRY_PACKET_ACTION: 1 + SAI_ROUTE_ENTRY_NEXT_HOP_ID: 2 diff --git a/dash-pipeline/SAI/specs/sai_spec.yaml b/dash-pipeline/SAI/specs/sai_spec.yaml index 47b34d09b..76e5b6129 100644 --- a/dash-pipeline/SAI/specs/sai_spec.yaml +++ b/dash-pipeline/SAI/specs/sai_spec.yaml @@ -12,6 +12,7 @@ api_types: - SAI_API_DASH_PA_VALIDATION - SAI_API_ROUTE - SAI_API_DASH_VIP +- SAI_API_DASH_TUNNEL object_types: - SAI_OBJECT_TYPE_DASH_ACL_GROUP - SAI_OBJECT_TYPE_DASH_ACL_RULE @@ -30,6 +31,7 @@ object_types: - SAI_OBJECT_TYPE_PA_VALIDATION_ENTRY - SAI_OBJECT_TYPE_ROUTE_ENTRY - SAI_OBJECT_TYPE_VIP_ENTRY +- SAI_OBJECT_TYPE_DASH_TUNNEL object_entries: - !!python/object:utils.sai_spec.sai_struct_entry.SaiStructEntry name: direction_lookup_entry @@ -97,81 +99,81 @@ enums: description: '' value: '2' - !!python/object:utils.sai_spec.sai_enum.SaiEnum - name: sai_dash_tunnel_dscp_mode_t + name: sai_dash_encapsulation_t description: '' members: - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: PRESERVE_MODEL + name: INVALID description: '' value: '0' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: PIPE_MODEL + name: VXLAN description: '' value: '1' + - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember + name: NVGRE + description: '' + value: '2' - !!python/object:utils.sai_spec.sai_enum.SaiEnum - name: sai_dash_ha_role_t + name: sai_dash_routing_actions_t description: '' members: - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: DEAD - description: '' - value: '0' - - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: ACTIVE + name: STATIC_ENCAP description: '' value: '1' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: STANDBY + name: NAT description: '' value: '2' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: STANDALONE + name: NAT46 description: '' - value: '3' + value: '4' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: SWITCHING_TO_ACTIVE + name: NAT64 description: '' - value: '4' + value: '8' + - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember + name: NAT_PORT + description: '' + value: '16' - !!python/object:utils.sai_spec.sai_enum.SaiEnum - name: sai_dash_encapsulation_t + name: sai_dash_tunnel_dscp_mode_t description: '' members: - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: INVALID + name: PRESERVE_MODEL description: '' value: '0' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: VXLAN + name: PIPE_MODEL description: '' value: '1' - - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: NVGRE - description: '' - value: '2' - !!python/object:utils.sai_spec.sai_enum.SaiEnum - name: sai_dash_routing_actions_t + name: sai_dash_ha_role_t description: '' members: - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: STATIC_ENCAP + name: DEAD description: '' - value: '1' + value: '0' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: NAT + name: ACTIVE description: '' - value: '2' + value: '1' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: NAT46 + name: STANDBY description: '' - value: '4' + value: '2' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: NAT64 + name: STANDALONE description: '' - value: '8' + value: '3' - !!python/object:utils.sai_spec.sai_enum_member.SaiEnumMember - name: NAT_PORT + name: SWITCHING_TO_ACTIVE description: '' - value: '16' + value: '4' port_extenstion: !!python/object:utils.sai_spec.sai_api_extension.SaiApiExtension attributes: [] stats: @@ -260,3 +262,4 @@ api_groups: - !inc '/SAI/specs/dash_pa_validation.yaml' - !inc '/SAI/specs/route.yaml' - !inc '/SAI/specs/dash_vip.yaml' +- !inc '/SAI/specs/dash_tunnel.yaml'