Skip to content

[MSTP] Schema Support #961

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.

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

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions common/schema.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ namespace swss {
#define APP_BFD_SESSION_TABLE_NAME "BFD_SESSION_TABLE"
#define APP_ICMP_ECHO_SESSION_TABLE_NAME "ICMP_ECHO_SESSION_TABLE"

#define APP_STP_MST_TABLE_NAME "STP_MST_INST_TABLE"
#define APP_STP_MST_PORT_TABLE_NAME "STP_MST_PORT_TABLE"
#define APP_STP_INST_PORT_FLUSH_TABLE_NAME "STP_INST_PORT_FLUSH_TABLE"

Choose a reason for hiding this comment

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

Please rename the tables as below

#define APP_STP_MST_TABLE_NAME "STP_MST_INST_TABLE"
#define APP_STP_MST_PORT_TABLE_NAME "STP_MST_PORT_TABLE"
#define [APP_STP_INST_PORT_FLUSH_TABLE_NAME "STP_INST_PORT_FLUSH_TABLE"

#define APP_SAG_TABLE_NAME "SAG_TABLE"

Expand Down Expand Up @@ -437,6 +440,10 @@ namespace swss {
#define CFG_STP_VLAN_PORT_TABLE_NAME "STP_VLAN_PORT"
#define CFG_STP_PORT_TABLE_NAME "STP_PORT"

#define CFG_STP_MST_GLOBAL_TABLE_NAME "STP_MST"
#define CFG_STP_MST_INST_TABLE_NAME "STP_MST_INST"
#define CFG_STP_MST_PORT_TABLE_NAME "STP_MST_PORT"

#define CFG_MCLAG_TABLE_NAME "MCLAG_DOMAIN"
#define CFG_MCLAG_INTF_TABLE_NAME "MCLAG_INTERFACE"
#define CFG_MCLAG_UNIQUE_IP_TABLE_NAME "MCLAG_UNIQUE_IP"
Expand Down Expand Up @@ -493,9 +500,10 @@ namespace swss {

#define CFG_MEMORY_STATISTICS_TABLE_NAME "MEMORY_STATISTICS"

#define CFG_PAC_PORT_CONFIG_TABLE "PAC_PORT_CONFIG_TABLE"
#define CFG_PAC_GLOBAL_CONFIG_TABLE "PAC_GLOBAL_CONFIG_TABLE"
#define CFG_PAC_HOSTAPD_GLOBAL_CONFIG_TABLE "HOSTAPD_GLOBAL_CONFIG_TABLE"
#define CFG_PAC_PORT_CONFIG_TABLE "PAC_PORT_CONFIG_TABLE"
#define CFG_PAC_GLOBAL_CONFIG_TABLE "PAC_GLOBAL_CONFIG_TABLE"
#define CFG_PAC_HOSTAPD_GLOBAL_CONFIG_TABLE "HOSTAPD_GLOBAL_CONFIG_TABLE"

Choose a reason for hiding this comment

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

Remove the extra lines,


#define CFG_SRV6_MY_SID_TABLE_NAME "SRV6_MY_SIDS"
#define CFG_SRV6_MY_LOCATOR_TABLE_NAME "SRV6_MY_LOCATORS"
Expand Down