3. remove common lib and include to schema.h

Author: wen587

common/Makefile.am

@@ -22,8 +22,12 @@ EXTRA_DIST = gen_cfg_schema.py
 # Generate cfg_schema.h before building the library
 BUILT_SOURCES = common/cfg_schema.h
 
-common/cfg_schema.h:
-	$(PYTHON) $(srcdir)/gen_cfg_schema.py -o $@
+# Rule to generate cfg_schema.h and make it depend on gen_cfg_schema.py
+common/cfg_schema.h: $(srcdir)/gen_cfg_schema.py
+	$(AM_V_GEN)$(PYTHON) $< -o $@
+
+# Make sure the header is cleaned up
+CLEANFILES += common/cfg_schema.h
 
 # Install cfg_schema.h with other headers
 #nobase_include_HEADERS = common/cfg_schema.h

common/cfg_schema.h

@@ -137,6 +137,7 @@ namespace swss {
 #define CFG_PORT_QOS_MAP_TABLE_NAME "PORT_QOS_MAP"
 #define CFG_PORT_STORM_CONTROL_TABLE_NAME "PORT_STORM_CONTROL"
 #define CFG_PREFIX_TABLE_NAME "PREFIX"
+#define CFG_PREFIX_LIST_TABLE_NAME "PREFIX_LIST"
 #define CFG_PREFIX_SET_TABLE_NAME "PREFIX_SET"
 #define CFG_QUEUE_TABLE_NAME "QUEUE"
 #define CFG_RADIUS_TABLE_NAME "RADIUS"
@@ -190,37 +191,33 @@ namespace swss {
 #define CFG_WARM_RESTART_TABLE_NAME "WARM_RESTART"
 #define CFG_WRED_PROFILE_TABLE_NAME "WRED_PROFILE"
 #define CFG_XCVRD_LOG_TABLE_NAME "XCVRD_LOG"
-#define CFG_alpm-parity-error_TABLE_NAME "alpm-parity-error"
-#define CFG_asic-sdk-health-event_TABLE_NAME "asic-sdk-health-event"
-#define CFG_bgp-state_TABLE_NAME "bgp-state"
+// #define CFG_alpm-parity-error_TABLE_NAME "alpm-parity-error"
+// #define CFG_asic-sdk-health-event_TABLE_NAME "asic-sdk-health-event"
+// #define CFG_bgp-state_TABLE_NAME "bgp-state"
 #define CFG_chk_crm_threshold_TABLE_NAME "chk_crm_threshold"
-#define CFG_cpu-usage_TABLE_NAME "cpu-usage"
-#define CFG_dhcp-relay-bind-failure_TABLE_NAME "dhcp-relay-bind-failure"
-#define CFG_dhcp-relay-discard_TABLE_NAME "dhcp-relay-discard"
-#define CFG_dhcp-relay-disparity_TABLE_NAME "dhcp-relay-disparity"
-#define CFG_disk-usage_TABLE_NAME "disk-usage"
-#define CFG_event-disk_TABLE_NAME "event-disk"
-#define CFG_event-down-ctr_TABLE_NAME "event-down-ctr"
-#define CFG_event-kernel_TABLE_NAME "event-kernel"
-#define CFG_event-seu_TABLE_NAME "event-seu"
-#define CFG_event-sshd_TABLE_NAME "event-sshd"
-#define CFG_event-stopped-ctr_TABLE_NAME "event-stopped-ctr"
-#define CFG_if-state_TABLE_NAME "if-state"
-#define CFG_invalid-freelist_TABLE_NAME "invalid-freelist"
-#define CFG_mem-threshold-exceeded_TABLE_NAME "mem-threshold-exceeded"
-#define CFG_memory-usage_TABLE_NAME "memory-usage"
+// #define CFG_cpu-usage_TABLE_NAME "cpu-usage"
+// #define CFG_dhcp-relay-bind-failure_TABLE_NAME "dhcp-relay-bind-failure"
+// #define CFG_dhcp-relay-discard_TABLE_NAME "dhcp-relay-discard"
+// #define CFG_dhcp-relay-disparity_TABLE_NAME "dhcp-relay-disparity"
+// #define CFG_disk-usage_TABLE_NAME "disk-usage"
+// #define CFG_event-disk_TABLE_NAME "event-disk"
+// #define CFG_event-down-ctr_TABLE_NAME "event-down-ctr"
+// #define CFG_event-kernel_TABLE_NAME "event-kernel"
+// #define CFG_event-seu_TABLE_NAME "event-seu"
+// #define CFG_event-sshd_TABLE_NAME "event-sshd"
+// #define CFG_event-stopped-ctr_TABLE_NAME "event-stopped-ctr"
+// #define CFG_if-state_TABLE_NAME "if-state"
+// #define CFG_invalid-freelist_TABLE_NAME "invalid-freelist"
+// #define CFG_mem-threshold-exceeded_TABLE_NAME "mem-threshold-exceeded"
+// #define CFG_memory-usage_TABLE_NAME "memory-usage"
 #define CFG_notification_TABLE_NAME "notification"
-#define CFG_pfc-storm_TABLE_NAME "pfc-storm"
-#define CFG_process-exited-unexpectedly_TABLE_NAME "process-exited-unexpectedly"
-#define CFG_process-not-running_TABLE_NAME "process-not-running"
-#define CFG_select-operation-failure_TABLE_NAME "select-operation-failure"
-#define CFG_sonic-bgp-common_TABLE_NAME "sonic-bgp-common"
-#define CFG_sonic-events-common_TABLE_NAME "sonic-events-common"
-#define CFG_sonic-extension_TABLE_NAME "sonic-extension"
-#define CFG_sonic-types_TABLE_NAME "sonic-types"
-#define CFG_syncd-failure_TABLE_NAME "syncd-failure"
-#define CFG_watchdog-timeout_TABLE_NAME "watchdog-timeout"
-#define CFG_zebra-no-buff_TABLE_NAME "zebra-no-buff"
+// #define CFG_pfc-storm_TABLE_NAME "pfc-storm"
+// #define CFG_process-exited-unexpectedly_TABLE_NAME "process-exited-unexpectedly"
+// #define CFG_process-not-running_TABLE_NAME "process-not-running"
+// #define CFG_select-operation-failure_TABLE_NAME "select-operation-failure"
+// #define CFG_syncd-failure_TABLE_NAME "syncd-failure"
+// #define CFG_watchdog-timeout_TABLE_NAME "watchdog-timeout"
+// #define CFG_zebra-no-buff_TABLE_NAME "zebra-no-buff"
 
 #ifdef __cplusplus
 }

common/schema.h

@@ -1,6 +1,8 @@
 #ifndef __SCHEMA__
 #define __SCHEMA__
 
+#include "cfg_schema.h"
+
 #ifdef __cplusplus
 namespace swss {
 #endif

gen_cfg_schema.py

@@ -48,7 +48,7 @@ def main():
     yang_dir = args.dir
     sy = sonic_yang.SonicYang(yang_dir)
     sy.loadYangModel()
-    keys = sy.confDbYangMap.keys()
+    keys = [k for k, v in sy.confDbYangMap.items() if "container" in v]
     write_cfg_schema(keys, args.output)
 
 if __name__ == "__main__":