Skip to content
Merged
Changes from 6 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
8 changes: 8 additions & 0 deletions common/schema.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ namespace swss {
#define APP_VXLAN_VRF_TABLE_NAME "VXLAN_VRF_TABLE"
#define APP_VXLAN_TUNNEL_MAP_TABLE_NAME "VXLAN_TUNNEL_MAP_TABLE"
#define APP_VXLAN_TUNNEL_TABLE_NAME "VXLAN_TUNNEL_TABLE"
#define APP_VXLAN_FDB_TABLE_NAME "VXLAN_FDB_TABLE"
#define APP_VXLAN_REMOTE_VNI_TABLE_NAME "VXLAN_REMOTE_VNI_TABLE"
#define APP_EVPN_NVO_TABLE_NAME "VXLAN_EVPN_NVO_TABLE"
Copy link
Contributor

Choose a reason for hiding this comment

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

Based on previous comment, it should have been APP_EVPN_NVO_TABLE_NAME -> APP_VXLAN_EVPN_NVO_TABLE_NAME to be consistent with CFG_VXLAN_EVPN_NVO_TABLE_NAME

#define APP_NEIGH_SUPPRESS_VLAN_TABLE_NAME "SUPPRESS_VLAN_NEIGH_TABLE"
#define APP_PASS_THROUGH_ROUTE_TABLE_NAME "PASS_THROUGH_ROUTE_TABLE"
#define APP_ACL_TABLE_TABLE_NAME "ACL_TABLE_TABLE"
#define APP_ACL_RULE_TABLE_NAME "ACL_RULE_TABLE"
Expand Down Expand Up @@ -210,8 +214,10 @@ namespace swss {

#define CFG_VXLAN_TUNNEL_TABLE_NAME "VXLAN_TUNNEL"
#define CFG_VXLAN_TUNNEL_MAP_TABLE_NAME "VXLAN_TUNNEL_MAP"
#define CFG_VXLAN_EVPN_NVO_TABLE_NAME "VXLAN_EVPN_NVO"
#define CFG_VNET_TABLE_NAME "VNET"
#define CFG_NEIGH_TABLE_NAME "NEIGH"
#define CFG_NEIGH_SUPPRESS_VLAN_TABLE_NAME "SUPPRESS_VLAN_NEIGH"

#define CFG_VNET_RT_TABLE_NAME "VNET_ROUTE"
#define CFG_VNET_RT_TUNNEL_TABLE_NAME "VNET_ROUTE_TUNNEL"
Expand Down Expand Up @@ -251,6 +257,8 @@ namespace swss {
#define STATE_NEIGH_RESTORE_TABLE_NAME "NEIGH_RESTORE_TABLE"
#define STATE_MIRROR_SESSION_TABLE_NAME "MIRROR_SESSION_TABLE"
#define STATE_VXLAN_TABLE_NAME "VXLAN_TABLE"
#define STATE_VXLAN_TUNNEL_TABLE_NAME "VXLAN_TUNNEL_TABLE"
#define STATE_NEIGH_SUPPRESS_VLAN_TABLE_NAME "NEIGH_SUPPRESS_VLAN_MAP_TABLE"
Copy link
Contributor

Choose a reason for hiding this comment

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

I think there is a mismatch here w.r.t APP DB - "NEIGH_SUPPRESS_VLAN_MAP_TABLE" -> "SUPPRESS_VLAN_NEIGH_TABLE". Can you please correct this one?

Copy link
Contributor

Choose a reason for hiding this comment

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

Done

#define STATE_BGP_TABLE_NAME "BGP_STATE_TABLE"
#define STATE_DEBUG_COUNTER_CAPABILITIES_NAME "DEBUG_COUNTER_CAPABILITIES"
#define STATE_NAT_RESTORE_TABLE_NAME "NAT_RESTORE_TABLE"
Expand Down