Schema.h Changes to support PAC functionality. #871

vijaya-ops · 2024-04-08T07:16:22Z

Why I did it

Added below tables to support PAC functionality.

#define APP_PAC_PORT_TABLE_NAME "PAC_PORT_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"
#define STATE_PAC_GLOBAL_OPER_TABLE "PAC_GLOBAL_OPER_TABLE"
#define STATE_PAC_PORT_OPER_TABLE "PAC_PORT_OPER_TABLE"
#define STATE_PAC_AUTHENTICATED_CLIENT_OPER_TABLE "PAC_AUTHENTICATED_CLIENT_OPER_TABLE"
#define STATE_OPER_VLAN_TABLE_NAME "OPER_VLAN"
#define STATE_OPER_VLAN_MEMBER_TABLE_NAME "OPER_VLAN_MEMBER"
#define STATE_OPER_FDB_TABLE_NAME "OPER_FDB"
#define STATE_OPER_PORT_TABLE_NAME "OPER_PORT"

How I did it

How to verify it

adyeung · 2024-08-07T20:52:16Z

@jeff-yin @ridahanif96 pls help review

vijaya-ops · 2024-08-13T09:36:37Z

/azpw run Azure

mssonicbld · 2024-08-13T09:36:39Z

/AzurePipelines run Azure

azure-pipelines · 2024-08-13T09:36:45Z

No pipelines are associated with this pull request.

ridahanif96 · 2024-08-15T05:54:06Z

/azpw run Azure

ridahanif96

Changes looks good. Please re-push these changes or make a latest push to rerun pipelines to pass swss checkes.

vijaya-ops · 2024-09-20T04:18:33Z

/azpw run Azure

mssonicbld · 2024-09-20T04:18:35Z

/AzurePipelines run Azure

azure-pipelines · 2024-09-20T04:18:41Z

No pipelines are associated with this pull request.

vijaya-ops · 2024-09-20T06:35:57Z

I see below error, Which is not related to my changes, Any help on this is highly appreciated.

