Refactor Project Layout.

CMakeLists.txt

@@ -54,44 +54,44 @@ add_executable(owprov
         build
         src/Daemon.cpp src/Daemon.h
         src/Dashboard.h src/Dashboard.cpp
-        src/MicroService.cpp src/MicroService.h
-        src/Utils.h src/Utils.cpp
-        src/RESTAPI_utils.cpp src/RESTAPI_utils.h
-        src/RESTAPI_SecurityObjects.h src/RESTAPI_SecurityObjects.h
-        src/ALBHealthCheckServer.h
-        src/AuthClient.cpp src/AuthClient.h
-        src/KafkaManager.cpp src/KafkaManager.h
-        src/Kafka_topics.h
-        src/OpenAPIRequest.cpp src/OpenAPIRequest.h
-        src/RESTAPI_SecurityObjects.h src/RESTAPI_SecurityObjects.cpp
-        src/RESTAPI_handler.cpp src/RESTAPI_handler.h
-        src/RESTAPI_server.h src/RESTAPI_server.cpp
-        src/RESTAPI_system_command.h src/RESTAPI_system_command.cpp
-        src/RESTAPI_InternalServer.h src/RESTAPI_InternalServer.cpp
+        src/framework/MicroService.cpp src/framework/MicroService.h
+        src/framework/Utils.h src/framework/Utils.cpp
+        src/framework/RESTAPI_utils.cpp src/framework/RESTAPI_utils.h
+        src/RESTAPI/RESTAPI_SecurityObjects.h src/RESTAPI/RESTAPI_SecurityObjects.h
+        src/framework/ALBHealthCheckServer.h
+        src/framework/AuthClient.cpp src/framework/AuthClient.h
+        src/framework/KafkaManager.cpp src/framework/KafkaManager.h
+        src/framework/Kafka_topics.h
+        src/framework/OpenAPIRequest.cpp src/framework/OpenAPIRequest.h
+        src/RESTAPI/RESTAPI_SecurityObjects.h src/RESTAPI/RESTAPI_SecurityObjects.cpp
+        src/framework/RESTAPI_handler.cpp src/framework/RESTAPI_handler.h
+        src/RESTAPI/RESTAPI_server.h src/RESTAPI/RESTAPI_server.cpp
+        src/framework/RESTAPI_system_command.h src/framework/RESTAPI_system_command.cpp
+        src/RESTAPI/RESTAPI_InternalServer.h src/RESTAPI/RESTAPI_InternalServer.cpp
         src/StorageService.cpp src/StorageService.h
-        src/SubSystemServer.cpp src/SubSystemServer.h
-        src/RESTAPI_ProvObjects.cpp src/RESTAPI_ProvObjects.h
-        src/storage_entity.cpp src/storage_entity.h
-        src/storage_policies.cpp src/storage_policies.h
-        src/OpenWifiTypes.h
-        src/storage_venue.cpp src/storage_venue.h
-        src/storage_location.cpp src/storage_location.h
-        src/storage_contact.cpp src/storage_contact.h
-        src/RESTAPI_entity_handler.cpp src/RESTAPI_entity_handler.h
-        src/storage_inventory.cpp src/storage_inventory.h
-        src/RESTAPI_contact_handler.cpp src/RESTAPI_contact_handler.h
-        src/RESTAPI_location_handler.cpp src/RESTAPI_location_handler.h
-        src/RESTAPI_venue_handler.cpp src/RESTAPI_venue_handler.h
-        src/RESTAPI_inventory_handler.cpp src/RESTAPI_inventory_handler.h
-        src/RESTAPI_managementPolicy_handler.cpp src/RESTAPI_managementPolicy_handler.h
-        src/RESTAPI_inventory_list_handler.cpp src/RESTAPI_inventory_list_handler.h
-        src/RESTAPI_entity_list_handler.cpp src/RESTAPI_entity_list_handler.h
-        src/storage_management_roles.cpp src/storage_management_roles.h
-        src/storage_setup.cpp
-        src/storage_configurations.cpp src/storage_configurations.h
-        src/RESTAPI_configurations_handler.cpp src/RESTAPI_configurations_handler.h
-        src/RESTAPI_webSocketServer.h src/RESTAPI_webSocketServer.cpp src/RESTAPI_contact_list_handler.cpp src/RESTAPI_contact_list_handler.h src/RESTAPI_location_list_handler.cpp src/RESTAPI_location_list_handler.h src/RESTAPI_venue_list_handler.cpp src/RESTAPI_venue_list_handler.h src/RESTAPI_managementPolicy_list_handler.cpp src/RESTAPI_managementPolicy_list_handler.h src/RESTAPI_managementRole_handler.cpp src/RESTAPI_managementRole_handler.h src/RESTAPI_managementRole_list_handler.cpp src/RESTAPI_managementRole_list_handler.h src/RESTAPI_configurations_list_handler.cpp src/RESTAPI_configurations_list_handler.h src/SecurityDBProxy.cpp src/SecurityDBProxy.h src/APConfig.cpp src/APConfig.h src/RESTAPI_errors.h src/ConfigurationValidator.cpp src/ConfigurationValidator.h src/RESTAPI_GenericServer.cpp src/RESTAPI_GenericServer.h src/AutoDiscovery.cpp src/AutoDiscovery.h src/CIDRUtils.cpp src/CIDRUtils.h src/SDK_stubs.cpp src/SDK_stubs.h src/ConfigSanityChecker.cpp src/ConfigSanityChecker.h src/storage_tags.cpp src/storage_tags.h src/TagServer.cpp src/TagServer.h src/Storage.h
-        src/CountryCodes.h src/RESTAPI_db_helpers.cpp src/RESTAPI_db_helpers.h)
+        src/framework/SubSystemServer.cpp src/framework/SubSystemServer.h
+        src/RESTAPI/RESTAPI_ProvObjects.cpp src/RESTAPI/RESTAPI_ProvObjects.h
+        src/storage/storage_entity.cpp src/storage/storage_entity.h
+        src/storage/storage_policies.cpp src/storage/storage_policies.h
+        src/framework/OpenWifiTypes.h
+        src/storage/storage_venue.cpp src/storage/storage_venue.h
+        src/storage/storage_location.cpp src/storage/storage_location.h
+        src/storage/storage_contact.cpp src/storage/storage_contact.h
+        src/RESTAPI/RESTAPI_entity_handler.cpp src/RESTAPI/RESTAPI_entity_handler.h
+        src/storage/storage_inventory.cpp src/storage/storage_inventory.h
+        src/RESTAPI/RESTAPI_contact_handler.cpp src/RESTAPI/RESTAPI_contact_handler.h
+        src/RESTAPI/RESTAPI_location_handler.cpp src/RESTAPI/RESTAPI_location_handler.h
+        src/RESTAPI/RESTAPI_venue_handler.cpp src/RESTAPI/RESTAPI_venue_handler.h
+        src/RESTAPI/RESTAPI_inventory_handler.cpp src/RESTAPI/RESTAPI_inventory_handler.h
+        src/RESTAPI/RESTAPI_managementPolicy_handler.cpp src/RESTAPI/RESTAPI_managementPolicy_handler.h
+        src/RESTAPI/RESTAPI_inventory_list_handler.cpp src/RESTAPI/RESTAPI_inventory_list_handler.h
+        src/RESTAPI/RESTAPI_entity_list_handler.cpp src/RESTAPI/RESTAPI_entity_list_handler.h
+        src/storage/storage_management_roles.cpp src/storage/storage_management_roles.h
+        src/framework/storage_setup.cpp
+        src/storage/storage_configurations.cpp src/storage/storage_configurations.h
+        src/RESTAPI/RESTAPI_configurations_handler.cpp src/RESTAPI/RESTAPI_configurations_handler.h
+        src/RESTAPI/RESTAPI_webSocketServer.h src/RESTAPI/RESTAPI_webSocketServer.cpp src/RESTAPI/RESTAPI_contact_list_handler.cpp src/RESTAPI/RESTAPI_contact_list_handler.h src/RESTAPI/RESTAPI_location_list_handler.cpp src/RESTAPI/RESTAPI_location_list_handler.h src/RESTAPI/RESTAPI_venue_list_handler.cpp src/RESTAPI/RESTAPI_venue_list_handler.h src/RESTAPI/RESTAPI_managementPolicy_list_handler.cpp src/RESTAPI/RESTAPI_managementPolicy_list_handler.h src/RESTAPI/RESTAPI_managementRole_handler.cpp src/RESTAPI/RESTAPI_managementRole_handler.h src/RESTAPI/RESTAPI_managementRole_list_handler.cpp src/RESTAPI/RESTAPI_managementRole_list_handler.h src/RESTAPI/RESTAPI_configurations_list_handler.cpp src/RESTAPI/RESTAPI_configurations_list_handler.h src/SecurityDBProxy.cpp src/SecurityDBProxy.h src/APConfig.cpp src/APConfig.h src/framework/RESTAPI_errors.h src/ConfigurationValidator.cpp src/ConfigurationValidator.h src/framework/RESTAPI_GenericServer.cpp src/framework/RESTAPI_GenericServer.h src/AutoDiscovery.cpp src/AutoDiscovery.h src/framework/CIDRUtils.cpp src/framework/CIDRUtils.h src/SDK_stubs.cpp src/SDK_stubs.h src/ConfigSanityChecker.cpp src/ConfigSanityChecker.h src/storage/storage_tags.cpp src/storage/storage_tags.h src/TagServer.cpp src/TagServer.h src/framework/Storage.h
+        src/framework/CountryCodes.h src/RESTAPI/RESTAPI_db_helpers.cpp src/RESTAPI/RESTAPI_db_helpers.h)
 
 target_link_libraries(owprov PUBLIC
         ${Poco_LIBRARIES} ${MySQL_LIBRARIES}

build

@@ -1 +1 @@
-325
+343

config-samples/basic-example.json

@@ -0,0 +1,46 @@
+{
+	"interfaces": [{
+			"ethernet": [{
+				"select-ports": [
+					"WAN*"
+				]
+			}],
+			"ipv4": {
+				"addressing": "dynamic"
+			},
+			"name": "WAN",
+			"role": "upstream",
+			"services": [
+				"lldp"
+			]
+		},
+		{
+			"ethernet": [{
+				"select-ports": [
+					"LAN*"
+				]
+			}],
+			"ipv4": {
+				"addressing": "dynamic"
+			},
+			"name": "LAN",
+			"role": "upstream",
+			"services": [
+				"ssh",
+				"lldp"
+			],
+			"ssids": [{
+				"bss-mode": "wds-ap",
+				"encryption": {
+					"ieee80211w": "optional",
+					"key": "ViaSat!s3cretWifi",
+					"proto": "psk2"
+				},
+				"name": "ViaSat_WDS_AP",
+				"wifi-bands": [
+					"5G"
+				]
+			}]
+		}
+	]
+}

src/APConfig.h

@@ -7,7 +7,7 @@
 
 #include <string>
 #include "Poco/Logger.h"
-#include "RESTAPI_ProvObjects.h"
+#include "RESTAPI/RESTAPI_ProvObjects.h"
 
 namespace OpenWifi {
 

src/AutoDiscovery.cpp

@@ -3,10 +3,10 @@
 //
 
 #include "AutoDiscovery.h"
-#include "uCentralProtocol.h"
-#include "KafkaManager.h"
-#include "Kafka_topics.h"
-#include "storage_inventory.h"
+#include "framework/uCentralProtocol.h"
+#include "framework/KafkaManager.h"
+#include "framework/Kafka_topics.h"
+#include "storage/storage_inventory.h"
 #include "StorageService.h"
 #include "Daemon.h"
 

src/AutoDiscovery.h

@@ -5,8 +5,8 @@
 #ifndef OWPROV_AUTODISCOVERY_H
 #define OWPROV_AUTODISCOVERY_H
 
-#include "SubSystemServer.h"
-#include "OpenWifiTypes.h"
+#include "framework/SubSystemServer.h"
+#include "framework/OpenWifiTypes.h"
 
 namespace OpenWifi {
     class AutoDiscovery : public SubSystemServer, Poco::Runnable {

src/ConfigurationValidator.cpp

@@ -7,11 +7,11 @@
 #include <regex>
 
 #include "ConfigurationValidator.h"
-#include "Utils.h"
+#include "framework/Utils.h"
 #include "Daemon.h"
 #include "Poco/Logger.h"
 #include "Poco/URI.h"
-#include "CountryCodes.h"
+#include "framework/CountryCodes.h"
 #include "Poco/StringTokenizer.h"
 
 namespace OpenWifi {

src/ConfigurationValidator.h

@@ -7,7 +7,7 @@
 
 #include <nlohmann/json-schema.hpp>
 #include "Poco/Logger.h"
-#include "SubSystemServer.h"
+#include "framework/SubSystemServer.h"
 
 using nlohmann::json;
 using nlohmann::json_schema::json_validator;

src/Daemon.cpp

@@ -14,10 +14,10 @@
 #include "Daemon.h"
 
 #include "StorageService.h"
-#include "Utils.h"
-#include "AuthClient.h"
-#include "RESTAPI_server.h"
-#include "RESTAPI_InternalServer.h"
+#include "framework/Utils.h"
+#include "framework/AuthClient.h"
+#include "RESTAPI/RESTAPI_server.h"
+#include "RESTAPI/RESTAPI_InternalServer.h"
 #include "SecurityDBProxy.h"
 #include "AutoDiscovery.h"
 #include "ConfigurationValidator.h"

src/Daemon.h

@@ -26,8 +26,8 @@
 #include "Poco/Crypto/Cipher.h"
 
 #include "Dashboard.h"
-#include "MicroService.h"
-#include "OpenWifiTypes.h"
+#include "framework/MicroService.h"
+#include "framework/OpenWifiTypes.h"
 
 namespace OpenWifi {
 

src/Dashboard.h

@@ -8,8 +8,8 @@
 #ifndef UCENTRALGW_DASHBOARD_H
 #define UCENTRALGW_DASHBOARD_H
 
-#include "OpenWifiTypes.h"
-#include "RESTAPI_ProvObjects.h"
+#include "framework/OpenWifiTypes.h"
+#include "RESTAPI/RESTAPI_ProvObjects.h"
 
 namespace OpenWifi {
 	class TopoDashboard {

src/RESTAPI/RESTAPI_InternalServer.cpp

@@ -10,11 +10,11 @@
 #include "RESTAPI_InternalServer.h"
 #include "Poco/URI.h"
 
-#include "RESTAPI_system_command.h"
+#include "framework/RESTAPI_system_command.h"
 #include "RESTAPI_inventory_handler.h"
-#include "RESTAPI_configurations_list_handler.h"
-#include "RESTAPI_configurations_handler.h"
-#include "Utils.h"
+#include "RESTAPI/RESTAPI_configurations_list_handler.h"
+#include "RESTAPI/RESTAPI_configurations_handler.h"
+#include "framework/Utils.h"
 
 namespace OpenWifi {
 

src/RESTAPI/RESTAPI_InternalServer.h

@@ -10,13 +10,13 @@
 #ifndef UCENTRALSEC_RESTAPI_INTERNALSERVER_H
 #define UCENTRALSEC_RESTAPI_INTERNALSERVER_H
 
-#include "SubSystemServer.h"
+#include "framework/SubSystemServer.h"
 #include "Poco/Net/HTTPServer.h"
 #include "Poco/Net/HTTPRequestHandler.h"
 #include "Poco/Net/HTTPRequestHandlerFactory.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/NetException.h"
-#include "RESTAPI_GenericServer.h"
+#include "framework/RESTAPI_GenericServer.h"
 
 namespace OpenWifi {
 

src/RESTAPI/RESTAPI_ProvObjects.cpp

@@ -8,7 +8,7 @@
 
 
 #include "RESTAPI_ProvObjects.h"
-#include "RESTAPI_utils.h"
+#include "framework/RESTAPI_utils.h"
 
 namespace OpenWifi::ProvObjects {
 

src/RESTAPI/RESTAPI_SecurityObjects.cpp

@@ -10,7 +10,7 @@
 #include "Poco/JSON/Stringifier.h"
 
 #include "RESTAPI_SecurityObjects.h"
-#include "RESTAPI_utils.h"
+#include "framework/RESTAPI_utils.h"
 
 using OpenWifi::RESTAPI_utils::field_to_json;
 using OpenWifi::RESTAPI_utils::field_from_json;

src/RESTAPI/RESTAPI_SecurityObjects.h

@@ -10,7 +10,7 @@
 #define UCENTRAL_RESTAPI_SECURITYOBJECTS_H
 
 #include "Poco/JSON/Object.h"
-#include "OpenWifiTypes.h"
+#include "framework/OpenWifiTypes.h"
 
 namespace OpenWifi::SecurityObjects {
 

src/RESTAPI/RESTAPI_configurations_handler.cpp

@@ -10,7 +10,7 @@
 #include "RESTAPI_ProvObjects.h"
 #include "StorageService.h"
 #include "Daemon.h"
-#include "RESTAPI_errors.h"
+#include "framework/RESTAPI_errors.h"
 
 #include "ConfigurationValidator.h"
 

src/RESTAPI/RESTAPI_configurations_handler.h

@@ -8,7 +8,7 @@
 #ifndef OWPROV_RESTAPI_CONFIGURATIONS_HANDLER_H
 #define OWPROV_RESTAPI_CONFIGURATIONS_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "RESTAPI_ProvObjects.h"

src/RESTAPI/RESTAPI_configurations_list_handler.cpp

@@ -4,10 +4,10 @@
 
 #include "RESTAPI_configurations_list_handler.h"
 
-#include "Utils.h"
+#include "framework/Utils.h"
 #include "RESTAPI_ProvObjects.h"
 #include "StorageService.h"
-#include "RESTAPI_errors.h"
+#include "framework/RESTAPI_errors.h"
 
 namespace OpenWifi{
     void RESTAPI_configurations_list_handler::DoGet() {

src/RESTAPI/RESTAPI_configurations_list_handler.h

@@ -5,7 +5,7 @@
 #ifndef OWPROV_RESTAPI_CONFIGURATIONS_LIST_HANDLER_H
 #define OWPROV_RESTAPI_CONFIGURATIONS_LIST_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "RESTAPI_ProvObjects.h"

src/RESTAPI/RESTAPI_contact_handler.cpp

@@ -7,12 +7,12 @@
 //
 
 #include "RESTAPI_contact_handler.h"
-#include "RESTAPI_protocol.h"
+#include "framework/RESTAPI_protocol.h"
 #include "RESTAPI_ProvObjects.h"
 #include "StorageService.h"
 #include "Poco/JSON/Parser.h"
 #include "Daemon.h"
-#include "RESTAPI_errors.h"
+#include "framework/RESTAPI_errors.h"
 #include "RESTAPI_db_helpers.h"
 
 namespace OpenWifi{

src/RESTAPI/RESTAPI_contact_handler.h

@@ -9,11 +9,11 @@
 #ifndef OWPROV_RESTAPI_CONTACT_HANDLER_H
 #define OWPROV_RESTAPI_CONTACT_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "StorageService.h"
-#include "RESTAPI_GenericServer.h"
+#include "framework/RESTAPI_GenericServer.h"
 
 namespace OpenWifi {
     class RESTAPI_contact_handler : public RESTAPIHandler {

src/RESTAPI/RESTAPI_contact_list_handler.cpp

@@ -3,10 +3,10 @@
 //
 
 #include "RESTAPI_contact_list_handler.h"
-#include "Utils.h"
+#include "framework/Utils.h"
 #include "RESTAPI_ProvObjects.h"
 #include "StorageService.h"
-#include "RESTAPI_errors.h"
+#include "framework/RESTAPI_errors.h"
 #include "RESTAPI_db_helpers.h"
 
 namespace OpenWifi{

src/RESTAPI/RESTAPI_contact_list_handler.h

@@ -5,7 +5,7 @@
 #ifndef OWPROV_RESTAPI_CONTACT_LIST_HANDLER_H
 #define OWPROV_RESTAPI_CONTACT_LIST_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "RESTAPI_ProvObjects.h"

src/RESTAPI/RESTAPI_entity_handler.cpp

@@ -14,9 +14,9 @@
 #include "Poco/JSON/Parser.h"
 #include "Daemon.h"
 #include "RESTAPI_SecurityObjects.h"
-#include "RESTAPI_utils.h"
-#include "RESTAPI_errors.h"
-#include "CIDRUtils.h"
+#include "framework/RESTAPI_utils.h"
+#include "framework/RESTAPI_errors.h"
+#include "framework/CIDRUtils.h"
 #include "RESTAPI_db_helpers.h"
 
 namespace OpenWifi{

src/RESTAPI/RESTAPI_entity_handler.h

@@ -10,7 +10,7 @@
 #ifndef OWPROV_RESTAPI_ENTITY_HANDLER_H
 #define OWPROV_RESTAPI_ENTITY_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"

src/RESTAPI/RESTAPI_entity_list_handler.cpp

@@ -8,10 +8,10 @@
 
 
 #include "RESTAPI_entity_list_handler.h"
-#include "Utils.h"
+#include "framework/Utils.h"
 #include "StorageService.h"
-#include "RESTAPI_utils.h"
-#include "RESTAPI_errors.h"
+#include "framework/RESTAPI_utils.h"
+#include "framework/RESTAPI_errors.h"
 #include "RESTAPI_db_helpers.h"
 
 namespace OpenWifi{

src/RESTAPI/RESTAPI_entity_list_handler.h

@@ -10,7 +10,7 @@
 #ifndef OWPROV_RESTAPI_ENTITY_LIST_HANDLER_H
 #define OWPROV_RESTAPI_ENTITY_LIST_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 

src/RESTAPI/RESTAPI_inventory_handler.cpp

@@ -8,16 +8,16 @@
 
 
 #include "RESTAPI_inventory_handler.h"
-#include "RESTAPI_protocol.h"
+#include "framework/RESTAPI_protocol.h"
 #include "StorageService.h"
 #include "Poco/JSON/Parser.h"
 #include "Daemon.h"
-#include "RESTAPI_utils.h"
+#include "framework/RESTAPI_utils.h"
 #include "APConfig.h"
-#include "RESTAPI_errors.h"
+#include "framework/RESTAPI_errors.h"
 #include "AutoDiscovery.h"
 #include "SDK_stubs.h"
-#include "RESTAPI_db_helpers.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
 

src/RESTAPI/RESTAPI_inventory_handler.h

@@ -10,7 +10,7 @@
 #ifndef OWPROV_RESTAPI_INVENTORY_HANDLER_H
 #define OWPROV_RESTAPI_INVENTORY_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "StorageService.h"

src/RESTAPI/RESTAPI_inventory_list_handler.cpp

@@ -9,9 +9,9 @@
 
 #include "RESTAPI_inventory_list_handler.h"
 #include "StorageService.h"
-#include "Utils.h"
-#include "RESTAPI_errors.h"
-#include "RESTAPI_db_helpers.h"
+#include "framework/Utils.h"
+#include "framework/RESTAPI_errors.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
     void RESTAPI_inventory_list_handler::SendList( const ProvObjects::InventoryTagVec & Tags, bool SerialOnly) {

src/RESTAPI/RESTAPI_inventory_list_handler.h

@@ -11,7 +11,7 @@
 #define OWPROV_RESTAPI_INVENTORY_LIST_HANDLER_H
 
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "RESTAPI_ProvObjects.h"

src/RESTAPI/RESTAPI_location_handler.cpp

@@ -8,13 +8,13 @@
 
 
 #include "RESTAPI_location_handler.h"
-#include "RESTAPI_errors.h"
+#include "framework/RESTAPI_errors.h"
 
 #include "RESTAPI_ProvObjects.h"
 #include "StorageService.h"
-#include "RESTAPI_protocol.h"
+#include "framework/RESTAPI_protocol.h"
 #include "Daemon.h"
-#include "RESTAPI_db_helpers.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
 

src/RESTAPI/RESTAPI_location_handler.h

@@ -10,7 +10,7 @@
 #ifndef OWPROV_RESTAPI_LOCATION_HANDLER_H
 #define OWPROV_RESTAPI_LOCATION_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "StorageService.h"

src/RESTAPI/RESTAPI_location_list_handler.cpp

@@ -3,11 +3,11 @@
 //
 
 #include "RESTAPI_location_list_handler.h"
-#include "Utils.h"
+#include "framework/Utils.h"
 #include "RESTAPI_ProvObjects.h"
 #include "StorageService.h"
-#include "RESTAPI_errors.h"
-#include "RESTAPI_db_helpers.h"
+#include "framework/RESTAPI_errors.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
 

src/RESTAPI/RESTAPI_location_list_handler.h

@@ -5,7 +5,7 @@
 #ifndef OWPROV_RESTAPI_LOCATION_LIST_HANDLER_H
 #define OWPROV_RESTAPI_LOCATION_LIST_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "RESTAPI_ProvObjects.h"

src/RESTAPI/RESTAPI_managementPolicy_handler.cpp

@@ -12,8 +12,8 @@
 #include "StorageService.h"
 #include "Poco/JSON/Parser.h"
 #include "Daemon.h"
-#include "RESTAPI_errors.h"
-#include "RESTAPI_db_helpers.h"
+#include "framework/RESTAPI_errors.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
 

src/RESTAPI/RESTAPI_managementPolicy_handler.h

@@ -10,7 +10,7 @@
 #ifndef OWPROV_RESTAPI_MANAGEMENTPOLICY_HANDLER_H
 #define OWPROV_RESTAPI_MANAGEMENTPOLICY_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "StorageService.h"

src/RESTAPI/RESTAPI_managementPolicy_list_handler.cpp

@@ -4,11 +4,11 @@
 
 #include "RESTAPI_managementPolicy_list_handler.h"
 
-#include "Utils.h"
+#include "framework/Utils.h"
 #include "RESTAPI_ProvObjects.h"
 #include "StorageService.h"
-#include "RESTAPI_errors.h"
-#include "RESTAPI_db_helpers.h"
+#include "framework/RESTAPI_errors.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
     void RESTAPI_managementPolicy_list_handler::DoGet() {

src/RESTAPI/RESTAPI_managementPolicy_list_handler.h

@@ -5,7 +5,7 @@
 #ifndef OWPROV_RESTAPI_MANAGEMENTPOLICY_LIST_HANDLER_H
 #define OWPROV_RESTAPI_MANAGEMENTPOLICY_LIST_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "RESTAPI_ProvObjects.h"

src/RESTAPI/RESTAPI_managementRole_handler.cpp

@@ -4,14 +4,14 @@
 
 #include "RESTAPI_managementRole_handler.h"
 
-#include "RESTAPI_protocol.h"
+#include "framework/RESTAPI_protocol.h"
 #include "RESTAPI_ProvObjects.h"
 #include "StorageService.h"
 #include "Poco/JSON/Parser.h"
 #include "Daemon.h"
 #include "Poco/StringTokenizer.h"
-#include "RESTAPI_errors.h"
-#include "RESTAPI_db_helpers.h"
+#include "framework/RESTAPI_errors.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
 

src/RESTAPI/RESTAPI_managementRole_handler.h

@@ -5,7 +5,7 @@
 #ifndef OWPROV_RESTAPI_MANAGEMENTROLE_HANDLER_H
 #define OWPROV_RESTAPI_MANAGEMENTROLE_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "StorageService.h"

src/RESTAPI/RESTAPI_managementRole_list_handler.cpp

@@ -4,11 +4,11 @@
 
 #include "RESTAPI_managementRole_list_handler.h"
 
-#include "Utils.h"
+#include "framework/Utils.h"
 #include "RESTAPI_ProvObjects.h"
 #include "StorageService.h"
-#include "RESTAPI_errors.h"
-#include "RESTAPI_db_helpers.h"
+#include "framework/RESTAPI_errors.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
     void RESTAPI_managementRole_list_handler::DoGet() {

src/RESTAPI/RESTAPI_managementRole_list_handler.h

@@ -5,7 +5,7 @@
 #ifndef OWPROV_RESTAPI_MANAGEMENTROLE_LIST_HANDLER_H
 #define OWPROV_RESTAPI_MANAGEMENTROLE_LIST_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "RESTAPI_ProvObjects.h"

src/RESTAPI/RESTAPI_server.cpp

@@ -10,27 +10,27 @@
 #include "Poco/URI.h"
 
 #include "RESTAPI_server.h"
-#include "Utils.h"
-#include "RESTAPI_handler.h"
+#include "framework/Utils.h"
+#include "framework/RESTAPI_handler.h"
 
-#include "RESTAPI_system_command.h"
+#include "framework/RESTAPI_system_command.h"
 
-#include "RESTAPI_entity_handler.h"
-#include "RESTAPI_contact_handler.h"
-#include "RESTAPI_location_handler.h"
+#include "RESTAPI/RESTAPI_entity_handler.h"
+#include "RESTAPI/RESTAPI_contact_handler.h"
+#include "RESTAPI/RESTAPI_location_handler.h"
 #include "RESTAPI_venue_handler.h"
-#include "RESTAPI_inventory_handler.h"
-#include "RESTAPI_managementPolicy_handler.h"
-#include "RESTAPI_managementPolicy_list_handler.h"
-#include "RESTAPI_inventory_list_handler.h"
-#include "RESTAPI_entity_list_handler.h"
-#include "RESTAPI_configurations_handler.h"
-#include "RESTAPI_configurations_list_handler.h"
+#include "RESTAPI/RESTAPI_inventory_handler.h"
+#include "RESTAPI/RESTAPI_managementPolicy_handler.h"
+#include "RESTAPI/RESTAPI_managementPolicy_list_handler.h"
+#include "RESTAPI/RESTAPI_inventory_list_handler.h"
+#include "RESTAPI/RESTAPI_entity_list_handler.h"
+#include "RESTAPI/RESTAPI_configurations_handler.h"
+#include "RESTAPI/RESTAPI_configurations_list_handler.h"
 #include "RESTAPI_webSocketServer.h"
-#include "RESTAPI_contact_list_handler.h"
-#include "RESTAPI_location_list_handler.h"
+#include "RESTAPI/RESTAPI_contact_list_handler.h"
+#include "RESTAPI/RESTAPI_location_list_handler.h"
 #include "RESTAPI_venue_list_handler.h"
-#include "RESTAPI_managementRole_list_handler.h"
+#include "RESTAPI/RESTAPI_managementRole_list_handler.h"
 
 namespace OpenWifi {
 

src/RESTAPI/RESTAPI_server.h

@@ -16,8 +16,8 @@
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/NetException.h"
 
-#include "SubSystemServer.h"
-#include "RESTAPI_GenericServer.h"
+#include "framework/SubSystemServer.h"
+#include "framework/RESTAPI_GenericServer.h"
 
 namespace OpenWifi {
 

src/RESTAPI/RESTAPI_venue_handler.cpp

@@ -8,13 +8,13 @@
 
 
 #include "RESTAPI_venue_handler.h"
-#include "RESTAPI_ProvObjects.h"
+#include "RESTAPI/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
 #include "Poco/JSON/Parser.h"
 #include "Daemon.h"
-#include "RESTAPI_errors.h"
-#include "CIDRUtils.h"
-#include "RESTAPI_db_helpers.h"
+#include "framework/RESTAPI_errors.h"
+#include "framework/CIDRUtils.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
 

src/RESTAPI/RESTAPI_venue_handler.h

@@ -10,7 +10,7 @@
 #ifndef OWPROV_RESTAPI_VENUE_HANDLER_H
 #define OWPROV_RESTAPI_VENUE_HANDLER_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "StorageService.h"

src/RESTAPI/RESTAPI_venue_list_handler.cpp

@@ -3,11 +3,11 @@
 //
 
 #include "RESTAPI_venue_list_handler.h"
-#include "Utils.h"
+#include "framework/Utils.h"
 #include "StorageService.h"
-#include "RESTAPI_utils.h"
-#include "RESTAPI_errors.h"
-#include "RESTAPI_db_helpers.h"
+#include "framework/RESTAPI_utils.h"
+#include "framework/RESTAPI_errors.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
     void RESTAPI_venue_list_handler::DoGet() {

src/RESTAPI/RESTAPI_venue_list_handler.h

@@ -6,10 +6,10 @@
 #define OWPROV_RESTAPI_VENUE_LIST_HANDLER_H
 
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
-#include "RESTAPI_ProvObjects.h"
+#include "RESTAPI/RESTAPI_ProvObjects.h"
 
 namespace OpenWifi {
 

src/RESTAPI/RESTAPI_webSocketServer.cpp

@@ -9,9 +9,9 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"
 
-#include "Utils.h"
-#include "AuthClient.h"
-#include "RESTAPI_errors.h"
+#include "framework/Utils.h"
+#include "framework/AuthClient.h"
+#include "framework/RESTAPI_errors.h"
 
 namespace OpenWifi {
 

src/RESTAPI/RESTAPI_webSocketServer.h

@@ -7,7 +7,7 @@
 
 #include <functional>
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 
 namespace OpenWifi {
 

src/SDK_stubs.h

@@ -5,7 +5,7 @@
 #ifndef OWPROV_SDK_STUBS_H
 #define OWPROV_SDK_STUBS_H
 
-#include "OpenAPIRequest.h"
+#include "framework/OpenAPIRequest.h"
 
 namespace OpenWifi::SDK {
 

src/SecurityDBProxy.cpp

@@ -3,10 +3,10 @@
 //
 
 #include "SecurityDBProxy.h"
-#include "OpenAPIRequest.h"
-#include "MicroService.h"
+#include "framework/OpenAPIRequest.h"
+#include "framework/MicroService.h"
 #include "Poco/Net/HTTPResponse.h"
-#include "RESTAPI_SecurityObjects.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
 
 namespace OpenWifi {
     class SecurityDBProxy *SecurityDBProxy::instance_ = nullptr;

src/SecurityDBProxy.h

@@ -5,9 +5,9 @@
 #ifndef OWPROV_SECURITYDBPROXY_H
 #define OWPROV_SECURITYDBPROXY_H
 
-#include "OpenWifiTypes.h"
-#include "RESTAPI_SecurityObjects.h"
-#include "SubSystemServer.h"
+#include "framework/OpenWifiTypes.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
+#include "framework/SubSystemServer.h"
 
 namespace OpenWifi {
     class SecurityDBProxy : public SubSystemServer {

src/StorageService.cpp

@@ -12,9 +12,9 @@
 
 #include "StorageService.h"
 #include "Daemon.h"
-#include "Utils.h"
-#include "OpenAPIRequest.h"
-#include "RESTAPI_ProvObjects.h"
+#include "framework/Utils.h"
+#include "framework/OpenAPIRequest.h"
+#include "RESTAPI/RESTAPI_ProvObjects.h"
 
 namespace OpenWifi {
 

src/StorageService.h

@@ -18,18 +18,18 @@
 #include "Poco/Data/PostgreSQL/Connector.h"
 #include "Poco/Data/MySQL/Connector.h"
 #include "Poco/URI.h"
-#include "SubSystemServer.h"
+#include "framework/SubSystemServer.h"
 
-#include "Storage.h"
-#include "storage_entity.h"
-#include "storage_policies.h"
-#include "storage_venue.h"
-#include "storage_location.h"
-#include "storage_contact.h"
-#include "storage_inventory.h"
-#include "storage_management_roles.h"
-#include "storage_configurations.h"
-#include "storage_tags.h"
+#include "framework/Storage.h"
+#include "storage/storage_entity.h"
+#include "storage/storage_policies.h"
+#include "storage/storage_venue.h"
+#include "storage/storage_location.h"
+#include "storage/storage_contact.h"
+#include "storage/storage_inventory.h"
+#include "storage/storage_management_roles.h"
+#include "storage/storage_configurations.h"
+#include "storage/storage_tags.h"
 
 #include "SecurityDBProxy.h"
 

src/TagServer.h

@@ -5,7 +5,7 @@
 #ifndef OWPROV_TAGSERVER_H
 #define OWPROV_TAGSERVER_H
 
-#include "SubSystemServer.h"
+#include "framework/SubSystemServer.h"
 
 namespace OpenWifi {
 

src/framework/AuthClient.cpp

@@ -9,7 +9,7 @@
 #include <utility>
 
 #include "AuthClient.h"
-#include "RESTAPI_SecurityObjects.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
 #include "Daemon.h"
 #include "OpenAPIRequest.h"
 

src/framework/AuthClient.h

@@ -10,7 +10,7 @@
 #include "Poco/Net/HTTPServerResponse.h"
 #include "Poco/JWT/Signer.h"
 #include "Poco/SHA2Engine.h"
-#include "RESTAPI_SecurityObjects.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
 #include "SubSystemServer.h"
 
 namespace OpenWifi {

src/framework/CIDRUtils.cpp

@@ -4,7 +4,7 @@
 
 #include "CIDRUtils.h"
 
-#include "OpenWifiTypes.h"
+#include "framework/OpenWifiTypes.h"
 
 namespace OpenWifi::CIDR {
 

src/framework/CIDRUtils.h

@@ -5,7 +5,7 @@
 #ifndef OWPROV_CIDRUTILS_H
 #define OWPROV_CIDRUTILS_H
 
-#include "OpenWifiTypes.h"
+#include "framework/OpenWifiTypes.h"
 
 namespace OpenWifi::CIDR {
     [[nodiscard]] bool IpInRanges(const std::string &IP, const Types::StringVec &R);

src/framework/MicroService.cpp

@@ -26,7 +26,7 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"
 
-#include "ALBHealthCheckServer.h"
+#include "framework/ALBHealthCheckServer.h"
 #ifndef SMALL_BUILD
 #include "KafkaManager.h"
 #endif
@@ -36,7 +36,7 @@
 #include "Utils.h"
 
 #ifndef TIP_SECURITY_SERVICE
-#include "AuthClient.h"
+#include "framework/AuthClient.h"
 #endif
 
 namespace OpenWifi {

src/framework/RESTAPI_handler.cpp

@@ -22,7 +22,7 @@
 #ifdef	TIP_SECURITY_SERVICE
 #include "AuthService.h"
 #else
-#include "AuthClient.h"
+#include "framework/AuthClient.h"
 #endif
 
 #include "RESTAPI_handler.h"

src/framework/RESTAPI_handler.h

@@ -24,7 +24,7 @@
 #include "Poco/CountingStream.h"
 #include "Poco/NullStream.h"
 
-#include "RESTAPI_SecurityObjects.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
 #include "RESTAPI_utils.h"
 #include "RESTAPI_GenericServer.h"
 

src/framework/RESTAPI_system_command.cpp

@@ -13,8 +13,8 @@
 #include "Poco/DateTimeFormat.h"
 
 #include "Daemon.h"
-#include "RESTAPI_protocol.h"
-#include "RESTAPI_errors.h"
+#include "framework/RESTAPI_protocol.h"
+#include "framework/RESTAPI_errors.h"
 #include <thread>
 #include <chrono>
 

src/framework/RESTAPI_system_command.h

@@ -9,7 +9,7 @@
 #ifndef UCENTRALGW_RESTAPI_SYSTEM_COMMAND_H
 #define UCENTRALGW_RESTAPI_SYSTEM_COMMAND_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 
 namespace OpenWifi {
 class RESTAPI_system_command : public RESTAPIHandler {

src/framework/RESTAPI_utils.h

@@ -9,8 +9,8 @@
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Parser.h"
 #include "Poco/Net/HTTPServerRequest.h"
-#include "OpenWifiTypes.h"
-#include "Utils.h"
+#include "framework/OpenWifiTypes.h"
+#include "framework/Utils.h"
 
 namespace OpenWifi::RESTAPI_utils {
 

src/framework/Utils.h

@@ -18,7 +18,7 @@
 #include "Poco/Net/IPAddress.h"
 #include "Poco/String.h"
 #include "Poco/File.h"
-#include "OpenWifiTypes.h"
+#include "framework/OpenWifiTypes.h"
 
 #define DBGLINE { std::cout << __FILE__ << ":" << __func__ << ":" << __LINE__ << std::endl; };
 

src/storage/dbhelpers.h

@@ -5,12 +5,12 @@
 #ifndef OWPROV_DBHELPERS_H
 #define OWPROV_DBHELPERS_H
 
-#include "storage_entity.h"
-#include "storage_venue.h"
-#include "storage_inventory.h"
-#include "storage_contact.h"
-#include "storage_location.h"
-#include "storage_policies.h"
+#include "storage/storage_entity.h"
+#include "storage/storage_venue.h"
+#include "storage/storage_inventory.h"
+#include "storage/storage_contact.h"
+#include "storage/storage_location.h"
+#include "storage/storage_policies.h"
 
 namespace OpenWifi {
 

src/storage/storage_configurations.cpp

@@ -8,10 +8,10 @@
 
 
 #include "storage_configurations.h"
-#include "Utils.h"
-#include "OpenWifiTypes.h"
-#include "RESTAPI_utils.h"
-#include "RESTAPI_SecurityObjects.h"
+#include "framework/Utils.h"
+#include "framework/OpenWifiTypes.h"
+#include "framework/RESTAPI_utils.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
 
 namespace OpenWifi {
 

src/storage/storage_configurations.h

@@ -11,8 +11,8 @@
 #define OWPROV_STORAGE_CONFIGURATIONS_H
 
 
-#include "orm.h"
-#include "RESTAPI_ProvObjects.h"
+#include "framework/orm.h"
+#include "RESTAPI/RESTAPI_ProvObjects.h"
 
 namespace OpenWifi {
     typedef Poco::Tuple<

src/storage/storage_contact.cpp

@@ -8,10 +8,10 @@
 
 
 #include "storage_contact.h"
-#include "Utils.h"
-#include "OpenWifiTypes.h"
-#include "RESTAPI_utils.h"
-#include "RESTAPI_SecurityObjects.h"
+#include "framework/Utils.h"
+#include "framework/OpenWifiTypes.h"
+#include "framework/RESTAPI_utils.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
 
 namespace OpenWifi {
 

src/storage/storage_contact.h

@@ -10,8 +10,8 @@
 #ifndef OWPROV_STORAGE_CONTACT_H
 #define OWPROV_STORAGE_CONTACT_H
 
-#include "orm.h"
-#include "RESTAPI_ProvObjects.h"
+#include "framework/orm.h"
+#include "RESTAPI/RESTAPI_ProvObjects.h"
 
 namespace OpenWifi {
     typedef Poco::Tuple<

src/storage/storage_entity.cpp

@@ -8,13 +8,13 @@
 
 
 #include "storage_entity.h"
-#include "Utils.h"
-#include "OpenWifiTypes.h"
-#include "RESTAPI_utils.h"
-#include "RESTAPI_SecurityObjects.h"
+#include "framework/Utils.h"
+#include "framework/OpenWifiTypes.h"
+#include "framework/RESTAPI_utils.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
 #include "StorageService.h"
 #include "Daemon.h"
-#include "CIDRUtils.h"
+#include "framework/CIDRUtils.h"
 
 namespace OpenWifi {