From 30e38c21fc4a7bb07f92db4a44b99dedcbcaeee5 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Fri, 29 Sep 2023 07:58:55 -0700 Subject: [PATCH] https://telecominfraproject.atlassian.net/browse/WIFI-7831 Signed-off-by: stephb9959 --- CMakeLists.txt | 14 ++++++++++++-- build | 2 +- src/Daemon.cpp | 2 +- .../GlobalReach.cpp} | 2 +- .../GlobalReach.h} | 0 src/{ => OpenRoaming}/OrionWifi.h | 0 .../RESTAPI_openroaming_gr_acct_handler.cpp | 2 +- .../RESTAPI_openroaming_gr_cert_handler.cpp | 2 +- .../RESTAPI_openroaming_orion_acct_handler.cpp | 1 - 9 files changed, 17 insertions(+), 8 deletions(-) rename src/{OpenRoamin_GlobalReach.cpp => OpenRoaming/GlobalReach.cpp} (99%) rename src/{OpenRoamin_GlobalReach.h => OpenRoaming/GlobalReach.h} (100%) rename src/{ => OpenRoaming}/OrionWifi.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c67c56b..55f34aba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,14 +209,24 @@ add_executable(owprov src/ProvWebSocketClient.cpp src/ProvWebSocketClient.h src/Tasks/VenueRebooter.h src/Tasks/VenueUpgrade.h src/sdks/SDK_fms.cpp src/sdks/SDK_fms.h - src/RESTAPI/RESTAPI_overrides_handler.cpp src/RESTAPI/RESTAPI_overrides_handler.h src/OpenRoamin_GlobalReach.cpp src/OpenRoamin_GlobalReach.h src/storage/storage_glblraccounts.cpp src/storage/storage_glblraccounts.h src/storage/storage_glblrcerts.cpp src/storage/storage_glblrcerts.h src/RESTAPI/RESTAPI_openroaming_gr_list_acct_handler.cpp src/RESTAPI/RESTAPI_openroaming_gr_list_acct_handler.h src/RESTAPI/RESTAPI_openroaming_gr_acct_handler.cpp src/RESTAPI/RESTAPI_openroaming_gr_acct_handler.h src/RESTAPI/RESTAPI_openroaming_gr_list_certificates.cpp src/RESTAPI/RESTAPI_openroaming_gr_list_certificates.h src/RESTAPI/RESTAPI_openroaming_gr_cert_handler.cpp src/RESTAPI/RESTAPI_openroaming_gr_cert_handler.h src/RESTAPI/RESTAPI_openroaming_orion_list_acct_handler.cpp src/RESTAPI/RESTAPI_openroaming_orion_list_acct_handler.h src/RESTAPI/RESTAPI_openroaming_orion_acct_handler.cpp src/RESTAPI/RESTAPI_openroaming_orion_acct_handler.h src/storage/storage_orion_accounts.cpp src/storage/storage_orion_accounts.h + src/RESTAPI/RESTAPI_overrides_handler.cpp src/RESTAPI/RESTAPI_overrides_handler.h + src/storage/storage_glblraccounts.cpp src/storage/storage_glblraccounts.h + src/storage/storage_glblrcerts.cpp src/storage/storage_glblrcerts.h + src/RESTAPI/RESTAPI_openroaming_gr_list_acct_handler.cpp src/RESTAPI/RESTAPI_openroaming_gr_list_acct_handler.h + src/RESTAPI/RESTAPI_openroaming_gr_acct_handler.cpp src/RESTAPI/RESTAPI_openroaming_gr_acct_handler.h + src/RESTAPI/RESTAPI_openroaming_gr_list_certificates.cpp src/RESTAPI/RESTAPI_openroaming_gr_list_certificates.h + src/RESTAPI/RESTAPI_openroaming_gr_cert_handler.cpp src/RESTAPI/RESTAPI_openroaming_gr_cert_handler.h + src/RESTAPI/RESTAPI_openroaming_orion_list_acct_handler.cpp src/RESTAPI/RESTAPI_openroaming_orion_list_acct_handler.h + src/RESTAPI/RESTAPI_openroaming_orion_acct_handler.cpp src/RESTAPI/RESTAPI_openroaming_orion_acct_handler.h + src/storage/storage_orion_accounts.cpp src/storage/storage_orion_accounts.h src/storage/storage_radius_endpoints.cpp src/storage/storage_radius_endpoints.h src/RESTAPI/RESTAPI_radiusendpoint_list_handler.cpp src/RESTAPI/RESTAPI_radiusendpoint_list_handler.h src/RESTAPI/RESTAPI_radius_endpoint_handler.cpp src/RESTAPI/RESTAPI_radius_endpoint_handler.h - src/OrionWifi.h + src/OpenRoaming/GlobalReach.cpp src/OpenRoaming/GlobalReach.h + src/OpenRoaming/OrionWifi.h ) target_link_libraries(owprov PUBLIC diff --git a/build b/build index abc4eff6..7c6ba0fe 100644 --- a/build +++ b/build @@ -1 +1 @@ -46 \ No newline at end of file +55 \ No newline at end of file diff --git a/src/Daemon.cpp b/src/Daemon.cpp index 55a39382..17391fe3 100644 --- a/src/Daemon.cpp +++ b/src/Daemon.cpp @@ -23,7 +23,7 @@ #include "UI_Prov_WebSocketNotifications.h" #include "framework/ConfigurationValidator.h" #include "framework/UI_WebSocketClientServer.h" -#include "OpenRoamin_GlobalReach.h" +#include namespace OpenWifi { class Daemon *Daemon::instance_ = nullptr; diff --git a/src/OpenRoamin_GlobalReach.cpp b/src/OpenRoaming/GlobalReach.cpp similarity index 99% rename from src/OpenRoamin_GlobalReach.cpp rename to src/OpenRoaming/GlobalReach.cpp index 133d1933..d2cd99f7 100644 --- a/src/OpenRoamin_GlobalReach.cpp +++ b/src/OpenRoaming/GlobalReach.cpp @@ -2,7 +2,7 @@ // Created by stephane bourque on 2023-09-11. // -#include "OpenRoamin_GlobalReach.h" +#include "GlobalReach.h" #include #include #include diff --git a/src/OpenRoamin_GlobalReach.h b/src/OpenRoaming/GlobalReach.h similarity index 100% rename from src/OpenRoamin_GlobalReach.h rename to src/OpenRoaming/GlobalReach.h diff --git a/src/OrionWifi.h b/src/OpenRoaming/OrionWifi.h similarity index 100% rename from src/OrionWifi.h rename to src/OpenRoaming/OrionWifi.h diff --git a/src/RESTAPI/RESTAPI_openroaming_gr_acct_handler.cpp b/src/RESTAPI/RESTAPI_openroaming_gr_acct_handler.cpp index 977a59a7..f0c5b3e9 100644 --- a/src/RESTAPI/RESTAPI_openroaming_gr_acct_handler.cpp +++ b/src/RESTAPI/RESTAPI_openroaming_gr_acct_handler.cpp @@ -3,7 +3,7 @@ // #include "RESTAPI_openroaming_gr_acct_handler.h" -#include "OpenRoamin_GlobalReach.h" +#include namespace OpenWifi { diff --git a/src/RESTAPI/RESTAPI_openroaming_gr_cert_handler.cpp b/src/RESTAPI/RESTAPI_openroaming_gr_cert_handler.cpp index b8747df2..bbcccb0f 100644 --- a/src/RESTAPI/RESTAPI_openroaming_gr_cert_handler.cpp +++ b/src/RESTAPI/RESTAPI_openroaming_gr_cert_handler.cpp @@ -3,7 +3,7 @@ // #include "RESTAPI_openroaming_gr_cert_handler.h" -#include +#include namespace OpenWifi { diff --git a/src/RESTAPI/RESTAPI_openroaming_orion_acct_handler.cpp b/src/RESTAPI/RESTAPI_openroaming_orion_acct_handler.cpp index 2bf37a86..d20a6030 100644 --- a/src/RESTAPI/RESTAPI_openroaming_orion_acct_handler.cpp +++ b/src/RESTAPI/RESTAPI_openroaming_orion_acct_handler.cpp @@ -3,7 +3,6 @@ // #include "RESTAPI_openroaming_orion_acct_handler.h" -#include "OpenRoamin_GlobalReach.h" namespace OpenWifi {