Skip to content

Class-Based Forwarding #1193

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

Merged
rlhui merged 20 commits into from
Aug 27, 2021
Merged

Class-Based Forwarding #1193

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fb7ea4d
Class-Based Forwarding
j-bos Mar 24, 2021
85db8bc
Create Class-Based-Forwarding.md
j-bos Apr 15, 2021
c043c39
Fix for comment formatting
j-bos Jul 12, 2021
1d822c8
Add Behavior Model diagram
j-bos Jul 20, 2021
e8d3c10
Fix attribute ordering after merge
j-bos Jul 20, 2021
d7983c1
Changes towards new object for fc to index map
j-bos Aug 10, 2021
9075a31
More changes towards new object for fc to index map
j-bos Aug 10, 2021
e163778
Merge remote-tracking branch 'upstream/master'
j-bos Aug 10, 2021
e615f4c
Bump serializetest count for unknown object type since, with
j-bos Aug 10, 2021
1e46a95
Updates to documentation
j-bos Aug 16, 2021
5063ef8
Handle review comments
j-bos Aug 19, 2021
0efff48
minor documentation update
j-bos Aug 19, 2021
c6eb5df
Update pipeline_v9.vsdx
j-bos Aug 19, 2021
46120df
Merge branch 'master' into master
j-bos Aug 19, 2021
d9bc49c
small merge fixup
j-bos Aug 19, 2021
4ee95c9
Merge remote-tracking branch 'upstream/master'
j-bos Aug 26, 2021
0b5e37c
revert meta change which is no longer needed
j-bos Aug 26, 2021
931ed05
fix the recently-introduced enum value checking to allow SAI_OBJECT_T…
j-bos Aug 26, 2021
632d265
Update pipeline_v9.vsdx
j-bos Aug 26, 2021
b11e57c
Add SAI_API_MAX to meta check skipping
j-bos Aug 26, 2021
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
6 changes: 3 additions & 3 deletions inc/saiacl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@ typedef enum _sai_acl_action_type_t
SAI_ACL_ACTION_TYPE_SET_ECMP_HASH_ID = 0x00000030,

/** Associate with virtual router */
SAI_ACL_ACTION_TYPE_SET_VRF,
SAI_ACL_ACTION_TYPE_SET_VRF = 0x00000031,

/** Set Forwarding class */
SAI_ACL_ACTION_TYPE_SET_FORWARDING_CLASS,
SAI_ACL_ACTION_TYPE_SET_FORWARDING_CLASS = 0x00000034,

} sai_acl_action_type_t;

Expand Down Expand Up @@ -2932,7 +2932,7 @@ typedef enum _sai_acl_entry_attr_t
* @flags CREATE_AND_SET
* @default disabled
*/
SAI_ACL_ENTRY_ATTR_ACTION_SET_FORWARDING_CLASS,
SAI_ACL_ENTRY_ATTR_ACTION_SET_FORWARDING_CLASS = SAI_ACL_ENTRY_ATTR_ACTION_START + 0x34,

/**
* @brief End of Rule Actions
Expand Down
41 changes: 41 additions & 0 deletions inc/saiswitch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2575,6 +2575,47 @@ typedef enum _sai_switch_attr_t
*/
SAI_SWITCH_ATTR_SLAVE_MDIO_ADDR_LIST,

/**
* @brief Minimum priority for My MAC
*
* @type sai_uint32_t
* @flags READ_ONLY
*/
SAI_SWITCH_ATTR_MY_MAC_TABLE_MINIMUM_PRIORITY,

/**
* @brief Maximum priority for My MAC
*
* @type sai_uint32_t
* @flags READ_ONLY
*/
SAI_SWITCH_ATTR_MY_MAC_TABLE_MAXIMUM_PRIORITY,

/**
* @brief My MAC entries installed on the switch
*
* @type sai_object_list_t
* @flags READ_ONLY
* @objects SAI_OBJECT_TYPE_MY_MAC
*/
SAI_SWITCH_ATTR_MY_MAC_LIST,

/**
* @brief Number of My MAC entries installed on the switch
*
* @type sai_uint32_t
* @flags READ_ONLY
*/
SAI_SWITCH_ATTR_INSTALLED_MY_MAC_ENTRIES,

/**
* @brief Number of available My MAC entries
*
* @type sai_uint32_t
* @flags READ_ONLY
*/
SAI_SWITCH_ATTR_AVAILABLE_MY_MAC_ENTRIES,

/**
* @brief Maximum forwarding classes limit
*
Expand Down
3 changes: 2 additions & 1 deletion inc/saitypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ typedef enum _sai_object_type_t
SAI_OBJECT_TYPE_FINE_GRAINED_HASH_FIELD = 94,
SAI_OBJECT_TYPE_SWITCH_TUNNEL = 95,
SAI_OBJECT_TYPE_MY_SID_ENTRY = 96,
SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MAP = 97,
SAI_OBJECT_TYPE_MY_MAC = 97,
SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MAP = 98,
SAI_OBJECT_TYPE_MAX, /* Must remain in last position */
} sai_object_type_t;

Expand Down
4 changes: 2 additions & 2 deletions meta/saiserializetest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,9 @@ void test_serialize_enum()

ASSERT_STR_EQ(buf, "-1", res);

res = sai_serialize_enum(buf, &sai_metadata_enum_sai_object_type_t, 200);
res = sai_serialize_enum(buf, &sai_metadata_enum_sai_object_type_t, 128);

ASSERT_STR_EQ(buf, "200", res);
ASSERT_STR_EQ(buf, "128", res);

/* test all enums */

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.