Chg: update image tag in helm values to v2.6.0

Fix: https://telecominfraproject.atlassian.net/browse/WIFI-10070

.clang-format

@@ -1,178 +0,0 @@
----
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignArrayOfStructures: None
-AlignConsecutiveMacros: None
-AlignConsecutiveAssignments: None
-AlignConsecutiveBitFields: None
-AlignConsecutiveDeclarations: None
-AlignEscapedNewlines: Right
-AlignOperands:   Align
-AlignTrailingComments: true
-AllowAllArgumentsOnNextLine: true
-AllowAllConstructorInitializersOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortEnumsOnASingleLine: true
-AllowShortBlocksOnASingleLine: Never
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortLambdasOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
-AttributeMacros:
-  - __capability
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterCaseLabel:  false
-  AfterClass:      false
-  AfterControlStatement: Never
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  BeforeLambdaBody: false
-  BeforeWhile:     false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
-BreakBeforeConceptDeclarations: true
-BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     100
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DeriveLineEnding: true
-DerivePointerAlignment: false
-DisableFormat:   false
-EmptyLineAfterAccessModifier: Never
-EmptyLineBeforeAccessModifier: LogicalBlock
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: true
-ForEachMacros:
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IfMacros:
-  - KJ_IF_MAYBE
-IncludeBlocks:   Preserve
-IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '.*'
-    Priority:        1
-    SortPriority:    0
-    CaseSensitive:   false
-IncludeIsMainRegex: '(Test)?$'
-IncludeIsMainSourceRegex: ''
-IndentAccessModifiers: false
-IndentCaseLabels: false
-IndentCaseBlocks: false
-IndentGotoLabels: true
-IndentPPDirectives: None
-IndentExternBlock: AfterExternBlock
-IndentRequires:  false
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-InsertTrailingCommas: None
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-LambdaBodyIndentation: Signature
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: All
-ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 2
-ObjCBreakBeforeNestedBlockParam: true
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PenaltyIndentedWhitespace: 0
-PointerAlignment: Right
-PPIndentWidth:   -1
-ReferenceAlignment: Pointer
-ReflowComments:  true
-ShortNamespaceLines: 1
-SortIncludes:    CaseSensitive
-SortJavaStaticImport: Before
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: false
-SpaceAfterLogicalNot: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCaseColon: false
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceAroundPointerQualifiers: Default
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyBlock: false
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  Never
-SpacesInConditionalStatement: false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInLineCommentPrefix:
-  Minimum:         1
-  Maximum:         -1
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-SpaceBeforeSquareBrackets: false
-BitFieldColonSpacing: Both
-Standard:        Latest
-StatementAttributeLikeMacros:
-  - Q_EMIT
-StatementMacros:
-  - Q_UNUSED
-  - QT_REQUIRE_VERSION
-TabWidth:        4
-UseCRLF:         false
-UseTab:          Always
-WhitespaceSensitiveMacros:
-  - STRINGIZE
-  - PP_STRINGIZE
-  - BOOST_PP_STRINGIZE
-  - NS_SWIFT_NAME
-  - CF_SWIFT_NAME
-...
-

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
       DOCKER_REGISTRY_USERNAME: ucentral
     steps:
     - name: Checkout actions repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         repository: Telecominfraproject/.github
         path: github
@@ -58,11 +58,11 @@ jobs:
     - name: Get base branch name and set as output
       id: get_base_branch
       run: |
