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

Jump to bottom

[DASH] Update dash headers to most recent #1832

Open
wants to merge 1 commit into
base: v1.12
Choose a base branch
from
Open

[DASH] Update dash headers to most recent #1832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 46 additions & 10 deletions experimental/saiexperimentaldashacl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ typedef enum _sai_dash_acl_group_attr_t
* @type sai_ip_addr_family_t
* @flags CREATE_AND_SET
* @default SAI_IP_ADDR_FAMILY_IPV4
* @isresourcetype true
*/
SAI_DASH_ACL_GROUP_ATTR_IP_ADDR_FAMILY = SAI_DASH_ACL_GROUP_ATTR_START,

Expand Down Expand Up @@ -105,46 +106,81 @@ typedef enum _sai_dash_acl_rule_attr_t
* @type sai_object_id_t
* @flags MANDATORY_ON_CREATE | CREATE_ONLY
* @objects SAI_OBJECT_TYPE_DASH_ACL_GROUP
* @isresourcetype true
*/
SAI_DASH_ACL_RULE_ATTR_DASH_ACL_GROUP_ID,

/**
* @brief List matched key dip
* @brief Ternary matched key dst_tag
*
* @type sai_ip_prefix_list_t
* @type sai_uint32_t
* @flags MANDATORY_ON_CREATE | CREATE_ONLY
*/
SAI_DASH_ACL_RULE_ATTR_DST_TAG,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACL tags should be removed from the SAI API. Recently DASH WG decided to remove ACL tags from the SAI requirements

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't follow exactly what rules are for acl, i just generated headers from DASH repo and just added here


/**
* @brief Ternary matched mask dst_tag
*
* @type sai_uint32_t
* @flags MANDATORY_ON_CREATE | CREATE_ONLY
*/
SAI_DASH_ACL_RULE_ATTR_DST_TAG_MASK,

/**
* @brief Ternary matched key src_tag
*
* @type sai_uint32_t
* @flags MANDATORY_ON_CREATE | CREATE_ONLY
*/
SAI_DASH_ACL_RULE_ATTR_SRC_TAG,

/**
* @brief Ternary matched mask src_tag
*
* @type sai_uint32_t
* @flags MANDATORY_ON_CREATE | CREATE_ONLY
*/
SAI_DASH_ACL_RULE_ATTR_SRC_TAG_MASK,

/**
* @brief Optional matched key dip
*
* @type sai_ip_address_t
* @flags MANDATORY_ON_CREATE | CREATE_ONLY
*/
SAI_DASH_ACL_RULE_ATTR_DIP,

/**
* @brief List matched key sip
* @brief Optional matched key sip
*
* @type sai_ip_prefix_list_t
* @type sai_ip_address_t
* @flags MANDATORY_ON_CREATE | CREATE_ONLY
*/
SAI_DASH_ACL_RULE_ATTR_SIP,

/**
* @brief List matched key protocol
* @brief Optional matched key protocol
*
* @type sai_u8_list_t
* @type sai_uint8_t
* @flags MANDATORY_ON_CREATE | CREATE_ONLY
*/
SAI_DASH_ACL_RULE_ATTR_PROTOCOL,

/**
* @brief Range_list matched key src_port
* @brief Optional matched key src_port
*
* @type sai_u16_range_list_t
* @type sai_uint16_t
* @flags MANDATORY_ON_CREATE | CREATE_ONLY
* @isvlan false
*/
SAI_DASH_ACL_RULE_ATTR_SRC_PORT,

/**
* @brief Range_list matched key dst_port
* @brief Optional matched key dst_port
*
* @type sai_u16_range_list_t
* @type sai_uint16_t
* @flags MANDATORY_ON_CREATE | CREATE_ONLY
* @isvlan false
*/
SAI_DASH_ACL_RULE_ATTR_DST_PORT,

Expand Down
22 changes: 22 additions & 0 deletions experimental/saiexperimentaldasheni.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,28 @@ typedef enum _sai_eni_attr_t
*/
SAI_ENI_ATTR_VNET_ID,

/**
* @brief Action set_eni_attrs parameter V4_METER_POLICY_ID
*
* @type sai_object_id_t
* @flags CREATE_AND_SET
* @objects SAI_OBJECT_TYPE_METER_POLICY
* @allownull true
* @default SAI_NULL_OBJECT_ID
*/
SAI_ENI_ATTR_V4_METER_POLICY_ID,

/**
* @brief Action set_eni_attrs parameter V6_METER_POLICY_ID
*
* @type sai_object_id_t
* @flags CREATE_AND_SET
* @objects SAI_OBJECT_TYPE_METER_POLICY
* @allownull true
* @default SAI_NULL_OBJECT_ID
*/
SAI_ENI_ATTR_V6_METER_POLICY_ID,

/**
* @brief Action set_eni_attrs parameter INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID
*
Expand Down
9 changes: 9 additions & 0 deletions experimental/saiexperimentaldashinboundrouting.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,15 @@ typedef enum _sai_inbound_routing_entry_attr_t
*/
SAI_INBOUND_ROUTING_ENTRY_ATTR_SRC_VNET_ID,

/**
* @brief IP address family for resource accounting
*
* @type sai_ip_addr_family_t
* @flags READ_ONLY
* @isresourcetype true
*/
SAI_INBOUND_ROUTING_ENTRY_ATTR_IP_ADDR_FAMILY,

/**
* @brief End of attributes
*/
Expand Down
Loading