Update database defintions for PINs / P4Runtime #536
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Added APPL STATE DB for response path
* Added table schema for P4RT routing, WCMP, and ACL
Submission containing materials of a third party:
Copyright Google LLC; Licensed under Apache 2.0
Co-authored-by: Jay Hu <jiarenhu@google.com>
Co-authored-by: Yilan Ji <yilanji@google.com>
Co-authored-by: Runming Wu <runmingwu@google.com>
Co-authored-by: Akarsh Gupta <akarshgupta@google.com>
Co-authored-by: Manali Kumar <manalikumar@google.com>
Signed-off-by: Don Newton don@opennetworking.org
donNewtonAlpha
changed the title
|
cc: @mint570 |
prsunny
requested changes
Oct 12, 2021
common/database_config.json
Outdated
| @@ -86,6 +86,11 @@ | |||
| "id" : 13, | |||
| "separator": "|", | |||
| "instance" : "redis_chassis" | |||
| }, | |||
| "APPL_STATE_DB" : { | |||
| "id" : 63, | |||
There was a problem hiding this comment.
Why random number? Suggest 14
There was a problem hiding this comment.
Why random number? Suggest 14
Updated to 14, originally we just wanted it out of the way to prevent clashing with ongoing work in Azure.
common/schema.h
Outdated
| @@ -43,6 +44,17 @@ namespace swss { | |||
| #define APP_NEXTHOP_GROUP_TABLE_NAME "NEXTHOP_GROUP_TABLE" | |||
| #define APP_CLASS_BASED_NEXT_HOP_GROUP_TABLE_NAME "CLASS_BASED_NEXT_HOP_GROUP_TABLE" | |||
|
|
|||
| #define APP_P4RT_TABLE_NAME "P4RT" | |||
| #define APP_P4RT_TABLE_NAME_SEPARATOR ":" | |||
There was a problem hiding this comment.
This should not be defined here
common/schema.h
Outdated
| @@ -43,6 +44,17 @@ namespace swss { | |||
| #define APP_NEXTHOP_GROUP_TABLE_NAME "NEXTHOP_GROUP_TABLE" | |||
| #define APP_CLASS_BASED_NEXT_HOP_GROUP_TABLE_NAME "CLASS_BASED_NEXT_HOP_GROUP_TABLE" | |||
|
|
|||
| #define APP_P4RT_TABLE_NAME "P4RT" | |||
There was a problem hiding this comment.
Use existing convention (_TABLE)
common/schema.h
Outdated
| #define APP_P4RT_WCMP_GROUP_TABLE_NAME "FIXED_WCMP_GROUP_TABLE" | ||
| #define APP_P4RT_IPV4_TABLE_NAME "FIXED_IPV4_TABLE" | ||
| #define APP_P4RT_IPV6_TABLE_NAME "FIXED_IPV6_TABLE" | ||
| #define APP_P4RT_ACL_TABLE_DEFINITION_NAME "DEFINITION" |
There was a problem hiding this comment.
Please rename to follow existing convention
added 2 commits
October 12, 2021 12:50
*Updating db const values to align with convention Signed-off-by: Don Newton don@opennetworking.org
*fix P4rt table references Signed of by Don Newton don@opennetworking.org
bocon13
reviewed
Oct 12, 2021
Comment on lines
+48
to
+55
| #define APP_P4RT_ROUTER_INTERFACE_TABLE_NAME "P4RT_ROUTER_INTERFACE_TABLE" | ||
| #define APP_P4RT_NEIGHBOR_TABLE_NAME "P4RT_NEIGHBOR_TABLE" | ||
| #define APP_P4RT_NEXTHOP_TABLE_NAME "P4RT_NEXTHOP_TABLE" | ||
| #define APP_P4RT_WCMP_GROUP_TABLE_NAME "P4RT_WCMP_GROUP_TABLE" | ||
| #define APP_P4RT_IPV4_TABLE_NAME "P4RT_IPV4_TABLE" | ||
| #define APP_P4RT_IPV6_TABLE_NAME "P4RT_IPV6_TABLE" | ||
| #define APP_P4RT_ACL_TABLE_DEFINITION_NAME "P4RT_ACL_TABLE_DEFINITION" | ||
| #define APP_P4RT_MIRROR_SESSION_TABLE_NAME "P4RT_MIRROR_SESSION_TABLE" |
There was a problem hiding this comment.
Every table will be prefixed with "P4RT_TABLE:" so this will create:
P4RT_TABLE:P4RT_ROUTER_INTERFACE_TABLE which I think is needlessly verbose.
I would prefer the old enum.
Signed-of-by: Don Newton <don@opennetworking.org>
Signed-off-by: Don Newton <don@opennetworking.org>
Signed-off-by Don Newton<don@opennetworking.org>
|
retest this please |
bocon13
reviewed
Oct 19, 2021
| @@ -28,7 +28,8 @@ const TableNameSeparatorMap TableBase::tableNameSeparatorMap = { | |||
| { CONFIG_DB, TABLE_NAME_SEPARATOR_VBAR }, | |||
| { PFC_WD_DB, TABLE_NAME_SEPARATOR_COLON }, | |||
| { FLEX_COUNTER_DB, TABLE_NAME_SEPARATOR_COLON }, | |||
| { STATE_DB, TABLE_NAME_SEPARATOR_VBAR } | |||
| { STATE_DB, TABLE_NAME_SEPARATOR_VBAR }, | |||
| { APPL_STATE_DB, TABLE_NAME_SEPARATOR_VBAR } | |||
There was a problem hiding this comment.
Suggested change
| { APPL_STATE_DB, TABLE_NAME_SEPARATOR_VBAR } | |
| { APPL_STATE_DB, TABLE_NAME_SEPARATOR_VBAR } |
prsunny
approved these changes
Oct 21, 2021
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
bocon13
approved these changes
Oct 21, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Submission containing materials of a third party:
Copyright Google LLC; Licensed under Apache 2.0
Co-authored-by: Jay Hu jiarenhu@google.com
Co-authored-by: Yilan Ji yilanji@google.com
Co-authored-by: Runming Wu runmingwu@google.com
Co-authored-by: Akarsh Gupta akarshgupta@google.com
Co-authored-by: Manali Kumar manalikumar@google.com
Signed-off-by: Don Newton don@opennetworking.org