-        echo "branch=$(echo ${GITHUB_BASE_REF##*/})" >> $GITHUB_OUTPUT
+        echo ::set-output name=branch::$(echo ${GITHUB_BASE_REF##*/})
-        echo "owgw_branch=$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')" >> $GITHUB_OUTPUT
+        echo ::set-output name=owgw_branch::$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')
 
     - name: Checkout actions repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         repository: Telecominfraproject/.github
         path: github

.github/workflows/enforce-jira-issue-key.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout actions repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           repository: Telecominfraproject/.github
           path: github

.github/workflows/openapi-pages.yml

@@ -1,41 +0,0 @@
-name: Update OpenAPI docs on GitHub Pages
-
-on:
-  push:
-    paths:
-      - 'openapi/**'
-    branches:
-      - main
-  workflow_dispatch:
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  docsgen:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Generate static HTML page with docs from OpenAPI definition
-        run: |
-          docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli:v6.2.1 generate -i https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-owprov/main/openapi/owprov.yaml -g html2 --skip-validate-spec -o /local/
-
-      - name: Update OpenAPI docs
-        run: |
-          mkdir tmp-docs
-          mv index.html tmp-docs/index.html
-          mkdir -p ~/.ssh
-          ssh-keyscan -H github.com >> ~/.ssh/known_hosts
-          echo https://tip-automation:${{ secrets.GIT_PUSH_PAT }}@github.com > ~/.git-credentials
-          git config --global credential.helper store
-          git config --global user.email "tip-automation@telecominfraproject.com"
-          git config --global user.name "TIP Automation User"
-          git pull
-          git checkout gh-pages || git checkout -b gh-pages
-          rm -rf docs
-          mv tmp-docs docs
-          git add docs
-          git commit -m'Update OpenAPI docs for GitHub pages'
-          git push --set-upstream origin gh-pages

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       HELM_REPO_USERNAME: ucentral
     steps:
       - name: Checkout uCentral assembly chart repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           path: wlan-cloud-owprov
 

BUILDING.md

@@ -1,190 +0,0 @@
-# Building from source
-In order to build the OWPROV, you will need to install its dependencies, which includes the following:
-- cmake
-- boost
-- POCO 1.10.1 or later
-- a C++17 compiler
-- openssl
-- libpq-dev (PortgreSQL development libraries)
-- mysql-client (MySQL client)
-- librdkafka
-- cppkafka
-
-The build is done in 2 parts. The first part is to build a local copy of the framework tailored to your environment. This
-framework is called [Poco](https://github.com/pocoproject/poco). The version used in this project has a couple of fixes
-from the master copy needed for cmake. Please use the version of this [Poco fix](https://github.com/AriliaWireless/poco). Building
-Poco may take several minutes depending on the platform you are building on.
-
-## Ubuntu
-These instructions have proven to work on Ubuntu 20.4.
-```bash
-sudo apt install git cmake g++ libssl-dev libmariadb-dev 
-sudo apt install libpq-dev libaprutil1-dev apache2-dev libboost-all-dev
-sudo apt install librdkafka-dev // default-libmysqlclient-dev
-sudo apt install nlohmann-json-dev
-
-cd ~
-git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
-cd poco
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-
-cd ~
-git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1
-cd cppkafka
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-
-cd ~
-git clone https://github.com/AriliaWireless/valijson --branch tip-v1
-cd valijson
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-
-git clone https://github.com/fmtlib/fmt --branch 9.0.0 /fmtlib
-cd fmtlib
-mkdir cmake-build
-cd cmake-build
-cmake ..
-make
-make install
-
-cd ~
-git clone https://github.com/Telecominfraproject/wlan-cloud-owprov
-cd wlan-cloud-owprov
-mkdir cmake-build
-cd cmake-build
-cmake ..
-make -j 8
-```
-
-## Fedora
-The following instructions have proven to work on Fedora 33
-```bash
-sudo yum install cmake g++ openssl-devel mysql-devel mysql apr-util-devel boost boost-devel
-sudo yum install yaml-cpp-devel lua-devel 
-sudo dnf install postgresql.x86_64 librdkafka-devel
-sudo dnf install postgresql-devel json-devel
-
-git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
-cd poco
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-
-git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1
-cd cppkafka
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-
-cd ~
-git clone https://github.com/AriliaWireless/valijson --branch tip-v1
-cd valijson
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-
-cd ~
-git clone https://github.com/Telecominfraproject/wlan-cloud-owprov
-cd wlan-cloud-owprov
-mkdir cmake-build
-cd cmake-build
-cmake ..
-make
-```
-
-## macOS Build
-The following instructions have proven to work on macOS Big Sur. You need to install [Homebrew](https://brew.sh/). You must also have installed [XCode for OS X](https://www.freecodecamp.org/news/how-to-download-and-install-xcode/).
-```bash
-brew install openssl \
-	cmake \
-	libpq \
-	mysql-client \
-	apr \
-	apr-util \
-	boost \
-	yaml-cpp \
-	postgresql \
-	librdkafka \
-	nlohmann-json \
-	fmt
-
-git clone https://github.com/AriliaWireless/poco --branch poco-tip-v1
-pushd poco
-mkdir cmake-build
-push cmake-build
-cmake -DOPENSSL_ROOT_DIR=</path/to/openssl> -DENABLE_NETSSL=1 -DENABLE_JWT=1 -DENABLE_CRYPTO=1 ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-popd
-popd
-
-git clone https://github.com/AriliaWireless/cppkafka --branch tip-v1
-pushd cppkafka
-mkdir cmake-build
-pushd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-popd
-popd
-
-git clone https://github.com/AriliaWireless/valijson --branch tip-v1
-cd valijson
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-popd
-popd
-
-git clone https://github.com/Telecominfraproject/wlan-cloud-owprov
-pushd wlan-cloud-owprov
-mkdir cmake-build
-pushd cmake-build
-cmake ..
-make -j
-popd
-popd
-```
-
-## Raspberry
-The build on a rPI takes a while. You can shorten that build time and requirements by disabling all the larger database
-support. You can build with only SQLite support by not installing the packages for PostgreSQL, and MySQL by
-adding -DSMALL_BUILD=1 on the cmake build line.
-
-```bash
-sudo apt install git cmake g++ libssl-dev libaprutil1-dev apache2-dev libboost-all-dev libyaml-cpp-dev
-git clone https://github.com/stephb9959/poco
-cd poco
-mkdir cmake-build
-cd cmake-build
-cmake ..
-cmake --build . --config Release
-sudo cmake --build . --target install
-
-cd ~
-git clone https://github.com/Telecominfraproject/wlan-cloud-owprov
-cd wlan-cloud-owprov
-mkdir cmake-build
-cd cmake-build
-cmake -DSMALL_BUILD=1 ..
-make
-```

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owprov VERSION 2.11.0)
+project(owprov VERSION 2.6.0)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -27,12 +27,12 @@ endif()
 
 find_package(Git QUIET)
 if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+    execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --tags
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
             RESULT_VARIABLE GIT_RESULT
             OUTPUT_VARIABLE GIT_HASH)
     if(NOT GIT_RESULT EQUAL "0")
-        message(FATAL_ERROR "git rev-parse --short HEAD failed with ${GIT_RESULT}")
+        message(FATAL_ERROR "git describe --always --tags failed with ${GIT_RESULT}")
     endif()
     string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}")
 endif()
@@ -40,11 +40,10 @@ endif()
 add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
 
 find_package(OpenSSL    REQUIRED)
-find_package(ZLIB       REQUIRED)
 find_package(Poco       REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
 find_package(nlohmann_json  REQUIRED)
+find_package(nlohmann_json_schema_validator REQUIRED)
 find_package(fmt        REQUIRED)
-# find_package(valijson   REQUIRED)
 
 if(SMALL_BUILD)
     find_package(Poco REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
@@ -59,8 +58,6 @@ include_directories(/usr/local/include  /usr/local/opt/openssl/include src inclu
 
 configure_file(src/ow_version.h.in ${PROJECT_SOURCE_DIR}/src/ow_version.h @ONLY)
 
-add_definitions(-DPOCO_LOG_DEBUG="1")
-
 add_compile_options(-Wall -Wextra)
 if(ASAN)
     add_compile_options(-fsanitize=address)
@@ -76,64 +73,18 @@ add_executable(owprov
         src/framework/OpenWifiTypes.h
         src/framework/orm.h
         src/framework/StorageClass.h
-        src/framework/MicroServiceErrorHandler.h
-        src/framework/UI_WebSocketClientServer.cpp
-        src/framework/UI_WebSocketClientServer.h
-        src/framework/utils.h
-        src/framework/utils.cpp
-        src/framework/AppServiceRegistry.h
-        src/framework/SubSystemServer.cpp
-        src/framework/SubSystemServer.h
-        src/framework/RESTAPI_utils.h
-        src/framework/UI_WebSocketClientNotifications.cpp
-        src/framework/AuthClient.cpp
-        src/framework/AuthClient.h
-        src/framework/MicroServiceNames.h
-        src/framework/MicroServiceFuncs.h
-        src/framework/OpenAPIRequests.cpp
-        src/framework/OpenAPIRequests.h
-        src/framework/MicroServiceFuncs.cpp
-        src/framework/ALBserver.cpp
-        src/framework/ALBserver.h
-        src/framework/KafkaManager.cpp
-        src/framework/KafkaManager.h
-        src/framework/RESTAPI_RateLimiter.h
-        src/framework/WebSocketLogger.h
-        src/framework/RESTAPI_GenericServerAccounting.h
-        src/framework/CIDR.h
-        src/framework/RESTAPI_Handler.cpp
-        src/framework/RESTAPI_Handler.h
-        src/framework/RESTAPI_ExtServer.h
-        src/framework/RESTAPI_ExtServer.cpp
-        src/framework/RESTAPI_IntServer.cpp
-        src/framework/RESTAPI_IntServer.h
-        src/framework/RESTAPI_SystemCommand.h
-        src/framework/RESTAPI_WebSocketServer.h
-        src/framework/RESTAPI_SystemConfiguration.h
-        src/framework/EventBusManager.cpp
-        src/framework/EventBusManager.h
-        src/framework/RESTAPI_PartHandler.h
-        src/framework/MicroService.cpp
-        src/framework/MicroServiceExtra.h
         src/framework/ConfigurationValidator.cpp
         src/framework/ConfigurationValidator.h
-        src/framework/default_device_types.h
+        src/framework/ow_constants.h
-        src/UI_Prov_WebSocketNotifications.h
+        src/framework/WebSocketClientNotifications.h
-        src/UI_Prov_WebSocketNotifications.cpp
         src/RESTObjects/RESTAPI_SecurityObjects.h src/RESTObjects/RESTAPI_SecurityObjects.cpp
+        src/RESTObjects/RESTAPI_ProvObjects.cpp src/RESTObjects/RESTAPI_ProvObjects.h
         src/RESTObjects/RESTAPI_GWobjects.h src/RESTObjects/RESTAPI_GWobjects.cpp
         src/RESTObjects/RESTAPI_FMSObjects.h src/RESTObjects/RESTAPI_FMSObjects.cpp
-        src/RESTObjects/RESTAPI_CertObjects.cpp src/RESTObjects/RESTAPI_CertObjects.h
-        src/RESTObjects/RESTAPI_OWLSobjects.cpp src/RESTObjects/RESTAPI_OWLSobjects.h
-        src/RESTObjects/RESTAPI_ProvObjects.cpp src/RESTObjects/RESTAPI_ProvObjects.h
-        src/RESTObjects/RESTAPI_AnalyticsObjects.cpp src/RESTObjects/RESTAPI_AnalyticsObjects.h
-        src/RESTObjects/RESTAPI_SubObjects.cpp src/RESTObjects/RESTAPI_SubObjects.h
-
         src/RESTAPI/RESTAPI_routers.cpp
         src/Daemon.cpp src/Daemon.h
         src/Dashboard.h src/Dashboard.cpp
         src/StorageService.cpp src/StorageService.h
-
         src/storage/storage_entity.cpp src/storage/storage_entity.h
         src/storage/storage_policies.cpp src/storage/storage_policies.h
         src/storage/storage_venue.cpp src/storage/storage_venue.h
@@ -143,14 +94,6 @@ add_executable(owprov
         src/storage/storage_management_roles.cpp src/storage/storage_management_roles.h
         src/storage/storage_configurations.cpp src/storage/storage_configurations.h
         src/storage/storage_tags.cpp src/storage/storage_tags.h
-        src/storage/storage_operataor.cpp src/storage/storage_operataor.h
-        src/storage/storage_sub_devices.cpp src/storage/storage_sub_devices.h
-        src/storage/storage_service_class.cpp src/storage/storage_service_class.h
-        src/storage/storage_maps.cpp src/storage/storage_maps.h
-        src/storage/storage_signup.cpp src/storage/storage_signup.h
-        src/storage/storage_variables.cpp src/storage/storage_variables.h
-        src/storage/storage_overrides.cpp src/storage/storage_overrides.h
-
         src/RESTAPI/RESTAPI_entity_handler.cpp src/RESTAPI/RESTAPI_entity_handler.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
@@ -170,13 +113,6 @@ add_executable(owprov
         src/RESTAPI/RESTAPI_iptocountry_handler.cpp src/RESTAPI/RESTAPI_iptocountry_handler.h
         src/RESTAPI/RESTAPI_signup_handler.h src/RESTAPI/RESTAPI_signup_handler.cpp
         src/RESTAPI/RESTAPI_asset_server.cpp src/RESTAPI/RESTAPI_asset_server.h
-        src/RESTAPI/RESTAPI_db_helpers.h
-        src/RESTAPI/RESTAPI_map_handler.cpp src/RESTAPI/RESTAPI_map_handler.h
-        src/RESTAPI/RESTAPI_map_list_handler.cpp src/RESTAPI/RESTAPI_map_list_handler.h
-        src/RESTAPI/RESTAPI_variables_handler.cpp src/RESTAPI/RESTAPI_variables_handler.h
-        src/RESTAPI/RESTAPI_variables_list_handler.cpp src/RESTAPI/RESTAPI_variables_list_handler.h
-        src/RESTAPI/RESTAPI_overrides_handler.cpp src/RESTAPI/RESTAPI_overrides_handler.h
-
         src/FindCountry.h
         src/sdks/SDK_gw.cpp src/sdks/SDK_gw.h
         src/sdks/SDK_prov.cpp src/sdks/SDK_prov.h
@@ -186,35 +122,25 @@ add_executable(owprov
         src/AutoDiscovery.cpp src/AutoDiscovery.h
         src/ConfigSanityChecker.cpp src/ConfigSanityChecker.h
         src/TagServer.cpp src/TagServer.h
+        src/RESTAPI/RESTAPI_db_helpers.h
         src/JobController.cpp src/JobController.h
         src/JobRegistrations.cpp
+        src/storage/storage_maps.cpp src/storage/storage_maps.h
+        src/RESTAPI/RESTAPI_map_handler.cpp src/RESTAPI/RESTAPI_map_handler.h
+        src/RESTAPI/RESTAPI_map_list_handler.cpp src/RESTAPI/RESTAPI_map_list_handler.h
+        src/storage/storage_signup.cpp src/storage/storage_signup.h
         src/Signup.cpp src/Signup.h
         src/DeviceTypeCache.h
-        src/FileDownloader.cpp src/FileDownloader.h
+        src/storage/storage_variables.cpp src/storage/storage_variables.h
-        src/Tasks/VenueConfigUpdater.h
+        src/RESTAPI/RESTAPI_variables_handler.cpp src/RESTAPI/RESTAPI_variables_handler.h
-        src/libs/croncpp.h
+        src/RESTAPI/RESTAPI_variables_list_handler.cpp src/RESTAPI/RESTAPI_variables_list_handler.h
-        src/Kafka_ProvUpdater.cpp src/Kafka_ProvUpdater.h
+        src/FileDownloader.cpp src/FileDownloader.h src/Tasks/VenueConfigUpdater.h src/Kafka_ProvUpdater.cpp src/Kafka_ProvUpdater.h src/storage/storage_operataor.cpp src/storage/storage_operataor.h src/storage/storage_sub_devices.cpp src/storage/storage_sub_devices.h src/storage/storage_service_class.cpp src/storage/storage_service_class.h src/RESTAPI/RESTAPI_sub_devices_list_handler.cpp src/RESTAPI/RESTAPI_sub_devices_list_handler.h src/RESTAPI/RESTAPI_sub_devices_handler.cpp src/RESTAPI/RESTAPI_sub_devices_handler.h src/RESTAPI/RESTAPI_service_class_list_handler.cpp src/RESTAPI/RESTAPI_service_class_list_handler.h src/RESTAPI/RESTAPI_service_class_handler.cpp src/RESTAPI/RESTAPI_service_class_handler.h src/RESTAPI/RESTAPI_operators_list_handler.cpp src/RESTAPI/RESTAPI_operators_list_handler.h src/RESTAPI/RESTAPI_operators_handler.cpp src/RESTAPI/RESTAPI_operators_handler.h src/storage/storage_op_contacts.cpp src/storage/storage_op_contacts.h src/storage/storage_op_locations.cpp src/storage/storage_op_locations.h src/RESTAPI/RESTAPI_op_contact_list_handler.cpp src/RESTAPI/RESTAPI_op_contact_list_handler.h src/RESTAPI/RESTAPI_op_contact_handler.cpp src/RESTAPI/RESTAPI_op_contact_handler.h src/RESTAPI/RESTAPI_op_location_list_handler.cpp src/RESTAPI/RESTAPI_op_location_list_handler.h src/RESTAPI/RESTAPI_op_location_handler.cpp src/RESTAPI/RESTAPI_op_location_handler.h 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_sub_devices_list_handler.cpp src/RESTAPI/RESTAPI_sub_devices_list_handler.h
-        src/RESTAPI/RESTAPI_sub_devices_handler.cpp src/RESTAPI/RESTAPI_sub_devices_handler.h
-        src/RESTAPI/RESTAPI_service_class_list_handler.cpp src/RESTAPI/RESTAPI_service_class_list_handler.h
-        src/RESTAPI/RESTAPI_service_class_handler.cpp src/RESTAPI/RESTAPI_service_class_handler.h
-        src/RESTAPI/RESTAPI_operators_list_handler.cpp src/RESTAPI/RESTAPI_operators_list_handler.h
-        src/RESTAPI/RESTAPI_operators_handler.cpp src/RESTAPI/RESTAPI_operators_handler.h
-        src/storage/storage_op_contacts.cpp src/storage/storage_op_contacts.h
-        src/storage/storage_op_locations.cpp src/storage/storage_op_locations.h
-        src/RESTAPI/RESTAPI_op_contact_list_handler.cpp src/RESTAPI/RESTAPI_op_contact_list_handler.h
-        src/RESTAPI/RESTAPI_op_contact_handler.cpp src/RESTAPI/RESTAPI_op_contact_handler.h
-        src/RESTAPI/RESTAPI_op_location_list_handler.cpp src/RESTAPI/RESTAPI_op_location_list_handler.h
-        src/RESTAPI/RESTAPI_op_location_handler.cpp src/RESTAPI/RESTAPI_op_location_handler.h
-        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)
 
 target_link_libraries(owprov PUBLIC
         ${Poco_LIBRARIES}
         ${MySQL_LIBRARIES}
         ${ZLIB_LIBRARIES}
         CppKafka::cppkafka
-        fmt::fmt)
+        fmt::fmt
+        nlohmann_json_schema_validator)
 

CONFIGURATION.md

@@ -1,243 +0,0 @@
-# OWPROV Configuration
-Here is the list of parameters you can configure in the `owprov.properties` file.
-
-## OWPROV Specific Parameters
-### Default firmware management rules
-FMS is already integrated with OpenWifi. In order to allow it to upgrade devices automatically, you should
-set the following values.
-```properties 
-firmware.updater.upgrade = <true/false>
-firmware.updater.releaseonly = <true/false>
-```
-#### firmware.updater.upgrade
-Should FMS attempt to upgrade devices by default.
-
-#### firmware.updater.releaseonly
-Should only RC software be used during upgrades.
-
-### Google Map API Key
-To support geocoding help, you need to configuration the following in the configuration file. Geocoding is used
-when creating location and when reporting analytics.
-```properties
-geocodeapi = google
-google.apikey = ********************************
-```
-
-### IP to Country Parameters
-The controller has the ability to find the location of the IP of each Access Points. This uses an external IP location service. Currently,
-the controller supports 3 services. Please note that these services will require to obtain an API key or token, and these may cause you to incur
-additional fees. Here is the list of the services supported:
-- ip2location: ip2location.com
-- ipdata: ipdata.co
-- ipinfo: ipinfo.io
-
-```properties
-iptocountry.default = US
-iptocountry.provider = ipinfo
-#iptocountry.provider = ipdata
-#iptocountry.provider = ip2location
-iptocountry.ipinfo.token =
-iptocountry.ipdata.apikey =
-iptocountry.ip2location.apikey =
-```
-
-#### iptocountry.default
-This is the country code to be used if no information can be found at one of the providers or you have not configured any of the providers.
-
-#### iptocountry.provider
-You must select onf of the possible services and the fill the appropriate token or api key parameter.
-
-## Generic OpenWiFi SDK parameters
-### REST API External parameters
-These are the parameters required for the configuration of the external facing REST API server
-```properties
-openwifi.restapi.host.0.backlog = 100
-openwifi.restapi.host.0.security = relaxed
-openwifi.restapi.host.0.rootca = $OWPROV_ROOT/certs/restapi-ca.pem
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = 16004
-openwifi.restapi.host.0.cert = $OWPROV_ROOT/certs/restapi-cert.pem
-openwifi.restapi.host.0.key = $OWPROV_ROOT/certs/restapi-key.pem
-openwifi.restapi.host.0.key.password = mypassword
-```
-
-#### openwifi.restapi.host.0.backlog
-This is the number of concurrent REST API calls that maybe be kept in the backlog for processing. That's a good rule of thumb. Never go above 500.
-#### openwifi.restapi.host.0.rootca
-This is the root file of your own certificate CA in `pem` format.
-#### openwifi.restapi.host.0.cert
-This is your own server certificate in `pem` format..
-#### openwifi.restapi.host.0.key
-This is the private key associated with your own certificate in `pem` format.
-#### openwifi.restapi.host.0.address
-Leve this a `*` in the case you want to bind to all interfaces on your gateway host or select the address of a single interface.
-#### openwifi.restapi.host.0.port
-The port on which the REST API server is listening. By default, this is 16002.
-#### openwifi.restapi.host.0.security
-Leave this as `relaxed` for now for devices.
-#### openwifi.restapi.host.0.key.password
-If you key file uses a password, please enter it here.
-
-### REST API Intra microservice parameters
-The following parameters describe the configuration for the inter-microservice HTTP server. You may use the same certificate/key
-you are using for your extenral server or another certificate.
-```properties
-openwifi.internal.restapi.host.0.backlog = 100
-openwifi.internal.restapi.host.0.security = relaxed
-openwifi.internal.restapi.host.0.rootca = $OWPROV_ROOT/certs/restapi-ca.pem
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = 17004
-openwifi.internal.restapi.host.0.cert = $OWPROV_ROOT/certs/restapi-cert.pem
-openwifi.internal.restapi.host.0.key = $OWPROV_ROOT/certs/restapi-key.pem
-openwifi.internal.restapi.host.0.key.password = mypassword
-```
-
-#### openwifi.internal.host.0.backlog
-This is the number of concurrent REST API calls that maybe be kept in the backlog for processing. That's a good rule of thumb. Never go above 500.
-#### openwifi.internal.host.0.rootca
-This is the root file of your own certificate CA in `pem` format.
-#### openwifi.internal.host.0.cert
-This is your own server certificate in `pem` format..
-#### openwifi.internal.host.0.key
-This is the private key associated with your own certificate in `pem` format.
-#### openwifi.internal.host.0.address
-Leve this a `*` in the case you want to bind to all interfaces on your gateway host or select the address of a single interface.
-#### openwifi.internal.host.0.port
-The port on which the REST API server is listening. By default, this is 17002.
-#### openwifi.internal.host.0.security
-Leave this as `relaxed` for now for devices.
-#### openwifi.internal.host.0.key.password
-If you key file uses a password, please enter it here.
-
-### Microservice information
-These are different Microservie parameters. Following is a brief explanation.
-```properties
-openwifi.service.key = $OWPROV_ROOT/certs/restapi-key.pem
-openwifi.service.key.password = mypassword
-openwifi.system.data = $OWPROV_ROOT/data
-openwifi.system.uri.private = https://localhost:17004
-openwifi.system.uri.public = https://ucentral.example.com:16004
-openwifi.system.uri.ui = https://provisionins-ui.example.com
-openwifi.security.restapi.disable = false
-openwifi.system.commandchannel = /tmp/app.ucentralprov
-openwifi.autoprovisioning = true
-```
-#### openwifi.service.key
-From time to time, the microservice must encrypt information. This is the key it should use. You may use the
-same keey as you RESTAPI or your server.
-#### openwifi.service.key.password
-The password for the `openwifi.service.key`
-#### openwifi.system.data
-The location of system data. This path must exist.
-#### openwifi.system.uri.private
-The URI to reach the controller on the internal port.
-#### openwifi.system.uri.public
-The URI to reach the controller from the outside world.
-#### openwifi.system.uri.ui
-The URI of the UI to manage this service
-#### openwifi.security.restapi.disable
-This allows to disable security for internal and external API calls. This should only be used if the controller
-sits behind an application load balancer that will actually do TLS. Setting this to `true` disables security.
-#### openwifi.system.commandchannel
-The UNIX socket command channel used by this service.
-#### openwifi.autoprovisioning
-Allow unknown devices to be provisioned by the system.
-
-### ALB Support
-In order to support an application load balancer health check verification, your need to provide the following parameters.
-```properties
-alb.enable = true
-alb.port = 16104
-```
-
-### Kafka
-The controller use Kafka, like all the other microservices. You must configure the kafka section in order for the
-system to work.
-```properties
-openwifi.kafka.group.id = provisioning
-openwifi.kafka.client.id = provisioning1
-openwifi.kafka.enable = true
-openwifi.kafka.brokerlist = my_Kafka.example.com:9092
-openwifi.kafka.auto.commit = false
-openwifi.kafka.queue.buffering.max.ms = 50
-```
-
-### openwifi.kafka.group.id
-The group ID is a single word that should identify the type of service tuning. In the case `provisioning`
-### openwifi.kafka.client.id
-The client ID is a single service within that group ID. Each participant must have a unique client ID.
-### openwifi.kafka.enable
-Kafka should always be enabled.
-### openwifi.kafka.brokerlist
-The list of servers where your Kafka server is running. Comma separated.
-### openwifi.kafka.auto.commit
-Auto commit flag in Kafka. Leave as `false`.
-### openwifi.kafka.queue.buffering.max.ms
-Kafka buffering. Leave as `50`.
-### Kafka security
-If you intend to use SSL, you should look into Kafka Connect and specify the certificates below.
-```properties
-penwifi.kafka.ssl.ca.location =
-openwifi.kafka.ssl.certificate.location =
-openwifi.kafka.ssl.key.location =
-openwifi.kafka.ssl.key.password =
-```
-
-### DB Type
-The controller supports 3 types of Database. SQLite should only be used for sites with less than 100 APs or for testing in the lab.
-In order to select which database to use, you must set the `storage.type` value to sqlite, postgresql, or mysql.
-
-```properties
-storage.type = sqlite
-#storage.type = postgresql
-#storage.type = mysql
-```
-
-### Storage SQLite parameters
-Additional parameters to set for SQLite. The only important one is `storage.type.sqlite.db` which is the database name on disk.
-```properties
-storage.type.sqlite.db = provisioning.db
-storage.type.sqlite.idletime = 120
-storage.type.sqlite.maxsessions = 128
-```
-
-### Storage Postgres
-Additional parameters to set if you select Postgres for your database. You must specify `host`, `username`, `password`,
-`database`, and `port`.
-```properties
-storage.type.postgresql.maxsessions = 64
-storage.type.postgresql.idletime = 60
-storage.type.postgresql.host = localhost
-storage.type.postgresql.username = provisioning
-storage.type.postgresql.password = provisioning
-storage.type.postgresql.database = provisioning
-storage.type.postgresql.port = 5432
-storage.type.postgresql.connectiontimeout = 60
-```
-
-### Storage MySQL/MariaDB
-Additional parameters to set if you select mysql for your database. You must specify `host`, `username`, `password`,
-`database`, and `port`.
-```properties
-storage.type.mysql.maxsessions = 64
-storage.type.mysql.idletime = 60
-storage.type.mysql.host = localhost
-storage.type.postgresql.username = provisioning
-storage.type.postgresql.password = provisioning
-storage.type.postgresql.database = provisioning
-storage.type.mysql.port = 3306
-storage.type.mysql.connectiontimeout = 60
-```
-
-### Logging Parameters
-The microservice provides extensive logging. If you would like to keep logging on disk, set the `logging.type = file`. If you only want
-console logging, `set logging.type = console`. When selecting file, `logging.path` must exist. `logging.level` sets the
-basic logging level for the entire controller. `logging.websocket` disables WebSocket logging.
-
-```properties
-logging.type = file
-logging.path = $OWPROV_ROOT/logs
-logging.level = information
-logging.asynch = true
-logging.websocket = false
-```

CONTRIBUTING.md

@@ -1,38 +0,0 @@
-# How to Contribute
-
-We'd love to accept your patches and contributions to this project. There are
-just a few small guidelines you need to follow.
-
-## Version of C++
-This project is based on the C++17 standard and compiles as-is on most platforms 
-using either clang or g++. Do not use C++21 or C++23 features for now. Some core 
-libraries used in this project do not support C++21 or C++23 yet.
-
-## Variable Naming
-Naming of pretty much anything uses Pascal naming. Longer explicit names using casing. 
-Member variable naming adds a `_` at the end of the vars. Try to
-keep this standard going. Sometimes you must override a base class function and then of course
-you need to follow the base class.
-
-## This is a cmake project
-This is a cmake project, and you need to adhere to the cmake rules. If you need
-to add a package to the CMakeList, you need to ensure that the package is available
-on all required platforms and compiles. Remember that this project runs on Linux, OS X, 
-and the Raspberry PI.
-
-## Licensed packages
-When adding a package, you must also state the licensing for the package. MIT, BSD, Apache licenses
-are acceptable. No commercial licenses are allowed. 
-
-## clang formatting
-Please format your code using the included `.clang-format` file included in the project.
-
-```bash
-clang-format -i --style=<project root>/.clang-format myfile.cpp
-```
-
-## Pull Requests
-All submissions, including submissions by project members, require review. We
-accept GitHub pull requests. Please create a branch with the Jira name for addressing the issue you are fixing or the 
-feature you are implementing.
-Create a pull-request from the branch into master. 

Dockerfile

@@ -1,22 +1,16 @@
-ARG DEBIAN_VERSION=11.5-slim
+FROM alpine:3.15 AS build-base
-ARG POCO_VERSION=poco-tip-v2
-ARG CPPKAFKA_VERSION=tip-v1
-ARG VALIJASON_VERSION=tip-v1
 
-FROM debian:$DEBIAN_VERSION AS build-base
+RUN apk add --update --no-cache \
-
-RUN apt-get update && apt-get install --no-install-recommends -y \
     make cmake g++ git \
-    libpq-dev libmariadb-dev libmariadbclient-dev-compat \
+    unixodbc-dev postgresql-dev mariadb-dev \
-    librdkafka-dev libboost-all-dev libssl-dev \
+    librdkafka-dev boost-dev openssl-dev \
-    zlib1g-dev nlohmann-json3-dev ca-certificates libcurl4-openssl-dev libfmt-dev
+    zlib-dev nlohmann-json \
+    curl-dev
 
 FROM build-base AS poco-build
 
-ARG POCO_VERSION
+ADD https://api.github.com/repos/stephb9959/poco/git/refs/heads/master version.json
-
+RUN git clone https://github.com/stephb9959/poco /poco
-ADD https://api.github.com/repos/AriliaWireless/poco/git/refs/tags/${POCO_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/poco --branch ${POCO_VERSION} /poco
 
 WORKDIR /poco
 RUN mkdir cmake-build
@@ -27,10 +21,8 @@ RUN cmake --build . --target install
 
 FROM build-base AS cppkafka-build
 
-ARG CPPKAFKA_VERSION
+ADD https://api.github.com/repos/stephb9959/cppkafka/git/refs/heads/master version.json
-
+RUN git clone https://github.com/stephb9959/cppkafka /cppkafka
-ADD https://api.github.com/repos/AriliaWireless/cppkafka/git/refs/tags/${CPPKAFKA_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/cppkafka --branch ${CPPKAFKA_VERSION} /cppkafka
 
 WORKDIR /cppkafka
 RUN mkdir cmake-build
@@ -39,19 +31,29 @@ RUN cmake ..
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install
 
-FROM build-base AS valijson-build
+FROM build-base AS json-schema-validator-build
 
-ARG VALIJASON_VERSION
+ADD https://api.github.com/repos/pboettch/json-schema-validator/git/refs/heads/master version.json
+RUN git clone https://github.com/pboettch/json-schema-validator /json-schema-validator
 
-ADD https://api.github.com/repos/AriliaWireless/valijson/git/refs/tags/${VALIJASON_VERSION} version.json
+WORKDIR /json-schema-validator
-RUN git clone https://github.com/AriliaWireless/valijson --branch ${VALIJASON_VERSION} /valijson
-
-WORKDIR /valijson
 RUN mkdir cmake-build
 WORKDIR cmake-build
 RUN cmake ..
-RUN cmake --build . --config Release -j8
+RUN make
-RUN cmake --build . --target install
+RUN make install
+
+FROM build-base AS fmtlib-build
+
+ADD https://api.github.com/repos/fmtlib/fmt/git/refs/heads/master version.json
+RUN git clone https://github.com/fmtlib/fmt /fmtlib
+
+WORKDIR /fmtlib
+RUN mkdir cmake-build
+WORKDIR cmake-build
+RUN cmake ..
+RUN make
+RUN make install
 
 FROM build-base AS owprov-build
 
@@ -64,7 +66,10 @@ COPY --from=poco-build /usr/local/include /usr/local/include
 COPY --from=poco-build /usr/local/lib /usr/local/lib
 COPY --from=cppkafka-build /usr/local/include /usr/local/include
 COPY --from=cppkafka-build /usr/local/lib /usr/local/lib
-COPY --from=valijson-build /usr/local/include /usr/local/include
+COPY --from=json-schema-validator-build /usr/local/include /usr/local/include
+COPY --from=json-schema-validator-build /usr/local/lib /usr/local/lib
+COPY --from=fmtlib-build /usr/local/include /usr/local/include
+COPY --from=fmtlib-build /usr/local/lib /usr/local/lib
 
 WORKDIR /owprov
 RUN mkdir cmake-build
@@ -72,21 +77,21 @@ WORKDIR /owprov/cmake-build
 RUN cmake ..
 RUN cmake --build . --config Release -j8
 
-FROM debian:$DEBIAN_VERSION
+FROM alpine:3.15
 
 ENV OWPROV_USER=owprov \
     OWPROV_ROOT=/owprov-data \
     OWPROV_CONFIG=/owprov-data
 
-RUN useradd "$OWPROV_USER"
+RUN addgroup -S "$OWPROV_USER" && \
+    adduser -S -G "$OWPROV_USER" "$OWPROV_USER"
 
 RUN mkdir /openwifi
 RUN mkdir -p "$OWPROV_ROOT" "$OWPROV_CONFIG" && \
     chown "$OWPROV_USER": "$OWPROV_ROOT" "$OWPROV_CONFIG"
 
-RUN apt-get update && apt-get install --no-install-recommends -y \
+RUN apk add --update --no-cache librdkafka su-exec gettext ca-certificates bash jq curl \
-    librdkafka++1 gosu gettext ca-certificates bash jq curl wget \
+    mariadb-connector-c libpq unixodbc postgresql-client
-    libmariadb-dev-compat libpq5 postgresql-client libfmt7
 
 COPY readiness_check /readiness_check
 COPY test_scripts/curl/cli /cli
@@ -95,13 +100,11 @@ COPY owprov.properties.tmpl /
 COPY docker-entrypoint.sh /
 COPY wait-for-postgres.sh /
 RUN wget https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentral-deploy/main/docker-compose/certs/restapi-ca.pem \
-    -O /usr/local/share/ca-certificates/restapi-ca-selfsigned.crt
+    -O /usr/local/share/ca-certificates/restapi-ca-selfsigned.pem
 
 COPY --from=owprov-build /owprov/cmake-build/owprov /openwifi/owprov
-COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/* /usr/local/lib/
+COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/* /usr/local/lib
-COPY --from=poco-build /poco/cmake-build/lib/* /usr/local/lib/
+COPY --from=poco-build /poco/cmake-build/lib/* /usr/local/lib
-
-RUN ldconfig
 
 EXPOSE 16005 17005 16105
 

README.md

@@ -1,23 +1,11 @@
-<p align="center">
+# OpenWiFi Provisioning
-    <img src="images/project/logo.svg" width="200"/>
-</p>
 
-# OpenWiFi Provisioning Service (OWPROV)
+## Build from source.
-## What is it?
+You need:
-The OWPROV is a service for the TIP OpenWiFi CloudSDK (OWSDK).
+- https://github.com/pboettch/json-schema-validator.git
-OWPROV manages groups of access points through the use of entities and vanues. OWPROV, like all other OWSDK microservices, is
+- https://github.com/nlohmann/json.git
-defined using an OpenAPI definition and uses the ucentral communication protocol to interact with Access Points. To use
-the OWPROV, you either need to [build it](#building) or use the [Docker version](#docker).
 
-## OpenAPI
+build and install them.
-You may get static page with OpenAPI docs generated from the definition on [GitHub Page](https://telecominfraproject.github.io/wlan-cloud-owprov/).
-Also, you may use [Swagger UI](https://petstore.swagger.io/#/) with OpenAPI definition file raw link (i.e. [latest version file](https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-owprov/main/openapi/owprov.yaml)) to get interactive docs page.
-
-## Building
-To build the microservice from source, please follow the instructions in [here](./BUILDING.md)
-
-## Docker
-To use the CLoudSDK deployment please follow [here](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy)
 
 ## Root entity
 It's UUID value is 0000-0000-0000. Its parent entity must be empty.
@@ -58,77 +46,24 @@ You may modify the following fields in the POST
 - You may include an array of devices UUIDs
 - Topology and design cannot be set
 
-#### Expected directory layout
+## Geocoding
-From the directory where your cloned source is, you will need to create the `certs`, `logs`, and `uploads` directories.
+To support geocoding help, you need to configuration the following in the configuration file. Geocoding is used
-```bash
+when creating location and when reporting analytics.
-mkdir certs
-mkdir certs/cas
-mkdir logs
-mkdir uploads
 ``` 
-You should now have the following:
+geocodeapi = google
-```text
+google.apikey = **********************************
---+-- certs
-  |   +--- cas
-  +-- cmake
-  +-- cmake-build
-  +-- logs
-  +-- src
-  +-- test_scripts
-  +-- openapi
-  +-- uploads
-  +-- owsec.properties
 ```
+Currently, only google Geocoding is supported. Additional methods may be added in the future.
 
-### Certificate
+## Default firmware management rules
-The OWFMS uses a certificate to provide security for the REST API Certificate to secure the Northbound API.
+FMS is already integrated with OpenWifi. In order to allow it to upgrade devices automatically, you should 
-
+set the following values.
-#### The `certs` directory
-For all deployments, you will need the following `certs` directory, populated with the proper files.
-
-```text
-certs ---+--- restapi-ca.pem
-         +--- restapi-cert.pem
-         +--- restapi-key.pem
 ``` 
-
+firmware.updater.upgrade = <true/false>
-## Firewall Considerations
+firmware.updater.releaseonly = <true/false>
-| Port  | Description                                    | Configurable |
-|:------|:-----------------------------------------------|:------------:|
-| 16004 | Default port for REST API Access to the OWPROV |     yes      |
-
-### Environment variables
-The following environment variables should be set from the root directory of the service. They tell the OWGW process where to find
-the configuration and the root directory.
-```bash
-export OWGW_ROOT=`pwd`
-export OWGW_CONFIG=`pwd`
 ```
-You can run the shell script `set_env.sh` from the microservice root.
+### firmware.updater.upgrade
-
+Should FMS attempt to upgrade devices by default.
-### OWPROV Service Configuration
-The configuration is kept in a file called `owprov.properties`. To understand the content of this file,
-please look [here](https://github.com/Telecominfraproject/wlan-cloud-owprov/blob/main/CONFIGURATION.md)
-
-## Kafka topics
-Toe read more about Kafka, follow the [document](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/KAFKA.md)
-
-## Contributions
-We need more contributors. Should you wish to contribute,
-please follow the [contributions](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/CONTRIBUTING.md) document.
-
-## Pull Requests
-Please create a branch with the Jira addressing the issue you are fixing or the feature you are implementing.
-Create a pull-request from the branch into master.
-
-## Additional OWSDK Microservices
-Here is a list of additional OWSDK microservices
-| Name | Description | Link | OpenAPI |
-| :--- | :--- | :---: | :---: |
-| OWSEC | Security Service | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralsec) | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml) |
-| OWGW | Controller Service | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw) | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/openapi/owgw.yaml) |
-| OWFMS | Firmware Management Service | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralfms) | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralfms/blob/main/openapi/owfms.yaml) |
-| OWPROV | Provisioning Service | [here](https://github.com/Telecominfraproject/wlan-cloud-owprov) | [here](https://github.com/Telecominfraproject/wlan-cloud-owprov/blob/main/openapi/owprov.yaml) |
-| OWANALYTICS | Analytics Service | [here](https://github.com/Telecominfraproject/wlan-cloud-analytics) | [here](https://github.com/Telecominfraproject/wlan-cloud-analytics/blob/main/openapi/owanalytics.yaml) |
-| OWSUB | Subscriber Service | [here](https://github.com/Telecominfraproject/wlan-cloud-userportal) | [here](https://github.com/Telecominfraproject/wlan-cloud-userportal/blob/main/openapi/userportal.yaml) |
 
+### firmware.updater.releaseonly
+Should only RC software be used during upgrades.

build

@@ -1 +1 @@
-4
+141

docker-entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 if [ "$SELFSIGNED_CERTS" = 'true' ]; then
@@ -24,7 +24,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   SYSTEM_URI_PRIVATE=${SYSTEM_URI_PRIVATE:-"https://localhost:17005"} \
   SYSTEM_URI_PUBLIC=${SYSTEM_URI_PUBLIC:-"https://localhost:16005"} \
   SYSTEM_URI_UI=${SYSTEM_URI_UI:-"http://localhost"} \
-  SECURITY_RESTAPI_DISABLE=${SECURITY_RESTAPI_DISABLE:-"false"} \
   KAFKA_ENABLE=${KAFKA_ENABLE:-"true"} \
   KAFKA_BROKERLIST=${KAFKA_BROKERLIST:-"localhost:9092"} \
   KAFKA_SSL_CA_LOCATION=${KAFKA_SSL_CA_LOCATION:-""} \
@@ -42,7 +41,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owprov"} \
   STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"owprov"} \
   STORAGE_TYPE_MYSQL_PORT=${STORAGE_TYPE_MYSQL_PORT:-"3306"} \
-  RRM_PROVIDERS=${RRM_PROVIDERS:-"owrrm"} \
   envsubst < /owprov.properties.tmpl > $OWPROV_CONFIG/owprov.properties
 fi
 
@@ -50,7 +48,7 @@ if [ "$1" = '/openwifi/owprov' -a "$(id -u)" = '0' ]; then
     if [ "$RUN_CHOWN" = 'true' ]; then
       chown -R "$OWPROV_USER": "$OWPROV_ROOT" "$OWPROV_CONFIG"
     fi
-    exec gosu "$OWPROV_USER" "$@"
+    exec su-exec "$OWPROV_USER" "$@"
 fi
 
 exec "$@"

helm/.gitignore

@@ -1,3 +1 @@
 *.swp
-Chart.lock
-charts/

helm/README.md

@@ -70,8 +70,8 @@ The following table lists the configurable parameters of the chart and their def
 | persistence.size | string | Defines PV size | `'10Gi'` |
 | public_env_variables | hash | Defines list of environment variables to be passed to the Provisioning | |
 | configProperties | hash | Configuration properties that should be passed to the application in `owprov.properties`. May be passed by key in set (i.e. `configProperties."rtty\.token"`) | |
-| existingCertsSecret | string | Existing Kubernetes secret containing all required certificates and private keys for microservice operation. If set, certificates from `certs` key are ignored | `""` |
+| certs | hash | Defines files (keys and certificates) that should be passed to the Provisioning (PEM format is adviced to be used) (see `volumes.owprov` on where it is mounted) |  |
-| certs | hash | Defines files (keys and certificates) that should be passed to the Gateway (PEM format is adviced to be used) (see `volumes.owprov` on where it is mounted). If `existingCertsSecret` is set, certificates passed this way will not be used. |  |
+
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

helm/templates/deployment.yaml

@@ -1,5 +1,4 @@
 {{- $root := . -}}
-{{- $storageType := index .Values.configProperties "storage.type" -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -47,39 +46,6 @@ spec:
             - -timeout
             - 600s
 
-{{- if eq $storageType "postgresql" }}
-        - name: wait-postgres
-          image: "{{ .Values.images.owprov.repository }}:{{ .Values.images.owprov.tag }}"
-          imagePullPolicy: {{ .Values.images.owprov.pullPolicy }}
-          command:
-            - /wait-for-postgres.sh
-            - {{ index .Values.configProperties "storage.type.postgresql.host" }}
-            - echo
-            - "PostgreSQL is ready"
-          env:
-            - name: KUBERNETES_DEPLOYED
-              value: "{{ now }}"
-          {{- range $key, $value := .Values.public_env_variables }}
-            - name: {{ $key }}
-              value: {{ $value | quote }}
-          {{- end }}
-          {{- range $key, $value := .Values.secret_env_variables }}
-            - name: {{ $key }}
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "owprov.fullname" $root }}-env
-                  key: {{ $key }}
-          {{- end }}
-          volumeMounts:
-          {{- range .Values.volumes.owprov }}
-          - name: {{ .name }}
-            mountPath: {{ .mountPath }}
-            {{- if .subPath }}
-            subPath: {{ .subPath }}
-            {{- end }}
-          {{- end }}
-{{- end }}
-
       containers:
 
         - name: owprov
@@ -131,10 +97,8 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
 
-      {{- with .Values.securityContext }}
       securityContext:
-        {{- toYaml . | nindent 8 }}
+        fsGroup: 101
-      {{- end }}
 
       imagePullSecrets:
       {{- range $image, $imageValue := .Values.images }}

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owprov:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owprov
-    tag: v2.11.0-RC1
+    tag: v2.6.0
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
@@ -71,7 +71,7 @@ volumes:
       mountPath: /owprov-data/certs
       volumeDefinition: |
         secret:
-          secretName: {{ if .Values.existingCertsSecret }}{{ .Values.existingCertsSecret }}{{ else }}{{ include "owprov.fullname" . }}-certs{{ end }}
+          secretName: {{ include "owprov.fullname" . }}-certs
     # Change this if you want to use another volume type
     - name: persist
       mountPath: /owprov-data/persist
@@ -91,9 +91,6 @@ resources: {}
   #  cpu: 100m
   #  memory: 128Mi
 
-securityContext:
-  fsGroup: 1000
-
 nodeSelector: {}
 
 tolerations: []
@@ -202,9 +199,6 @@ configProperties:
   storage.type.mysql.username: stephb
   storage.type.mysql.password: snoopy99
 
-# NOTE: List of required certificates may be found in "certs" key. Alternative way to pass required certificates is to create external secret with all required certificates and set secret name in "existingCertsSecret" key. Details may be found in https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart#tldr
-existingCertsSecret: ""
-
 certs:
   # restapi-ca.pem: ""
   # restapi-cert.pem: ""

images/project/logo.svg

@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 141.5 185.6" style="enable-background:new 0 0 141.5 185.6;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#414141;}
-	.st1{fill:#FFFFFF;}
-	.st2{fill:#FED206;}
-	.st3{fill:#EB6F53;}
-	.st4{fill:#3BA9B6;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M120.7,183.9H21.5c-10.8,0-19.5-8.7-19.5-19.5V20.5c0-10.8,8.7-19.5,19.5-19.5h99.2
-			c10.8,0,19.5,8.7,19.5,19.5v143.9C140.2,175.2,131.5,183.9,120.7,183.9z"/>
-		<g>
-			<g>
-				<g>
-					<path class="st1" d="M46.3,166.2v-3.4h-1.2v-0.6h3.1v0.6H47v3.4H46.3z"/>
-				</g>
-				<g>
-					<path class="st1" d="M49,166.2v-4h2.7v0.6h-2v1h2v0.6h-2v1.1h2v0.6H49z"/>
-				</g>
-				<g>
-					<path class="st1" d="M52.6,166.2v-4h0.7v3.4h1.8v0.6H52.6z"/>
-				</g>
-				<g>
-					<path class="st1" d="M55.7,166.2v-4h2.7v0.6h-2v1h2v0.6h-2v1.1h2v0.6H55.7z"/>
-				</g>
-				<g>
-					<path class="st1" d="M59.1,164.2c0-1.2,0.9-2.1,2.1-2.1c0.8,0,1.3,0.4,1.6,0.9l-0.6,0.3c-0.2-0.3-0.6-0.6-1-0.6
-						c-0.8,0-1.4,0.6-1.4,1.4c0,0.8,0.6,1.4,1.4,1.4c0.4,0,0.8-0.3,1-0.6l0.6,0.3c-0.3,0.5-0.8,0.9-1.6,0.9
-						C60,166.3,59.1,165.5,59.1,164.2z"/>
-				</g>
-				<g>
-					<path class="st1" d="M63.2,164.2c0-1.2,0.8-2.1,2-2.1c1.2,0,2,0.9,2,2.1c0,1.2-0.8,2.1-2,2.1C64,166.3,63.2,165.4,63.2,164.2z
-						 M66.5,164.2c0-0.8-0.5-1.4-1.3-1.4c-0.8,0-1.3,0.6-1.3,1.4c0,0.8,0.5,1.4,1.3,1.4C66,165.7,66.5,165,66.5,164.2z"/>
-				</g>
-				<g>
-					<path class="st1" d="M71.3,166.2v-3.1l-1.2,3.1h-0.3l-1.2-3.1v3.1h-0.7v-4h1l1.1,2.7l1.1-2.7h1v4H71.3z"/>
-				</g>
-				<g>
-					<path class="st1" d="M75.7,166.2v-4h0.7v4H75.7z"/>
-				</g>
-				<g>
-					<path class="st1" d="M80.4,166.2l-2.1-2.8v2.8h-0.7v-4h0.7l2,2.8v-2.8h0.7v4H80.4z"/>
-				</g>
-				<g>
-					<path class="st1" d="M82.3,166.2v-4H85v0.6h-2v1h2v0.6h-2v1.7H82.3z"/>
-				</g>
-				<g>
-					<path class="st1" d="M87.9,166.2l-0.9-1.5h-0.7v1.5h-0.7v-4h1.7c0.8,0,1.3,0.5,1.3,1.2c0,0.7-0.5,1.1-0.9,1.2l1,1.6H87.9z
-						 M88,163.5c0-0.4-0.3-0.6-0.7-0.6h-1v1.3h1C87.7,164.1,88,163.9,88,163.5z"/>
-				</g>
-				<g>
-					<path class="st1" d="M92.4,166.2l-0.3-0.8h-1.8l-0.3,0.8h-0.8l1.6-4h0.9l1.6,4H92.4z M91.2,162.9l-0.7,1.9h1.4L91.2,162.9z"/>
-				</g>
-				<g>
-					<path class="st1" d="M95.8,166.2v-4h1.5c0.8,0,1.2,0.5,1.2,1.2c0,0.6-0.4,1.2-1.2,1.2h-1.2v1.7H95.8z M98.2,163.4
-						c0-0.5-0.3-0.9-0.9-0.9h-1.1v1.7h1.1C97.8,164.3,98.2,163.9,98.2,163.4z"/>
-				</g>
-				<g>
-					<path class="st1" d="M101.5,166.2l-1.1-1.6h-0.9v1.6h-0.3v-4h1.5c0.7,0,1.2,0.4,1.2,1.2c0,0.7-0.5,1.1-1.1,1.1l1.2,1.7H101.5z
-						 M101.6,163.4c0-0.5-0.4-0.9-0.9-0.9h-1.1v1.7h1.1C101.2,164.3,101.6,163.9,101.6,163.4z"/>
-				</g>
-				<g>
-					<path class="st1" d="M102.8,164.2c0-1.2,0.8-2.1,1.9-2.1c1.2,0,1.9,0.9,1.9,2.1c0,1.2-0.8,2.1-1.9,2.1
-						C103.6,166.3,102.8,165.4,102.8,164.2z M106.3,164.2c0-1-0.6-1.7-1.6-1.7c-1,0-1.6,0.7-1.6,1.7c0,1,0.6,1.7,1.6,1.7
-						C105.7,166,106.3,165.2,106.3,164.2z"/>
-				</g>
-				<g>
-					<path class="st1" d="M106.9,165.8l0.2-0.3c0.2,0.2,0.4,0.4,0.8,0.4c0.5,0,0.9-0.4,0.9-0.9v-2.8h0.3v2.8c0,0.8-0.5,1.2-1.2,1.2
-						C107.5,166.3,107.2,166.1,106.9,165.8z"/>
-				</g>
-				<g>
-					<path class="st1" d="M110.4,166.2v-4h2.5v0.3h-2.2v1.5h2.1v0.3h-2.1v1.6h2.2v0.3H110.4z"/>
-				</g>
-				<g>
-					<path class="st1" d="M113.5,164.2c0-1.2,0.9-2.1,2-2.1c0.6,0,1.1,0.3,1.5,0.7l-0.3,0.2c-0.3-0.3-0.7-0.6-1.2-0.6
-						c-0.9,0-1.7,0.7-1.7,1.7c0,1,0.7,1.7,1.7,1.7c0.5,0,0.9-0.2,1.2-0.6l0.3,0.2c-0.4,0.4-0.8,0.7-1.5,0.7
-						C114.4,166.3,113.5,165.5,113.5,164.2z"/>
-				</g>
-				<g>
-					<path class="st1" d="M118.7,166.2v-3.7h-1.3v-0.3h2.9v0.3H119v3.7H118.7z"/>
-				</g>
-			</g>
-			<g>
-				<polygon class="st1" points="26.3,163.8 31.6,158.5 36.9,163.8 37.7,163.8 31.6,157.6 25.5,163.8 				"/>
-				<polygon class="st1" points="36.9,164.7 31.6,170 26.3,164.7 25.5,164.7 31.6,170.8 37.7,164.7 				"/>
-				<polygon class="st1" points="31,163.8 36.3,158.5 41.6,163.8 42.5,163.8 36.3,157.6 30.2,163.8 				"/>
-				<polygon class="st1" points="41.6,164.7 36.3,170 31,164.7 30.2,164.7 36.3,170.8 42.5,164.7 				"/>
-			</g>
-		</g>
-		<g>
-			<path class="st1" d="M33.2,100.7c-4.6,0-8.3,3.7-8.3,8.3s3.7,8.3,8.3,8.3s8.3-3.7,8.3-8.3S37.8,100.7,33.2,100.7z"/>
-		</g>
-		<g>
-			<g>
-				<g>
-					<path class="st2" d="M33.2,35.2c40.7,0,73.8,33.1,73.8,73.8c0,0.7,0,1.4,0,2.1c0,1.7,0.6,3.3,1.7,4.6c1.2,1.2,2.8,1.9,4.5,2
-						l0.2,0c3.5,0,6.3-2.7,6.4-6.2c0-0.8,0-1.7,0-2.5c0-47.7-38.8-86.6-86.6-86.6c-0.8,0-1.7,0-2.5,0c-1.7,0-3.3,0.8-4.5,2
-						c-1.2,1.2-1.8,2.9-1.7,4.6c0.1,3.5,3,6.3,6.6,6.2C31.8,35.2,32.5,35.2,33.2,35.2z"/>
-				</g>
-			</g>
-		</g>
-		<g>
-			<g>
-				<g>
-					<path class="st3" d="M33.2,60.5c26.7,0,48.5,21.7,48.5,48.5c0,0.6,0,1.3,0,2c-0.1,1.7,0.5,3.3,1.7,4.6c1.2,1.3,2.7,2,4.4,2.1
-						c1.7,0.1,3.3-0.5,4.6-1.7c1.2-1.2,2-2.7,2-4.4c0-0.9,0.1-1.8,0.1-2.6c0-33.8-27.5-61.2-61.2-61.2c-0.8,0-1.6,0-2.6,0.1
-						c-1.7,0.1-3.3,0.8-4.4,2.1c-1.2,1.3-1.8,2.9-1.7,4.6s0.8,3.3,2.1,4.4c1.3,1.2,2.9,1.8,4.6,1.7C31.9,60.5,32.6,60.5,33.2,60.5z"
-						/>
-				</g>
-			</g>
-		</g>
-		<g>
-			<g>
-				<g>
-					<path class="st4" d="M33.2,86.7c12.3,0,22.3,10,22.3,22.3c0,0.5,0,1.1-0.1,1.8c-0.3,3.5,2.3,6.6,5.8,6.9
-						c3.5,0.3,6.6-2.3,6.9-5.8c0.1-1,0.1-1.9,0.1-2.8c0-19.3-15.7-35.1-35.1-35.1c-0.9,0-1.8,0-2.8,0.1c-1.7,0.1-3.2,0.9-4.3,2.2
-						c-1.1,1.3-1.6,2.9-1.5,4.6c0.1,1.7,0.9,3.2,2.2,4.3c1.3,1.1,2.9,1.6,4.6,1.5C32.1,86.7,32.7,86.7,33.2,86.7z"/>
-				</g>
-			</g>
-		</g>
-	</g>
-	<g>
-		<path class="st1" d="M35.8,130.4c1.1,0.6,2.1,1.5,2.7,2.6c0.7,1.1,1,2.3,1,3.7s-0.3,2.6-1,3.7c-0.7,1.1-1.6,2-2.7,2.6
-			c-1.1,0.6-2.4,1-3.8,1s-2.7-0.3-3.8-1c-1.1-0.6-2.1-1.5-2.7-2.6c-0.7-1.1-1-2.3-1-3.7c0-1.3,0.3-2.6,1-3.7c0.7-1.1,1.6-2,2.7-2.6
-			c1.1-0.6,2.4-0.9,3.8-0.9C33.4,129.5,34.7,129.8,35.8,130.4z M29.9,132.9c-0.7,0.4-1.2,0.9-1.6,1.6s-0.6,1.4-0.6,2.2
-			c0,0.8,0.2,1.6,0.6,2.3c0.4,0.7,0.9,1.2,1.6,1.6c0.7,0.4,1.4,0.6,2.1,0.6c0.8,0,1.5-0.2,2.1-0.6c0.6-0.4,1.2-0.9,1.5-1.6
-			c0.4-0.7,0.6-1.4,0.6-2.3c0-0.8-0.2-1.6-0.6-2.2s-0.9-1.2-1.5-1.6c-0.6-0.4-1.4-0.6-2.1-0.6C31.3,132.3,30.6,132.5,29.9,132.9z"/>
-		<path class="st1" d="M50.6,133.6c0.8,0.5,1.4,1.1,1.8,2c0.4,0.8,0.6,1.8,0.6,2.9c0,1.1-0.2,2-0.6,2.8c-0.4,0.8-1,1.5-1.8,1.9
-			c-0.8,0.5-1.6,0.7-2.6,0.7c-0.7,0-1.4-0.1-2-0.4s-1.1-0.7-1.5-1.2v5.4h-3.1V133h3.1v1.6c0.4-0.5,0.9-1,1.4-1.2s1.2-0.4,2-0.4
-			C48.9,132.9,49.8,133.1,50.6,133.6z M49.1,140.5c0.5-0.6,0.7-1.3,0.7-2.2c0-0.9-0.2-1.6-0.7-2.1c-0.5-0.6-1.1-0.8-1.9-0.8
-			s-1.4,0.3-1.9,0.8c-0.5,0.6-0.8,1.3-0.8,2.1c0,0.9,0.2,1.6,0.8,2.2s1.1,0.8,1.9,0.8S48.6,141,49.1,140.5z"/>
-		<path class="st1" d="M63.4,134.4c0.9,1,1.4,2.4,1.4,4.2c0,0.3,0,0.6,0,0.7H57c0.2,0.7,0.5,1.2,1,1.6c0.5,0.4,1.1,0.6,1.8,0.6
-			c0.5,0,1-0.1,1.5-0.3s0.9-0.5,1.3-0.9l1.6,1.6c-0.5,0.6-1.2,1.1-2,1.4c-0.8,0.3-1.6,0.5-2.6,0.5c-1.1,0-2.1-0.2-3-0.7
-			s-1.5-1.1-2-1.9c-0.5-0.8-0.7-1.8-0.7-2.9c0-1.1,0.2-2.1,0.7-2.9s1.1-1.5,2-1.9c0.8-0.5,1.8-0.7,2.9-0.7
-			C61.2,132.9,62.5,133.4,63.4,134.4z M61.8,137.5c0-0.7-0.3-1.3-0.7-1.7s-1-0.6-1.7-0.6c-0.7,0-1.2,0.2-1.7,0.6
-			c-0.4,0.4-0.7,1-0.9,1.7H61.8z"/>
-		<path class="st1" d="M76.2,134c0.7,0.7,1.1,1.7,1.1,3v6.8h-3.1v-5.9c0-0.7-0.2-1.2-0.6-1.6s-0.9-0.6-1.5-0.6
-			c-0.8,0-1.4,0.3-1.8,0.8c-0.4,0.5-0.7,1.2-0.7,2v5.3h-3.1V133h3.1v1.9c0.7-1.3,2-2,3.7-2C74.6,132.8,75.5,133.2,76.2,134z"/>
-		<path class="st1" d="M96,129.7h3.3l-4.7,14h-3.3l-2.9-10.1l-3,10.1h-3.2l-4.7-14h3.4l3,10.7l3-10.7H90l3.1,10.7L96,129.7z"/>
-		<path class="st1" d="M103.3,128.7c0.3,0.3,0.5,0.7,0.5,1.2s-0.2,0.9-0.5,1.2c-0.3,0.3-0.7,0.5-1.2,0.5c-0.5,0-0.9-0.2-1.2-0.5
-			c-0.3-0.3-0.5-0.7-0.5-1.2c0-0.5,0.2-0.9,0.5-1.2c0.3-0.3,0.7-0.5,1.2-0.5C102.6,128.2,103,128.3,103.3,128.7z M100.6,133h3.1
-			v10.8h-3.1V133z"/>
-		<path class="st1" d="M106.5,129.7h10.1l0,2.6h-6.9v3.4h6.3v2.6h-6.3v5.3h-3.2V129.7z"/>
-		<path class="st1" d="M120.9,128.7c0.3,0.3,0.5,0.7,0.5,1.2s-0.2,0.9-0.5,1.2c-0.3,0.3-0.7,0.5-1.2,0.5c-0.5,0-0.9-0.2-1.2-0.5
-			c-0.3-0.3-0.5-0.7-0.5-1.2c0-0.5,0.2-0.9,0.5-1.2c0.3-0.3,0.7-0.5,1.2-0.5C120.1,128.2,120.5,128.3,120.9,128.7z M118.1,133h3.1
-			v10.8h-3.1V133z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

openapi/owprov.yaml

@@ -1220,54 +1220,11 @@ components:
           items:
             $ref: '#/components/schemas/SubscriberDevice'
 
-    ConfigurationOverride:
-      type: object
-      properties:
-        source:
-          type: string
-        reason:
-          type: string
-        parameterName:
-          type: string
-        parameterType:
-          enum:
-            - string
-            - integer
-            - boolean
-        parameterValue:
-          type: string
-        modified:
-          type: integer
-          format: int64
-
-    ConfigurationOverrideList:
-      type: object
-      properties:
-        serialNumber:
-          type: string
-        managementPolicy:
-          type: string
-          format: uuid
-        overrides:
-          type: array
-          items:
-            $ref: '#/components/schemas/ConfigurationOverride'
-
     #########################################################################################
     ##
     ## These are endpoints that all services in the OPenWiFI stack must provide
     ##
     #########################################################################################
-    ExtraSystemConfiguration:
-      type: array
-      items:
-        type: object
-        properties:
-          parameterName:
-            type: string
-          parameterValue:
-            type: string
-
     AnyPayload:
       type: object
       properties:
@@ -1331,6 +1288,12 @@ components:
             - $ref: '#/components/schemas/StringList'
             - $ref: '#/components/schemas/TagValuePairList'
 
+    SystemCommandResults:
+      type: object
+      oneOf:
+        - $ref: '#/components/schemas/StringList'
+        - $ref: '#/components/schemas/TagValuePairList'
+
     NoteInfo:
       type: object
       properties:
@@ -1370,33 +1333,6 @@ components:
                 type: integer
                 format: int64
 
-    SystemResources:
-      type: object
-      properties:
-        numberOfFileDescriptors:
-          type: integer
-          format: int64
-        currRealMem:
-          type: integer
-          format: int64
-        peakRealMem:
-          type: integer
-          format: int64
-        currVirtMem:
-          type: integer
-          format: int64
-        peakVirtMem:
-          type: integer
-          format: int64
-
-    SystemCommandResults:
-      type: object
-      oneOf:
-        - $ref: '#/components/schemas/SystemResources'
-        - $ref: '#/components/schemas/SystemInfoResults'
-        - $ref: '#/components/schemas/StringList'
-        - $ref: '#/components/schemas/TagValuePairList'
-
     Dashboard:
       type: object
       properties:
@@ -2022,6 +1958,11 @@ paths:
           schema:
             type: boolean
           required: false
+        - in: query
+          name: deviceType
+          schema:
+            type: string
+          required: false
         - in: query
           description: Pagination start (starts at 1. If not specified, 1 is assumed)
           name: offset
@@ -2087,20 +2028,12 @@ paths:
             default: false
           required: false
         - in: query
-          description: return the list of devices for a subscriber
+          description: return the list of devices under RRM
           name: subscriber
           schema:
             type: string
             format: uuid
           required: false
-        - in: query
-          description: return the resolved configuration for a specific device
-          name:   resolveConfig
-          schema:
-            type: boolean
-            default: false
-          required: false
-
       responses:
         200:
           description: Return a list of elements
@@ -2158,13 +2091,6 @@ paths:
             type: string
             format: uuid
           required: false
-        - in: query
-          description: return RRM settings for a specific device
-          name: rrmSettings
-          schema:
-            type: boolean
-            default: false
-          required: false
       responses:
         200:
           description: Succesful retrieve configuratiopn or part of the configuration
@@ -2275,94 +2201,6 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
-  /configurationOverrides/{serialNumber}:
-    get:
-      tags:
-        - Configuration Overrides
-      operationId: getConfigurationOverrides
-      summary: retrieve a list of configuration overrides for a given device
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-      responses:
-        200:
-          description: Return a list of configuration overrides.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ConfigurationOverrideList'
-        400:
-          $ref: '#/components/responses/BadRequest'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-    delete:
-      tags:
-        - Configuration Overrides
-      operationId: deleteConfigurationOverrides
-      summary: delete all configuration overrides for a given device from a given source
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-        - in: query
-          name: source
-          schema:
-            type: string
-          required: true
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
-        400:
-          $ref: '#/components/responses/BadRequest'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-    put:
-      tags:
-        - Configuration Overrides
-      operationId: modifyConfigurationOverrides
-      summary: modify configuration overrides for a given device for a given source
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-        - in: query
-          name: source
-          schema:
-            type: string
-          required: true
-      requestBody:
-        description: Information used to modify the override list
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ConfigurationOverrideList'
-      responses:
-        200:
-          description: Return the modified configuration overrides.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ConfigurationOverrideList'
-        400:
-          $ref: '#/components/responses/BadRequest'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-
-
   /venue:
     get:
       tags:
@@ -2417,6 +2255,12 @@ paths:
             type: string
             example: serial1,serial2,serial3
           required: false
+        - in: query
+          description: only serial numbers of full device details
+          name: serialOnly
+          schema:
+            type: boolean
+          required: false
         - in: query
           description: return the number of devices
           name: countOnly
@@ -2437,14 +2281,6 @@ paths:
             type: boolean
             default: false
           required: false
-        - in: query
-          description: list venues that use a specific RRM vendor
-          name: RRMvendor
-          schema:
-            type: string
-            example:
-              - this is the shortname of the RRM vendor
-          required: false
       responses:
         200:
           description: Return a list of venues.
@@ -2563,17 +2399,6 @@ paths:
             type: boolean
             default: false
           required: false
-        - in: query
-          name: revisionsAvailable
-          schema:
-            type: boolean
-            default: false
-          required: false
-        - in: query
-          name: revision
-          schema:
-            type: string
-          required: false
       requestBody:
         description: Information used to modify the new venue
         content:
@@ -4444,75 +4269,15 @@ paths:
             type: string
             enum:
               - info
-              - extraConfiguration
-              - resources
           required: true
       responses:
         200:
-          $ref: '#/components/schemas/SystemCommandResults'
+          description: Successful command execution
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-  /systemConfiguration:
-    get:
-      tags:
-        - SystemConfiguration
-      summary: Retrieve system configuration items
-      operationId: getSystemConfiguration
-      parameters:
-        - in: query
-          description: Which parameters you want to retrieve
-          name: entries
-          schema:
-            type: string
-            example:
-              - element1
-              - element1,element2,element3
-          required: false
-      responses:
-        200:
-          description: List of configuration elements
           content:
             application/json:
               schema:
-                type: array
+                oneOf:
-                items:
+                  - $ref: '#/components/schemas/SystemInfoResults'
-                  $ref: '#/components/schemas/ExtraSystemConfiguration'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    put:
-      tags:
-        - SystemConfiguration
-      summary: Set some or all system configuration
-      operationId: setSystemConfiguration
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ExtraSystemConfiguration'
-
-      responses:
-        200:
-          $ref: '#/components/schemas/ExtraSystemConfiguration'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    delete:
-      tags:
-        - SystemConfiguration
-      summary: Delete all additional system configuration
-      operationId: deleteSystemConfiguration
-
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:

openapi/rrm_provider.yaml

@@ -1,174 +0,0 @@
-openapi: 3.0.1
-info:
-  title: OpenWiFi RRM Provider Model
-  description: Definitions and APIs to manages an OpenWiFi RRM Providers.
-  version: 1.0.0
-  license:
-    name: BSD3
-    url: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-
-servers:
-  - url: 'https://localhost:16022/api/v1'
-
-security:
-  - bearerAuth: []
-  - ApiKeyAuth: []
-
-components:
-  securitySchemes:
-    ApiKeyAuth:
-      type: apiKey
-      in: header
-      name: X-API-KEY
-    bearerAuth:
-      type: http
-      scheme: bearer
-      bearerFormat: JWT
-
-  responses:
-    NotFound:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/NotFound'
-    Unauthorized:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/Unauthorized'
-    Success:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/Success'
-    BadRequest:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/BadRequest'
-
-  schemas:
-
-    Provider:
-      type: object
-      properties:
-        vendor:
-          description: The name of the vendor for display.
-          type: string
-          minLength: 1
-          maxLength: 128
-        vendorShortname:
-          description: A shortname for the vendor. Only letters and numbers are allowed. This is the name used internally.
-          type: string
-          minLength: 4
-          maxLength: 16
-        version:
-          description: An identifier that will help users identify the version of the RRM module they are using.
-          type: string
-        about:
-          description: A link to the Vendor page for this RRM Module
-          type: string
-
-
-    Algorithm:
-      type: object
-      properties:
-        name:
-          description: A display for this algorithm.
-          type: string
-          minLength: 1
-          maxLength: 128
-        description:
-          description: A description of the algorithm.
-          type: string
-        shortName:
-          description: This is the name used internally.
-          type: string
-          minLength: 4
-          maxLength: 16
-        parameterFormat:
-          description: this is a Regex used to validate the input. If this is empty, no validation will be performed.
-          type: string
-        parameterSamples:
-          description: These samples will be displayed in the UI to the user trying to configure the options
-          type: array
-          items:
-            type: string
-        helper:
-          description: A link to a web page or PDF document explaining the algorithm and its parameters
-          type: string
-
-    Algorithms:
-      description: The list of all algorithms supported by the vendor
-      type: array
-      items:
-        $ref: '#/components/schemas/Algorithm'
-
-paths:
-  /provider:
-    get:
-      tags:
-        - RRM
-      operationId: getProvider
-      summary: Retrieve information about the provider for this RRM Module
-      responses:
-        200:
-          $ref: '#/components/schemas/Provider'
-        400:
-          $ref: '#/components/responses/BadRequest'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-  /algorithms:
-    get:
-      tags:
-        - RRM
-      operationId: getAlgorithms
-      summary: Retrieve a lists of algorithms supported in the module.
-      responses:
-        200:
-          $ref: '#/components/schemas/Algorithms'
-        400:
-          $ref: '#/components/responses/BadRequest'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-  /runRRM:
-    put:
-      tags:
-        - RRM
-      operationId: runRRMNow
-      summary: Run a specific or default RRM algorithm. The UI user or CLI user will have the ability to run an algorithm on demand.
-      parameters:
-        - in: query
-          description:
-          name: venue
-          schema:
-            type: string
-            format: uuid
-          required: true
-        - in: query
-          description: Perform RRM without updating anything. This may be used by an admin to see what RRM would do.
-          name: mock
-          schema:
-            type: boolean
-            default: false
-          required: false
-        - in: query
-          description: Specify the RRM algorithm to use. If omitted, select the default algorithm.
-          schema:
-            type: string
-          required: false
-        - in: query
-          description: Specify the parameters to use with the RRM algorithm to use. If omitted, select the default parameters.
-          schema:
-            type: string
-          required: false
-      responses:
-        200:
-          description: Return the list of actions that were or would be performed.
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  type: string
-        400:
-          $ref: '#/components/responses/BadRequest'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-

owprov.properties

@@ -34,7 +34,6 @@ openwifi.system.uri.private = https://localhost:17005
 openwifi.system.uri.public = https://ucentral.dpaas.arilia.com:16005
 openwifi.system.commandchannel = /tmp/app.owprov
 openwifi.system.uri.ui = owprov-ui.arilia.com
-openwifi.security.restapi.disable = false
 
 firmware.updater.upgrade = false
 firmware.updater.releaseonly = false

owprov.properties.tmpl

@@ -37,11 +37,8 @@ openwifi.system.data = ${SYSTEM_DATA}
 openwifi.system.debug = false
 openwifi.system.uri.private = ${SYSTEM_URI_PRIVATE}
 openwifi.system.uri.public = ${SYSTEM_URI_PUBLIC}
-openwifi.system.commandchannel = /tmp/app.owprov
+openwifi.system.commandchannel = /tmp/app.ucentralfms
 openwifi.system.uri.ui = ${SYSTEM_URI_UI}
-openwifi.security.restapi.disable = ${SECURITY_RESTAPI_DISABLE}
-
-rrm.providers = ${RRM_PROVIDERS}
 
 #############################
 # Generic information for all micro services

src/APConfig.cpp

@@ -5,24 +5,25 @@
 #include "APConfig.h"
 #include "StorageService.h"
 
-#include "Poco/JSON/Parser.h"
-#include "Poco/StringTokenizer.h"
-#include "fmt/format.h"
-
 namespace OpenWifi {
 
-	APConfig::APConfig(const std::string &SerialNumber, const std::string &DeviceType,
+    APConfig::APConfig(const std::string &SerialNumber, const std::string &DeviceType, Poco::Logger &L, bool Explain)
-					   Poco::Logger &L, bool Explain)
+        :   SerialNumber_(SerialNumber),
-		: SerialNumber_(SerialNumber), DeviceType_(DeviceType), Logger_(L), Explain_(Explain) {}
+            DeviceType_(DeviceType),
+            Logger_(L),
+            Explain_(Explain)
+    {
+    }
 
     APConfig::APConfig(const std::string & SerialNumber, Poco::Logger & L)
-		: SerialNumber_(SerialNumber), Logger_(L) {
+        :   SerialNumber_(SerialNumber),
+            Logger_(L)
+    {
         Explain_ = false;
         Sub_ = true;
     }
 
-	bool APConfig::FindRadio(const std::string &Band, const Poco::JSON::Array::Ptr &Arr,
+    bool APConfig::FindRadio(const std::string &Band, const Poco::JSON::Array::Ptr &Arr, Poco::JSON::Object::Ptr & Radio) {
-							 Poco::JSON::Object::Ptr &Radio) {
         for(const auto &i:*Arr) {
             auto R = i.extract<Poco::JSON::Object::Ptr>();
             if(R->has("band") && R->get("band").toString()==Band) {
@@ -33,8 +34,7 @@ namespace OpenWifi {
         return false;
     }
 
-	bool APConfig::RemoveBand(const std::string &Band, const Poco::JSON::Array::Ptr &A_in,
+    bool APConfig::RemoveBand(const std::string &Band, const Poco::JSON::Array::Ptr &A_in,Poco::JSON::Array::Ptr &A_Out) {
-							  Poco::JSON::Array::Ptr &A_Out) {
         for(const auto &i:*A_in) {
             auto R = i.extract<Poco::JSON::Object::Ptr>();
             if(R->has("band") && R->get("band").toString()==Band) {
@@ -45,8 +45,8 @@ namespace OpenWifi {
         return false;
     }
 
-	[[maybe_unused]] static void ShowJSON([[maybe_unused]] const char *S,
+
-										  [[maybe_unused]] const Poco::JSON::Object::Ptr &Obj) {
+    [[maybe_unused ]] static void ShowJSON([[maybe_unused]] const char *S, [[maybe_unused]] const Poco::JSON::Object::Ptr &Obj) {
         /*
         std::stringstream O;
         Poco::JSON::Stringifier::stringify(Obj,O);
@@ -55,8 +55,7 @@ namespace OpenWifi {
          */
     }
 
-	bool APConfig::ReplaceVariablesInObject(const Poco::JSON::Object::Ptr &Original,
+    bool APConfig::ReplaceVariablesInObject( const Poco::JSON::Object::Ptr & Original, Poco::JSON::Object::Ptr & Result) {
-											Poco::JSON::Object::Ptr &Result) {
         // get all the names and expand
         auto Names = Original->getNames();
         for(const auto &i:Names) {
@@ -68,8 +67,7 @@ namespace OpenWifi {
                         if(StorageService()->VariablesDB().GetRecord("id", uuid, VB)) {
                             for(const auto &var:VB.variables) {
                                 Poco::JSON::Parser P;
-								auto VariableBlockInfo =
+                                auto VariableBlockInfo = P.parse(var.value).extract<Poco::JSON::Object::Ptr>();
-									P.parse(var.value).extract<Poco::JSON::Object::Ptr>();
                                 auto VarNames = VariableBlockInfo->getNames();
                                 for(const auto &j:VarNames) {
                                     Result->set(j,VariableBlockInfo->get(j));
@@ -95,8 +93,7 @@ namespace OpenWifi {
         return true;
     }
 
-	bool APConfig::ReplaceVariablesInArray(const Poco::JSON::Array::Ptr &Original,
+    bool APConfig::ReplaceVariablesInArray( const Poco::JSON::Array::Ptr & Original, Poco::JSON::Array::Ptr & ResultArray) {
-										   Poco::JSON::Array::Ptr &ResultArray) {
 
         for(const auto &element:*Original) {
 
@@ -110,8 +107,11 @@ namespace OpenWifi {
                 const auto & Object = element.extract<Poco::JSON::Object::Ptr>();
                 ReplaceVariablesInObject(Object,Expanded);
                 ResultArray->add(Expanded);
-			} else if (element.isString() || element.isNumeric() || element.isBoolean() ||
+            } else if(  element.isString() ||
-					   element.isInteger() || element.isSigned()) {
+                        element.isNumeric() ||
+                        element.isBoolean() ||
+                        element.isInteger() ||
+                        element.isSigned() ) {
                 ResultArray->add(element);
             } else {
                 auto Expanded = Poco::makeShared<Poco::JSON::Object>();
@@ -129,13 +129,9 @@ namespace OpenWifi {
             try {
                 if(!Sub_) {
                     ProvObjects::InventoryTag D;
-					if (StorageService()->InventoryDB().GetRecord("serialNumber", SerialNumber_,
+                    if (StorageService()->InventoryDB().GetRecord("serialNumber", SerialNumber_, D)) {
-																  D)) {
                         if (!D.deviceConfiguration.empty()) {
-							// std::cout << "Adding device specific configuration: " << D.deviceConfiguration.size() << std::endl;
                             AddConfiguration(D.deviceConfiguration);
-						} else {
-							// std::cout << "No device specific configuration." << std::endl;
                         }
                         if (!D.entity.empty()) {
                             AddEntityConfig(D.entity);
@@ -145,8 +141,7 @@ namespace OpenWifi {
                     }
                 } else {
                     ProvObjects::SubscriberDevice D;
-					if (StorageService()->SubscriberDeviceDB().GetRecord("serialNumber",
+                    if (StorageService()->SubscriberDeviceDB().GetRecord("serialNumber", SerialNumber_, D)) {
-																		 SerialNumber_, D)) {
                         if (!D.configuration.empty()) {
                             AddConfiguration(D.configuration);
                         }
@@ -181,8 +176,7 @@ namespace OpenWifi {
                             ReplaceVariablesInArray(OriginalArray, ExpandedArray);
                             Configuration->set(SectionName, ExpandedArray);
                         } else if (O->isObject(SectionName)) {
-							auto OriginalSection =
+                            auto OriginalSection = O->get(SectionName).extract<Poco::JSON::Object::Ptr>();
-								O->get(SectionName).extract<Poco::JSON::Object::Ptr>();
                             if (Explain_) {
                                 Poco::JSON::Object ExObj;
                                 ExObj.set("from-uuid", i.info.id);
@@ -195,7 +189,8 @@ namespace OpenWifi {
                             ReplaceVariablesInObject(OriginalSection, ExpandedSection);
                             Configuration->set(SectionName, ExpandedSection);
                         } else {
-                            poco_warning(Logger(), fmt::format("Unknown config element type: {}",O->get(SectionName).toString()));
+                            std::cout << " --- unknown element type --- " << O->get(SectionName).toString()
+                                      << std::endl;
                         }
                     } else {
                         if (Explain_) {
@@ -210,73 +205,8 @@ namespace OpenWifi {
                     }
                 }
             }
-
-			//  Apply overrides...
-			ProvObjects::ConfigurationOverrideList COL;
-			if (StorageService()->OverridesDB().GetRecord("serialNumber", SerialNumber_, COL)) {
-				for (const auto &col : COL.overrides) {
-					const auto Tokens = Poco::StringTokenizer(col.parameterName, ".");
-					if (Tokens[0] == "radios" && Tokens.count() == 3) {
-						std::uint64_t RadioIndex = std::strtoull(Tokens[1].c_str(), nullptr, 10);
-						if (RadioIndex < MaximumPossibleRadios) {
-							auto RadioArray = Configuration->getArray("radios");
-							if (RadioIndex < RadioArray->size()) {
-								auto IndexedRadio =
-									RadioArray->get(RadioIndex).extract<Poco::JSON::Object::Ptr>();
-								if (Tokens[2] == "tx-power") {
-									IndexedRadio->set(
-										"rx-power",
-										std::strtoull(col.parameterValue.c_str(), nullptr, 10));
-									if (Explain_) {
-										Poco::JSON::Object ExObj;
-										ExObj.set("from-name", "overrides");
-										ExObj.set("override", col.parameterName);
-										ExObj.set("source", col.source);
-										ExObj.set("reason", col.reason);
-										ExObj.set("value", col.parameterValue);
-										Explanation_.add(ExObj);
-									}
-									RadioArray->set(RadioIndex, IndexedRadio);
-									Configuration->set("radios", RadioArray);
-								} else if (Tokens[2] == "channel") {
-									if (col.parameterValue == "auto") {
-										IndexedRadio->set("channel", "auto");
-									} else {
-										IndexedRadio->set(
-											"channel",
-											std::strtoull(col.parameterValue.c_str(), nullptr, 10));
-									}
-									// std::cout << "Setting channel in radio " << RadioIndex << std::endl;
-									if (Explain_) {
-										Poco::JSON::Object ExObj;
-										ExObj.set("from-name", "overrides");
-										ExObj.set("override", col.parameterName);
-										ExObj.set("source", col.source);
-										ExObj.set("reason", col.reason);
-										ExObj.set("value", col.parameterValue);
-										Explanation_.add(ExObj);
-									}
-									RadioArray->set(RadioIndex, IndexedRadio);
-									Configuration->set("radios", RadioArray);
-								} else {
-									poco_error(
-										Logger(),
-										fmt::format("{}: Unsupported override variable name {}",
-													col.parameterName));
-								}
-							}
-						} else {
-							poco_error(Logger(), fmt::format("{}: radio index out of range in {}",
-															 col.parameterName));
-						}
-					} else {
-						poco_error(Logger(),
-								   fmt::format("{}: Unsupported override variable name {}",
-											   col.parameterName));
-					}
-				}
-			}
         } catch (...) {
+
         }
         return !Config_.empty();
     }
@@ -298,8 +228,7 @@ namespace OpenWifi {
                 // we need to insert after everything bigger or equal
                 auto Hint = std::lower_bound(Config_.cbegin(),Config_.cend(),i.weight,
                                              [](const VerboseElement &Elem, uint64_t Value) {
-												 return Elem.element.weight >= Value;
+                                                 return Elem.element.weight>=Value; });
-											 });
                 VerboseElement  VE{ .element = i, .info = ProvObjects::ObjectInfo{}};
                 Config_.insert(Hint,VE);
             }
@@ -325,11 +254,9 @@ namespace OpenWifi {
                             Config_.push_back(VE);
                         } else {
                             // we need to insert after everything bigger or equal
-							auto Hint =
+                            auto Hint = std::lower_bound(Config_.cbegin(),Config_.cend(),i.weight,
-								std::lower_bound(Config_.cbegin(), Config_.cend(), i.weight,
                                                          [](const VerboseElement &Elem, uint64_t Value) {
-													 return Elem.element.weight >= Value;
+                                return Elem.element.weight>=Value; });
-												 });
                             VerboseElement  VE{ .element = i, .info = Config.info};
                             Config_.insert(Hint,VE);
                         }
@@ -342,13 +269,7 @@ namespace OpenWifi {
                     ExObj.set("reason", "deviceType mismatch");
                     Explanation_.add(ExObj);
                 }
-			} else {
-				poco_error(Logger(),
-						   fmt::format("Device configuration for {} is empty.", SerialNumber_));
             }
-		} else {
-			poco_error(Logger(),
-					   fmt::format("Invalid device configuration UUID for {}.", SerialNumber_));
         }
     }
 
@@ -375,4 +296,4 @@ namespace OpenWifi {
         } else {
         }
     }
-} // namespace OpenWifi
+}

src/APConfig.h

@@ -4,14 +4,12 @@
 
 #pragma once
 
+#include <string>
 #include "Poco/Logger.h"
 #include "RESTObjects//RESTAPI_ProvObjects.h"
-#include <string>
 
 namespace OpenWifi {
 
-	constexpr std::uint64_t MaximumPossibleRadios = 6;
-
     struct VerboseElement {
         ProvObjects::DeviceConfigurationElement     element;
         ProvObjects::ObjectInfo                     info;
@@ -20,10 +18,10 @@ namespace OpenWifi {
 
     class APConfig {
         public:
-		explicit APConfig(const std::string &SerialNumber, const std::string &DeviceType,
+            explicit APConfig(const std::string & SerialNumber, const std::string & DeviceType, Poco::Logger & L, bool Explain=false);
-						  Poco::Logger &L, bool Explain = false);
             explicit APConfig(const std::string & SerialNumber, Poco::Logger & L);
 
+
             [[nodiscard]] bool Get(Poco::JSON::Object::Ptr &Configuration);
 
             void AddConfiguration(const std::string &UUID);
@@ -32,7 +30,6 @@ namespace OpenWifi {
             void AddVenueConfig(const std::string &UUID);
             void AddEntityConfig(const std::string &UUID);
             const Poco::JSON::Array & Explanation() { return Explanation_; };
-
         private:
             std::string                 SerialNumber_;
             std::string                 DeviceType_;
@@ -45,18 +42,12 @@ namespace OpenWifi {
             bool                        Sub_=false;
             Poco::Logger & Logger()     { return Logger_;}
 
-		bool ReplaceVariablesInArray(const Poco::JSON::Array::Ptr &O,
+            bool ReplaceVariablesInArray( const Poco::JSON::Array::Ptr & O, Poco::JSON::Array::Ptr & Result);
-									 Poco::JSON::Array::Ptr &Result);
+            bool ReplaceVariablesInObject( const Poco::JSON::Object::Ptr & Original, Poco::JSON::Object::Ptr & Result);
-		bool ReplaceVariablesInObject(const Poco::JSON::Object::Ptr &Original,
-									  Poco::JSON::Object::Ptr &Result);
 
-		bool FindRadio(const std::string &Band, const Poco::JSON::Array::Ptr &Arr,
+            bool FindRadio(const std::string &Band, const Poco::JSON::Array::Ptr &Arr, Poco::JSON::Object::Ptr & Radio);
-					   Poco::JSON::Object::Ptr &Radio);
+            bool mergeArray(const std::string &K, const Poco::JSON::Array::Ptr &A , const Poco::JSON::Array::Ptr &B, Poco::JSON::Array &Arr);
-		bool mergeArray(const std::string &K, const Poco::JSON::Array::Ptr &A,
+            bool merge(const Poco::JSON::Object::Ptr & A, const Poco::JSON::Object::Ptr & B, Poco::JSON::Object::Ptr &C);
-						const Poco::JSON::Array::Ptr &B, Poco::JSON::Array &Arr);
+            bool RemoveBand(const std::string &Band, const Poco::JSON::Array::Ptr &A_in,Poco::JSON::Array::Ptr &A_Out);
-		bool merge(const Poco::JSON::Object::Ptr &A, const Poco::JSON::Object::Ptr &B,
-				   Poco::JSON::Object::Ptr &C);
-		bool RemoveBand(const std::string &Band, const Poco::JSON::Array::Ptr &A_in,
-						Poco::JSON::Array::Ptr &A_Out);
     };
-} // namespace OpenWifi
+}

src/AutoDiscovery.cpp

@@ -3,32 +3,25 @@
 //
 
 #include "AutoDiscovery.h"
-#include "Poco/JSON/Parser.h"
-#include "StorageService.h"
-#include "framework/KafkaManager.h"
-#include "framework/KafkaTopics.h"
 #include "framework/ow_constants.h"
+#include "framework/KafkaTopics.h"
+#include "StorageService.h"
 
 namespace OpenWifi {
 
     int AutoDiscovery::Start() {
-		poco_information(Logger(), "Starting...");
         Running_ = true;
-		Types::TopicNotifyFunction F = [this](const std::string &Key, const std::string &Payload) {
+        Types::TopicNotifyFunction F = [this](const std::string &Key, const std::string &Payload) { this->ConnectionReceived(Key,Payload); };
-			this->ConnectionReceived(Key, Payload);
-		};
         ConnectionWatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::CONNECTION, F);
         Worker_.start(*this);
         return 0;
     };
 
     void AutoDiscovery::Stop() {
-		poco_information(Logger(), "Stopping...");
         Running_ = false;
         KafkaManager()->UnregisterTopicWatcher(KafkaTopics::CONNECTION, ConnectionWatcherId_);
         Queue_.wakeUpAll();
         Worker_.join();
-		poco_information(Logger(), "Stopped...");
     };
 
     void AutoDiscovery::run() {
@@ -45,8 +38,7 @@ namespace OpenWifi {
                         auto PayloadObj = Object->getObject(uCentralProtocol::PAYLOAD);
                         std::string ConnectedIP, SerialNumber, DeviceType;
                         if (PayloadObj->has(uCentralProtocol::CONNECTIONIP))
-							ConnectedIP =
+                            ConnectedIP = PayloadObj->get(uCentralProtocol::CONNECTIONIP).toString();
-								PayloadObj->get(uCentralProtocol::CONNECTIONIP).toString();
                         if (PayloadObj->has(uCentralProtocol::CAPABILITIES)) {
                             auto CapObj = PayloadObj->getObject(uCentralProtocol::CAPABILITIES);
                             if (CapObj->has(uCentralProtocol::COMPATIBLE)) {
@@ -59,12 +51,9 @@ namespace OpenWifi {
                                 PingMessage->has(uCentralProtocol::SERIALNUMBER) &&
                                 PingMessage->has(uCentralProtocol::COMPATIBLE)) {
                                 if (PingMessage->has(uCentralProtocol::CONNECTIONIP))
-									ConnectedIP =
+                                    ConnectedIP = PingMessage->get(uCentralProtocol::CONNECTIONIP).toString();
-										PingMessage->get(uCentralProtocol::CONNECTIONIP).toString();
+                                SerialNumber = PingMessage->get(uCentralProtocol::SERIALNUMBER).toString();
-								SerialNumber =
+                                DeviceType = PingMessage->get(uCentralProtocol::COMPATIBLE).toString();
-									PingMessage->get(uCentralProtocol::SERIALNUMBER).toString();
-								DeviceType =
-									PingMessage->get(uCentralProtocol::COMPATIBLE).toString();
                             }
                         }
                         std::string Locale;
@@ -72,18 +61,19 @@ namespace OpenWifi {
                             Locale = PayloadObj->get("locale").toString();
 
                         if (!SerialNumber.empty()) {
-							StorageService()->InventoryDB().CreateFromConnection(
+                            StorageService()->InventoryDB().CreateFromConnection(SerialNumber, ConnectedIP, DeviceType, Locale);
-								SerialNumber, ConnectedIP, DeviceType, Locale);
                         }
                     }
                 } catch (const Poco::Exception &E) {
                     Logger().log(E);
                 } catch (...) {
+
                 }
             } else {
+
             }
             Note = Queue_.waitDequeueNotification();
         }
     }
 
-} // namespace OpenWifi
+}

src/AutoDiscovery.h

@@ -4,21 +4,18 @@
 
 #pragma once
 
+#include "framework/MicroService.h"
 #include "framework/OpenWifiTypes.h"
-#include "framework/SubSystemServer.h"
-
-#include "Poco/Notification.h"
-#include "Poco/NotificationQueue.h"
 
 namespace OpenWifi {
 
     class DiscoveryMessage : public Poco::Notification {
         public:
-		explicit DiscoveryMessage(const std::string &Key, const std::string &Payload)
+            explicit DiscoveryMessage(const std::string &Key, const std::string &Payload ) :
-			: Key_(Key), Payload_(Payload) {}
+                Key_(Key),
+                Payload_(Payload) {}
             const std::string & Key() { return Key_; }
             const std::string & Payload() { return Payload_; }
-
         private:
             std::string     Key_;
             std::string     Payload_;
@@ -26,6 +23,7 @@ namespace OpenWifi {
 
     class AutoDiscovery : public SubSystemServer, Poco::Runnable {
         public:
+
             static auto instance() {
                 static auto instance_ = new AutoDiscovery;
                 return instance_;
@@ -35,7 +33,7 @@ namespace OpenWifi {
             void Stop() override;
             void ConnectionReceived( const std::string & Key, const std::string & Payload) {
                 std::lock_guard G(Mutex_);
-			poco_trace(Logger(), Poco::format("Device(%s): Connection/Ping message.", Key));
+                poco_debug(Logger(),Poco::format("Device(%s): Connection/Ping message.", Key));
                 Queue_.enqueueNotification( new DiscoveryMessage(Key,Payload));
             }
             void run() override;
@@ -46,10 +44,13 @@ namespace OpenWifi {
             Poco::Thread                            Worker_;
             std::atomic_bool                        Running_=false;
 
-		AutoDiscovery() noexcept
+            AutoDiscovery() noexcept:
-			: SubSystemServer("AutoDiscovery", "AUTO-DISCOVERY", "discovery") {}
+                SubSystemServer("AutoDiscovery", "AUTO-DISCOVERY", "discovery")
+                {
+                }
         };
 
     inline auto AutoDiscovery() { return AutoDiscovery::instance(); }
 
-} // namespace OpenWifi
+}
+

src/ConfigSanityChecker.cpp

@@ -4,8 +4,8 @@
 
 #include "ConfigSanityChecker.h"
 #include "nlohmann/json.hpp"
-#include <iomanip>
 #include <iostream>
+#include <iomanip>
 
 namespace OpenWifi {
 
@@ -20,28 +20,34 @@ namespace OpenWifi {
             }
             return true;
         } catch ( ... ) {
+
         }
         return false;
     }
 
     void ConfigSanityChecker::Check_radios([[maybe_unused]] nlohmann::json &d) {
         std::cout << "Validating radios" << std::endl;
+
     };
 
     void ConfigSanityChecker::Check_interfaces([[maybe_unused]] nlohmann::json &d) {
         std::cout << "Validating interfaces" << std::endl;
+
     };
 
     void ConfigSanityChecker::Check_metrics([[maybe_unused]] nlohmann::json &d) {
         std::cout << "Validating metrics" << std::endl;
+
     };
 
     void ConfigSanityChecker::Check_services([[maybe_unused]] nlohmann::json &d) {
         std::cout << "Validating services" << std::endl;
+
     };
 
     void ConfigSanityChecker::Check_uuid([[maybe_unused]] nlohmann::json &d) {
         std::cout << "Validating uuid" << std::endl;
+
     };
 
-} // namespace OpenWifi
+}

src/ConfigSanityChecker.h

@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "nlohmann/json.hpp"
-#include <functional>
-#include <list>
-#include <map>
 #include <string>
-#include <utility>
+#include <list>
+#include <functional>
+#include <map>
 #include <vector>
+#include <utility>
+#include "nlohmann/json.hpp"
 
 namespace OpenWifi {
     struct SanityError {
@@ -23,8 +23,9 @@ namespace OpenWifi {
 
     class ConfigSanityChecker {
         public:
-		explicit ConfigSanityChecker(std::string Config, std::string DeviceType)
+            explicit ConfigSanityChecker(std::string Config, std::string DeviceType) :
-			: Config_(std::move(Config)), DeviceType_(std::move(DeviceType)) {}
+                Config_(std::move(Config)),
+                DeviceType_(std::move(DeviceType)){}
 
             bool Check();
             const SanityErrorList & Errors() { return Errors_; }
@@ -55,6 +56,7 @@ namespace OpenWifi {
                 std::make_pair("interfaces", [this](nlohmann::json &d){ this->Check_interfaces(d);} ),
                 std::make_pair("metrics", [this](nlohmann::json &d){ this->Check_metrics(d);} ),
                 std::make_pair("services", [this](nlohmann::json &d){ this->Check_services(d);} ),
-			std::make_pair("uuid", [this](nlohmann::json &d) { this->Check_uuid(d); })};
+                std::make_pair("uuid", [this](nlohmann::json &d){ this->Check_uuid(d);} )
                 };
-} // namespace OpenWifi
+    };
+}

src/Daemon.cpp

@@ -6,36 +6,43 @@
 //	Arilia Wireless Inc.
 //
 
-#include "Poco/Environment.h"
-#include "Poco/Net/SSLManager.h"
 #include "Poco/Util/Application.h"
 #include "Poco/Util/Option.h"
+#include "Poco/Environment.h"
 
-#include "AutoDiscovery.h"
 #include "Daemon.h"
+#include "StorageService.h"
+#include "AutoDiscovery.h"
+#include "framework/ConfigurationValidator.h"
+#include "SerialNumberCache.h"
+#include "JobController.h"
+#include "FindCountry.h"
+#include "Signup.h"
 #include "DeviceTypeCache.h"
 #include "FileDownloader.h"
-#include "FindCountry.h"
-#include "JobController.h"
-#include "SerialNumberCache.h"
-#include "Signup.h"
-#include "StorageService.h"
-#include "UI_Prov_WebSocketNotifications.h"
-#include "framework/ConfigurationValidator.h"
-#include "framework/UI_WebSocketClientServer.h"
 
 namespace OpenWifi {
 	class Daemon *Daemon::instance_ = nullptr;
 
 	class Daemon *Daemon::instance() {
 		if (instance_ == nullptr) {
-			instance_ = new Daemon(vDAEMON_PROPERTIES_FILENAME, vDAEMON_ROOT_ENV_VAR,
+			instance_ = new Daemon(vDAEMON_PROPERTIES_FILENAME,
-								   vDAEMON_CONFIG_ENV_VAR, vDAEMON_APP_NAME, vDAEMON_BUS_TIMER,
+								   vDAEMON_ROOT_ENV_VAR,
-								   SubSystemVec{OpenWifi::StorageService(), DeviceTypeCache(),
+								   vDAEMON_CONFIG_ENV_VAR,
-												ConfigurationValidator(), SerialNumberCache(),
+								   vDAEMON_APP_NAME,
-												AutoDiscovery(), JobController(),
+								   vDAEMON_BUS_TIMER,
-												UI_WebSocketClientServer(), FindCountryFromIP(),
+								   SubSystemVec{
-												Signup(), FileDownloader()});
+									   OpenWifi::StorageService(),
+                                       DeviceTypeCache(),
+									   ConfigurationValidator(),
+									   SerialNumberCache(),
+									   AutoDiscovery(),
+									   JobController(),
+									   WebSocketClientServer(),
+                                       FindCountryFromIP(),
+                                       Signup(),
+                                       FileDownloader()
+								   });
 		}
 		return instance_;
 	}
@@ -63,34 +70,20 @@ namespace OpenWifi {
             }
         }
     }
-
-	void DaemonPostInitialization(Poco::Util::Application &self) {
-		Daemon()->PostInitialization(self);
-		ProvWebSocketNotifications::Register();
 }
 
-} // namespace OpenWifi
-
 int main(int argc, char **argv) {
-	int ExitCode;
 	try {
-		Poco::Net::SSLManager::instance().initializeServer(nullptr, nullptr, nullptr);
 		auto App = OpenWifi::Daemon::instance();
-		ExitCode = App->run(argc, argv);
+		auto ExitCode =  App->run(argc, argv);
-		Poco::Net::SSLManager::instance().shutdown();
+		delete App;
-	} catch (Poco::Exception &exc) {
-		ExitCode = Poco::Util::Application::EXIT_SOFTWARE;
-		std::cout << exc.displayText() << std::endl;
-	} catch (std::exception &exc) {
-		ExitCode = Poco::Util::Application::EXIT_TEMPFAIL;
-		std::cout << exc.what() << std::endl;
-	} catch (...) {
-		ExitCode = Poco::Util::Application::EXIT_TEMPFAIL;
-		std::cout << "Exception on closure" << std::endl;
-	}
 
-	std::cout << "Exitcode: " << ExitCode << std::endl;
 		return ExitCode;
+
+	} catch (Poco::Exception &exc) {
+		std::cerr << exc.displayText() << std::endl;
+		return Poco::Util::Application::EXIT_SOFTWARE;
+	}
 }
 
 // end of namespace

src/Daemon.h

@@ -9,17 +9,16 @@
 #pragma once
 
 #include <array>
-#include <cstdlib>
 #include <iostream>
-#include <set>
+#include <cstdlib>
 #include <vector>
+#include <set>
 
 #include "Dashboard.h"
-#include "ProvWebSocketClient.h"
-#include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "framework/MicroService.h"
-#include "framework/MicroServiceNames.h"
 #include "framework/OpenWifiTypes.h"
+#include "RESTObjects/RESTAPI_ProvObjects.h"
+#include "ProvWebSocketClient.h"
 
 namespace OpenWifi {
 
@@ -31,10 +30,13 @@ namespace OpenWifi {
 
     class Daemon : public MicroService {
 		public:
-		explicit Daemon(const std::string &PropFile, const std::string &RootEnv,
+			explicit Daemon(const std::string & PropFile,
-						const std::string &ConfigEnv, const std::string &AppName, uint64_t BusTimer,
+							const std::string & RootEnv,
-						const SubSystemVec &SubSystems)
+							const std::string & ConfigEnv,
-			: MicroService(PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems){};
+							const std::string & AppName,
+						  	uint64_t 	BusTimer,
+							const SubSystemVec & SubSystems) :
+				MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};
 
 			static Daemon *instance();
 			inline OpenWifi::ProvisioningDashboard & GetDashboard() { return DB_; }
@@ -52,5 +54,8 @@ namespace OpenWifi {
     };
 
 	inline Daemon * Daemon() { return Daemon::instance(); }
-	void DaemonPostInitialization(Poco::Util::Application &self);
+    inline void DaemonPostInitialization(Poco::Util::Application &self) {
-} // namespace OpenWifi
+        Daemon()->PostInitialization(self);
+    }
+}
+

src/Dashboard.cpp

@@ -6,15 +6,15 @@
 //	Arilia Wireless Inc.
 //
 #include "Dashboard.h"
-#include "framework/utils.h"
+#include "StorageService.h"
 
 namespace OpenWifi {
 	void ProvisioningDashboard::Create() {
-		uint64_t Now = Utils::Now();
+		uint64_t Now = OpenWifi::Now();
 		if(LastRun_==0 || (Now-LastRun_)>120) {
 			DB_.reset();
 			//  Todo: call dashboard creation code.
 			LastRun_ = Now;
 		}
 	}
-} // namespace OpenWifi
+}

src/Dashboard.h

@@ -8,21 +8,17 @@
 
 #pragma once
 
-#include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "framework/OpenWifiTypes.h"
+#include "RESTObjects/RESTAPI_ProvObjects.h"
 
 namespace OpenWifi {
 	class ProvisioningDashboard {
 	  public:
 			void Create();
 			[[nodiscard]] const ProvObjects::Report & Report() const { return DB_;}
-		inline void Reset() {
+			inline void Reset() { LastRun_=0; DB_.reset(); }
-			LastRun_ = 0;
-			DB_.reset();
-		}
-
 	  private:
 	        ProvObjects::Report  	DB_{};
 			uint64_t 				LastRun_=0;
 	};
-} // namespace OpenWifi
+}

src/DeviceTypeCache.h

@@ -6,11 +6,7 @@
 
 #include <set>
 
-#include "framework/AppServiceRegistry.h"
+#include "framework/MicroService.h"
-#include "framework/MicroServiceNames.h"
-#include "framework/OpenAPIRequests.h"
-#include "framework/SubSystemServer.h"
-
 #include "Poco/Timer.h"
 
 namespace OpenWifi {
@@ -24,23 +20,23 @@ namespace OpenWifi {
 
         inline int Start() final {
             InitializeCache();
-			TimerCallback_ = std::make_unique<Poco::TimerCallback<DeviceTypeCache>>(
+            TimerCallback_ = std::make_unique<Poco::TimerCallback<DeviceTypeCache>>(*this,&DeviceTypeCache::onTimer);
-				*this, &DeviceTypeCache::onTimer);
             Timer_.setStartInterval( 60 * 1000);            // first run in 60 seconds
             Timer_.setPeriodicInterval(1 * 60 * 60 * 1000); // 1 hours
             Timer_.start(*TimerCallback_);
             return 0;
         }
 
-		inline void Stop() final { Timer_.stop(); }
+        inline void Stop() final {
+            Timer_.stop();
+        }
 
-		inline void onTimer([[maybe_unused]] Poco::Timer &timer) { UpdateDeviceTypes(); }
+        inline void onTimer([[maybe_unused]] Poco::Timer & timer) {
+            UpdateDeviceTypes();
+        }
 
-		inline bool IsAcceptableDeviceType(const std::string &D) const {
+        inline bool IsAcceptableDeviceType(const std::string &D) const { return (DeviceTypes_.find(D)!=DeviceTypes_.end());};
-			return (DeviceTypes_.find(D) != DeviceTypes_.end());
+        inline bool AreAcceptableDeviceTypes(const Types::StringVec &S, bool WildCardAllowed=true) const {
-		};
-		inline bool AreAcceptableDeviceTypes(const Types::StringVec &S,
-											 bool WildCardAllowed = true) const {
             for(const auto &i:S) {
                 if(WildCardAllowed && i=="*") {
                     //   We allow wildcards
@@ -56,8 +52,10 @@ namespace OpenWifi {
         std::set<std::string>                                   DeviceTypes_;
         std::unique_ptr<Poco::TimerCallback<DeviceTypeCache>>   TimerCallback_;
 
-		inline DeviceTypeCache() noexcept
+        inline DeviceTypeCache() noexcept:
-			: SubSystemServer("DeviceTypes", "DEV-TYPES", "devicetypes") {}
+                SubSystemServer("DeviceTypes", "DEV-TYPES", "devicetypes")
+        {
+        }
 
         inline void InitializeCache() {
             std::lock_guard G(Mutex_);
@@ -72,6 +70,7 @@ namespace OpenWifi {
                         DeviceTypes_.insert(i.toString());
                     }
                 } catch (...) {
+
                 }
             }
         }
@@ -81,7 +80,10 @@ namespace OpenWifi {
                 Types::StringPairVec QueryData;
 
                 QueryData.push_back(std::make_pair("deviceSet","true"));
-				OpenAPIRequestGet Req(uSERVICE_FIRMWARE, "/api/v1/firmwares", QueryData, 10000);
+                OpenAPIRequestGet	Req(    uSERVICE_FIRMWARE,
+                                             "/api/v1/firmwares",
+                                             QueryData,
+                                             10000);
 
                 auto Response = Poco::makeShared<Poco::JSON::Object>();
                 auto StatusCode = Req.Do(Response);
@@ -121,4 +123,4 @@ namespace OpenWifi {
 
     inline auto DeviceTypeCache() { return DeviceTypeCache::instance(); }
 
-} // namespace OpenWifi
+}

src/FileDownloader.cpp

@@ -7,9 +7,7 @@
 
 namespace OpenWifi {
     int FileDownloader::Start() {
-		poco_information(Logger(), "Starting...");
+        TimerCallback_ = std::make_unique<Poco::TimerCallback<FileDownloader>>(*this,&FileDownloader::onTimer);
-		TimerCallback_ =
-			std::make_unique<Poco::TimerCallback<FileDownloader>>(*this, &FileDownloader::onTimer);
         Timer_.setStartInterval( 20 * 1000);  // first run in 20 seconds
         Timer_.setPeriodicInterval(2 * 60 * 60 * 1000); // 1 hours
         Timer_.start(*TimerCallback_);
@@ -17,16 +15,16 @@ namespace OpenWifi {
     }
 
     void FileDownloader::Stop() {
-		poco_information(Logger(), "Stopping...");
         Timer_.stop();
-		poco_information(Logger(), "Stopped...");
+        Logger().notice("Stopping.");
     }
 
     void FileDownloader::onTimer([[maybe_unused]] Poco::Timer &timer) {
-		const static std::vector<std::pair<std::string, std::string>> Files{
+        const static std::vector<std::pair<std::string,std::string>> Files
-			{"https://raw.githubusercontent.com/blogic/ucentral-schema/main/ucentral.schema.json",
+            {
-			 "ucentral.schema.json"},
+                {"https://raw.githubusercontent.com/blogic/ucentral-schema/main/ucentral.schema.json", "ucentral.schema.json" },
-			{"https://ucentral.io/ucentral.schema.pretty.json", "ucentral.schema.pretty.json"}};
+                {"https://ucentral.io/ucentral.schema.pretty.json", "ucentral.schema.pretty.json" }
+            };
 
         Utils::SetThreadName("file-dmnldr");
 
@@ -44,4 +42,4 @@ namespace OpenWifi {
             }
         }
     }
-} // namespace OpenWifi
+}

src/FileDownloader.h

@@ -3,13 +3,14 @@
 //
 
 #pragma once
+#include "framework/MicroService.h"
 #include "Poco/Timer.h"
-#include "framework/SubSystemServer.h"
 
 namespace OpenWifi {
 
     class FileDownloader : public SubSystemServer {
     public:
+
         static auto instance() {
             static auto instance_ = new FileDownloader;
             return instance_;
@@ -24,9 +25,10 @@ namespace OpenWifi {
         std::unique_ptr<Poco::TimerCallback<FileDownloader>>       TimerCallback_;
         std::atomic_bool Running_ = false;
 
-		FileDownloader() noexcept
+        FileDownloader() noexcept:
-			: SubSystemServer("FileDownloader", "FILE-DOWNLOADER", "downloader") {}
+                SubSystemServer("FileDownloader", "FILE-DOWNLOADER", "downloader") {
+        }
     };
 
     inline auto FileDownloader() { return FileDownloader::instance(); }
-} // namespace OpenWifi
+}

src/FindCountry.h

@@ -4,11 +4,8 @@
 
 #pragma once
 
+#include "framework/MicroService.h"
 #include "Poco/Net/IPAddress.h"
-
-#include "framework/MicroServiceFuncs.h"
-#include "framework/SubSystemServer.h"
-
 #include "nlohmann/json.hpp"
 
 namespace OpenWifi {
@@ -18,14 +15,15 @@ namespace OpenWifi {
 		virtual bool Init() = 0 ;
 		virtual Poco::URI URI(const std::string & IPAddress) = 0;
 		virtual std::string Country( const std::string & Response ) = 0 ;
-		virtual ~IPToCountryProvider(){};
+		virtual ~IPToCountryProvider() {
+		};
 	};
 
 	class IPInfo : public IPToCountryProvider {
 	  public:
 		static std::string Name() { return "ipinfo"; }
 		inline bool Init() override {
-			Key_ = MicroServiceConfigGetString("iptocountry.ipinfo.token", "");
+			Key_ = MicroService::instance().ConfigGetString("iptocountry.ipinfo.token", "");
 			return !Key_.empty();
 		}
 
@@ -43,19 +41,21 @@ namespace OpenWifi {
 					return IPInfo["country"];
 				}
 			} catch (...) {
+
 			}
 			return "";
 		}
 
 	  private:
 		std::string Key_;
+
 	};
 
 	class IPData : public IPToCountryProvider {
 	  public:
 		static std::string Name() { return "ipdata"; }
 		inline bool Init() override {
-			Key_ = MicroServiceConfigGetString("iptocountry.ipdata.apikey", "");
+			Key_ = MicroService::instance().ConfigGetString("iptocountry.ipdata.apikey", "");
 			return !Key_.empty();
 		}
 
@@ -73,10 +73,10 @@ namespace OpenWifi {
 					return IPInfo["country_code"];
 				}
 			} catch (...) {
+
 			}
 			return "";
 		}
-
 	  private:
 		std::string Key_;
 	};
@@ -85,7 +85,7 @@ namespace OpenWifi {
 	  public:
 		static std::string Name() { return "ip2location"; }
 		inline bool Init() override {
-			Key_ = MicroServiceConfigGetString("iptocountry.ip2location.apikey", "");
+			Key_ = MicroService::instance().ConfigGetString("iptocountry.ip2location.apikey", "");
 			return !Key_.empty();
 		}
 
@@ -105,10 +105,10 @@ namespace OpenWifi {
 					return IPInfo["country_code"];
 				}
 			} catch (...) {
+
 			}
 			return "";
 		}
-
 	  private:
 		std::string Key_;
 	};
@@ -133,27 +133,24 @@ namespace OpenWifi {
 		}
 
 		inline int Start() final {
-			poco_notice(Logger(), "Starting...");
+			ProviderName_ = MicroService::instance().ConfigGetString("iptocountry.provider","");
-			ProviderName_ = MicroServiceConfigGetString("iptocountry.provider", "");
 			if(!ProviderName_.empty()) {
-				Provider_ = IPLocationProvider<IPToCountryProvider, IPInfo, IPData, IP2Location>(
+				Provider_ = IPLocationProvider<IPToCountryProvider, IPInfo, IPData, IP2Location>(ProviderName_);
-					ProviderName_);
 				if(Provider_!= nullptr) {
 					Enabled_ = Provider_->Init();
 				}
 			}
-			Default_ = MicroServiceConfigGetString("iptocountry.default", "US");
+			Default_ = MicroService::instance().ConfigGetString("iptocountry.default", "US");
 			return 0;
 		}
 
 		inline void Stop() final {
-			poco_notice(Logger(), "Stopping...");
-			//	Nothing to do - just to provide the same look at the others.
-			poco_notice(Logger(), "Stopped...");
 		}
 
-		[[nodiscard]] static inline std::string ReformatAddress(const std::string &I) {
+		[[nodiscard]] static inline std::string ReformatAddress(const std::string & I )
-			if (I.substr(0, 7) == "::ffff:") {
+		{
+			if(I.substr(0,7) == "::ffff:")
+			{
 				std::string ip = I.substr(7 );
 				return ip;
 			}
@@ -190,9 +187,12 @@ namespace OpenWifi {
 		std::unique_ptr<IPToCountryProvider>	Provider_;
 		std::string 							ProviderName_;
 
-		FindCountryFromIP() noexcept : SubSystemServer("IpToCountry", "IPTOC-SVR", "iptocountry") {}
+		FindCountryFromIP() noexcept:
+			SubSystemServer("IpToCountry", "IPTOC-SVR", "iptocountry")
+		{
+		}
 	};
 
 	inline auto FindCountryFromIP() { return FindCountryFromIP::instance(); }
 
-} // namespace OpenWifi
+}

src/JobController.cpp

@@ -3,16 +3,15 @@
 //
 
 #include "JobController.h"
-#include "fmt/format.h"
-#include "framework/utils.h"
 
 namespace OpenWifi {
 
     void RegisterJobTypes();
 
     int JobController::Start() {
-		poco_information(Logger(), "Starting...");
+
         RegisterJobTypes();
+
         if(!Running_)
             Thr_.start(*this);
 
@@ -21,10 +20,8 @@ namespace OpenWifi {
 
     void JobController::Stop() {
         if(Running_) {
-			poco_information(Logger(), "Stopping...");
             Running_ = false;
             Thr_.join();
-			poco_information(Logger(), "Stopped...");
         }
     }
 
@@ -39,21 +36,17 @@ namespace OpenWifi {
             for(auto &current_job:jobs_) {
                 if(current_job!=nullptr) {
                     if(current_job->Started()==0 && Pool_.used()<Pool_.available()) {
-						poco_information(current_job->Logger(),
+                        current_job->Logger().information(fmt::format("Starting {}: {}",current_job->JobId(),current_job->Name()));
-										 fmt::format("Starting {}: {}", current_job->JobId(),
-													 current_job->Name()));
                         current_job->Start();
                         Pool_.start(*current_job);
                     }
                 }
             }
 
-			for (auto it = jobs_.begin(); it != jobs_.end();) {
+            for(auto it = jobs_.begin(); it!=jobs_.end();) {\
                 auto current_job = *it;
                 if(current_job!=nullptr && current_job->Completed()!=0) {
-					poco_information(
+                    current_job->Logger().information(fmt::format("Completed {}: {}",current_job->JobId(),current_job->Name()));
-						current_job->Logger(),
-						fmt::format("Completed {}: {}", current_job->JobId(), current_job->Name()));
                     it = jobs_.erase(it);
                     delete current_job;
                 } else {
@@ -62,4 +55,4 @@ namespace OpenWifi {
             }
         }
     }
-} // namespace OpenWifi
+}

src/JobController.h

@@ -4,23 +4,24 @@
 
 #pragma once
 
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
+#include <vector>
-#include "framework/SubSystemServer.h"
+#include <utility>
-#include "framework/utils.h"
 #include <functional>
 #include <list>
-#include <utility>
+#include "framework/MicroService.h"
-#include <vector>
 
 namespace OpenWifi {
 
     class Job : public Poco::Runnable {
     public:
-		Job(const std::string &JobID, const std::string &name,
+        Job(const std::string &JobID, const std::string &name, const std::vector<std::string> & parameters, uint64_t when, const SecurityObjects::UserInfo &UI, Poco::Logger &L) :
-			const std::vector<std::string> &parameters, uint64_t when,
+            jobId_(JobID),
-			const SecurityObjects::UserInfo &UI, Poco::Logger &L)
+            name_(name),
-			: jobId_(JobID), name_(name), parameters_(parameters), when_(when), userinfo_(UI),
+            parameters_(parameters),
-			  Logger_(L){};
+            when_(when),
+            userinfo_(UI),
+            Logger_(L)
+        {};
 
         virtual void run() = 0;
         [[nodiscard]] std::string Name() const { return name_; }
@@ -29,10 +30,10 @@ namespace OpenWifi {
         const std::string & JobId() const { return jobId_; }
         const std::string & Parameter(int x) const { return parameters_[x];}
         uint64_t When() const { return when_; }
-		void Start() { started_ = Utils::Now(); }
+        void Start() { started_ = OpenWifi::Now(); }
         uint64_t Started() const { return started_; }
         uint64_t Completed() const { return completed_;}
-		void Complete() { completed_ = Utils::Now(); }
+        void Complete() { completed_ = OpenWifi::Now(); }
 
     private:
         std::string                 jobId_;
@@ -68,8 +69,12 @@ namespace OpenWifi {
             std::list<Job *>                    jobs_;
             Poco::ThreadPool                    Pool_;
 
-		JobController() noexcept : SubSystemServer("JobController", "JOB-SVR", "job") {}
+        JobController() noexcept:
+            SubSystemServer("JobController", "JOB-SVR", "job")
+            {
+            }
     };
     inline auto JobController() { return JobController::instance(); }
 
-} // namespace OpenWifi
+}
+

src/JobRegistrations.cpp

@@ -4,6 +4,8 @@
 
 namespace OpenWifi {
 
-	void RegisterJobTypes() {}
+    void RegisterJobTypes() {
 
-} // namespace OpenWifi
+    }
+
+}

src/Kafka_ProvUpdater.h

@@ -4,16 +4,16 @@
 
 #pragma once
 
+#include "framework/MicroService.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
-#include "framework/KafkaManager.h"
-#include "framework/KafkaTopics.h"
 
 namespace OpenWifi {
 
-	enum ProvisioningOperation { creation = 0, modification, removal };
+    enum ProvisioningOperation {
+        creation=0, modification, removal
+    };
 
-	template <typename ObjectType>
+    template <typename ObjectType> inline bool UpdateKafkaProvisioningObject( ProvisioningOperation op, const ObjectType & obj) {
-	inline bool UpdateKafkaProvisioningObject(ProvisioningOperation op, const ObjectType &obj) {
         static std::vector<std::string> Ops{ "creation", "modification", "removal" };
 
         std::string OT{"object"};
@@ -41,8 +41,8 @@ namespace OpenWifi {
         Payload.set("ObjectType",OT);
         std::ostringstream OS;
         Payload.stringify(OS);
-		KafkaManager()->PostMessage(KafkaTopics::PROVISIONING_CHANGE, Ops[op], std::make_shared<std::string>(OS.str()));
+        KafkaManager()->PostMessage(KafkaTopics::PROVISIONING_CHANGE, Ops[op] , OS.str());
 
         return true;
     }
-} // namespace OpenWifi
+}

src/ProvWebSocketClient.cpp

@@ -4,26 +4,25 @@
 
 #include "ProvWebSocketClient.h"
 
-#include "SerialNumberCache.h"
 #include "StorageService.h"
-#include "framework/UI_WebSocketClientServer.h"
+#include "SerialNumberCache.h"
 #include "sdks/SDK_sec.h"
 
 namespace OpenWifi {
 
-	ProvWebSocketClient::ProvWebSocketClient(Poco::Logger &Logger) : Logger_(Logger) {
+    ProvWebSocketClient::ProvWebSocketClient(Poco::Logger &Logger) :
-		UI_WebSocketClientServer()->SetProcessor(this);
+            Logger_(Logger){
+        WebSocketClientServer()->SetProcessor(this);
     }
 
     ProvWebSocketClient::~ProvWebSocketClient() {
-		UI_WebSocketClientServer()->SetProcessor(nullptr);
+        WebSocketClientServer()->SetProcessor(nullptr);
     }
 
     void ProvWebSocketClient::ws_command_serial_number_search(const Poco::JSON::Object::Ptr &O,
                                                               bool &Done, std::string &Answer) {
         Done = false;
-		auto Prefix = ORM::Escape(O->get("serial_prefix").toString());
+        auto Prefix = O->get("serial_prefix").toString();
-		Poco::toLowerInPlace(Prefix);
         Logger().information(Poco::format("serial_number_search: %s", Prefix));
         if (!Prefix.empty() && Prefix.length() < 13) {
             std::vector<uint64_t> Numbers;
@@ -39,29 +38,25 @@ namespace OpenWifi {
         }
     }
 
-	void ProvWebSocketClient::ws_command_address_completion(const Poco::JSON::Object::Ptr &O,
+    void ProvWebSocketClient::ws_command_address_completion(const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer) {
-															bool &Done, std::string &Answer) {
         Done = false;
         auto Address = O->get("address").toString();
         Answer = GoogleGeoCodeCall(Address);
     }
 
-	void ProvWebSocketClient::ws_command_exit([[maybe_unused]] const Poco::JSON::Object::Ptr &O,
+    void ProvWebSocketClient::ws_command_exit([[maybe_unused]] const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer) {
-											  bool &Done, std::string &Answer) {
         Done = true;
         Answer = R"lit({ "closing" : "Goodbye! Aurevoir! Hasta la vista!" })lit";
     }
 
-	void ProvWebSocketClient::ws_command_invalid([[maybe_unused]] const Poco::JSON::Object::Ptr &O,
+    void ProvWebSocketClient::ws_command_invalid([[maybe_unused]] const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer) {
-												 bool &Done, std::string &Answer) {
         Done = false;
         Answer = std::string{R"lit({ "error" : "invalid command" })lit"};
     }
 
-	void ProvWebSocketClient::ws_command_subuser_search(const Poco::JSON::Object::Ptr &O,
+    void ProvWebSocketClient::ws_command_subuser_search( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer) {
-														bool &Done, std::string &Answer) {
         Done = false;
-		auto operatorId = ORM::Escape(O->get("operatorId").toString());
+        auto operatorId = O->get("operatorId").toString();
         std::string nameSearch, emailSearch;
         OpenWifi::RESTAPIHandler::AssignIfPresent(O,"nameSearch",nameSearch);
         OpenWifi::RESTAPIHandler::AssignIfPresent(O,"emailSearch",emailSearch);
@@ -84,22 +79,17 @@ namespace OpenWifi {
         Answer = SS.str();
     }
 
-	void ProvWebSocketClient::ws_command_subdevice_search(const Poco::JSON::Object::Ptr &O,
+    void ProvWebSocketClient::ws_command_subdevice_search( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer) {
-														  bool &Done, std::string &Answer) {
         Done = false;
         auto operatorId = O->get("operatorId").toString();
         auto Prefix = O->get("serial_prefix").toString();
-		Poco::toLowerInPlace(Prefix);
         std::string Query;
 
         if(Prefix[0]=='*') {
-			Query = fmt::format(" operatorId='{}' and (right(serialNumber,{})='{}' or "
+            Query = fmt::format(" operatorId='{}' and (right(serialNumber,{})='{}' or right(realMacAddress,{})='{}' ) ",
-								"right(realMacAddress,{})='{}' ) ",
+                                operatorId, Prefix.size()-1, Prefix.substr(1), Prefix.size()-1, Prefix.substr(1));
-								operatorId, Prefix.size() - 1, Prefix.substr(1), Prefix.size() - 1,
-								Prefix.substr(1));
         } else {
-			Query = fmt::format(" operatorId='{}' and (left(serialNumber,{})='{}'  or "
+            Query = fmt::format(" operatorId='{}' and (left(serialNumber,{})='{}'  or left(realMacAddress,{})='{}' ) ",
-								"left(realMacAddress,{})='{}' ) ",
                                 operatorId, Prefix.size(), Prefix, Prefix.size(), Prefix);
         }
 
@@ -117,10 +107,7 @@ namespace OpenWifi {
         Answer = SS.str();
     }
 
-	void
+    void ProvWebSocketClient::Processor(const Poco::JSON::Object::Ptr &O, std::string &Result, bool &Done ) {
-	ProvWebSocketClient::Processor(const Poco::JSON::Object::Ptr &O, std::string &Result,
-								   bool &Done,
-								   [[maybe_unused]] const SecurityObjects::UserInfo &UserInfo) {
         try {
             if (O->has("command") && O->has("id")) {
                 auto id = (uint64_t) O->get("id");
@@ -128,15 +115,11 @@ namespace OpenWifi {
                 auto Command = O->get("command").toString();
                 if (Command == "serial_number_search" && O->has("serial_prefix")) {
                     ws_command_serial_number_search(O,Done,Answer);
-				} else if (UI_WebSocketClientServer()->GeoCodeEnabled() &&
+                } else if (WebSocketClientServer()->GeoCodeEnabled() && Command == "address_completion" && O->has("address")) {
-						   Command == "address_completion" && O->has("address")) {
                     ws_command_address_completion(O,Done,Answer);
-				} else if (UI_WebSocketClientServer()->GeoCodeEnabled() &&
+                } else if (WebSocketClientServer()->GeoCodeEnabled() && Command == "subuser_search" && O->has("operatorId")) {
-						   Command == "subuser_search" && O->has("operatorId")) {
                     ws_command_subuser_search(O,Done,Answer);
-				} else if (UI_WebSocketClientServer()->GeoCodeEnabled() &&
+                } else if (WebSocketClientServer()->GeoCodeEnabled() && Command == "subdevice_search" && O->has("operatorId") && O->has("serial_prefix")) {
-						   Command == "subdevice_search" && O->has("operatorId") &&
-						   O->has("serial_prefix")) {
                     ws_command_subdevice_search(O,Done,Answer);
                 } else if (Command=="exit") {
                     ws_command_exit(O,Done,Answer);
@@ -144,8 +127,7 @@ namespace OpenWifi {
                     ws_command_invalid(O,Done,Answer);
                 }
 
-				Result = fmt::format("{{ \"command_response_id\" : {} , \"response\" : {}  }}", id,
+                Result = fmt::format("{{ \"command_response_id\" : {} , \"response\" : {}  }}" , id, Answer);
-									 Answer);
             }
         } catch (const Poco::Exception &E) {
             Logger().log(E);
@@ -158,11 +140,10 @@ namespace OpenWifi {
             Poco::URI   uri(URI);
 
             uri.addQueryParameter("address",A);
-			uri.addQueryParameter("key", UI_WebSocketClientServer()->GoogleApiKey());
+            uri.addQueryParameter("key", WebSocketClientServer()->GoogleApiKey());
 
             Poco::Net::HTTPSClientSession session(uri.getHost(), uri.getPort());
-			Poco::Net::HTTPRequest req(Poco::Net::HTTPRequest::HTTP_GET, uri.getPathAndQuery(),
+            Poco::Net::HTTPRequest req(Poco::Net::HTTPRequest::HTTP_GET, uri.getPathAndQuery(), Poco::Net::HTTPMessage::HTTP_1_1);
-									   Poco::Net::HTTPMessage::HTTP_1_1);
             session.sendRequest(req);
             Poco::Net::HTTPResponse res;
             std::istream& rs = session.receiveResponse(res);
@@ -176,8 +157,9 @@ namespace OpenWifi {
                 return R"lit({ "error: )lit" + os.str() + R"lit( })lit";
             }
         } catch(...) {
+
         }
         return "{ \"error\" : \"No call made\" }";
     }
 
-} // namespace OpenWifi
+}

src/ProvWebSocketClient.h

@@ -4,31 +4,25 @@
 
 #pragma once
 
-#include "framework/UI_WebSocketClientServer.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
-	class ProvWebSocketClient : public UI_WebSocketClientProcessor {
+    class ProvWebSocketClient : public WebSocketClientProcessor {
     public:
         explicit ProvWebSocketClient(Poco::Logger &Logger);
         virtual ~ProvWebSocketClient();
-		virtual void Processor(const Poco::JSON::Object::Ptr &O, std::string &Answer, bool &Done,
+        virtual void Processor(const Poco::JSON::Object::Ptr &O, std::string &Answer, bool &Done );
-							   const SecurityObjects::UserInfo &UserInfo);
+        void ws_command_serial_number_search( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
-		void ws_command_serial_number_search(const Poco::JSON::Object::Ptr &O, bool &Done,
+        void ws_command_address_completion( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
-											 std::string &Answer);
-		void ws_command_address_completion(const Poco::JSON::Object::Ptr &O, bool &Done,
-										   std::string &Answer);
         void ws_command_exit( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
         void ws_command_invalid( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
-		void ws_command_subuser_search(const Poco::JSON::Object::Ptr &O, bool &Done,
+        void ws_command_subuser_search( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
-									   std::string &Answer);
+        void ws_command_subdevice_search( const Poco::JSON::Object::Ptr &O, bool &Done, std::string &Answer);
-		void ws_command_subdevice_search(const Poco::JSON::Object::Ptr &O, bool &Done,
-										 std::string &Answer);
         std::string GoogleGeoCodeCall(const std::string &A);
-
     private:
         Poco::Logger & Logger_;
         inline Poco::Logger & Logger() { return Logger_; }
     };
 
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_asset_server.cpp

@@ -3,9 +3,9 @@
 //
 
 #include "RESTAPI_asset_server.h"
-#include "Daemon.h"
 #include "Poco/File.h"
 #include "framework/ow_constants.h"
+#include "Daemon.h"
 
 namespace OpenWifi {
     void RESTAPI_asset_server::DoGet() {
@@ -18,4 +18,4 @@ namespace OpenWifi {
         }
         SendFile(AssetFile);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_asset_server.h

@@ -3,19 +3,21 @@
 //
 
 #pragma once
-#include "StorageService.h"
+
-#include "framework/RESTAPI_Handler.h"
+#include "../framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_asset_server : public RESTAPIHandler {
     public:
-		RESTAPI_asset_server(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_asset_server(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, uint64_t TransactionId, bool Internal)
-							 RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-							 bool Internal)
                 : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                                 std::vector<std::string>
+                                         {
+                                          Poco::Net::HTTPRequest::HTTP_GET,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal, false) {}
+                                          Server,
+                                          TransactionId,
+                                          Internal, false) {}
         static auto PathName() { return std::list<std::string>{"/wwwassets/{id}"}; };
         void DoGet() final;
         void DoPost() final {};
@@ -23,5 +25,7 @@ namespace OpenWifi {
         void DoPut() final {};
 
     private:
+
     };
-} // namespace OpenWifi
+}
+

src/RESTAPI/RESTAPI_configurations_handler.cpp

@@ -6,12 +6,14 @@
 //	Arilia Wireless Inc.
 //
 
+#include "framework/MicroService.h"
+
 #include "RESTAPI_configurations_handler.h"
-#include "DeviceTypeCache.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
 #include "framework/ConfigurationValidator.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
+#include "DeviceTypeCache.h"
 
 namespace OpenWifi{
 
@@ -64,15 +66,11 @@ namespace OpenWifi {
         }
 
         DB_.DeleteRecord("id", UUID);
-		MoveUsage(StorageService()->PolicyDB(), DB_, Existing.managementPolicy, "",
+        MoveUsage(StorageService()->PolicyDB(),DB_,Existing.managementPolicy,"",Existing.info.id);
-				  Existing.info.id);
+        RemoveMembership(StorageService()->VenueDB(),&ProvObjects::Venue::configurations,Existing.venue,Existing.info.id);
-		RemoveMembership(StorageService()->VenueDB(), &ProvObjects::Venue::configurations,
+        RemoveMembership(StorageService()->EntityDB(),&ProvObjects::Entity::configurations,Existing.entity,Existing.info.id);
-						 Existing.venue, Existing.info.id);
-		RemoveMembership(StorageService()->EntityDB(), &ProvObjects::Entity::configurations,
-						 Existing.entity, Existing.info.id);
         for(const auto &i:Existing.variables)
-			RemoveMembership(StorageService()->VariablesDB(),
+            RemoveMembership(StorageService()->VariablesDB(),&ProvObjects::VariableBlock::configurations,i,Existing.info.id);
-							 &ProvObjects::VariableBlock::configurations, i, Existing.info.id);
 
         return OK();
     }
@@ -91,9 +89,8 @@ namespace OpenWifi {
             }
             auto Config=RawObject->get("configuration").toString();
             Poco::JSON::Object  Answer;
-			std::vector<std::string> Error;
+            std::string Error;
-			auto Res =
+            auto Res = ValidateUCentralConfiguration(Config,Error);
-				ValidateUCentralConfiguration(Config, Error, GetBoolParameter("strict", true));
             Answer.set("valid",Res);
             Answer.set("error", Error);
             return ReturnObject(Answer);
@@ -112,39 +109,32 @@ namespace OpenWifi {
             return BadRequest(RESTAPI::Errors::NameMustBeSet);
         }
 
-		if (!NewObject.entity.empty() &&
+        if(!NewObject.entity.empty() && !StorageService()->EntityDB().Exists("id",NewObject.entity)) {
-			!StorageService()->EntityDB().Exists("id", NewObject.entity)) {
             return BadRequest(RESTAPI::Errors::EntityMustExist);
         }
 
-		if (!NewObject.venue.empty() &&
+        if(!NewObject.venue.empty() && !StorageService()->VenueDB().Exists("id",NewObject.venue)) {
-			!StorageService()->VenueDB().Exists("id", NewObject.venue)) {
             return BadRequest(RESTAPI::Errors::VenueMustExist);
         }
 
-		if (!NewObject.managementPolicy.empty() &&
+        if(!NewObject.managementPolicy.empty() && !StorageService()->PolicyDB().Exists("id",NewObject.managementPolicy)) {
-			!StorageService()->PolicyDB().Exists("id", NewObject.managementPolicy)) {
             return BadRequest(RESTAPI::Errors::UnknownManagementPolicyUUID);
         }
 
         NewObject.inUse.clear();
-		if (NewObject.deviceTypes.empty() ||
+        if(NewObject.deviceTypes.empty() || !DeviceTypeCache()->AreAcceptableDeviceTypes(NewObject.deviceTypes, true)) {
-			!DeviceTypeCache()->AreAcceptableDeviceTypes(NewObject.deviceTypes, true)) {
             return BadRequest(RESTAPI::Errors::InvalidDeviceTypes);
         }
 
-		std::vector<std::string> Errors;
+        RESTAPI::Errors::msg Error;
-		if (!ValidateConfigBlock(NewObject, Errors)) {
+        if(!ValidateConfigBlock(NewObject,Error)) {
-			return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
+            return BadRequest(Error);
         }
 
         if(DB_.CreateRecord(NewObject)) {
-			MoveUsage(StorageService()->PolicyDB(), DB_, "", NewObject.managementPolicy,
+            MoveUsage(StorageService()->PolicyDB(),DB_,"",NewObject.managementPolicy,NewObject.info.id);
-					  NewObject.info.id);
+            AddMembership(StorageService()->VenueDB(),&ProvObjects::Venue::configurations,NewObject.venue, NewObject.info.id);
-			AddMembership(StorageService()->VenueDB(), &ProvObjects::Venue::configurations,
+            AddMembership(StorageService()->EntityDB(),&ProvObjects::Entity::configurations,NewObject.entity, NewObject.info.id);
-						  NewObject.venue, NewObject.info.id);
-			AddMembership(StorageService()->EntityDB(), &ProvObjects::Entity::configurations,
-						  NewObject.entity, NewObject.info.id);
 
             ConfigurationDB::RecordName AddedRecord;
             DB_.GetRecord("id", NewObject.info.id, AddedRecord);
@@ -176,17 +166,16 @@ namespace OpenWifi {
             return BadRequest(RESTAPI::Errors::NameMustBeSet);
         }
 
-		if (!NewObject.deviceTypes.empty() &&
+        if(!NewObject.deviceTypes.empty() && !DeviceTypeCache()->AreAcceptableDeviceTypes(NewObject.deviceTypes, true)) {
-			!DeviceTypeCache()->AreAcceptableDeviceTypes(NewObject.deviceTypes, true)) {
             return BadRequest(RESTAPI::Errors::InvalidDeviceTypes);
         }
 
         if(!NewObject.deviceTypes.empty())
             Existing.deviceTypes = NewObject.deviceTypes;
 
-		std::vector<std::string> Errors;
+        RESTAPI::Errors::msg Error;
-		if (!ValidateConfigBlock(NewObject, Errors)) {
+        if(!ValidateConfigBlock( NewObject,Error)) {
-			return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
+            return BadRequest(Error);
         }
 
         if(RawObject->has("configuration")) {
@@ -194,19 +183,15 @@ namespace OpenWifi {
         }
 
         std::string FromPolicy, ToPolicy;
-		if (!CreateMove(RawObject, "managementPolicy",
+        if(!CreateMove(RawObject,"managementPolicy",&ConfigurationDB::RecordName::managementPolicy, Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB()))
-						&ConfigurationDB::RecordName::managementPolicy, Existing, FromPolicy,
-						ToPolicy, StorageService()->PolicyDB()))
             return BadRequest(RESTAPI::Errors::EntityMustExist);
 
         std::string FromEntity, ToEntity;
-		if (!CreateMove(RawObject, "entity", &ConfigurationDB::RecordName::entity, Existing,
+        if(!CreateMove(RawObject,"entity",&ConfigurationDB::RecordName::entity, Existing, FromEntity, ToEntity, StorageService()->EntityDB()))
-						FromEntity, ToEntity, StorageService()->EntityDB()))
             return BadRequest(RESTAPI::Errors::EntityMustExist);
 
         std::string FromVenue, ToVenue;
-		if (!CreateMove(RawObject, "venue", &ConfigurationDB::RecordName::venue, Existing,
+        if(!CreateMove(RawObject,"venue",&ConfigurationDB::RecordName::venue, Existing, FromVenue, ToVenue, StorageService()->VenueDB()))
-						FromVenue, ToVenue, StorageService()->VenueDB()))
             return BadRequest(RESTAPI::Errors::VenueMustExist);
 
         Types::UUIDvec_t FromVariables, ToVariables;
@@ -229,13 +214,9 @@ namespace OpenWifi {
             Existing.deviceRules = NewObject.deviceRules;
 
         if(DB_.UpdateRecord("id",UUID,Existing)) {
-			ManageMembership(StorageService()->VariablesDB(),
+            ManageMembership(StorageService()->VariablesDB(),&ProvObjects::VariableBlock::configurations, FromVariables, ToVariables, Existing.info.id);
-							 &ProvObjects::VariableBlock::configurations, FromVariables,
+            ManageMembership(StorageService()->VenueDB(), &ProvObjects::Venue::configurations, FromVenue, ToVenue, Existing.info.id);
-							 ToVariables, Existing.info.id);
+            ManageMembership(StorageService()->EntityDB(), &ProvObjects::Entity::configurations, FromEntity, ToEntity, Existing.info.id);
-			ManageMembership(StorageService()->VenueDB(), &ProvObjects::Venue::configurations,
-							 FromVenue, ToVenue, Existing.info.id);
-			ManageMembership(StorageService()->EntityDB(), &ProvObjects::Entity::configurations,
-							 FromEntity, ToEntity, Existing.info.id);
             MoveUsage(StorageService()->PolicyDB(),DB_,FromPolicy,ToPolicy,Existing.info.id);
 
             ProvObjects::DeviceConfiguration    D;
@@ -246,4 +227,4 @@ namespace OpenWifi {
         }
         InternalError(RESTAPI::Errors::RecordNotUpdated);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_configurations_handler.h

@@ -5,26 +5,25 @@
 //	Created by Stephane Bourque on 2021-03-04.
 //	Arilia Wireless Inc.
 //
-
 #pragma once
+
+#include "framework/MicroService.h"
+#include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
     class RESTAPI_configurations_handler : public RESTAPIHandler {
     public:
-		RESTAPI_configurations_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_configurations_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-									   RESTAPI_GenericServerAccounting &Server,
-									   uint64_t TransactionId, bool Internal)
         : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                         std::vector<std::string>{
-													  Poco::Net::HTTPRequest::HTTP_POST,
+            Poco::Net::HTTPRequest::HTTP_GET, Poco::Net::HTTPRequest::HTTP_POST,
-													  Poco::Net::HTTPRequest::HTTP_PUT,
+            Poco::Net::HTTPRequest::HTTP_PUT, Poco::Net::HTTPRequest::HTTP_DELETE,
-													  Poco::Net::HTTPRequest::HTTP_DELETE,
             Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+            Server,
+            TransactionId,
+            Internal){}
         static auto PathName() { return std::list<std::string>{"/api/v1/configuration/{uuid}"}; };
-
     private:
         ConfigurationDB     &DB_=StorageService()->ConfigurationDB();
         void DoGet();
@@ -32,4 +31,4 @@ namespace OpenWifi {
         void DoPut();
         void DoDelete();
     };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_configurations_list_handler.cpp

@@ -4,12 +4,12 @@
 
 #include "RESTAPI_configurations_list_handler.h"
 
-#include "RESTAPI_db_helpers.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
+#include "RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
     void RESTAPI_configurations_list_handler::DoGet() {
         return ListHandler<ConfigurationDB>("configurations", DB_, *this);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_configurations_list_handler.h

@@ -3,23 +3,23 @@
 //
 
 #pragma once
+
+#include "framework/MicroService.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
 
     class RESTAPI_configurations_list_handler : public RESTAPIHandler {
     public:
-		RESTAPI_configurations_list_handler(const RESTAPIHandler::BindingMap &bindings,
+        RESTAPI_configurations_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-											Poco::Logger &L,
-											RESTAPI_GenericServerAccounting &Server,
-											uint64_t TransactionId, bool Internal)
         : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                         std::vector<std::string>{
+            Poco::Net::HTTPRequest::HTTP_GET,
             Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+            Server,
+            TransactionId,
+            Internal){}
         static auto PathName() { return std::list<std::string>{"/api/v1/configuration"}; };
-
     private:
         ConfigurationDB & DB_=StorageService()->ConfigurationDB();
         void DoGet() final;
@@ -27,4 +27,4 @@ namespace OpenWifi {
         void DoPut() final {};
         void DoDelete() final {};
     };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_contact_handler.cpp

@@ -8,9 +8,9 @@
 
 #include "RESTAPI_contact_handler.h"
 
-#include "RESTAPI_db_helpers.h"
-#include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "framework/ow_constants.h"
+#include "RESTObjects/RESTAPI_ProvObjects.h"
+#include "RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
     void RESTAPI_contact_handler::DoGet() {
@@ -67,8 +67,7 @@ namespace OpenWifi {
         }
 
         DB_.DeleteRecord("id",UUID);
-		RemoveMembership(StorageService()->EntityDB(), &ProvObjects::Entity::contacts,
+        RemoveMembership(StorageService()->EntityDB(),&ProvObjects::Entity::contacts,Existing.entity,Existing.info.id);
-						 Existing.entity, Existing.info.id);
         MoveUsage(StorageService()->PolicyDB(),DB_,Existing.info.id,"",Existing.info.id);
         return OK();
     }
@@ -90,23 +89,19 @@ namespace OpenWifi {
             return BadRequest(RESTAPI::Errors::NameMustBeSet);
         }
 
-		if (NewObject.entity.empty() &&
+        if(NewObject.entity.empty() && !StorageService()->EntityDB().Exists("id",NewObject.entity)) {
-			!StorageService()->EntityDB().Exists("id", NewObject.entity)) {
             return BadRequest(RESTAPI::Errors::EntityMustExist);
         }
 
-		if (!NewObject.managementPolicy.empty() &&
+        if(!NewObject.managementPolicy.empty() && !StorageService()->PolicyDB().Exists("id",NewObject.managementPolicy)) {
-			!StorageService()->PolicyDB().Exists("id", NewObject.managementPolicy)) {
             return BadRequest(RESTAPI::Errors::UnknownManagementPolicyUUID);
         }
 
         NewObject.inUse.clear();
 
         if(DB_.CreateRecord(NewObject)) {
-			AddMembership(StorageService()->EntityDB(), &ProvObjects::Entity::contacts,
+            AddMembership(StorageService()->EntityDB(),&ProvObjects::Entity::contacts,NewObject.entity,NewObject.info.id);
-						  NewObject.entity, NewObject.info.id);
+            MoveUsage(StorageService()->PolicyDB(),DB_,"",NewObject.managementPolicy,NewObject.info.id);
-			MoveUsage(StorageService()->PolicyDB(), DB_, "", NewObject.managementPolicy,
-					  NewObject.info.id);
 
             ProvObjects::Contact    NewContact;
             StorageService()->ContactDB().GetRecord("id", NewObject.info.id, NewContact);
@@ -137,13 +132,11 @@ namespace OpenWifi {
         }
 
         std::string FromPolicy, ToPolicy;
-		if (!CreateMove(RawObject, "managementPolicy", &ContactDB::RecordName::managementPolicy,
+        if(!CreateMove(RawObject,"managementPolicy",&ContactDB::RecordName::managementPolicy, Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB()))
-						Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB()))
             return BadRequest(RESTAPI::Errors::EntityMustExist);
 
         std::string FromEntity, ToEntity;
-		if (!CreateMove(RawObject, "entity", &ContactDB::RecordName::entity, Existing, FromEntity,
+        if(!CreateMove(RawObject,"entity",&ContactDB::RecordName::entity, Existing, FromEntity, ToEntity, StorageService()->EntityDB()))
-						ToEntity, StorageService()->EntityDB()))
             return BadRequest(RESTAPI::Errors::EntityMustExist);
 
         AssignIfPresent(RawObject, "title", Existing.title);
@@ -164,8 +157,7 @@ namespace OpenWifi {
 
         if(DB_.UpdateRecord("id", UUID, Existing)) {
             MoveUsage(StorageService()->PolicyDB(),DB_,FromPolicy,ToPolicy,Existing.info.id);
-			ManageMembership(StorageService()->EntityDB(), &ProvObjects::Entity::contacts,
+            ManageMembership(StorageService()->EntityDB(),&ProvObjects::Entity::contacts,FromEntity,ToEntity,Existing.info.id);
-							 FromEntity, ToEntity, Existing.info.id);
 
             ProvObjects::Contact    NewObjectAdded;
             DB_.GetRecord("id", UUID, NewObjectAdded);
@@ -175,4 +167,4 @@ namespace OpenWifi {
         }
         InternalError(RESTAPI::Errors::RecordNotUpdated);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_contact_handler.h

@@ -7,22 +7,22 @@
 //
 
 #pragma once
+
+#include "framework/MicroService.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
     class RESTAPI_contact_handler : public RESTAPIHandler {
     public:
-		RESTAPI_contact_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_contact_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-								RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-								bool Internal)
         : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                         std::vector<std::string>{
-													  Poco::Net::HTTPRequest::HTTP_POST,
+            Poco::Net::HTTPRequest::HTTP_GET, Poco::Net::HTTPRequest::HTTP_POST,
-													  Poco::Net::HTTPRequest::HTTP_PUT,
+            Poco::Net::HTTPRequest::HTTP_PUT, Poco::Net::HTTPRequest::HTTP_DELETE,
-													  Poco::Net::HTTPRequest::HTTP_DELETE,
             Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+            Server,
+            TransactionId,
+            Internal){}
         static auto PathName() { return std::list<std::string>{"/api/v1/contact/{uuid}"}; };
 
     private:
@@ -32,4 +32,4 @@ namespace OpenWifi {
         void DoPut() final;
         void DoDelete() final;
     };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_contact_list_handler.cpp

@@ -4,12 +4,12 @@
 
 #include "RESTAPI_contact_list_handler.h"
 
-#include "RESTAPI_db_helpers.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
+#include "RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
     void RESTAPI_contact_list_handler::DoGet() {
         return ListHandler<ContactDB>("contacts", DB_, *this);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_contact_list_handler.h

@@ -3,22 +3,24 @@
 //
 
 #pragma once
+
+#include "framework/MicroService.h"
+#include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
 
     class RESTAPI_contact_list_handler : public RESTAPIHandler {
     public:
-		RESTAPI_contact_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_contact_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-									 RESTAPI_GenericServerAccounting &Server,
-									 uint64_t TransactionId, bool Internal)
         : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                         std::vector<std::string>{
+            Poco::Net::HTTPRequest::HTTP_GET,
             Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+            Server,
+            TransactionId,
+            Internal){}
         static auto PathName() { return std::list<std::string>{"/api/v1/contact"}; };
-
     private:
         ContactDB   & DB_=StorageService()->ContactDB();
         void DoGet() final;
@@ -26,4 +28,4 @@ namespace OpenWifi {
         void DoPut() final {};
         void DoDelete() final {};
     };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_db_helpers.h

@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "Poco/StringTokenizer.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
+#include "framework/MicroService.h"
 #include "framework/ConfigurationValidator.h"
-#include "libs/croncpp.h"
 #include "sdks/SDK_sec.h"
 
 namespace OpenWifi {
@@ -19,8 +18,7 @@ namespace OpenWifi {
         J.set("id", O.id);
     }
 
-	template <typename R, typename Q = decltype(R{}.entity)>
+    template <typename R, typename Q = decltype(R{}.entity)> void Extend_entity(const R &T, Poco::JSON::Object &EI ) {
-	void Extend_entity(const R &T, Poco::JSON::Object &EI) {
         if constexpr(std::is_same_v<Q,std::string>) {
             if(!T.entity.empty()) {
                 Poco::JSON::Object  EntObj;
@@ -36,8 +34,7 @@ namespace OpenWifi {
         static_assert( sizeof...(args) == 2);
     }
 
-	template <typename R, typename Q = decltype(R{}.managementPolicy)>
+    template <typename R, typename Q = decltype(R{}.managementPolicy)> void Extend_managementPolicy(const R &T, Poco::JSON::Object &EI ) {
-	void Extend_managementPolicy(const R &T, Poco::JSON::Object &EI) {
         if constexpr(std::is_same_v<Q,std::string>) {
             if(!T.managementPolicy.empty()) {
                 Poco::JSON::Object  PolObj;
@@ -53,8 +50,7 @@ namespace OpenWifi {
         static_assert( sizeof...(args) == 2);
     }
 
-	template <typename R, typename Q = decltype(R{}.venue)>
+    template <typename R, typename Q = decltype(R{}.venue)> void Extend_venue(const R &T, Poco::JSON::Object &EI ) {
-	void Extend_venue(const R &T, Poco::JSON::Object &EI) {
         if constexpr(std::is_same_v<Q,std::string>) {
             if(!T.venue.empty()) {
                 Poco::JSON::Object  VenObj;
@@ -66,10 +62,11 @@ namespace OpenWifi {
             }
         }
     }
-	template <typename... Ts> void Extend_venue(Ts... args) { static_assert(sizeof...(args) == 2); }
+    template <typename... Ts> void Extend_venue(Ts... args) {
+        static_assert( sizeof...(args) == 2);
+    }
 
-	template <typename R, typename Q = decltype(R{}.contact)>
+    template <typename R, typename Q = decltype(R{}.contact)> void Extend_contact(const R &T, Poco::JSON::Object &EI ) {
-	void Extend_contact(const R &T, Poco::JSON::Object &EI) {
         if constexpr(std::is_same_v<Q,std::string>) {
             if(!T.contact.empty()) {
                 Poco::JSON::Object  ConObj;
@@ -85,8 +82,7 @@ namespace OpenWifi {
         static_assert( sizeof...(args) == 2);
     }
 
-	template <typename R, typename Q = decltype(R{}.location)>
+    template <typename R, typename Q = decltype(R{}.location)> void Extend_location(const R &T, Poco::JSON::Object &EI ) {
-	void Extend_location(const R &T, Poco::JSON::Object &EI) {
         if constexpr(std::is_same_v<Q,std::string>) {
             if(!T.location.empty()) {
                 Poco::JSON::Object  LocObj;
@@ -102,14 +98,12 @@ namespace OpenWifi {
         static_assert( sizeof...(args) == 2);
     }
 
-	template <typename R, typename Q = decltype(R{}.deviceConfiguration)>
+    template <typename R, typename Q = decltype(R{}.deviceConfiguration)> void Extend_deviceConfiguration(const R &T, Poco::JSON::Object &EI ) {
-	void Extend_deviceConfiguration(const R &T, Poco::JSON::Object &EI) {
         if constexpr(std::is_same_v<Q,std::string>) {
             if(!T.deviceConfiguration.empty()) {
                 Poco::JSON::Object  DevObj;
                 ProvObjects::DeviceConfiguration DevConf;
-				if (StorageService()->ConfigurationDB().GetRecord("id", T.deviceConfiguration,
+                if(StorageService()->ConfigurationDB().GetRecord("id",T.deviceConfiguration,DevConf)) {
-																  DevConf)) {
                     AddInfoBlock(DevConf.info, DevObj);
                 }
                 EI.set("deviceConfiguration",DevObj);
@@ -147,8 +141,7 @@ namespace OpenWifi {
         return true;
     }
 
-	template <typename T>
+    template <typename T> void MakeJSONObjectArray(const char * ArrayName, const std::vector<T> & V, RESTAPIHandler & R) {
-	void MakeJSONObjectArray(const char *ArrayName, const std::vector<T> &V, RESTAPIHandler &R) {
         Poco::JSON::Array   ObjArray;
         for(const auto &i:V) {
             Poco::JSON::Object  Obj;
@@ -162,10 +155,11 @@ namespace OpenWifi {
         return R.ReturnObject(Answer);
     }
 
-	inline static bool is_uuid(const std::string &u) { return u.find('-') != std::string::npos; }
+    inline static bool is_uuid(const std::string &u) {
+        return u.find('-') != std::string::npos;
+    }
 
-	template <typename DB>
+    template <typename DB> void ReturnRecordList(const char *ArrayName,DB & DBInstance, RESTAPIHandler & R) {
-	void ReturnRecordList(const char *ArrayName, DB &DBInstance, RESTAPIHandler &R) {
         Poco::JSON::Array   ObjArr;
         for(const auto &i:R.SelectedRecords()) {
             ProvObjects::InventoryTag E;
@@ -184,8 +178,7 @@ namespace OpenWifi {
         return R.ReturnObject(Answer);
     }
 
-	template <typename DB, typename Record>
+    template <typename DB, typename Record> void ReturnRecordList(const char *ArrayName,DB & DBInstance, RESTAPIHandler & R) {
-	void ReturnRecordList(const char *ArrayName, DB &DBInstance, RESTAPIHandler &R) {
         Poco::JSON::Array   ObjArr;
         for(const auto &i:R.SelectedRecords()) {
             Record E;
@@ -226,8 +219,7 @@ namespace OpenWifi {
         }
     }
 
-	inline void AddLocationTriplet(const std::vector<std::string> &id,
+    inline void AddLocationTriplet(const std::vector<std::string> &id, std::vector<triplet_t> & IDs) {
-								   std::vector<triplet_t> &IDs) {
         for(const auto &i:id)
             AddLocationTriplet(i,IDs);
     }
@@ -260,8 +252,7 @@ namespace OpenWifi {
         }
     }
 
-	template <typename DB>
+    template <typename DB> void ListHandler(const char *BlockName,DB & DBInstance, RESTAPIHandler & R) {
-	void ListHandler(const char *BlockName, DB &DBInstance, RESTAPIHandler &R) {
         auto Entity = R.GetParameter("entity", "");
         auto Venue = R.GetParameter("venue", "");
 
@@ -288,16 +279,15 @@ namespace OpenWifi {
         }
 
         if(!R.QB_.Select.empty()) {
-			return ReturnRecordList<decltype(DBInstance), RecType>(BlockName, DBInstance, R);
+            return ReturnRecordList<decltype(DBInstance),
-		}
+                    RecType>(BlockName, DBInstance, R);
-		if (!Entity.empty()) {
+        } if(!Entity.empty()) {
             RecVec Entries;
             DBInstance.GetRecords(R.QB_.Offset,R.QB_.Limit,Entries," entity=' " + Entity +"'");
             if(R.QB_.CountOnly)
                 return R.ReturnCountOnly(Entries.size());
             return MakeJSONObjectArray(BlockName, Entries, R);
-		}
+        } if(!Venue.empty()) {
-		if (!Venue.empty()) {
             RecVec Entries;
             DBInstance.GetRecords(R.QB_.Offset,R.QB_.Limit,Entries," venue=' " + Venue +"'");
             if(R.QB_.CountOnly)
@@ -314,17 +304,13 @@ namespace OpenWifi {
         }
     }
 
-	template <typename db_type>
+    template <typename db_type> void ListHandlerForOperator(const char *BlockName,db_type & DB, RESTAPIHandler & R, const Types::UUID_t & OperatorId, const Types::UUID_t & subscriberId="") {
-	void ListHandlerForOperator(const char *BlockName, db_type &DB, RESTAPIHandler &R,
-								const Types::UUID_t &OperatorId,
-								const Types::UUID_t &subscriberId = "") {
         typedef typename db_type::RecordVec      RecVec;
         typedef typename db_type::RecordName     RecType;
 
-		auto whereClause =
+        auto whereClause = subscriberId.empty() ?
-			subscriberId.empty()
+                            fmt::format(" operatorId='{}'", OperatorId) :
-				? fmt::format(" operatorId='{}'", OperatorId)
+                            fmt::format(" operatorId='{}' and subscriberId='{}' ", OperatorId, subscriberId);
-				: fmt::format(" operatorId='{}' and subscriberId='{}' ", OperatorId, subscriberId);
 
         if(R.QB_.CountOnly) {
             auto Count = DB.Count( whereClause );
@@ -332,7 +318,8 @@ namespace OpenWifi {
         }
 
         if(!R.QB_.Select.empty()) {
-			return ReturnRecordList<decltype(DB), RecType>(BlockName, DB, R);
+            return ReturnRecordList<decltype(DB),
+                    RecType>(BlockName, DB, R);
         }
 
         RecVec  Entries;
@@ -340,9 +327,7 @@ namespace OpenWifi {
         return MakeJSONObjectArray(BlockName, Entries, R);
     }
 
-	template <typename db_type, typename ObjectDB>
+    template <typename db_type, typename ObjectDB> void MoveUsage(db_type &DB_InUse, ObjectDB & DB, const std::string & From, const std::string & To, const std::string &Id) {
-	void MoveUsage(db_type &DB_InUse, ObjectDB &DB, const std::string &From, const std::string &To,
-				   const std::string &Id) {
         if(From!=To) {
             if(!From.empty())
                 DB_InUse.DeleteInUse("id",From,DB.Prefix(),Id);
@@ -351,9 +336,7 @@ namespace OpenWifi {
         }
     }
 
-	template <typename db_type, typename ObjectDB>
+    template <typename db_type, typename ObjectDB> void MoveUsage(db_type &DB_InUse, ObjectDB & DB, const Types::UUIDvec_t & From, const Types::UUIDvec_t & To, const std::string &Id) {
-	void MoveUsage(db_type &DB_InUse, ObjectDB &DB, const Types::UUIDvec_t &From,
-				   const Types::UUIDvec_t &To, const std::string &Id) {
         if(From!=To) {
             if(!From.empty()) {
                 for(const auto &i:From)
@@ -366,9 +349,7 @@ namespace OpenWifi {
         }
     }
 
-	template <typename db_type>
+    template <typename db_type> void MoveChild(db_type &DB, const std::string & Parent, const std::string & Child, const std::string &Id) {
-	void MoveChild(db_type &DB, const std::string &Parent, const std::string &Child,
-				   const std::string &Id) {
         if(Parent!=Child) {
             if(!Parent.empty())
                 DB.InUse.DeleteInUse("id",Parent,Id);
@@ -377,28 +358,22 @@ namespace OpenWifi {
         }
     }
 
-	template <typename db_type, typename Member>
+    template <typename db_type, typename Member> void RemoveMembership( db_type & DB, Member T, const std::string & Obj, const std::string &Id) {
-	void RemoveMembership(db_type &DB, Member T, const std::string &Obj, const std::string &Id) {
         if(!Obj.empty())
             DB.ManipulateVectorMember(T, "id", Obj, Id, false);
     }
 
-	template <typename db_type, typename Member>
+    template <typename db_type, typename Member> void AddMembership( db_type & DB, Member T, const std::string & Obj, const std::string &Id) {
-	void AddMembership(db_type &DB, Member T, const std::string &Obj, const std::string &Id) {
         if(!Obj.empty())
             DB.ManipulateVectorMember(T, "id", Obj, Id, true);
     }
 
-	template <typename db_type, typename Member>
+    template <typename db_type, typename Member> void ManageMembership( db_type & DB, Member T, const std::string & From, const std::string & To, const std::string &Id) {
-	void ManageMembership(db_type &DB, Member T, const std::string &From, const std::string &To,
-						  const std::string &Id) {
         RemoveMembership(DB,T,From,Id);
         AddMembership(DB,T,To,Id);
     }
 
-	template <typename db_type, typename Member>
+    template <typename db_type, typename Member> void ManageMembership( db_type & DB, Member T, const Types::UUIDvec_t & From, const Types::UUIDvec_t & To, const std::string &Id) {
-	void ManageMembership(db_type &DB, Member T, const Types::UUIDvec_t &From,
-						  const Types::UUIDvec_t &To, const std::string &Id) {
         if(From!=To) {
             for (const auto &i: From) {
                 RemoveMembership(DB, T, i, Id);
@@ -409,9 +384,7 @@ namespace OpenWifi {
         }
     }
 
-	template <typename Member, typename Rec, typename db_type>
+    template <typename Member, typename Rec, typename db_type > bool CreateMove(const Poco::JSON::Object::Ptr & RawObj, const char *fieldname, Member T, Rec & Existing, std::string &From, std::string &To, db_type & TheDB) {
-	bool CreateMove(const Poco::JSON::Object::Ptr &RawObj, const char *fieldname, Member T,
-					Rec &Existing, std::string &From, std::string &To, db_type &TheDB) {
         if(RawObj->has(fieldname)) {
             From = Existing.*T;
             To = RawObj->get(fieldname).toString();
@@ -431,16 +404,14 @@ namespace OpenWifi {
         return EntityDB::RootUUID();
     }
 
-	inline bool ValidateConfigBlock(const ProvObjects::DeviceConfiguration &Config,
+    inline bool ValidateConfigBlock(const ProvObjects::DeviceConfiguration &Config, RESTAPI::Errors::msg & Error) {
-									std::vector<std::string> &Errors) {
+        static const std::vector<std::string> SectionNames{ "globals", "interfaces", "metrics", "radios", "services", "unit" };
-		static const std::vector<std::string> SectionNames{
-			"globals",	   "interfaces", "metrics", "radios",	  "services",	"unit",
-			"definitions", "ethernet",	 "switch",	"config-raw", "third-party"};
 
         for(const auto &i:Config.configuration) {
             Poco::JSON::Parser  P;
             if(i.name.empty()) {
-				Errors.push_back("Name is empty");
+                std::cout << "Name is empty" << std::endl;
+                Error = RESTAPI::Errors::NameMustBeSet;
                 return false;
             }
 
@@ -448,38 +419,39 @@ namespace OpenWifi {
                 auto Blocks = P.parse(i.configuration).extract<Poco::JSON::Object::Ptr>();
                 auto N = Blocks->getNames();
                 for (const auto &j: N) {
-					if (std::find(SectionNames.cbegin(), SectionNames.cend(), j) ==
+                    if (std::find(SectionNames.cbegin(), SectionNames.cend(), j) == SectionNames.cend()) {
-						SectionNames.cend()) {
+                        Error = RESTAPI::Errors::UnknownConfigurationSection;
-						Errors.push_back("Unknown block name");
                         return false;
                     }
                 }
             } catch (const Poco::JSON::JSONException &E ) {
-				Errors.push_back("Invalid JSON document");
+                Error = RESTAPI::Errors::InvalidJSONDocument;
                 return false;
             }
 
             try {
-				if (ValidateUCentralConfiguration(i.configuration, Errors, true)) {
+                std::string ErrorText;
+                if (ValidateUCentralConfiguration(i.configuration, ErrorText)) {
                     // std::cout << "Block: " << i.name << " is valid" << std::endl;
                 } else {
+                    Error =  RESTAPI::Errors::ConfigBlockInvalid ;
                     return false;
                 }
             } catch(...) {
-				Errors.push_back("Invalid configuration caused an exception");
+                std::cout << "Exception in validation" << std::endl;
                 return false;
             }
+
         }
         return true;
     }
 
-	template <typename Type>
+    template <typename Type> std::map<std::string,std::string>   CreateObjects(Type & NewObject, RESTAPIHandler & R, RESTAPI::Errors::msg & Error) {
-	std::map<std::string, std::string> CreateObjects(Type &NewObject, RESTAPIHandler &R,
-													 std::vector<std::string> &Errors) {
         std::map<std::string,std::string>   Result;
 
         auto createObjects = R.GetParameter("createObjects","");
         if(!createObjects.empty()) {
+            std::cout << "createObjects: " << createObjects << std::endl;
             Poco::JSON::Parser P;
             auto Objects = P.parse(createObjects).extract<Poco::JSON::Object::Ptr>();
             if(Objects->isArray("objects")) {
@@ -487,41 +459,39 @@ namespace OpenWifi {
                 for(const auto &i:*ObjectsArray) {
                     auto Object = i.extract<Poco::JSON::Object::Ptr>();
                     if (Object->has("location")) {
-						auto LocationDetails =
+                        auto LocationDetails = Object->get("location").extract<Poco::JSON::Object::Ptr>();
-							Object->get("location").extract<Poco::JSON::Object::Ptr>();
                         ProvObjects::Location LC;
                         if (LC.from_json(LocationDetails)) {
                             if constexpr(std::is_same_v<Type,ProvObjects::Venue>) {
+                                std::cout << "Location decoded: " << LC.info.name << std::endl;
                                 std::string ParentEntity = FindParentEntity(NewObject);
                                 ProvObjects::CreateObjectInfo(R.UserInfo_.userinfo, LC.info);
                                 LC.entity = ParentEntity;
                                 if (StorageService()->LocationDB().CreateRecord(LC)) {
                                     NewObject.location = LC.info.id;
-									AddMembership(StorageService()->EntityDB(),
+                                    AddMembership(StorageService()->EntityDB(), &ProvObjects::Entity::locations,
-												  &ProvObjects::Entity::locations, ParentEntity,
+                                                  ParentEntity, LC.info.id);
-												  LC.info.id);
                                     Result["location"] = LC.info.id;
                                 }
                             }
                             if constexpr(std::is_same_v<Type,ProvObjects::Operator>) {
+                                std::cout << "Location decoded: " << LC.info.name << std::endl;
                                 std::string ParentEntity = FindParentEntity(NewObject);
                                 ProvObjects::CreateObjectInfo(R.UserInfo_.userinfo, LC.info);
                                 LC.entity = ParentEntity;
                                 if (StorageService()->LocationDB().CreateRecord(LC)) {
                                     NewObject.location = LC.info.id;
-									AddMembership(StorageService()->EntityDB(),
+                                    AddMembership(StorageService()->EntityDB(), &ProvObjects::Entity::locations,
-												  &ProvObjects::Entity::locations, ParentEntity,
+                                                  ParentEntity, LC.info.id);
-												  LC.info.id);
                                     Result["location"] = LC.info.id;
                                 }
                             }
                         } else {
-							Errors.push_back("Invalid JSON document");
+                            Error = RESTAPI::Errors::InvalidJSONDocument;
                             break;
                         }
                     } else if (Object->has("contact")) {
-						auto ContactDetails =
+                        auto ContactDetails = Object->get("contact").extract<Poco::JSON::Object::Ptr>();
-							Object->get("contact").extract<Poco::JSON::Object::Ptr>();
                         ProvObjects::Contact CC;
                         if (CC.from_json(ContactDetails)) {
                             std::cout << "contact decoded: " << CC.info.name << std::endl;
@@ -529,15 +499,14 @@ namespace OpenWifi {
                             std::cout << "contact not decoded." << std::endl;
                         }
                     } else if (Object->has("configuration")) {
-						auto ConfigurationDetails =
+                        auto ConfigurationDetails = Object->get("configuration").template extract<Poco::JSON::Object::Ptr>();
-							Object->get("configuration")
-								.template extract<Poco::JSON::Object::Ptr>();
                         ProvObjects::DeviceConfiguration    DC;
                         if(DC.from_json(ConfigurationDetails)) {
                             if constexpr(std::is_same_v<Type, ProvObjects::InventoryTag>) {
-								if (!ValidateConfigBlock(DC, Errors)) {
+                                if(!ValidateConfigBlock(DC,Error)) {
                                     break;
                                 }
+                                std::cout << "Configuration decoded: " << DC.info.name << std::endl;
                                 ProvObjects::CreateObjectInfo(R.UserInfo_.userinfo, DC.info);
                                 if (StorageService()->ConfigurationDB().CreateRecord(DC)) {
                                     NewObject.deviceConfiguration = DC.info.id;
@@ -545,45 +514,20 @@ namespace OpenWifi {
                                 }
                             }
                         } else {
-							Errors.push_back("Invalid JSON document");
+                            Error = RESTAPI::Errors::InvalidJSONDocument;
                             break;
                         }
                     }
                 }
             }
         }
+
         return Result;
     }
 
-	inline bool ValidSchedule(const std::string &v) {
-		try {
-			auto cron = cron::make_cron(v);
-			return true;
-		} catch (cron::bad_cronexpr const &ex) {
-		}
-		return false;
-	}
-
-	inline bool ValidRRM(const std::string &v) {
-		if ((v == "no") || (v == "inherit"))
-			return true;
-		try {
-			Poco::JSON::Parser P;
-			auto O = P.parse(v).extract<Poco::JSON::Object::Ptr>();
-
-			ProvObjects::RRMDetails D;
-			if (D.from_json(O)) {
-				return ValidSchedule(D.schedule);
-			}
-		} catch (...) {
-		}
-		return false;
-	}
-
     inline bool ValidDeviceRules(const ProvObjects::DeviceRules & DR) {
-		return (ValidRRM(DR.rrm)) &&
+        return  (DR.rrm=="yes" || DR.rrm=="no" || DR.rrm=="inherit") &&
-			   (DR.firmwareUpgrade == "yes" || DR.firmwareUpgrade == "no" ||
+                (DR.firmwareUpgrade=="yes" || DR.firmwareUpgrade=="no" || DR.firmwareUpgrade=="inherit") &&
-				DR.firmwareUpgrade == "inherit") &&
                 (DR.rcOnly=="yes" || DR.rcOnly=="no" || DR.rcOnly=="inherit");
     }
 
@@ -594,24 +538,28 @@ namespace OpenWifi {
         return false;
     }
 
-	inline bool ValidSourceIP([[maybe_unused]] const std::vector<std::string> &IPs) { return true; }
+    inline bool ValidSourceIP([[maybe_unused]] const std::vector<std::string> & IPs) {
+        return true;
+    }
 
     inline bool ValidPeriod(const std::string &P) {
         return (P=="hourly" || P=="daily" || P=="monthly" || P=="yearly" ||
-				P == "quarterly" || P == "lifetime" || P == "custom1" || P == "custom2" ||
+                P=="quarterly" || P=="lifetime" || P=="custom1" ||
-				P == "custom3" || P == "custom4");
+                P=="custom2"|| P=="custom3"|| P=="custom4");
     }
 
     inline bool ValidContactType(const std::string &contact) {
         auto C = Poco::toLower(contact);
         return (C=="subscriber" || C=="user" || C=="installer" || C=="csr" ||
-				C == "manager" || C == "businessowner" || C == "technician" || C == "corporate");
+                C=="manager" || C=="businessowner" || C=="technician" ||
+                C=="corporate");
     }
 
     inline bool ValidContactType(const std::string &contact, RESTAPIHandler &H) {
         auto C = Poco::toLower(contact);
-		if (C == "subscriber" || C == "user" || C == "installer" || C == "csr" || C == "manager" ||
+        if (C=="subscriber" || C=="user" || C=="installer" || C=="csr" ||
-			C == "businessowner" || C == "technician" || C == "corporate")
+                C=="manager" || C=="businessowner" || C=="technician" ||
+                C=="corporate")
             return true;
         H.BadRequest(RESTAPI::Errors::InvalidContactType);
         return false;
@@ -625,16 +573,14 @@ namespace OpenWifi {
 
     inline bool ValidLocationType(const std::string &location, RESTAPIHandler &H) {
         auto C = Poco::toLower(location);
-		if ((C == "service" || C == "equipment" || C == "auto" || C == "manual" || C == "special" ||
+        if((C=="service" || C=="equipment" || C=="auto" || C=="manual" ||
-			 C == "unknown" || C == "corporate"))
+                C=="special" || C=="unknown" || C=="corporate"))
             return true;
         H.BadRequest(RESTAPI::Errors::InvalidLocationType);
         return false;
     }
 
-	template <typename DBType>
+    template <typename DBType> bool ValidDbId(const Types::UUID_t &uuid, DBType & DB, bool AllowEmpty , const RESTAPI::Errors::msg &Error , RESTAPIHandler & H) {
-	bool ValidDbId(const Types::UUID_t &uuid, DBType &DB, bool AllowEmpty,
-				   const RESTAPI::Errors::msg &Error, RESTAPIHandler &H) {
         if(!AllowEmpty && uuid.empty()) {
             H.BadRequest(Error);
             return false;
@@ -663,8 +609,7 @@ namespace OpenWifi {
         return true;
     }
 
-	inline bool ValidSubscriberId(const Types::UUID_t &uuid, bool AllowEmpty, std::string &email,
+    inline bool ValidSubscriberId( const Types::UUID_t & uuid, bool AllowEmpty, std::string & email, RESTAPIHandler &H ) {
-								  RESTAPIHandler &H) {
         if(!AllowEmpty && uuid.empty()) {
             H.BadRequest(RESTAPI::Errors::InvalidSubscriberId);
             return false;
@@ -680,8 +625,7 @@ namespace OpenWifi {
         return true;
     }
 
-	inline bool ValidSerialNumber(const std::string &serialNumber, bool AllowEmpty,
+    inline bool ValidSerialNumber(const std::string &serialNumber, bool AllowEmpty, RESTAPIHandler &H) {
-								  RESTAPIHandler &H) {
         if(!AllowEmpty && serialNumber.empty()) {
             H.BadRequest(RESTAPI::Errors::InvalidSerialNumber);
             return false;
@@ -694,8 +638,7 @@ namespace OpenWifi {
         return true;
     }
 
-	template <typename DBType, typename DBRecordType>
+    template <typename DBType, typename DBRecordType> void ReturnUpdatedObject( DBType & DB, const DBRecordType & R, RESTAPIHandler &H) {
-	void ReturnUpdatedObject(DBType &DB, const DBRecordType &R, RESTAPIHandler &H) {
         if(DB.UpdateRecord("id",R.info.id,R)) {
             DBRecordType    Updated;
             DB.GetRecord("id",R.info.id,Updated);
@@ -707,8 +650,7 @@ namespace OpenWifi {
         }
     }
 
-	template <typename DBType, typename DBRecordType>
+    template <typename DBType, typename DBRecordType> void ReturnCreatedObject( DBType & DB, const DBRecordType & R, RESTAPIHandler &H) {
-	void ReturnCreatedObject(DBType &DB, const DBRecordType &R, RESTAPIHandler &H) {
         if(DB.CreateRecord(R)) {
             DBRecordType    Updated;
             DB.GetRecord("id",R.info.id,Updated);
@@ -727,4 +669,4 @@ namespace OpenWifi {
         RESTAPI_utils::field_to_json(Answer,"list",Fields);
         return H.ReturnObject(Answer);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_entity_handler.cpp

@@ -6,14 +6,13 @@
 //	Arilia Wireless Inc.
 //
 
+
 #include "RESTAPI_entity_handler.h"
 
-#include "RESTAPI_db_helpers.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "RESTObjects/RESTAPI_SecurityObjects.h"
 #include "StorageService.h"
-
+#include "RESTAPI_db_helpers.h"
-#include "framework/CIDR.h"
 
 namespace OpenWifi{
 
@@ -42,14 +41,12 @@ namespace OpenWifi {
             return BadRequest(RESTAPI::Errors::CannotDeleteRoot);
         }
 
-		if (!Existing.children.empty() || !Existing.devices.empty() || !Existing.venues.empty() ||
+        if( !Existing.children.empty() || !Existing.devices.empty() || !Existing.venues.empty() || !Existing.locations.empty()
-			!Existing.locations.empty() || !Existing.contacts.empty() ||
+            || !Existing.contacts.empty() || !Existing.configurations.empty()) {
-			!Existing.configurations.empty()) {
             return BadRequest(RESTAPI::Errors::StillInUse);
         }
 
-		MoveUsage(StorageService()->PolicyDB(), DB_, Existing.managementPolicy, "",
+        MoveUsage(StorageService()->PolicyDB(),DB_,Existing.managementPolicy,"",Existing.info.id);
-				  Existing.info.id);
         DB_.DeleteRecord("id",UUID);
         DB_.DeleteChild("id",Existing.parent,UUID);
         return OK();
@@ -79,9 +76,9 @@ namespace OpenWifi {
             return BadRequest(RESTAPI::Errors::NameMustBeSet);
         }
 
-		//  When creating an entity, it cannot have any relations other that parent, notes, name,
+        //  When creating an entity, it cannot have any relations other that parent, notes, name, description. Everything else
-		//  description. Everything else must be conveyed through PUT.
+        //  must be conveyed through PUT.
-		NewEntity.info.id = (UUID == EntityDB::RootUUID()) ? UUID : MicroServiceCreateUUID();
+        NewEntity.info.id = (UUID==EntityDB::RootUUID()) ? UUID : MicroService::CreateUUID();
 
         if(UUID==EntityDB::RootUUID()) {
             NewEntity.parent="";
@@ -89,8 +86,7 @@ namespace OpenWifi {
             return BadRequest(RESTAPI::Errors::ParentUUIDMustExist);
         }
 
-		if (!NewEntity.managementPolicy.empty() &&
+        if(!NewEntity.managementPolicy.empty() && !StorageService()->PolicyDB().Exists("id", NewEntity.managementPolicy)){
-			!StorageService()->PolicyDB().Exists("id", NewEntity.managementPolicy)) {
             return BadRequest(RESTAPI::Errors::UnknownManagementPolicyUUID);
         }
 
@@ -106,8 +102,7 @@ namespace OpenWifi {
         NewEntity.managementRoles.clear();
 
         if(DB_.CreateRecord(NewEntity)) {
-			MoveUsage(StorageService()->PolicyDB(), DB_, "", NewEntity.managementPolicy,
+            MoveUsage(StorageService()->PolicyDB(),DB_,"",NewEntity.managementPolicy,NewEntity.info.id);
-					  NewEntity.info.id);
             DB_.AddChild("id",NewEntity.parent,NewEntity.info.id);
 
             Poco::JSON::Object  Answer;
@@ -148,8 +143,7 @@ namespace OpenWifi {
         }
 
         std::string FromPolicy, ToPolicy;
-		if (!CreateMove(RawObject, "managementPolicy", &EntityDB::RecordName::managementPolicy,
+        if(!CreateMove(RawObject,"managementPolicy",&EntityDB::RecordName::managementPolicy, Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB()))
-						Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB()))
             return BadRequest(RESTAPI::Errors::UnknownManagementPolicyUUID);
 
         if(RawObject->has("sourceIP")) {
@@ -178,4 +172,4 @@ namespace OpenWifi {
         }
         InternalError(RESTAPI::Errors::RecordNotUpdated);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_entity_handler.h

@@ -7,22 +7,24 @@
 //
 
 #pragma once
+
+#include "framework/MicroService.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
     class RESTAPI_entity_handler : public RESTAPIHandler {
     public:
-		RESTAPI_entity_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_entity_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-							   RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-							   bool Internal)
         : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                         std::vector<std::string>{
+                                Poco::Net::HTTPRequest::HTTP_GET,
                                 Poco::Net::HTTPRequest::HTTP_POST,
                                 Poco::Net::HTTPRequest::HTTP_PUT,
                                 Poco::Net::HTTPRequest::HTTP_DELETE,
                                 Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+                                Server,
+                                TransactionId,
+                                Internal){}
         static auto PathName() { return std::list<std::string>{"/api/v1/entity/{uuid}"}; };
 
     private:
@@ -32,4 +34,4 @@ namespace OpenWifi {
         void DoPut() final;
         void DoDelete() final;
     };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_entity_list_handler.cpp

@@ -6,15 +6,17 @@
 //	Arilia Wireless Inc.
 //
 
+#include "framework/MicroService.h"
 #include "RESTAPI_entity_list_handler.h"
-#include "RESTAPI_db_helpers.h"
 #include "StorageService.h"
+#include "RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
 
     void RESTAPI_entity_list_handler::DoGet() {
         if(!QB_.Select.empty()) {
-			return ReturnRecordList<decltype(DB_), ProvObjects::Entity>("entities", DB_, *this);
+            return ReturnRecordList<decltype(DB_),
+            ProvObjects::Entity>("entities",DB_,*this );
         } else if(QB_.CountOnly) {
             auto C = DB_.Count();
             return ReturnCountOnly(C);
@@ -37,4 +39,4 @@ namespace OpenWifi {
         }
         BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_entity_list_handler.h

@@ -6,23 +6,25 @@
 //	Arilia Wireless Inc.
 //
 
+
 #pragma once
+
+#include "framework/MicroService.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
     class RESTAPI_entity_list_handler : public RESTAPIHandler {
     public:
-		RESTAPI_entity_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_entity_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-									RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-									bool Internal)
         : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                         std::vector<std::string>{
+            Poco::Net::HTTPRequest::HTTP_GET,
             Poco::Net::HTTPRequest::HTTP_POST,
             Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+            Server,
+            TransactionId,
+            Internal){}
         static auto PathName() { return std::list<std::string>{"/api/v1/entity"}; };
-
     private:
         EntityDB    &DB_=StorageService()->EntityDB();
         void DoGet() final;
@@ -30,4 +32,4 @@ namespace OpenWifi {
         void DoPut() final {};
         void DoDelete() final {};
     };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_inventory_handler.cpp

@@ -8,15 +8,14 @@
 
 #include "RESTAPI_inventory_handler.h"
 
+#include "StorageService.h"
 #include "APConfig.h"
 #include "AutoDiscovery.h"
-#include "DeviceTypeCache.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
-#include "SerialNumberCache.h"
-#include "StorageService.h"
-#include "framework/utils.h"
 #include "sdks/SDK_gw.h"
 #include "sdks/SDK_sec.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
+#include "SerialNumberCache.h"
+#include "DeviceTypeCache.h"
 
 namespace OpenWifi{
 
@@ -26,9 +25,7 @@ namespace OpenWifi {
                 auto Results = Response->get("results").extract<Poco::JSON::Object::Ptr>();
                 auto Status = Results->get("status").extract<Poco::JSON::Object::Ptr>();
                 auto Rejected = Status->getArray("rejected");
-				std::transform(
+                std::transform(Rejected->begin(),Rejected->end(),std::back_inserter(Warnings), [](auto i) -> auto { return i.toString(); });
-					Rejected->begin(), Rejected->end(), std::back_inserter(Warnings),
-					[](auto i) -> auto { return i.toString(); });
 //                for(const auto &i:*Rejected)
   //                  Warnings.push_back(i.toString());
             }
@@ -40,19 +37,16 @@ namespace OpenWifi {
 
         ProvObjects::InventoryTag   Existing;
         std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,"");
-		poco_debug(Logger(), fmt::format("{}: Retrieving inventory information.", SerialNumber));
+        Logger().debug(Poco::format("%s: Retrieving inventory information.",SerialNumber));
-		if (SerialNumber.empty() ||
+        if(SerialNumber.empty() || !DB_.GetRecord(RESTAPI::Protocol::SERIALNUMBER,SerialNumber,Existing)) {
-			!DB_.GetRecord(RESTAPI::Protocol::SERIALNUMBER, SerialNumber, Existing)) {
             return NotFound();
         }
-		poco_debug(Logger(), fmt::format("{},{}: Retrieving inventory information.",
+        Logger().debug(Poco::format("%s,%s: Retrieving inventory information.", Existing.serialNumber, Existing.info.id ));
-										 Existing.serialNumber, Existing.info.id));
 
         Poco::JSON::Object  Answer;
         std::string Arg;
-		if (GetBoolParameter("config", false)) {
+        if(HasParameter("config",Arg) && Arg=="true") {
-			bool Explain = GetBoolParameter("explain", false);
+            bool Explain = (HasParameter("explain",Arg) && Arg == "true");
-
             APConfig    Device(SerialNumber,Existing.deviceType,Logger(), Explain);
 
             auto Configuration = Poco::makeShared<Poco::JSON::Object>();
@@ -64,78 +58,39 @@ namespace OpenWifi {
                 Answer.set("config","none");
             }
             return ReturnObject(Answer);
-		} else if (GetBoolParameter("firmwareOptions", false)) {
+        } else if(HasParameter("firmwareOptions", Arg) && Arg=="true") {
             ProvObjects::DeviceRules Rules;
             StorageService()->InventoryDB().EvaluateDeviceSerialNumberRules(SerialNumber,Rules);
             Answer.set("firmwareUpgrade",Rules.firmwareUpgrade);
             Answer.set("firmwareRCOnly", Rules.rcOnly == "yes" );
             return ReturnObject(Answer);
-		} else if (GetBoolParameter("rrmSettings", false)) {
+        } else if(HasParameter("applyConfiguration",Arg) && Arg=="true") {
-			ProvObjects::DeviceRules Rules;
+            Logger().debug(Poco::format("%s: Retrieving configuration.",Existing.serialNumber));
-			StorageService()->InventoryDB().EvaluateDeviceSerialNumberRules(SerialNumber, Rules);
+            auto Device = std::make_shared<APConfig>(SerialNumber, Existing.deviceType, Logger(), false);
-			if (Rules.rrm == "no" || Rules.rrm == "inherit") {
-				Answer.set("rrm", Rules.rrm);
-			} else {
-				ProvObjects::RRMDetails D;
-				Poco::JSON::Parser P;
-				try {
-					auto Obj = P.parse(Rules.rrm).extract<Poco::JSON::Object::Ptr>();
-					Answer.set("rrm", Obj);
-				} catch (...) {
-					Answer.set("rrm", "invalid");
-				}
-			}
-			return ReturnObject(Answer);
-		} else if (GetBoolParameter("applyConfiguration", false)) {
-			poco_debug(Logger(),
-					   fmt::format("{}: Retrieving configuration.", Existing.serialNumber));
-			auto Device =
-				std::make_shared<APConfig>(SerialNumber, Existing.deviceType, Logger(), false);
             auto Configuration = Poco::makeShared<Poco::JSON::Object>();
             Poco::JSON::Object ErrorsObj, WarningsObj;
             ProvObjects::InventoryConfigApplyResult Results;
-			poco_debug(Logger(),
+            Logger().debug(Poco::format("%s: Computing configuration.",Existing.serialNumber));
-					   fmt::format("{}: Computing configuration.", Existing.serialNumber));
             if (Device->Get(Configuration)) {
                 std::ostringstream OS;
                 Configuration->stringify(OS);
                 Results.appliedConfiguration = OS.str();
                 auto Response=Poco::makeShared<Poco::JSON::Object>();
-				poco_debug(Logger(),
+                Logger().debug(Poco::format("%s: Sending configuration push.",Existing.serialNumber));
-						   fmt::format("{}: Sending configuration push.", Existing.serialNumber));
                 if (SDK::GW::Device::Configure(this, SerialNumber, Configuration, Response)) {
-					poco_debug(Logger(), fmt::format("{}: Sending configuration pushed.",
+                    Logger().debug(Poco::format("%s: Sending configuration pushed.",Existing.serialNumber));
-													 Existing.serialNumber));
                     GetRejectedLines(Response, Results.warnings);
                     Results.errorCode = 0;
                 } else {
-					poco_debug(Logger(), fmt::format("{}: Sending configuration failed.",
+                    Logger().debug(Poco::format("%s: Sending configuration failed.",Existing.serialNumber));
-													 Existing.serialNumber));
                     Results.errorCode = 1;
                 }
             } else {
-				poco_debug(Logger(),
+                Logger().debug(Poco::format("%s: Configuration is bad.",Existing.serialNumber));
-						   fmt::format("{}: Configuration is bad.", Existing.serialNumber));
                 Results.errorCode = 1;
             }
             Results.to_json(Answer);
             return ReturnObject(Answer);
-		} else if (GetBoolParameter("resolveConfig", false)) {
-			poco_debug(Logger(),
-					   fmt::format("{}: Retrieving configuration.", Existing.serialNumber));
-			auto Device =
-				std::make_shared<APConfig>(SerialNumber, Existing.deviceType, Logger(), false);
-			auto Configuration = Poco::makeShared<Poco::JSON::Object>();
-			Poco::JSON::Object ErrorsObj, WarningsObj;
-			ProvObjects::InventoryConfigApplyResult Results;
-			poco_debug(Logger(),
-					   Poco::format("{}: Computing configuration.", Existing.serialNumber));
-			if (Device->Get(Configuration)) {
-				Answer.set("configuration", Configuration);
-			} else {
-				Answer.set("error", 1);
-			}
-			return ReturnObject(Answer);
         }   else if(QB_.AdditionalInfo) {
             AddExtendedInfo(Existing,Answer);
         }
@@ -146,51 +101,41 @@ namespace OpenWifi {
     void RESTAPI_inventory_handler::DoDelete() {
         ProvObjects::InventoryTag   Existing;
         std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,"");
-		if (SerialNumber.empty() ||
+        if(SerialNumber.empty() || !DB_.GetRecord(RESTAPI::Protocol::SERIALNUMBER,SerialNumber,Existing)) {
-			!DB_.GetRecord(RESTAPI::Protocol::SERIALNUMBER, SerialNumber, Existing)) {
             return NotFound();
         }
 
-		MoveUsage(StorageService()->PolicyDB(), DB_, Existing.managementPolicy, "",
+        MoveUsage(StorageService()->PolicyDB(),DB_,Existing.managementPolicy,"",Existing.info.id);
-				  Existing.info.id);
+        RemoveMembership(StorageService()->VenueDB(),&ProvObjects::Venue::configurations,Existing.venue,Existing.info.id);
-		RemoveMembership(StorageService()->VenueDB(), &ProvObjects::Venue::configurations,
+        RemoveMembership(StorageService()->EntityDB(),&ProvObjects::Entity::configurations,Existing.entity,Existing.info.id);
-						 Existing.venue, Existing.info.id);
-		RemoveMembership(StorageService()->EntityDB(), &ProvObjects::Entity::configurations,
-						 Existing.entity, Existing.info.id);
         MoveUsage(StorageService()->LocationDB(),DB_,Existing.location,"",Existing.info.id);
         MoveUsage(StorageService()->ContactDB(),DB_,Existing.contact,"",Existing.info.id);
 
         if(!Existing.deviceConfiguration.empty()) {
             ProvObjects::DeviceConfiguration    DC;
-			if (StorageService()->ConfigurationDB().GetRecord("id", Existing.deviceConfiguration,
+            if(StorageService()->ConfigurationDB().GetRecord("id", Existing.deviceConfiguration, DC)) {
-															  DC)) {
                 if(DC.subscriberOnly)
-					StorageService()->ConfigurationDB().DeleteRecord("id",
+                    StorageService()->ConfigurationDB().DeleteRecord("id", Existing.deviceConfiguration);
-																	 Existing.deviceConfiguration);
                 else
-					StorageService()->ConfigurationDB().DeleteInUse(
+                    StorageService()->ConfigurationDB().DeleteInUse("id", Existing.deviceConfiguration, DB_.Prefix(),
-						"id", Existing.deviceConfiguration, DB_.Prefix(), Existing.info.id);
+                                                                    Existing.info.id);
             }
         }
 
-		MoveUsage(StorageService()->PolicyDB(), DB_, Existing.managementPolicy, "",
+        MoveUsage(StorageService()->PolicyDB(),DB_,Existing.managementPolicy,"",Existing.info.id);
-				  Existing.info.id);
         MoveUsage(StorageService()->LocationDB(),DB_,Existing.location,"",Existing.info.id);
         MoveUsage(StorageService()->ContactDB(),DB_,Existing.contact,"",Existing.info.id);
-		MoveUsage(StorageService()->ConfigurationDB(), DB_, Existing.deviceConfiguration, "",
+        MoveUsage(StorageService()->ConfigurationDB(),DB_,Existing.deviceConfiguration,"",Existing.info.id);
-				  Existing.info.id);
+        ManageMembership(StorageService()->EntityDB(),&ProvObjects::Entity::devices,Existing.entity,"",Existing.info.id);
-		ManageMembership(StorageService()->EntityDB(), &ProvObjects::Entity::devices,
+        ManageMembership(StorageService()->VenueDB(),&ProvObjects::Venue::devices,Existing.venue,"",Existing.info.id);
-						 Existing.entity, "", Existing.info.id);
-		ManageMembership(StorageService()->VenueDB(), &ProvObjects::Venue::devices, Existing.venue,
-						 "", Existing.info.id);
         DB_.DeleteRecord("id", Existing.info.id);
         SerialNumberCache()->DeleteSerialNumber(SerialNumber);
         return OK();
     }
 
+
     void RESTAPI_inventory_handler::DoPost() {
         std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER,"");
-		Poco::toLowerInPlace(SerialNumber);
         if(SerialNumber.empty()) {
             return BadRequest(RESTAPI::Errors::MissingSerialNumber);
         }
@@ -209,11 +154,6 @@ namespace OpenWifi {
             return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
         }
 
-		NormalizeMac(NewObject.serialNumber);
-		if (SerialNumber != NewObject.serialNumber) {
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
         if((RawObject->has("deviceRules") && !ValidDeviceRules(NewObject.deviceRules,*this))) {
             return;
         }
@@ -230,19 +170,15 @@ namespace OpenWifi {
             return BadRequest( RESTAPI::Errors::NameMustBeSet);
         }
 
-		if (NewObject.deviceType.empty() ||
+        if(NewObject.deviceType.empty() || !DeviceTypeCache()->IsAcceptableDeviceType(NewObject.deviceType)) {
-			!DeviceTypeCache()->IsAcceptableDeviceType(NewObject.deviceType)) {
             return BadRequest(RESTAPI::Errors::InvalidDeviceTypes);
         }
 
-		if (OpenWifi::EntityDB::IsRoot(NewObject.entity) ||
+        if(OpenWifi::EntityDB::IsRoot(NewObject.entity) || (!NewObject.entity.empty() && !StorageService()->EntityDB().Exists("id",NewObject.entity))) {
-			(!NewObject.entity.empty() &&
-			 !StorageService()->EntityDB().Exists("id", NewObject.entity))) {
             return BadRequest(RESTAPI::Errors::ValidNonRootUUID);
         }
 
-		if (!NewObject.venue.empty() &&
+        if(!NewObject.venue.empty() && !StorageService()->VenueDB().Exists("id",NewObject.venue)) {
-			!StorageService()->VenueDB().Exists("id", NewObject.venue)) {
             return BadRequest(RESTAPI::Errors::VenueMustExist);
         }
 
@@ -250,47 +186,37 @@ namespace OpenWifi {
             return BadRequest(RESTAPI::Errors::NotBoth);
         }
 
-		if (!NewObject.location.empty() &&
+        if(!NewObject.location.empty() && !StorageService()->LocationDB().Exists("id",NewObject.location)) {
-			!StorageService()->LocationDB().Exists("id", NewObject.location)) {
             return BadRequest(RESTAPI::Errors::LocationMustExist);
         }
 
-		if (!NewObject.contact.empty() &&
+        if(!NewObject.contact.empty() && !StorageService()->ContactDB().Exists("id",NewObject.contact)) {
-			!StorageService()->ContactDB().Exists("id", NewObject.contact)) {
             return BadRequest(RESTAPI::Errors::ContactMustExist);
         }
 
-		if (!NewObject.deviceConfiguration.empty() &&
+        if(!NewObject.deviceConfiguration.empty() && !StorageService()->ConfigurationDB().Exists("id",NewObject.deviceConfiguration)) {
-			!StorageService()->ConfigurationDB().Exists("id", NewObject.deviceConfiguration)) {
             return BadRequest(RESTAPI::Errors::ConfigurationMustExist);
         }
 
-		if (!NewObject.managementPolicy.empty() &&
+        if(!NewObject.managementPolicy.empty() && !StorageService()->PolicyDB().Exists("id",NewObject.managementPolicy)) {
-			!StorageService()->PolicyDB().Exists("id", NewObject.managementPolicy)) {
             return BadRequest(RESTAPI::Errors::UnknownManagementPolicyUUID);
         }
 
-		std::vector<std::string> Errors;
+        RESTAPI::Errors::msg Error=RESTAPI::Errors::SUCCESS;
-		auto ObjectsCreated = CreateObjects(NewObject, *this, Errors);
+        auto ObjectsCreated = CreateObjects(NewObject,*this,Error);
-		if (!Errors.empty()) {
+        if(Error.err_num != 0) {
-			return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
+            return BadRequest(Error);
         }
 
         if(DB_.CreateRecord(NewObject)) {
-			SDK::GW::Device::SetOwnerShip(this, SerialNumber, NewObject.entity, NewObject.venue,
+            SDK::GW::Device::SetOwnerShip(this, SerialNumber, NewObject.entity, NewObject.venue, NewObject.subscriber);
-										  NewObject.subscriber);
             SerialNumberCache()->AddSerialNumber(SerialNumber,NewObject.deviceType);
-			MoveUsage(StorageService()->PolicyDB(), DB_, "", NewObject.managementPolicy,
+            MoveUsage(StorageService()->PolicyDB(),DB_,"",NewObject.managementPolicy,NewObject.info.id);
-					  NewObject.info.id);
+            MoveUsage(StorageService()->LocationDB(),DB_,"",NewObject.location,NewObject.info.id);
-			MoveUsage(StorageService()->LocationDB(), DB_, "", NewObject.location,
-					  NewObject.info.id);
             MoveUsage(StorageService()->ContactDB(),DB_,"",NewObject.contact,NewObject.info.id);
-			MoveUsage(StorageService()->ConfigurationDB(), DB_, "", NewObject.deviceConfiguration,
+            MoveUsage(StorageService()->ConfigurationDB(),DB_,"",NewObject.deviceConfiguration,NewObject.info.id);
-					  NewObject.info.id);
+            ManageMembership(StorageService()->EntityDB(),&ProvObjects::Entity::devices,"",NewObject.entity,NewObject.info.id);
-			ManageMembership(StorageService()->EntityDB(), &ProvObjects::Entity::devices, "",
+            ManageMembership(StorageService()->VenueDB(),&ProvObjects::Venue::devices,"",NewObject.venue,NewObject.info.id);
-							 NewObject.entity, NewObject.info.id);
-			ManageMembership(StorageService()->VenueDB(), &ProvObjects::Venue::devices, "",
-							 NewObject.venue, NewObject.info.id);
 
             ProvObjects::InventoryTag   NewTag;
             DB_.GetRecord("id",NewObject.info.id,NewTag);
@@ -309,50 +235,43 @@ namespace OpenWifi {
         }
 
         ProvObjects::InventoryTag   Existing;
-		if (SerialNumber.empty() ||
+        if(SerialNumber.empty() || !DB_.GetRecord(RESTAPI::Protocol::SERIALNUMBER,SerialNumber,Existing)) {
-			!DB_.GetRecord(RESTAPI::Protocol::SERIALNUMBER, SerialNumber, Existing)) {
             return NotFound();
         }
 
         auto RemoveSubscriber = GetParameter("removeSubscriber");
         if(!RemoveSubscriber.empty()) {
             if(Existing.subscriber == RemoveSubscriber) {
-				poco_information(Logger(), fmt::format("{}: removing subscriber ({})", SerialNumber,
+                Logger().information(Poco::format("%s: removing subscriber (%s)", SerialNumber, RemoveSubscriber));
-													   RemoveSubscriber));
                 ProvObjects::DeviceConfiguration    DC;
-				if (StorageService()->ConfigurationDB().GetRecord(
+                if(StorageService()->ConfigurationDB().GetRecord("id",Existing.deviceConfiguration,DC)) {
-						"id", Existing.deviceConfiguration, DC)) {
+                    Logger().information(Poco::format("%s: removing configuration for subscriber (%s)", SerialNumber, RemoveSubscriber));
-					poco_information(Logger(),
-									 fmt::format("{}: removing configuration for subscriber ({})",
-												 SerialNumber, RemoveSubscriber));
                     if(DC.subscriberOnly) {
-						if (!StorageService()->ConfigurationDB().DeleteRecord(
+                        if(!StorageService()->ConfigurationDB().DeleteRecord("id", Existing.deviceConfiguration)) {
-								"id", Existing.deviceConfiguration)) {
+                            Logger().debug("Could not delete the subscriber configuration");
-							poco_debug(Logger(), "Could not delete the subscriber configuration");
                         }
-					} else {
+                    }
-						poco_debug(Logger(), "Configurations is not for a subscriber.");
+                    else {
+                        Logger().debug("Configurations is not for a subscriber.");
                     }
                     Existing.deviceConfiguration = "";
                 }
                 Existing.subscriber = "";
                 Poco::JSON::Object state;
-				state.set("date", Utils::Now());
+                state.set("date",OpenWifi::Now());
                 state.set("method","auto-discovery");
                 state.set("last-operation", "returned to inventory");
                 std::ostringstream OO;
                 state.stringify(OO);
                 Existing.state = OO.str();
                 StorageService()->InventoryDB().UpdateRecord("id",Existing.info.id,Existing);
-				RemoveMembership(StorageService()->EntityDB(), &ProvObjects::Entity::devices, "id",
+                RemoveMembership(StorageService()->EntityDB(),&ProvObjects::Entity::devices,"id",Existing.info.id);
-								 Existing.info.id);
                 Poco::JSON::Object  Answer;
                 Existing.to_json(Answer);
                 SDK::GW::Device::SetSubscriber(nullptr, SerialNumber, "");
                 return ReturnObject(Answer);
             } else {
-				poco_information(Logger(), fmt::format("{}: wrong subscriber ({})", SerialNumber,
+                Logger().information(Poco::format("%s: wrong subscriber (%s)", SerialNumber, RemoveSubscriber));
-													   RemoveSubscriber));
             }
             return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
         }
@@ -385,34 +304,33 @@ namespace OpenWifi {
             Existing.deviceRules = NewObject.deviceRules;
 
         std::string FromPolicy, ToPolicy;
-		if (!CreateMove(RawObject, "managementPolicy", &InventoryDB::RecordName::managementPolicy,
+        if(!CreateMove(RawObject,"managementPolicy",&InventoryDB::RecordName::managementPolicy, Existing, FromPolicy,
-						Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB()))
+                       ToPolicy, StorageService()->PolicyDB()))
             return BadRequest(RESTAPI::Errors::EntityMustExist);
 
         std::string FromEntity, ToEntity;
-		if (!CreateMove(RawObject, "entity", &InventoryDB::RecordName::entity, Existing, FromEntity,
+        if(!CreateMove(RawObject,"entity",&InventoryDB::RecordName::entity, Existing, FromEntity, ToEntity,
-						ToEntity, StorageService()->EntityDB()))
+                       StorageService()->EntityDB()))
             return BadRequest(RESTAPI::Errors::EntityMustExist);
 
         std::string FromVenue, ToVenue;
-		if (!CreateMove(RawObject, "venue", &InventoryDB::RecordName::venue, Existing, FromVenue,
+        if(!CreateMove(RawObject,"venue",&InventoryDB::RecordName::venue, Existing, FromVenue, ToVenue,
-						ToVenue, StorageService()->VenueDB()))
+                       StorageService()->VenueDB()))
             return BadRequest(RESTAPI::Errors::VenueMustExist);
 
         std::string FromLocation, ToLocation;
-		if (!CreateMove(RawObject, "location", &InventoryDB::RecordName::location, Existing,
+        if(!CreateMove(RawObject,"location",&InventoryDB::RecordName::location, Existing, FromLocation, ToLocation,
-						FromLocation, ToLocation, StorageService()->LocationDB()))
+                       StorageService()->LocationDB()))
             return BadRequest(RESTAPI::Errors::VenueMustExist);
 
         std::string FromContact, ToContact;
-		if (!CreateMove(RawObject, "contact", &InventoryDB::RecordName::contact, Existing,
+        if(!CreateMove(RawObject,"contact",&InventoryDB::RecordName::contact, Existing, FromContact, ToContact,
-						FromContact, ToContact, StorageService()->ContactDB()))
+                       StorageService()->ContactDB()))
             return BadRequest(RESTAPI::Errors::VenueMustExist);
 
         std::string FromConfiguration, ToConfiguration;
-		if (!CreateMove(RawObject, "deviceConfiguration",
+        if(!CreateMove(RawObject,"deviceConfiguration",&InventoryDB::RecordName::deviceConfiguration, Existing,
-						&InventoryDB::RecordName::deviceConfiguration, Existing, FromConfiguration,
+                       FromConfiguration, ToConfiguration, StorageService()->ConfigurationDB()))
-						ToConfiguration, StorageService()->ConfigurationDB()))
             return BadRequest(RESTAPI::Errors::ConfigurationMustExist);
 
         std::string NewSubScriber;
@@ -431,8 +349,6 @@ namespace OpenWifi {
             }
         }
 
-		AssignIfPresent(RawObject, "doNotAllowOverrides", Existing.doNotAllowOverrides);
-
         if( RawObject->has("devClass") && NewObject.devClass!= Existing.devClass) {
             Existing.devClass = NewObject.devClass;
         }
@@ -441,10 +357,10 @@ namespace OpenWifi {
             Existing.state = NewObject.state;
         }
 
-		std::vector<std::string> Errors;
+        RESTAPI::Errors::msg Error=RESTAPI::Errors::SUCCESS;
-		auto ObjectsCreated = CreateObjects(NewObject, *this, Errors);
+        auto ObjectsCreated = CreateObjects(NewObject,*this,Error);
-		if (!Errors.empty()) {
+        if(Error.err_num != 0) {
-			return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
+            return BadRequest(Error);
         }
 
         if(!ObjectsCreated.empty()) {
@@ -458,18 +374,13 @@ namespace OpenWifi {
 
         if(StorageService()->InventoryDB().UpdateRecord("id", Existing.info.id, Existing)) {
             MoveUsage(StorageService()->PolicyDB(),DB_,FromPolicy,ToPolicy,Existing.info.id);
-			MoveUsage(StorageService()->LocationDB(), DB_, FromLocation, ToLocation,
+            MoveUsage(StorageService()->LocationDB(),DB_,FromLocation,ToLocation,Existing.info.id);
-					  Existing.info.id);
             MoveUsage(StorageService()->ContactDB(),DB_,FromContact,ToContact,Existing.info.id);
-			MoveUsage(StorageService()->ConfigurationDB(), DB_, FromConfiguration, ToConfiguration,
+            MoveUsage(StorageService()->ConfigurationDB(),DB_,FromConfiguration,ToConfiguration,Existing.info.id);
-					  Existing.info.id);
+            ManageMembership(StorageService()->EntityDB(),&ProvObjects::Entity::devices,FromEntity,ToEntity,Existing.info.id);
-			ManageMembership(StorageService()->EntityDB(), &ProvObjects::Entity::devices,
+            ManageMembership(StorageService()->VenueDB(),&ProvObjects::Venue::devices,FromVenue,ToVenue,Existing.info.id);
-							 FromEntity, ToEntity, Existing.info.id);
-			ManageMembership(StorageService()->VenueDB(), &ProvObjects::Venue::devices, FromVenue,
-							 ToVenue, Existing.info.id);
 
-			SDK::GW::Device::SetOwnerShip(this, SerialNumber, Existing.entity, Existing.venue,
+            SDK::GW::Device::SetOwnerShip(this, SerialNumber, Existing.entity, Existing.venue, Existing.subscriber);
-										  Existing.subscriber);
 
             ProvObjects::InventoryTag   NewObjectCreated;
             DB_.GetRecord("id", Existing.info.id, NewObjectCreated);
@@ -479,4 +390,4 @@ namespace OpenWifi {
         }
         InternalError(RESTAPI::Errors::RecordNotUpdated);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_inventory_handler.h

@@ -7,25 +7,23 @@
 //
 
 #pragma once
+
+#include "framework/MicroService.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
     class RESTAPI_inventory_handler : public RESTAPIHandler {
     public:
-		RESTAPI_inventory_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_inventory_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-								  RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-								  bool Internal)
         : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                         std::vector<std::string>{
-													  Poco::Net::HTTPRequest::HTTP_POST,
+            Poco::Net::HTTPRequest::HTTP_GET, Poco::Net::HTTPRequest::HTTP_POST,
-													  Poco::Net::HTTPRequest::HTTP_PUT,
+            Poco::Net::HTTPRequest::HTTP_PUT, Poco::Net::HTTPRequest::HTTP_DELETE,
-													  Poco::Net::HTTPRequest::HTTP_DELETE,
             Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+            Server,
-		static auto PathName() {
+            TransactionId,
-			return std::list<std::string>{"/api/v1/inventory/{serialNumber}"};
+            Internal){}
-		};
+        static auto PathName() { return std::list<std::string>{"/api/v1/inventory/{serialNumber}"}; };
 
     private:
         InventoryDB     &DB_=StorageService()->InventoryDB();
@@ -36,4 +34,4 @@ namespace OpenWifi {
         void PerformClaim(const std::string &SerialNumber, const std::string & Claimer ,
                           std::string & ClaimId, uint64_t &ErrorCode, Poco::JSON::Object &Answer);
     };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_inventory_list_handler.cpp

@@ -6,13 +6,13 @@
 //	Arilia Wireless Inc.
 //
 
+
 #include "RESTAPI_inventory_list_handler.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
 #include "StorageService.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
-	void RESTAPI_inventory_list_handler::SendList(const ProvObjects::InventoryTagVec &Tags,
+    void RESTAPI_inventory_list_handler::SendList( const ProvObjects::InventoryTagVec & Tags, bool SerialOnly) {
-												  bool SerialOnly) {
         Poco::JSON::Array   Array;
         for(const auto &i:Tags) {
             if(SerialOnly) {
@@ -75,8 +75,7 @@ namespace OpenWifi {
                 return ReturnCountOnly( C);
             }
             ProvObjects::InventoryTagVec Tags;
-			DB_.GetRecords(QB_.Offset, QB_.Limit, Tags, " devClass='subscriber' and subscriber='' ",
+            DB_.GetRecords(QB_.Offset, QB_.Limit, Tags, " devClass='subscriber' and subscriber='' ", OrderBy);
-						   OrderBy);
             if(QB_.CountOnly) {
                 auto C = DB_.Count(DB_.OP("venue",ORM::EQ,UUID));
                 return ReturnCountOnly( C);
@@ -88,31 +87,27 @@ namespace OpenWifi {
                 return ReturnCountOnly( C);
             }
             ProvObjects::InventoryTagVec Tags;
-			DB_.GetRecords(QB_.Offset, QB_.Limit, Tags,
+            DB_.GetRecords(QB_.Offset, QB_.Limit, Tags," devClass='subscriber' and subscriber!='' ", OrderBy);
-						   " devClass='subscriber' and subscriber!='' ", OrderBy);
             return SendList(Tags, SerialOnly);
         } else if(GetBoolParameter("unassigned")) {
             if(QB_.CountOnly) {
                 std::string Empty;
-				auto C = DB_.Count(InventoryDB::OP(DB_.OP("venue", ORM::EQ, Empty), ORM::AND,
+                auto C = DB_.Count( InventoryDB::OP( DB_.OP("venue",ORM::EQ,Empty),
-												   DB_.OP("entity", ORM::EQ, Empty)));
+                                                                          ORM::AND, DB_.OP("entity",ORM::EQ,Empty) ));
                 return ReturnCountOnly(C);
             }
             ProvObjects::InventoryTagVec Tags;
             std::string Empty;
-			DB_.GetRecords(QB_.Offset, QB_.Limit, Tags,
+            DB_.GetRecords(QB_.Offset, QB_.Limit, Tags, InventoryDB::OP( DB_.OP("venue",ORM::EQ,Empty),
-						   InventoryDB::OP(DB_.OP("venue", ORM::EQ, Empty), ORM::AND,
+                                                                         ORM::AND, DB_.OP("entity",ORM::EQ,Empty) ) , OrderBy );
-										   DB_.OP("entity", ORM::EQ, Empty)),
-						   OrderBy);
             return SendList(Tags, SerialOnly);
         } else if (HasParameter("subscriber",Arg) && !Arg.empty()) {
             // looking for device(s) for a specific subscriber...
             ProvObjects::InventoryTagVec Tags;
-			DB_.GetRecords(0, 100, Tags, " subscriber='" + ORM::Escape(Arg) + "'");
+            DB_.GetRecords(0,100,Tags," subscriber='" + Arg + "'");
             if(SerialOnly) {
                 std::vector<std::string>    SerialNumbers;
-				std::transform(cbegin(Tags), cend(Tags), std::back_inserter(SerialNumbers),
+                std::transform(cbegin(Tags), cend(Tags), std::back_inserter(SerialNumbers), [](const auto &T) { return T.serialNumber; });
-							   [](const auto &T) { return T.serialNumber; });
                 return ReturnObject("serialNumbers",SerialNumbers);
             } else {
                 return MakeJSONObjectArray("taglist", Tags, *this);
@@ -134,4 +129,4 @@ namespace OpenWifi {
             return MakeJSONObjectArray("taglist", Tags, *this);
         }
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_inventory_list_handler.h

@@ -7,22 +7,23 @@
 //
 
 #pragma once
+
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
     class RESTAPI_inventory_list_handler : public RESTAPIHandler {
     public:
-		RESTAPI_inventory_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_inventory_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-									   RESTAPI_GenericServerAccounting &Server,
-									   uint64_t TransactionId, bool Internal)
         : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                         std::vector<std::string>{
+            Poco::Net::HTTPRequest::HTTP_GET,
             Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+            Server,
+            TransactionId,
+            Internal){}
         static auto PathName() { return std::list<std::string>{"/api/v1/inventory"}; };
-
     private:
         InventoryDB     &DB_=StorageService()->InventoryDB();
         void DoGet() final;
@@ -32,4 +33,4 @@ namespace OpenWifi {
 
         void SendList(const ProvObjects::InventoryTagVec & Tags, bool SerialOnly);
     };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_iptocountry_handler.cpp

@@ -28,4 +28,4 @@ namespace OpenWifi {
 		return ReturnObject(Answer);
 	}
 
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_iptocountry_handler.h

@@ -3,23 +3,23 @@
 //
 
 #pragma once
-#include "StorageService.h"
+
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 class RESTAPI_iptocountry_handler : public RESTAPIHandler {
   public:
-		RESTAPI_iptocountry_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+	RESTAPI_iptocountry_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-									RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-									bool Internal)
 		: RESTAPIHandler(bindings, L,
 						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
 												  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal){};
+						 Server,
+						 TransactionId,
+						 Internal){};
     static auto PathName() { return std::list<std::string>{"/api/v1/iptocountry"}; };
 	void DoGet() final;
 	void DoDelete() final {};
 	void DoPost() final {};
 	void DoPut() final {};
 };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_location_handler.cpp

@@ -6,12 +6,12 @@
 //	Arilia Wireless Inc.
 //
 
+
 #include "RESTAPI_location_handler.h"
-#include "Daemon.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
-#include "framework/utils.h"
+#include "Daemon.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
 
@@ -65,8 +65,7 @@ namespace OpenWifi {
         }
 
         DB_.DeleteRecord("id",UUID);
-		RemoveMembership(StorageService()->EntityDB(), &ProvObjects::Entity::locations,
+        RemoveMembership(StorageService()->EntityDB(),&ProvObjects::Entity::locations,Existing.entity,Existing.info.id);
-						 Existing.entity, Existing.info.id);
         MoveUsage(StorageService()->PolicyDB(),DB_,Existing.info.id,"",Existing.info.id);
         return OK();
     }
@@ -87,23 +86,19 @@ namespace OpenWifi {
             return BadRequest( RESTAPI::Errors::NameMustBeSet);
         }
 
-		if (NewObject.entity.empty() ||
+        if(NewObject.entity.empty() || !StorageService()->EntityDB().Exists("id",NewObject.entity)) {
-			!StorageService()->EntityDB().Exists("id", NewObject.entity)) {
             return BadRequest(RESTAPI::Errors::EntityMustExist);
         }
 
-		if (!NewObject.managementPolicy.empty() &&
+        if(!NewObject.managementPolicy.empty() && !StorageService()->PolicyDB().Exists("id",NewObject.managementPolicy)) {
-			!StorageService()->PolicyDB().Exists("id", NewObject.managementPolicy)) {
             return BadRequest(RESTAPI::Errors::UnknownManagementPolicyUUID);
         }
 
         NewObject.inUse.clear();
 
         if(DB_.CreateRecord(NewObject)) {
-			MoveUsage(StorageService()->PolicyDB(), DB_, "", NewObject.managementPolicy,
+            MoveUsage(StorageService()->PolicyDB(),DB_,"",NewObject.managementPolicy,NewObject.info.id);
-					  NewObject.info.id);
+            AddMembership(StorageService()->EntityDB(),&ProvObjects::Entity::locations,NewObject.entity,NewObject.info.id);
-			AddMembership(StorageService()->EntityDB(), &ProvObjects::Entity::locations,
-						  NewObject.entity, NewObject.info.id);
 
             LocationDB::RecordName AddedRecord;
             DB_.GetRecord("id", NewObject.info.id,AddedRecord);
@@ -133,13 +128,11 @@ namespace OpenWifi {
         }
 
         std::string FromPolicy, ToPolicy;
-		if (!CreateMove(RawObject, "managementPolicy", &LocationDB::RecordName::managementPolicy,
+        if(!CreateMove(RawObject,"managementPolicy",&LocationDB::RecordName::managementPolicy, Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB()))
-						Existing, FromPolicy, ToPolicy, StorageService()->PolicyDB()))
             return BadRequest(RESTAPI::Errors::EntityMustExist);
 
         std::string FromEntity, ToEntity;
-		if (!CreateMove(RawObject, "entity", &LocationDB::RecordName::entity, Existing, FromEntity,
+        if(!CreateMove(RawObject,"entity",&LocationDB::RecordName::entity, Existing, FromEntity, ToEntity, StorageService()->EntityDB()))
-						ToEntity, StorageService()->EntityDB()))
             return BadRequest(RESTAPI::Errors::EntityMustExist);
 
         AssignIfPresent(RawObject, "buildingName", Existing.buildingName);
@@ -154,14 +147,13 @@ namespace OpenWifi {
             Existing.phones = NewObject.phones;
         if(RawObject->has("mobiles"))
             Existing.mobiles = NewObject.mobiles;
-		Existing.info.modified = Utils::Now();
+        Existing.info.modified = OpenWifi::Now();
         if(RawObject->has("type"))
             Existing.type = NewObject.type;
 
         if(DB_.UpdateRecord("id", UUID, Existing)) {
             MoveUsage(StorageService()->PolicyDB(), DB_, FromPolicy, ToPolicy, Existing.info.id);
-			ManageMembership(StorageService()->EntityDB(), &ProvObjects::Entity::locations,
+            ManageMembership(StorageService()->EntityDB(),&ProvObjects::Entity::locations,FromEntity, ToEntity, Existing.info.id);
-							 FromEntity, ToEntity, Existing.info.id);
 
             ProvObjects::Location    NewObjectAdded;
             DB_.GetRecord("id", UUID, NewObjectAdded);
@@ -171,4 +163,4 @@ namespace OpenWifi {
         }
         InternalError(RESTAPI::Errors::RecordNotUpdated);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_location_handler.h

@@ -7,22 +7,22 @@
 //
 
 #pragma once
+
+#include "framework/MicroService.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
     class RESTAPI_location_handler : public RESTAPIHandler {
     public:
-		RESTAPI_location_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_location_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-								 RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-								 bool Internal)
         : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                         std::vector<std::string>{
-													  Poco::Net::HTTPRequest::HTTP_POST,
+            Poco::Net::HTTPRequest::HTTP_GET, Poco::Net::HTTPRequest::HTTP_POST,
-													  Poco::Net::HTTPRequest::HTTP_PUT,
+            Poco::Net::HTTPRequest::HTTP_PUT, Poco::Net::HTTPRequest::HTTP_DELETE,
-													  Poco::Net::HTTPRequest::HTTP_DELETE,
             Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+            Server,
+            TransactionId,
+            Internal){}
         static auto PathName() { return std::list<std::string>{"/api/v1/location/{uuid}"}; };
 
     private:
@@ -32,4 +32,4 @@ namespace OpenWifi {
         void DoPut() final ;
         void DoDelete() final ;
     };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_location_list_handler.cpp

@@ -4,13 +4,13 @@
 
 #include "RESTAPI_location_list_handler.h"
 
-#include "RESTAPI/RESTAPI_db_helpers.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
 
     void RESTAPI_location_list_handler::DoGet() {
         return ListHandler<LocationDB>("locations", DB_, *this);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_location_list_handler.h

@@ -3,22 +3,23 @@
 //
 
 #pragma once
+
+#include "framework/MicroService.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
 
     class RESTAPI_location_list_handler : public RESTAPIHandler {
     public:
-		RESTAPI_location_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_location_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-									  RESTAPI_GenericServerAccounting &Server,
-									  uint64_t TransactionId, bool Internal)
         : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                         std::vector<std::string>{
+            Poco::Net::HTTPRequest::HTTP_GET,
             Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+            Server,
+            TransactionId,
+            Internal){}
         static auto PathName() { return std::list<std::string>{"/api/v1/location"}; };
-
     private:
         LocationDB  & DB_=StorageService()->LocationDB();
         void DoGet() final;
@@ -26,4 +27,4 @@ namespace OpenWifi {
         void DoPut() final {};
         void DoDelete() final {};
     };
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_managementPolicy_handler.cpp

@@ -6,12 +6,13 @@
 //	Arilia Wireless Inc.
 //
 
+
 #include "RESTAPI_managementPolicy_handler.h"
-#include "Daemon.h"
-#include "Poco/JSON/Parser.h"
-#include "RESTAPI/RESTAPI_db_helpers.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
+#include "Poco/JSON/Parser.h"
+#include "Daemon.h"
+#include "RESTAPI/RESTAPI_db_helpers.h"
 
 namespace OpenWifi{
 
@@ -63,10 +64,8 @@ namespace OpenWifi {
         }
 
         StorageService()->PolicyDB().DeleteRecord("id", UUID);
-		ManageMembership(StorageService()->EntityDB(), &ProvObjects::Entity::managementPolicies,
+        ManageMembership(StorageService()->EntityDB(),&ProvObjects::Entity::managementPolicies,Existing.entity,"",Existing.info.id);
-						 Existing.entity, "", Existing.info.id);
+        ManageMembership(StorageService()->VenueDB(),&ProvObjects::Venue::managementPolicies,Existing.venue,"",Existing.info.id);
-		ManageMembership(StorageService()->VenueDB(), &ProvObjects::Venue::managementPolicies,
-						 Existing.venue, "", Existing.info.id);
         return OK();
     }
 
@@ -86,8 +85,7 @@ namespace OpenWifi {
             return BadRequest( RESTAPI::Errors::NameMustBeSet);
         }
 
-		if (NewObject.entity.empty() ||
+        if(NewObject.entity.empty() || !StorageService()->EntityDB().Exists("id", NewObject.entity)) {
-			!StorageService()->EntityDB().Exists("id", NewObject.entity)) {
             return BadRequest(RESTAPI::Errors::EntityMustExist);
         }
 
@@ -97,10 +95,8 @@ namespace OpenWifi {
 
         NewObject.inUse.clear();
         if(DB_.CreateRecord(NewObject)) {
-			AddMembership(StorageService()->EntityDB(), &ProvObjects::Entity::managementPolicies,
+            AddMembership(StorageService()->EntityDB(),&ProvObjects::Entity::managementPolicies,NewObject.entity,NewObject.info.id);
-						  NewObject.entity, NewObject.info.id);
+            AddMembership(StorageService()->VenueDB(),&ProvObjects::Venue::managementPolicies,NewObject.venue,NewObject.info.id);
-			AddMembership(StorageService()->VenueDB(), &ProvObjects::Venue::managementPolicies,
-						  NewObject.venue, NewObject.info.id);
             PolicyDB::RecordName  AddedObject;
             DB_.GetRecord("id",NewObject.info.id,AddedObject);
             Poco::JSON::Object  Answer;
@@ -128,23 +124,19 @@ namespace OpenWifi {
         }
 
         std::string FromEntity, ToEntity;
-		if (!CreateMove(RawObject, "entity", &PolicyDB::RecordName::entity, Existing, FromEntity,
+        if(!CreateMove(RawObject,"entity",&PolicyDB::RecordName::entity, Existing, FromEntity, ToEntity, StorageService()->EntityDB()))
-						ToEntity, StorageService()->EntityDB()))
             return BadRequest(RESTAPI::Errors::EntityMustExist);
 
         std::string FromVenue, ToVenue;
-		if (!CreateMove(RawObject, "venue", &PolicyDB::RecordName::venue, Existing, FromVenue,
+        if(!CreateMove(RawObject,"venue",&PolicyDB::RecordName::venue, Existing, FromVenue, ToVenue, StorageService()->VenueDB()))
-						ToVenue, StorageService()->VenueDB()))
             return BadRequest(RESTAPI::Errors::EntityMustExist);
 
         if(!NewPolicy.entries.empty())
             Existing.entries = NewPolicy.entries;
 
         if(DB_.UpdateRecord("id", Existing.info.id, Existing)) {
-			ManageMembership(StorageService()->EntityDB(), &ProvObjects::Entity::managementPolicies,
+            ManageMembership(StorageService()->EntityDB(),&ProvObjects::Entity::managementPolicies, FromEntity,ToEntity,Existing.info.id);
-							 FromEntity, ToEntity, Existing.info.id);
+            ManageMembership(StorageService()->VenueDB(),&ProvObjects::Venue::managementPolicies, FromVenue,ToVenue,Existing.info.id);
-			ManageMembership(StorageService()->VenueDB(), &ProvObjects::Venue::managementPolicies,
-							 FromVenue, ToVenue, Existing.info.id);
 
             ProvObjects::ManagementPolicy   P;
             DB_.GetRecord("id",Existing.info.id,P);
@@ -154,4 +146,4 @@ namespace OpenWifi {
         }
         InternalError(RESTAPI::Errors::RecordNotUpdated);
     }
-} // namespace OpenWifi
+}