Making all in orchagent
make[3]: Entering directory '/__w/1/s/orchagent'
make[4]: Entering directory '/__w/1/s/orchagent'
g++ -DHAVE_CONFIG_H -I. -I.. -I ../lib -I .. -I ../warmrestart -I switch -I flex_counter -I debug_counter -I port -I pbh -I nhg -g -DNDEBUG -std=c++14 -Wall -fPIC -Wno-write-strings -I/usr/include/swss -I/usr/include/libnl3 -Werror -Wno-reorder -Wcast-align -Wcast-qual -Wconversion -Wdisabled-optimization -Wextra -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Winvalid-pch -Wlong-long -Wmissing-field-initializers -Wmissing-format-attribute -Wno-aggregate-return -Wno-padded -Wno-switch-enum -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wstack-protector -Wstrict-aliasing=3 -Wswitch -Wswitch-default -Wunreachable-code -Wunused -Wvariadic-macros -Wno-switch-default -Wno-long-long -Wno-redundant-decls -I /usr/include/sai -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/__w/1/s=. -fstack-protector-strong -Wformat -Werror=format-security -c -o orchagent-main.o test -f 'main.cpp' || echo './'main.cpp
g++ -DHAVE_CONFIG_H -I. -I.. -I ../lib -I .. -I ../warmrestart -I switch -I flex_counter -I debug_counter -I port -I pbh -I nhg -g -DNDEBUG -std=c++14 -Wall -fPIC -Wno-write-strings -I/usr/include/swss -I/usr/include/libnl3 -Werror -Wno-reorder -Wcast-align -Wcast-qual -Wconversion -Wdisabled-optimization -Wextra -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Winvalid-pch -Wlong-long -Wmissing-field-initializers -Wmissing-format-attribute -Wno-aggregate-return -Wno-padded -Wno-switch-enum -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wstack-protector -Wstrict-aliasing=3 -Wswitch -Wswitch-default -Wunreachable-code -Wunused -Wvariadic-macros -Wno-switch-default -Wno-long-long -Wno-redundant-decls -I /usr/include/sai -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/__w/1/s=. -fstack-protector-strong -Wformat -Werror=format-security -c -o orchagent-gearboxutils.o test -f '../lib/gearboxutils.cpp' || echo './'../lib/gearboxutils.cpp
g++ -DHAVE_CONFIG_H -I. -I.. -I ../lib -I .. -I ../warmrestart -I switch -I flex_counter -I debug_counter -I port -I pbh -I nhg -g -DNDEBUG -std=c++14 -Wall -fPIC -Wno-write-strings -I/usr/include/swss -I/usr/include/libnl3 -Werror -Wno-reorder -Wcast-align -Wcast-qual -Wconversion -Wdisabled-optimization -Wextra -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Winvalid-pch -Wlong-long -Wmissing-field-initializers -Wmissing-format-attribute -Wno-aggregate-return -Wno-padded -Wno-switch-enum -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wstack-protector -Wstrict-aliasing=3 -Wswitch -Wswitch-default -Wunreachable-code -Wunused -Wvariadic-macros -Wno-switch-default -Wno-long-long -Wno-redundant-decls -I /usr/include/sai -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/__w/1/s=. -fstack-protector-strong -Wformat -Werror=format-security -c -o orchagent-subintf.o test -f '../lib/subintf.cpp' || echo './'../lib/subintf.cpp
g++ -DHAVE_CONFIG_H -I. -I.. -I ../lib -I .. -I ../warmrestart -I switch -I flex_counter -I debug_counter -I port -I pbh -I nhg -g -DNDEBUG -std=c++14 -Wall -fPIC -Wno-write-strings -I/usr/include/swss -I/usr/include/libnl3 -Werror -Wno-reorder -Wcast-align -Wcast-qual -Wconversion -Wdisabled-optimization -Wextra -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Winvalid-pch -Wlong-long -Wmissing-field-initializers -Wmissing-format-attribute -Wno-aggregate-return -Wno-padded -Wno-switch-enum -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wstack-protector -Wstrict-aliasing=3 -Wswitch -Wswitch-default -Wunreachable-code -Wunused -Wvariadic-macros -Wno-switch-default -Wno-long-long -Wno-redundant-decls -I /usr/include/sai -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/__w/1/s=. -fstack-protector-strong -Wformat -Werror=format-security -c -o orchagent-recorder.o test -f '../lib/recorder.cpp' || echo './'../lib/recorder.cpp
g++ -DHAVE_CONFIG_H -I. -I.. -I ../lib -I .. -I ../warmrestart -I switch -I flex_counter -I debug_counter -I port -I pbh -I nhg -g -DNDEBUG -std=c++14 -Wall -fPIC -Wno-write-strings -I/usr/include/swss -I/usr/include/libnl3 -Werror -Wno-reorder -Wcast-align -Wcast-qual -Wconversion -Wdisabled-optimization -Wextra -Wfloat-equal -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k -Wimport -Winit-self -Winvalid-pch -Wlong-long -Wmissing-field-initializers -Wmissing-format-attribute -Wno-aggregate-return -Wno-padded -Wno-switch-enum -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wstack-protector -Wstrict-aliasing=3 -Wswitch -Wswitch-default -Wunreachable-code -Wunused -Wvariadic-macros -Wno-switch-default -Wno-long-long -Wno-redundant-decls -I /usr/include/sai -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/__w/1/s=. -fstack-protector-strong -Wformat -Werror=format-security -c -o orchagent-orchdaemon.o test -f 'orchdaemon.cpp' || echo './'orchdaemon.cpp
orchdaemon.cpp: In member function 'virtual bool OrchDaemon::init()':
orchdaemon.cpp:122:73: error: 'CFG_SUPPRESS_ASIC_SDK_HEALTH_EVENT_NAME' was not declared in this scope
122 | TableConnector conf_suppress_asic_sdk_health_categories(m_configDb, CFG_SUPPRESS_ASIC_SDK_HEALTH_EVENT_NAME);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[4]: *** [Makefile:987: orchagent-orchdaemon.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[4]: Leaving directory '/__w/1/s/orchagent'

vijaya-ops · 2024-09-24T08:59:41Z

/azpw run Azure

mssonicbld · 2024-09-24T08:59:44Z

/AzurePipelines run Azure

azure-pipelines · 2024-09-24T08:59:51Z

No pipelines are associated with this pull request.

vijaya-ops · 2024-09-24T09:00:46Z

/azpw run Azure

mssonicbld · 2024-09-24T09:00:49Z

/AzurePipelines run Azure

azure-pipelines · 2024-09-24T09:00:56Z

No pipelines are associated with this pull request.

vijaya-ops · 2024-09-25T07:02:34Z

/azpw run Azure

mssonicbld · 2024-09-25T07:02:36Z

/AzurePipelines run Azure

azure-pipelines · 2024-09-25T07:02:43Z

No pipelines are associated with this pull request.

vijaya-ops · 2024-09-25T09:21:05Z

/azpw run Azure

mssonicbld · 2024-09-25T09:21:07Z

/AzurePipelines run Azure

azure-pipelines · 2024-09-25T09:21:14Z

No pipelines are associated with this pull request.

vijaya-ops · 2024-09-25T09:24:32Z

/azpw run Azure.sonic-swss-common

mssonicbld · 2024-09-25T09:24:34Z

/AzurePipelines run Azure.sonic-swss-common

azure-pipelines · 2024-09-25T09:24:46Z

Azure Pipelines successfully started running 1 pipeline(s).

vijaya-ops · 2024-09-26T05:59:28Z

The below test is failing and I see it is failing for all the PRs in this repo.

vijaya-ops · 2024-09-29T05:36:43Z

/azpw run Azure.sonic-swss-common

mssonicbld · 2024-09-29T05:36:45Z

/AzurePipelines run Azure.sonic-swss-common

azure-pipelines · 2024-09-29T05:36:57Z

Azure Pipelines successfully started running 1 pipeline(s).

matiAlfaro · 2024-09-29T06:42:00Z

common/schema.h

+#define STATE_PAC_PORT_OPER_TABLE                 "PAC_PORT_OPER_TABLE"
+#define STATE_PAC_AUTHENTICATED_CLIENT_OPER_TABLE "PAC_AUTHENTICATED_CLIENT_OPER_TABLE"
+#define STATE_OPER_VLAN_TABLE_NAME             "OPER_VLAN"
+#define STATE_OPER_VLAN_MEMBER_TABLE_NAME      "OPER_VLAN_MEMBER"


Wouldn't it be better to name it STATE_PAC_OPER_VLAN_TABLE_NAME? to allow for easier identification. same of actual name, something like PAC_OPER_VLAN

#define STATE_OPER_VLAN_TABLE_NAME "OPER_VLAN"
#define STATE_OPER_VLAN_MEMBER_TABLE_NAME "OPER_VLAN_MEMBER"

The purpose of these two tables is to create VLANs and VLAN memberships dynamically. As of now the PAC is only one, which is creating dynamic VLAN memberships. But in future any other component can use these tables and create the dynamic VLANs and dynamic membership functionality. Hence the PAC key word is not present , for these tables.

Thank you for your response, good to know

vijaya-ops · 2024-09-30T08:59:35Z

I am observing below error , which is not related to my changes. Any help is appreciated.

adyeung · 2024-10-01T18:31:41Z

To all sonic-swss-common repo maintainer @qiluo-msft @liuh-80 @msosyak @marian-pritsak @mint570, code PR has been approved by PENS WG members, please help merge. The feature is targeted for 202411

qiluo-msft · 2024-10-11T21:26:17Z

common/schema.h

@@ -465,6 +467,11 @@ namespace swss {

 #define CFG_SUPPRESS_ASIC_SDK_HEALTH_EVENT_NAME     "SUPPRESS_ASIC_SDK_HEALTH_EVENT"

+#define CFG_PAC_PORT_CONFIG_TABLE   "PAC_PORT_CONFIG_TABLE"


"PAC_PORT_CONFIG_TABLE"

Could you make them vertically aligned, like nearby lines?

anilkpan mentioned this pull request May 13, 2024

Vlanmgr and Fdborch changes for PAC sonic-net/sonic-swss#3143

Open

adyeung mentioned this pull request May 13, 2024

SONiC PAC Support HLD sonic-net/SONiC#1315

Merged

ridahanif96 reviewed Aug 15, 2024

View reviewed changes

venkatmahalingam approved these changes Sep 16, 2024

View reviewed changes

PAC changes for community

8f5058f

vijaya-ops force-pushed the community_changes_pac branch from f9f748d to 8f5058f Compare September 20, 2024 04:18

Fixed compilaton issues

3920132

matiAlfaro reviewed Sep 29, 2024

View reviewed changes

Merge branch 'sonic-net:master' into community_changes_pac

9b2db89

matiAlfaro approved these changes Oct 1, 2024

View reviewed changes

adyeung approved these changes Oct 1, 2024

View reviewed changes

qiluo-msft reviewed Oct 11, 2024

View reviewed changes

qiluo-msft approved these changes Oct 11, 2024

View reviewed changes

qiluo-msft merged commit 352234a into sonic-net:master Oct 11, 2024
17 checks passed

		@@ -465,6 +467,11 @@ namespace swss {

		#define CFG_SUPPRESS_ASIC_SDK_HEALTH_EVENT_NAME "SUPPRESS_ASIC_SDK_HEALTH_EVENT"

		#define CFG_PAC_PORT_CONFIG_TABLE "PAC_PORT_CONFIG_TABLE"

Schema.h Changes to support PAC functionality. #871

Schema.h Changes to support PAC functionality. #871

Conversation

vijaya-ops commented Apr 8, 2024

Why I did it

How I did it

How to verify it

adyeung commented Aug 7, 2024

vijaya-ops commented Aug 13, 2024

mssonicbld commented Aug 13, 2024

azure-pipelines bot commented Aug 13, 2024

ridahanif96 commented Aug 15, 2024

ridahanif96 left a comment

Choose a reason for hiding this comment

vijaya-ops commented Sep 20, 2024

mssonicbld commented Sep 20, 2024

azure-pipelines bot commented Sep 20, 2024

vijaya-ops commented Sep 20, 2024

vijaya-ops commented Sep 24, 2024

mssonicbld commented Sep 24, 2024

azure-pipelines bot commented Sep 24, 2024

vijaya-ops commented Sep 24, 2024

mssonicbld commented Sep 24, 2024

azure-pipelines bot commented Sep 24, 2024

vijaya-ops commented Sep 25, 2024

mssonicbld commented Sep 25, 2024

azure-pipelines bot commented Sep 25, 2024

vijaya-ops commented Sep 25, 2024

mssonicbld commented Sep 25, 2024

azure-pipelines bot commented Sep 25, 2024

vijaya-ops commented Sep 25, 2024

mssonicbld commented Sep 25, 2024

azure-pipelines bot commented Sep 25, 2024

vijaya-ops commented Sep 26, 2024

vijaya-ops commented Sep 29, 2024

mssonicbld commented Sep 29, 2024

azure-pipelines bot commented Sep 29, 2024

matiAlfaro Sep 29, 2024

Choose a reason for hiding this comment

vijaya-ops Oct 1, 2024 • edited Loading

Choose a reason for hiding this comment

matiAlfaro Oct 1, 2024

Choose a reason for hiding this comment

vijaya-ops commented Sep 30, 2024

adyeung commented Oct 1, 2024 • edited Loading

qiluo-msft Oct 11, 2024

Choose a reason for hiding this comment

vijaya-ops Oct 1, 2024 •

edited

Loading

adyeung commented Oct 1, 2024 •

edited

Loading