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

https://telecominfraproject.atlassian.net/browse/WIFI-10040

.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

@@ -26,7 +26,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
@@ -57,11 +57,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 "owgw_branch=$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')" >> $GITHUB_OUTPUT
+        echo ::set-output name=branch::$(echo ${GITHUB_BASE_REF##*/})
+        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
@@ -86,7 +86,7 @@ jobs:
       - docker
     steps:
     - 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-analytics/main/openapi/owanalytics.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-analytics
 

.gitignore

@@ -32,7 +32,6 @@
 *.app
 
 test_scripts/curl/token.json
-test_scripts/curl/result.json
 .vscode/c_cpp_properties.json
 test_scripts/curl/result.json
 *.swp

BUILDING.md

@@ -1,190 +0,0 @@
-# Building from source
-In order to build the OWANALYTICS, 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/Telecominfraproject/wlan-cloud-lib-poco). Building
-Poco may take several minutes depending on the platform you are building on.
-
-## Ubuntu
-These instructions have proven to work on Ubuntu 23.04.
-```bash
-sudo apt install git cmake g++ libssl-dev libmariadb-dev libmariadbclient-dev-compat
-sudo apt install libpq-dev libaprutil1-dev apache2-dev libboost-all-dev
-sudo apt install librdkafka-dev
-sudo apt install zlib1g-dev nlohmann-json3-dev ca-certificates libcurl4-openssl-dev
-
-cd ~
-git clone https://github.com/Telecominfraproject/wlan-cloud-lib-poco --branch poco-tip-v1 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-lib-cppkafka --branch tip-v1 cppkafka
-cd cppkafka
-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-lib-valijson --branch tip-v1 valijson
-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-analytics
-cd wlan-cloud-analytics
-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/Telecominfraproject/wlan-cloud-lib-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/Telecominfraproject/wlan-cloud-lib-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/Telecominfraproject/wlan-cloud-lib-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-analytics
-cd wlan-cloud-analytics
-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/Telecominfraproject/wlan-cloud-lib-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/Telecominfraproject/wlan-cloud-lib-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/Telecominfraproject/wlan-cloud-lib-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-analytics
-pushd wlan-cloud-analytics
-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-analytics
-cd wlan-cloud-ucentralgw
-mkdir cmake-build
-cd cmake-build
-cmake -DSMALL_BUILD=1 ..
-make
-```

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owanalytics VERSION 3.2.0)
+project(owanalytics VERSION 2.6.0)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_GENERATOR "Unix Makefiles")
@@ -28,20 +28,20 @@ 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()
 
 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)
 
 if(SMALL_BUILD)
@@ -63,8 +63,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" -DBOOST_NO_CXX98_FUNCTION_BASE=1)
-
 add_executable(owanalytics
         build
         src/ow_version.h.in
@@ -74,57 +72,14 @@ add_executable(owanalytics
         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/UI_WebSocketClientNotifications.cpp
-        src/framework/UI_WebSocketClientNotifications.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/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/RESTAPI_SystemConfiguration.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/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/framework/WebSocketClientNotifications.h
         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
@@ -155,7 +110,6 @@ target_link_libraries(owanalytics PUBLIC
                         ${MySQL_LIBRARIES}
                         ${ZLIB_LIBRARIES}
                         fmt::fmt
-                        resolv
                         CppKafka::cppkafka
-)
+                        nlohmann_json_schema_validator)
 

CONFIGURATION.md

@@ -1,203 +0,0 @@
-# OWANALYTICS Configuration
-Here is the list of parameters you can configure in the `owanalytics.properties` file.
-
-## OWANALYTICS Specific Parameters
-```properties
-firmware.updater.upgrade = false
-firmware.updater.releaseonly = false
-```
-
-## 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 = $OWANALYTICS_ROOT/certs/restapi-ca.pem
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = 16005
-openwifi.restapi.host.0.cert = $OWANALYTICS_ROOT/certs/restapi-cert.pem
-openwifi.restapi.host.0.key = $OWANALYTICS_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 = $OWANALYTICS_ROOT/certs/restapi-ca.pem
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = 17005
-openwifi.internal.restapi.host.0.cert = $OWANALYTICS_ROOT/certs/restapi-cert.pem
-openwifi.internal.restapi.host.0.key = $OWANALYTICS_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 = $OWANALYTICS_ROOT/certs/restapi-key.pem
-openwifi.service.key.password = mypassword
-openwifi.system.data = $OWANALYTICS_ROOT/data
-openwifi.system.uri.private = https://localhost:17005
-openwifi.system.uri.public = https://openwifi.example.com:16005
-openwifi.system.uri.ui = https://provisioning-ui.arilia.com
-openwifi.security.restapi.disable = false
-openwifi.system.commandchannel = /tmp/app.ucentralanalytics
-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 = 16105
-```
-
-### 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 = analytics
-openwifi.kafka.client.id = analytics1
-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 `analytics`
-### 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 = analytics.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 = analytics
-storage.type.postgresql.password = analytics
-storage.type.postgresql.database = analytics
-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 = analytics
-storage.type.postgresql.password = analytics
-storage.type.postgresql.database = analytics
-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 = $OWANALYTICS_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
-ARG POCO_VERSION=poco-tip-v2
-ARG CPPKAFKA_VERSION=tip-v1
-ARG VALIJASON_VERSION=tip-v1
+FROM alpine:3.15 AS build-base
 
-FROM debian:$DEBIAN_VERSION AS build-base
-
-RUN apt-get update && apt-get install --no-install-recommends -y \
+RUN apk add --update --no-cache \
     make cmake g++ git \
-    libpq-dev libmariadb-dev libmariadbclient-dev-compat \
-    librdkafka-dev libboost-all-dev libssl-dev \
-    zlib1g-dev nlohmann-json3-dev ca-certificates libcurl4-openssl-dev libfmt-dev
+    unixodbc-dev postgresql-dev mariadb-dev \
+    librdkafka-dev boost-dev openssl-dev \
+    zlib-dev nlohmann-json \
+    curl-dev
 
 FROM build-base AS poco-build
 
-ARG POCO_VERSION
-
-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
+ADD https://api.github.com/repos/stephb9959/poco/git/refs/heads/master version.json
+RUN git clone https://github.com/stephb9959/poco /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/AriliaWireless/cppkafka/git/refs/tags/${CPPKAFKA_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/cppkafka --branch ${CPPKAFKA_VERSION} /cppkafka
+ADD https://api.github.com/repos/stephb9959/cppkafka/git/refs/heads/master version.json
+RUN git clone https://github.com/stephb9959/cppkafka /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
-RUN git clone https://github.com/AriliaWireless/valijson --branch ${VALIJASON_VERSION} /valijson
-
-WORKDIR /valijson
+WORKDIR /json-schema-validator
 RUN mkdir cmake-build
 WORKDIR cmake-build
 RUN cmake ..
-RUN cmake --build . --config Release -j8
-RUN cmake --build . --target install
+RUN make
+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 owanalytics-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 /owanalytics
 RUN mkdir cmake-build
@@ -72,21 +77,21 @@ WORKDIR /owanalytics/cmake-build
 RUN cmake ..
 RUN cmake --build . --config Release -j8
 
-FROM debian:$DEBIAN_VERSION
+FROM alpine:3.15
 
 ENV OWANALYTICS_USER=owanalytics \
     OWANALYTICS_ROOT=/owanalytics-data \
     OWANALYTICS_CONFIG=/owanalytics-data
 
-RUN useradd "$OWANALYTICS_USER"
+RUN addgroup -S "$OWANALYTICS_USER" && \
+    adduser -S -G "$OWANALYTICS_USER" "$OWANALYTICS_USER"
 
 RUN mkdir /openwifi
 RUN mkdir -p "$OWANALYTICS_ROOT" "$OWANALYTICS_CONFIG" && \
     chown "$OWANALYTICS_USER": "$OWANALYTICS_ROOT" "$OWANALYTICS_CONFIG"
 
-RUN apt-get update && apt-get install --no-install-recommends -y \
-    librdkafka++1 gosu gettext ca-certificates bash jq curl wget \
-    libmariadb-dev-compat libpq5 postgresql-client libfmt7
+RUN apk add --update --no-cache librdkafka su-exec gettext ca-certificates bash jq curl \
+    mariadb-connector-c libpq unixodbc postgresql-client
 
 COPY readiness_check /readiness_check
 COPY test_scripts/curl/cli /cli
@@ -95,13 +100,11 @@ COPY owanalytics.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=owanalytics-build /owanalytics/cmake-build/owanalytics /openwifi/owanalytics
-COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/* /usr/local/lib/
-COPY --from=poco-build /poco/cmake-build/lib/* /usr/local/lib/
-
-RUN ldconfig
+COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/* /usr/local/lib
+COPY --from=poco-build /poco/cmake-build/lib/* /usr/local/lib
 
 EXPOSE 16009 17009 16109
 

README.md

@@ -1,97 +1,2 @@
-<p align="center">
-    <img src="images/project/logo.svg" width="200"/>
-</p>
-
-# OpenWiFI Analytics Service (OWANALYTICS)
-
-## What is it?
-The OpenWiFi Analytics Service is a service for the TIP OpenWiFi CloudSDK (OWSDK).
-OWANALYTICS gathers statistics about device used in OpenWiFI and groups them according to their 
-provisioning (OWPROV) entities or venues. OWANALYTICS, like all other OWSDK microservices, is
-defined using an OpenAPI definition and uses the ucentral communication protocol to interact with Access Points. To use
-the OWANALYTICS, you either need to [build it](#building) or use the [Docker version](#docker).
-
-## OpenAPI
-You may get static page with OpenAPI docs generated from the definition on [GitHub Page](https://telecominfraproject.github.io/wlan-cloud-analytics/).
-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-analytics/main/openapi/owanalytics.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)
-
-#### Expected directory layout
-From the directory where your cloned source is, you will need to create the `certs`, `logs`, and `uploads` directories.
-```bash
-mkdir certs
-mkdir certs/cas
-mkdir logs
-mkdir uploads
-```
-You should now have the following:
-```text
---+-- certs
-  |   +--- cas
-  +-- cmake
-  +-- cmake-build
-  +-- logs
-  +-- src
-  +-- test_scripts
-  +-- openapi
-  +-- uploads
-  +-- owsec.properties
-```
-
-### Certificate
-The OWANALYTICS uses a certificate to provide security for the REST API Certificate to secure the Northbound API.
-
-#### 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
-```
-
-## Firewall Considerations
-| Port  | Description                                    | Configurable |
-|:------|:-----------------------------------------------|:------------:|
-| 16005 | Default port for REST API Access to the OWANALYTICS |     yes      |
-
-### Environment variables
-The following environment variables should be set from the root directory of the service. They tell the OWANALYTICS process where to find
-the configuration and the root directory.
-```bash
-export OWANALYTICS_ROOT=`pwd`
-export OWANALYTICS_CONFIG=`pwd`
-```
-You can run the shell script `set_env.sh` from the microservice root.
-
-### OWANALYTICS Service Configuration
-The configuration is kept in a file called `owanalytics.properties`. To understand the content of this file,
-please look [here](https://github.com/Telecominfraproject/wlan-cloud-analytics/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) |
-
+# wlan-cloud-analytics
+OpenWiFi Analytics V0.01

build

@@ -1 +1 @@
-1
+70

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:17009"} \
   SYSTEM_URI_PUBLIC=${SYSTEM_URI_PUBLIC:-"https://localhost:16009"} \
   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:-""} \
@@ -49,7 +48,7 @@ if [ "$1" = '/openwifi/owanalytics' -a "$(id -u)" = '0' ]; then
     if [ "$RUN_CHOWN" = 'true' ]; then
       chown -R "$OWANALYTICS_USER": "$OWANALYTICS_ROOT" "$OWANALYTICS_CONFIG"
     fi
-    exec gosu "$OWANALYTICS_USER" "$@"
+    exec su-exec "$OWANALYTICS_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 Analytics | |
 | configProperties | hash | Configuration properties that should be passed to the application in `owanalytics.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 Gateway (PEM format is adviced to be used) (see `volumes.owanalytics` on where it is mounted). If `existingCertsSecret` is set, certificates passed this way will not be used. |  |
+| certs | hash | Defines files (keys and certificates) that should be passed to the Analytics (PEM format is adviced to be used) (see `volumes.owanalytics` on where it is mounted) |  |
+
 
 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.owanalytics.repository }}:{{ .Values.images.owanalytics.tag }}"
-          imagePullPolicy: {{ .Values.images.owanalytics.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 "owanalytics.fullname" $root }}-env
-                  key: {{ $key }}
-          {{- end }}
-          volumeMounts:
-          {{- range .Values.volumes.owanalytics }}
-          - name: {{ .name }}
-            mountPath: {{ .mountPath }}
-            {{- if .subPath }}
-            subPath: {{ .subPath }}
-            {{- end }}
-          {{- end }}
-{{- end }}
-
       containers:
 
         - name: owanalytics
@@ -131,10 +97,8 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
 
-      {{- with .Values.securityContext }}
       securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        fsGroup: 101
 
       imagePullSecrets:
       {{- range $image, $imageValue := .Values.images }}

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owanalytics:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owanalytics
-    tag: v3.2.0
+    tag: v2.6.0
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
@@ -71,7 +71,7 @@ volumes:
       mountPath: /owanalytics-data/certs
       volumeDefinition: |
         secret:
-          secretName: {{ if .Values.existingCertsSecret }}{{ .Values.existingCertsSecret }}{{ else }}{{ include "owanalytics.fullname" . }}-certs{{ end }}
+          secretName: {{ include "owanalytics.fullname" . }}-certs
     # Change this if you want to use another volume type
     - name: persist
       mountPath: /owanalytics-data/persist
@@ -91,9 +91,6 @@ resources: {}
   #  cpu: 100m
   #  memory: 128Mi
 
-securityContext:
-  fsGroup: 1000
-
 nodeSelector: {}
 
 tolerations: []
@@ -201,9 +198,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/owanalytics.yaml

@@ -27,13 +27,71 @@ components:
 
   responses:
     NotFound:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/NotFound'
+      description: The specified resource was not found.
+      content:
+        application/json:
+          schema:
+            properties:
+              ErrorCode:
+                type: integer
+              ErrorDetails:
+                type: string
+              ErrorDescription:
+                type: string
+
     Unauthorized:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/Unauthorized'
+      description: The requested does not have sufficient rights to perform the operation.
+      content:
+        application/json:
+          schema:
+            properties:
+              ErrorCode:
+                type: integer
+                enum:
+                  - 0     # Success
+                  - 1     # PASSWORD_CHANGE_REQUIRED,
+                  - 2     # INVALID_CREDENTIALS,
+                  - 3     # PASSWORD_ALREADY_USED,
+                  - 4     # USERNAME_PENDING_VERIFICATION,
+                  - 5     # PASSWORD_INVALID,
+                  - 6     # INTERNAL_ERROR,
+                  - 7     # ACCESS_DENIED,
+                  - 8     # INVALID_TOKEN
+                  - 9     # EXPIRED_TOKEN
+                  - 10    # RATE_LIMIT_EXCEEDED
+                  - 11    # BAD_MFA_TRANSACTION
+                  - 12    # MFA_FAILURE
+                  - 13    # SECURITY_SERVICE_UNREACHABLE
+              ErrorDetails:
+                type: string
+              ErrorDescription:
+                type: string
+
     Success:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/Success'
+      description: The requested operation was performed.
+      content:
+        application/json:
+          schema:
+            properties:
+              Operation:
+                type: string
+              Details:
+                type: string
+              Code:
+                type: integer
+
     BadRequest:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/BadRequest'
+      description: The requested operation failed.
+      content:
+        application/json:
+          schema:
+            properties:
+              ErrorCode:
+                type: integer
+              ErrorDetails:
+                type: string
+              ErrorDescription:
+                type: integer
 
   schemas:
     ObjectInfo:
@@ -613,16 +671,6 @@ components:
           items:
             type: string
 
-    ExtraSystemConfiguration:
-      type: array
-      items:
-        type: object
-        properties:
-          parameterName:
-            type: string
-          parameterValue:
-            type: string
-
     #########################################################################################
     ##
     ## These are endpoints that all services in the OPenWiFI stack must provide
@@ -691,6 +739,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:
@@ -730,33 +784,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:
@@ -1107,6 +1134,42 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
+
+  /iptocountry:
+    get:
+      tags:
+        - Utility
+      summary: Get the country code for an IP address
+      operationId: getIpToCountry
+      parameters:
+        - in: query
+          name: iplist
+          schema:
+            type: string
+            example:
+              10.2.2.2,10.3.4.3
+          required: true
+      responses:
+        200:
+          description: List of country codes.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  enabled:
+                    type: boolean
+                  countryCodes:
+                    type: array
+                    items:
+                      type: string
+        400:
+          $ref: '#/components/responses/BadRequest'
+        403:
+          $ref: '#/components/responses/Unauthorized'
+        404:
+          $ref: '#/components/responses/NotFound'
+
   /wifiClientHistory:
     get:
       tags:
@@ -1328,75 +1391,18 @@ paths:
             type: string
             enum:
               - info
-              - extraConfiguration
-              - resources
           required: true
-      responses:
-        200:
-          $ref: '#/components/schemas/SystemCommandResults'
-        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
+          description: Successful command execution
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $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'
+                oneOf:
+                  - $ref: '#/components/schemas/SystemInfoResults'
+        400:
+          $ref: '#/components/responses/BadRequest'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:

owanalytics.properties

@@ -34,7 +34,6 @@ openwifi.system.uri.private = https://localhost:17009
 openwifi.system.uri.public = https://ucentral.dpaas.arilia.com:16009
 openwifi.system.commandchannel = /tmp/app.owanalytics
 openwifi.system.uri.ui = owprov-ui.arilia.com
-openwifi.security.restapi.disable = false
 
 #############################
 # Generic information for all micro services
@@ -102,4 +101,4 @@ storage.type.mysql.connectiontimeout = 60
 ########################################################################
 logging.type = file
 logging.path = $OWANALYTICS_ROOT/logs
-logging.level = debug
+logging.level = debug

owanalytics.properties.tmpl

@@ -39,7 +39,6 @@ openwifi.system.uri.private = ${SYSTEM_URI_PRIVATE}
 openwifi.system.uri.public = ${SYSTEM_URI_PUBLIC}
 openwifi.system.commandchannel = /tmp/app.owanalytics
 openwifi.system.uri.ui = ${SYSTEM_URI_UI}
-openwifi.security.restapi.disable = ${SECURITY_RESTAPI_DISABLE}
 
 #############################
 # Generic information for all micro services

src/APStats.h

@@ -4,42 +4,37 @@
 
 #pragma once
 
-#include "Poco/Logger.h"
-#include "RESTObjects/RESTAPI_AnalyticsObjects.h"
-#include "framework/utils.h"
-#include "nlohmann/json.hpp"
 #include <mutex>
+#include "framework/MicroService.h"
+#include "nlohmann/json.hpp"
+#include "RESTObjects/RESTAPI_AnalyticsObjects.h"
 
 namespace OpenWifi {
 
-	struct InterfaceClientEntry {
-		std::vector<std::string> ipv4_addresses;
-		std::vector<std::string> ipv6_addresses;
-	};
+    class AP {
+    public:
+        explicit AP(uint64_t mac, const std::string &venue_id, const std::string &BoardId, Poco::Logger &L) :
+            venue_id_(venue_id),
+            boardId_(BoardId),
+            Logger_(L)
+        {
+            DI_.serialNumber = Utils::IntToSerialNumber(mac);
+        }
 
-	using InterfaceClientEntryMap_t = std::map<std::string, InterfaceClientEntry>;
+        void UpdateStats(const std::shared_ptr<nlohmann::json> & State);
+        void UpdateConnection(const std::shared_ptr<nlohmann::json> & Connection);
+        void UpdateHealth(const std::shared_ptr<nlohmann::json> & Health);
 
-	class AP {
-	  public:
-		explicit AP(uint64_t mac, const std::string &venue_id, const std::string &BoardId,
-					Poco::Logger &L)
-			: venue_id_(venue_id), boardId_(BoardId), Logger_(L) {
-			DI_.serialNumber = Utils::IntToSerialNumber(mac);
-		}
-
-		void UpdateStats(const std::shared_ptr<nlohmann::json> &State);
-		void UpdateConnection(const std::shared_ptr<nlohmann::json> &Connection);
-		void UpdateHealth(const std::shared_ptr<nlohmann::json> &Health);
-
-		[[nodiscard]] const AnalyticsObjects::DeviceInfo &Info() const { return DI_; }
-
-	  private:
-		std::string venue_id_;
-		std::string boardId_;
-		AnalyticsObjects::DeviceInfo DI_;
-		AnalyticsObjects::DeviceTimePoint tp_base_;
-		bool got_health = false, got_connection = false, got_base = false;
-		Poco::Logger &Logger_;
-		inline Poco::Logger &Logger() { return Logger_; }
-	};
-} // namespace OpenWifi
+        [[nodiscard]] const AnalyticsObjects::DeviceInfo & Info() const { return DI_; }
+    private:
+        std::string                                     venue_id_;
+        std::string                                     boardId_;
+        AnalyticsObjects::DeviceInfo                    DI_;
+        AnalyticsObjects::DeviceTimePoint               tp_base_;
+        bool                                            got_health = false,
+                                                        got_connection = false,
+                                                        got_base = false;
+        Poco::Logger                                    &Logger_;
+        inline Poco::Logger & Logger() { return Logger_; }
+    };
+}

src/CMakeFiles/3.21.3/CMakeSystem.cmake

@@ -1,15 +0,0 @@
-set(CMAKE_HOST_SYSTEM "Darwin-23.0.0")
-set(CMAKE_HOST_SYSTEM_NAME "Darwin")
-set(CMAKE_HOST_SYSTEM_VERSION "23.0.0")
-set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")
-
-
-
-set(CMAKE_SYSTEM "Darwin-23.0.0")
-set(CMAKE_SYSTEM_NAME "Darwin")
-set(CMAKE_SYSTEM_VERSION "23.0.0")
-set(CMAKE_SYSTEM_PROCESSOR "x86_64")
-
-set(CMAKE_CROSSCOMPILING "FALSE")
-
-set(CMAKE_SYSTEM_LOADED 1)

src/CMakeFiles/CMakeOutput.log

@@ -1 +0,0 @@
-The system is: Darwin - 23.0.0 - x86_64

src/Daemon.cpp

@@ -6,64 +6,56 @@
 //	Arilia Wireless Inc.
 //
 
-#include "Daemon.h"
-
-#include "Poco/Environment.h"
-#include "Poco/Net/SSLManager.h"
 #include "Poco/Util/Application.h"
 #include "Poco/Util/Option.h"
-#include "framework/OpenWifiTypes.h"
+#include "Poco/Environment.h"
 
-#include "DeviceStatusReceiver.h"
-#include "HealthReceiver.h"
-#include "StateReceiver.h"
+#include "Daemon.h"
 #include "StorageService.h"
 #include "VenueCoordinator.h"
+#include "StateReceiver.h"
+#include "DeviceStatusReceiver.h"
+#include "HealthReceiver.h"
 #include "WifiClientCache.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,
-								   vDAEMON_CONFIG_ENV_VAR, vDAEMON_APP_NAME, vDAEMON_BUS_TIMER,
-								   SubSystemVec{OpenWifi::StorageService(), StateReceiver(),
-												DeviceStatusReceiver(), HealthReceiver(),
-												VenueCoordinator(), WifiClientCache(),
-												UI_WebSocketClientServer()});
+			instance_ = new Daemon(vDAEMON_PROPERTIES_FILENAME,
+								   vDAEMON_ROOT_ENV_VAR,
+								   vDAEMON_CONFIG_ENV_VAR,
+								   vDAEMON_APP_NAME,
+								   vDAEMON_BUS_TIMER,
+								   SubSystemVec{
+									   OpenWifi::StorageService(),
+                                       StateReceiver(),
+                                       DeviceStatusReceiver(),
+                                       HealthReceiver(),
+                                       VenueCoordinator(),
+                                       WifiClientCache()
+								   });
 		}
 		return instance_;
 	}
 
-	void Daemon::PostInitialization([[maybe_unused]] Poco::Util::Application &self) {}
-
-	void DaemonPostInitialization(Poco::Util::Application &self) {
-		Daemon()->PostInitialization(self);
-	}
-} // namespace OpenWifi
+    void Daemon::PostInitialization([[maybe_unused]] Poco::Util::Application &self) {
+    }
+}
 
 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);
-		Poco::Net::SSLManager::instance().shutdown();
-	} 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;
-	}
+		auto ExitCode =  App->run(argc, argv);
+		delete App;
 
-	std::cout << "Exitcode: " << ExitCode << std::endl;
-	return ExitCode;
+		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,43 +9,46 @@
 #pragma once
 
 #include <array>
-#include <cstdlib>
 #include <iostream>
-#include <set>
+#include <cstdlib>
 #include <vector>
+#include <set>
 
 #include "Dashboard.h"
-#include "RESTObjects/RESTAPI_AnalyticsObjects.h"
 #include "framework/MicroService.h"
-#include "framework/MicroServiceNames.h"
 #include "framework/OpenWifiTypes.h"
+#include "RESTObjects/RESTAPI_AnalyticsObjects.h"
 
 namespace OpenWifi {
 
-	[[maybe_unused]] inline static const char *vDAEMON_PROPERTIES_FILENAME =
-		"owanalytics.properties";
-	[[maybe_unused]] inline static const char *vDAEMON_ROOT_ENV_VAR = "OWANALYTICS_ROOT";
-	[[maybe_unused]] inline static const char *vDAEMON_CONFIG_ENV_VAR = "OWANALYTICS_CONFIG";
-	[[maybe_unused]] inline static const char *vDAEMON_APP_NAME = uSERVICE_ANALYTICS.c_str();
-	[[maybe_unused]] inline static const uint64_t vDAEMON_BUS_TIMER = 10000;
+	[[maybe_unused]] inline static const char * vDAEMON_PROPERTIES_FILENAME = "owanalytics.properties";
+    [[maybe_unused]] inline static const char * vDAEMON_ROOT_ENV_VAR = "OWANALYTICS_ROOT";
+    [[maybe_unused]] inline static const char * vDAEMON_CONFIG_ENV_VAR = "OWANALYTICS_CONFIG";
+    [[maybe_unused]] inline static const char * vDAEMON_APP_NAME = uSERVICE_ANALYTICS.c_str() ;
+    [[maybe_unused]] inline static const uint64_t vDAEMON_BUS_TIMER = 10000;
 
-	class Daemon : public MicroService {
-	  public:
-		explicit Daemon(const std::string &PropFile, const std::string &RootEnv,
-						const std::string &ConfigEnv, const std::string &AppName, uint64_t BusTimer,
-						const SubSystemVec &SubSystems)
-			: MicroService(PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems){};
+    class Daemon : public MicroService {
+		public:
+			explicit Daemon(const std::string & PropFile,
+							const std::string & RootEnv,
+							const std::string & ConfigEnv,
+							const std::string & AppName,
+						  	uint64_t 	BusTimer,
+							const SubSystemVec & SubSystems) :
+				MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};
 
-		void PostInitialization(Poco::Util::Application &self);
-		static Daemon *instance();
-		inline OpenWifi::AnalyticsDashboard &GetDashboard() { return DB_; }
-		Poco::Logger &Log() { return Poco::Logger::get(AppName()); }
+			void PostInitialization(Poco::Util::Application &self);
+			static Daemon *instance();
+			inline OpenWifi::AnalyticsDashboard & GetDashboard() { return DB_; }
+			Poco::Logger & Log() { return Poco::Logger::get(AppName()); }
+	  	private:
+			static Daemon 				*instance_;
+			OpenWifi::AnalyticsDashboard		DB_{};
+    };
 
-	  private:
-		static Daemon *instance_;
-		OpenWifi::AnalyticsDashboard DB_{};
-	};
+	inline Daemon * Daemon() { return Daemon::instance(); }
+    inline void DaemonPostInitialization(Poco::Util::Application &self) {
+        Daemon()->PostInitialization(self);
+    }
+}
 
-	inline Daemon *Daemon() { return Daemon::instance(); }
-	void DaemonPostInitialization(Poco::Util::Application &self);
-} // namespace OpenWifi

src/Dashboard.cpp

@@ -7,15 +7,15 @@
 //
 
 #include "Dashboard.h"
-#include "framework/utils.h"
+#include "StorageService.h"
 
 namespace OpenWifi {
 	void AnalyticsDashboard::Create() {
-		uint64_t Now = Utils::Now();
-		if (LastRun_ == 0 || (Now - LastRun_) > 120) {
+		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

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

src/DeviceStatusReceiver.cpp

@@ -5,82 +5,77 @@
 #include "DeviceStatusReceiver.h"
 #include "VenueWatcher.h"
 #include "fmt/core.h"
-#include "framework/KafkaManager.h"
-#include "framework/KafkaTopics.h"
 
 namespace OpenWifi {
-	int DeviceStatusReceiver::Start() {
-		Running_ = true;
-		Types::TopicNotifyFunction F = [this](const std::string &Key, const std::string &Payload) {
-			this->DeviceStatusReceived(Key, Payload);
-		};
-		DeviceStateWatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::CONNECTION, F);
-		Worker_.start(*this);
-		return 0;
-	}
+    int DeviceStatusReceiver::Start() {
+        Running_ = true;
+        Types::TopicNotifyFunction F = [this](const std::string &Key, const std::string &Payload) { this->DeviceStatusReceived(Key,Payload); };
+        DeviceStateWatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::CONNECTION, F);
+        Worker_.start(*this);
+        return 0;
+    }
 
-	void DeviceStatusReceiver::Stop() {
-		Running_ = false;
-		KafkaManager()->UnregisterTopicWatcher(KafkaTopics::CONNECTION, DeviceStateWatcherId_);
-		Queue_.wakeUpAll();
-		Worker_.join();
-	}
+    void DeviceStatusReceiver::Stop() {
+        Running_ = false;
+        KafkaManager()->UnregisterTopicWatcher(KafkaTopics::CONNECTION, DeviceStateWatcherId_);
+        Queue_.wakeUpAll();
+        Worker_.join();
+    }
 
-	void DeviceStatusReceiver::run() {
-		Utils::SetThreadName("dev-status");
-		Poco::AutoPtr<Poco::Notification> Note(Queue_.waitDequeueNotification());
-		while (Note && Running_) {
-			auto Msg = dynamic_cast<DeviceStatusMessage *>(Note.get());
-			if (Msg != nullptr) {
-				try {
-					nlohmann::json msg = nlohmann::json::parse(Msg->Payload());
-					if (msg.contains(uCentralProtocol::PAYLOAD)) {
-						auto payload = msg[uCentralProtocol::PAYLOAD];
+    void DeviceStatusReceiver::run() {
+        Utils::SetThreadName("dev-status");
+        Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
+        while(Note && Running_) {
+            auto Msg = dynamic_cast<DeviceStatusMessage *>(Note.get());
+            if(Msg!= nullptr) {
+                try {
+                    nlohmann::json msg = nlohmann::json::parse(Msg->Payload());
+                    if (msg.contains(uCentralProtocol::PAYLOAD)) {
+                        auto payload = msg[uCentralProtocol::PAYLOAD];
 
-						uint64_t SerialNumber = Utils::SerialNumberToInt(Msg->Key());
-						std::lock_guard G(Mutex_);
+                        uint64_t SerialNumber = Utils::SerialNumberToInt(Msg->Key());
+                        std::lock_guard     G(Mutex_);
 
-						for (const auto &[venue, devices] : Notifiers_) {
-							if (devices.find(SerialNumber) != cend(devices)) {
-								auto connection_data = std::make_shared<nlohmann::json>(payload);
-								venue->PostConnection(SerialNumber, connection_data);
-								break;
-							}
-						}
-					}
-				} catch (const Poco::Exception &E) {
-					Logger().log(E);
-				} catch (...) {
-				}
-			} else {
-			}
-			Note = Queue_.waitDequeueNotification();
-		}
-	}
+                        for(const auto &[venue,devices]:Notifiers_) {
+                            if(devices.find(SerialNumber)!=cend(devices)) {
+                                auto connection_data = std::make_shared<nlohmann::json>(payload);
+                                venue->PostConnection(SerialNumber, connection_data);
+                                break;
+                            }
+                        }
+                    }
+                } catch (const Poco::Exception &E) {
+                    Logger().log(E);
+                } catch (...) {
 
-	void DeviceStatusReceiver::Register(const std::vector<uint64_t> &SerialNumber,
-										VenueWatcher *VW) {
-		std::lock_guard G(Mutex_);
+                }
+            } else {
 
-		std::set<uint64_t> NewSerialNumbers;
-		std::copy(SerialNumber.begin(), SerialNumber.end(),
-				  std::inserter(NewSerialNumbers, NewSerialNumbers.begin()));
-		auto it = Notifiers_.find(VW);
-		if (it == end(Notifiers_))
-			Notifiers_[VW] = NewSerialNumbers;
-		else
-			it->second = NewSerialNumbers;
-	}
+            }
+            Note = Queue_.waitDequeueNotification();
+        }
+    }
 
-	void DeviceStatusReceiver::DeRegister(VenueWatcher *VW) {
-		std::lock_guard G(Mutex_);
-		Notifiers_.erase(VW);
-	}
+    void DeviceStatusReceiver::Register(const std::vector <uint64_t> &SerialNumber, VenueWatcher *VW) {
+        std::lock_guard     G(Mutex_);
 
-	void DeviceStatusReceiver::DeviceStatusReceived(const std::string &Key,
-													const std::string &Payload) {
-		std::lock_guard G(Mutex_);
-		poco_trace(Logger(), fmt::format("Device({}): Connection/Ping message.", Key));
-		Queue_.enqueueNotification(new DeviceStatusMessage(Key, Payload));
-	}
-} // namespace OpenWifi
+        std::set<uint64_t>  NewSerialNumbers;
+        std::copy(SerialNumber.begin(),SerialNumber.end(),std::inserter(NewSerialNumbers,NewSerialNumbers.begin()));
+        auto it = Notifiers_.find(VW);
+        if(it==end(Notifiers_))
+            Notifiers_[VW]=NewSerialNumbers;
+        else
+            it->second = NewSerialNumbers;
+    }
+
+    void DeviceStatusReceiver::DeRegister(VenueWatcher *VW) {
+        std::lock_guard     G(Mutex_);
+        Notifiers_.erase(VW);
+    }
+
+    void DeviceStatusReceiver::DeviceStatusReceived(const std::string &Key, const std::string &Payload) {
+        std::lock_guard G(Mutex_);
+        poco_debug(Logger(),fmt::format("Device({}): Connection/Ping message.", Key));
+        Queue_.enqueueNotification( new DeviceStatusMessage(Key,Payload));
+    }
+}

src/DeviceStatusReceiver.h

@@ -4,51 +4,53 @@
 
 #pragma once
 
-#include "Poco/Notification.h"
-#include "Poco/NotificationQueue.h"
-#include "framework/SubSystemServer.h"
+#include "framework/MicroService.h"
+// #include "VenueWatcher.h"
 
 namespace OpenWifi {
-	class DeviceStatusMessage : public Poco::Notification {
-	  public:
-		explicit DeviceStatusMessage(const std::string &Key, const std::string &Payload)
-			: Key_(Key), Payload_(Payload) {}
-		const std::string &Key() { return Key_; }
-		const std::string &Payload() { return Payload_; }
+    class DeviceStatusMessage : public Poco::Notification {
+    public:
+        explicit DeviceStatusMessage(const std::string &Key, const std::string &Payload ) :
+                Key_(Key),
+                Payload_(Payload) {}
+        const std::string & Key() { return Key_; }
+        const std::string & Payload() { return Payload_; }
+    private:
+        std::string     Key_;
+        std::string     Payload_;
+    };
 
-	  private:
-		std::string Key_;
-		std::string Payload_;
-	};
+    class VenueWatcher;
 
-	class VenueWatcher;
+    class DeviceStatusReceiver : public SubSystemServer, Poco::Runnable {
+    public:
 
-	class DeviceStatusReceiver : public SubSystemServer, Poco::Runnable {
-	  public:
-		static auto instance() {
-			static auto instance_ = new DeviceStatusReceiver;
-			return instance_;
-		}
+        static auto instance() {
+            static auto instance_ = new DeviceStatusReceiver;
+            return instance_;
+        }
 
-		int Start() override;
-		void Stop() override;
-		void run() override;
-		void DeviceStatusReceived(const std::string &Key, const std::string &Payload);
-		void Register(const std::vector<uint64_t> &SerialNumber, VenueWatcher *VW);
-		void DeRegister(VenueWatcher *VW);
+        int Start() override;
+        void Stop() override;
+        void run() override;
+        void DeviceStatusReceived( const std::string & Key, const std::string & Payload);
+        void Register(const std::vector<uint64_t> & SerialNumber, VenueWatcher *VW);
+        void DeRegister(VenueWatcher *VW);
 
-	  private:
-		// map of mac(as int), list of (id,func)
-		std::map<VenueWatcher *, std::set<uint64_t>> Notifiers_;
-		uint64_t DeviceStateWatcherId_ = 0;
-		Poco::NotificationQueue Queue_;
-		Poco::Thread Worker_;
-		std::atomic_bool Running_ = false;
+    private:
+        // map of mac(as int), list of (id,func)
+        std::map<VenueWatcher *, std::set<uint64_t>>   Notifiers_;
+        uint64_t                                DeviceStateWatcherId_=0;
+        Poco::NotificationQueue                 Queue_;
+        Poco::Thread                            Worker_;
+        std::atomic_bool                        Running_=false;
 
-		DeviceStatusReceiver() noexcept
-			: SubSystemServer("DeviceStatus", "DEV-STATUS-RECEIVER", "devicestatus.receiver") {}
-	};
+        DeviceStatusReceiver() noexcept:
+            SubSystemServer("DeviceStatus", "DEV-STATUS-RECEIVER", "devicestatus.receiver")
+            {
+            }
+    };
 
-	inline auto DeviceStatusReceiver() { return DeviceStatusReceiver::instance(); }
+    inline auto DeviceStatusReceiver() { return DeviceStatusReceiver::instance(); }
 
-} // namespace OpenWifi
+}

src/HealthReceiver.cpp

@@ -5,80 +5,77 @@
 #include "HealthReceiver.h"
 #include "VenueWatcher.h"
 #include "fmt/core.h"
-#include "framework/KafkaManager.h"
-#include "framework/KafkaTopics.h"
 
 namespace OpenWifi {
-	int HealthReceiver::Start() {
-		Running_ = true;
-		Types::TopicNotifyFunction F = [this](const std::string &Key, const std::string &Payload) {
-			this->HealthReceived(Key, Payload);
-		};
-		HealthWatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::HEALTHCHECK, F);
-		Worker_.start(*this);
-		return 0;
-	}
+    int HealthReceiver::Start() {
+        Running_ = true;
+        Types::TopicNotifyFunction F = [this](const std::string &Key, const std::string &Payload) { this->HealthReceived(Key,Payload); };
+        HealthWatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::HEALTHCHECK, F);
+        Worker_.start(*this);
+        return 0;
+    }
 
-	void HealthReceiver::Stop() {
-		Running_ = false;
-		KafkaManager()->UnregisterTopicWatcher(KafkaTopics::HEALTHCHECK, HealthWatcherId_);
-		Queue_.wakeUpAll();
-		Worker_.join();
-	}
+    void HealthReceiver::Stop() {
+        Running_ = false;
+        KafkaManager()->UnregisterTopicWatcher(KafkaTopics::HEALTHCHECK, HealthWatcherId_);
+        Queue_.wakeUpAll();
+        Worker_.join();
+    }
 
-	void HealthReceiver::run() {
-		Utils::SetThreadName("dev-health");
-		Poco::AutoPtr<Poco::Notification> Note(Queue_.waitDequeueNotification());
-		while (Note && Running_) {
-			auto Msg = dynamic_cast<HealthMessage *>(Note.get());
-			if (Msg != nullptr) {
-				try {
-					nlohmann::json msg = nlohmann::json::parse(Msg->Payload());
-					if (msg.contains(uCentralProtocol::PAYLOAD)) {
-						auto payload = msg[uCentralProtocol::PAYLOAD];
+    void HealthReceiver::run() {
+        Utils::SetThreadName("dev-health");
+        Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
+        while(Note && Running_) {
+            auto Msg = dynamic_cast<HealthMessage *>(Note.get());
+            if(Msg!= nullptr) {
+                try {
+                    nlohmann::json msg = nlohmann::json::parse(Msg->Payload());
+                    if (msg.contains(uCentralProtocol::PAYLOAD)) {
+                        auto payload = msg[uCentralProtocol::PAYLOAD];
 
-						uint64_t SerialNumber = Utils::SerialNumberToInt(Msg->Key());
-						std::lock_guard G(Mutex_);
+                        uint64_t SerialNumber = Utils::SerialNumberToInt(Msg->Key());
+                        std::lock_guard     G(Mutex_);
 
-						for (const auto &[venue, devices] : Notifiers_) {
-							if (devices.find(SerialNumber) != cend(devices)) {
-								auto health_data = std::make_shared<nlohmann::json>(payload);
-								venue->PostHealth(SerialNumber, health_data);
-								break;
-							}
-						}
-					}
-				} catch (const Poco::Exception &E) {
-					Logger().log(E);
-				} catch (...) {
-				}
-			} else {
-			}
-			Note = Queue_.waitDequeueNotification();
-		}
-	}
+                        for(const auto &[venue,devices]:Notifiers_) {
+                            if(devices.find(SerialNumber)!=cend(devices)) {
+                                auto health_data = std::make_shared<nlohmann::json>(payload);
+                                venue->PostHealth(SerialNumber, health_data);
+                                break;
+                            }
+                        }
+                    }
+                } catch (const Poco::Exception &E) {
+                    Logger().log(E);
+                } catch (...) {
 
-	void HealthReceiver::Register(const std::vector<uint64_t> &SerialNumber, VenueWatcher *VW) {
-		std::lock_guard G(Mutex_);
+                }
+            } else {
 
-		std::set<uint64_t> NewSerialNumbers;
-		std::copy(SerialNumber.begin(), SerialNumber.end(),
-				  std::inserter(NewSerialNumbers, NewSerialNumbers.begin()));
-		auto it = Notifiers_.find(VW);
-		if (it == end(Notifiers_))
-			Notifiers_[VW] = NewSerialNumbers;
-		else
-			it->second = NewSerialNumbers;
-	}
+            }
+            Note = Queue_.waitDequeueNotification();
+        }
+    }
 
-	void HealthReceiver::DeRegister(VenueWatcher *VW) {
-		std::lock_guard G(Mutex_);
-		Notifiers_.erase(VW);
-	}
+    void HealthReceiver::Register(const std::vector <uint64_t> &SerialNumber, VenueWatcher *VW) {
+        std::lock_guard     G(Mutex_);
 
-	void HealthReceiver::HealthReceived(const std::string &Key, const std::string &Payload) {
-		std::lock_guard G(Mutex_);
-		poco_trace(Logger(), fmt::format("Device({}): Health message.", Key));
-		Queue_.enqueueNotification(new HealthMessage(Key, Payload));
-	}
-} // namespace OpenWifi
+        std::set<uint64_t>  NewSerialNumbers;
+        std::copy(SerialNumber.begin(),SerialNumber.end(),std::inserter(NewSerialNumbers,NewSerialNumbers.begin()));
+        auto it = Notifiers_.find(VW);
+        if(it==end(Notifiers_))
+            Notifiers_[VW]=NewSerialNumbers;
+        else
+            it->second = NewSerialNumbers;
+    }
+
+    void HealthReceiver::DeRegister(VenueWatcher *VW) {
+        std::lock_guard     G(Mutex_);
+        Notifiers_.erase(VW);
+    }
+
+    void HealthReceiver::HealthReceived(const std::string &Key, const std::string &Payload) {
+        std::lock_guard G(Mutex_);
+        poco_debug(Logger(),fmt::format("Device({}): Health message.", Key));
+        Queue_.enqueueNotification( new HealthMessage(Key,Payload));
+    }
+}

src/HealthReceiver.h

@@ -2,53 +2,66 @@
 // Created by stephane bourque on 2022-03-15.
 //
 
+#ifndef OWANALYTICS_HEALTHRECEIVER_H
+#define OWANALYTICS_HEALTHRECEIVER_H
+
+
+class HealthReceiver {
+
+};
+
+
+#endif //OWANALYTICS_HEALTHRECEIVER_H
+
 #pragma once
 
-#include "Poco/Notification.h"
-#include "Poco/NotificationQueue.h"
-#include "framework/SubSystemServer.h"
+#include "framework/MicroService.h"
+// #include "VenueWatcher.h"
 
 namespace OpenWifi {
-	class HealthMessage : public Poco::Notification {
-	  public:
-		explicit HealthMessage(const std::string &Key, const std::string &Payload)
-			: Key_(Key), Payload_(Payload) {}
-		const std::string &Key() { return Key_; }
-		const std::string &Payload() { return Payload_; }
+    class HealthMessage : public Poco::Notification {
+    public:
+        explicit HealthMessage(const std::string &Key, const std::string &Payload ) :
+                Key_(Key),
+                Payload_(Payload) {}
+        const std::string & Key() { return Key_; }
+        const std::string & Payload() { return Payload_; }
+    private:
+        std::string     Key_;
+        std::string     Payload_;
+    };
 
-	  private:
-		std::string Key_;
-		std::string Payload_;
-	};
+    class VenueWatcher;
 
-	class VenueWatcher;
+    class HealthReceiver : public SubSystemServer, Poco::Runnable {
+    public:
 
-	class HealthReceiver : public SubSystemServer, Poco::Runnable {
-	  public:
-		static auto instance() {
-			static auto instance_ = new HealthReceiver;
-			return instance_;
-		}
+        static auto instance() {
+            static auto instance_ = new HealthReceiver;
+            return instance_;
+        }
 
-		int Start() override;
-		void Stop() override;
-		void run() override;
-		void HealthReceived(const std::string &Key, const std::string &Payload);
-		void Register(const std::vector<uint64_t> &SerialNumber, VenueWatcher *VW);
-		void DeRegister(VenueWatcher *VW);
+        int Start() override;
+        void Stop() override;
+        void run() override;
+        void HealthReceived( const std::string & Key, const std::string & Payload);
+        void Register(const std::vector<uint64_t> & SerialNumber, VenueWatcher *VW);
+        void DeRegister(VenueWatcher *VW);
 
-	  private:
-		// map of mac(as int), list of (id,func)
-		std::map<VenueWatcher *, std::set<uint64_t>> Notifiers_;
-		uint64_t HealthWatcherId_ = 0;
-		Poco::NotificationQueue Queue_;
-		Poco::Thread Worker_;
-		std::atomic_bool Running_ = false;
+    private:
+        // map of mac(as int), list of (id,func)
+        std::map<VenueWatcher *, std::set<uint64_t>>   Notifiers_;
+        uint64_t                                HealthWatcherId_=0;
+        Poco::NotificationQueue                 Queue_;
+        Poco::Thread                            Worker_;
+        std::atomic_bool                        Running_=false;
 
-		HealthReceiver() noexcept
-			: SubSystemServer("HealthReceiver", "HEALTH-RECEIVER", "health.receiver") {}
-	};
+        HealthReceiver() noexcept:
+                SubSystemServer("HealthReceiver", "HEALTH-RECEIVER", "health.receiver")
+                {
+                }
+    };
 
-	inline auto HealthReceiver() { return HealthReceiver::instance(); }
+    inline auto HealthReceiver() { return HealthReceiver::instance(); }
 
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_analytics_db_helpers.h

@@ -4,67 +4,66 @@
 
 #pragma once
 
+#include "framework/MicroService.h"
 #include "RESTObjects/RESTAPI_AnalyticsObjects.h"
 #include "StorageService.h"
 #include "framework/orm.h"
 
 namespace OpenWifi {
 
-	template <typename DB>
-	void ReturnRecordList(const char *ArrayName, DB &DBInstance, RESTAPIHandler &R) {
-		Poco::JSON::Array ObjArr;
-		for (const auto &i : R.SelectedRecords()) {
-			typename DB::RecordName Rec;
-			if (DBInstance.GetRecord("id", i, Rec)) {
-				Poco::JSON::Object Obj;
-				Rec.to_json(Obj);
-				ObjArr.add(Obj);
-			} else {
-				return R.BadRequest(RESTAPI::Errors::UnknownId);
-			}
-		}
-		Poco::JSON::Object Answer;
-		Answer.set(ArrayName, ObjArr);
-		return R.ReturnObject(Answer);
-	}
+    template <typename DB> void ReturnRecordList(const char *ArrayName,DB & DBInstance, RESTAPIHandler & R) {
+        Poco::JSON::Array   ObjArr;
+        for(const auto &i:R.SelectedRecords()) {
+            typename DB::RecordName     Rec;
+            if(DBInstance.GetRecord("id",i,Rec)) {
+                Poco::JSON::Object  Obj;
+                Rec.to_json(Obj);
+                ObjArr.add(Obj);
+            } else {
+                return R.BadRequest(RESTAPI::Errors::UnknownId);
+            }
+        }
+        Poco::JSON::Object  Answer;
+        Answer.set(ArrayName, ObjArr);
+        return R.ReturnObject(Answer);
+    }
 
-	template <typename T>
-	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;
-			i.to_json(Obj);
-			ObjArray.add(Obj);
-		}
-		Poco::JSON::Object Answer;
-		Answer.set(ArrayName, ObjArray);
-		return R.ReturnObject(Answer);
-	}
+    template <typename T> 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;
+            i.to_json(Obj);
+            ObjArray.add(Obj);
+        }
+        Poco::JSON::Object  Answer;
+        Answer.set(ArrayName,ObjArray);
+        return R.ReturnObject(Answer);
+    }
 
-	template <typename DB>
-	void ListHandler(const char *BlockName, DB &DBInstance, RESTAPIHandler &R) {
+    template<typename DB>
+    void ListHandler(const char *BlockName, DB &DBInstance, RESTAPIHandler &R) {
 
-		typedef typename DB::RecordVec RecVec;
+        typedef typename DB::RecordVec RecVec;
 
-		if (!R.QB_.Select.empty()) {
-			return ReturnRecordList(BlockName, DBInstance, R);
-		} else if (R.QB_.CountOnly) {
-			Poco::JSON::Object Answer;
-			auto C = DBInstance.Count();
-			return R.ReturnCountOnly(C);
-		} else {
-			RecVec Entries;
-			DBInstance.GetRecords(R.QB_.Offset, R.QB_.Limit, Entries);
-			return MakeJSONObjectArray(BlockName, Entries, R);
-		}
-	}
+        if (!R.QB_.Select.empty()) {
+            return ReturnRecordList(BlockName, DBInstance, R);
+        } else if (R.QB_.CountOnly) {
+            Poco::JSON::Object Answer;
+            auto C = DBInstance.Count();
+            return R.ReturnCountOnly(C);
+        } else {
+            RecVec Entries;
+            DBInstance.GetRecords(R.QB_.Offset, R.QB_.Limit, Entries);
+            return MakeJSONObjectArray(BlockName, Entries, R);
+        }
+    }
 
-	template <typename DBType> void ReturnFieldList(DBType &DB, RESTAPIHandler &H) {
-		Types::StringVec Fields;
-		DB.GetFieldNames(Fields);
-		Poco::JSON::Object Answer;
-		RESTAPI_utils::field_to_json(Answer, "list", Fields);
-		return H.ReturnObject(Answer);
-	}
+    template <typename DBType> void ReturnFieldList(DBType & DB, RESTAPIHandler &H) {
+        Types::StringVec Fields;
+        DB.GetFieldNames(Fields);
+        Poco::JSON::Object  Answer;
+        RESTAPI_utils::field_to_json(Answer,"list",Fields);
+        return H.ReturnObject(Answer);
+    }
 
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_board_devices_handler.cpp

@@ -7,24 +7,24 @@
 #include "VenueCoordinator.h"
 
 namespace OpenWifi {
-	void RESTAPI_board_devices_handler::DoGet() {
+    void RESTAPI_board_devices_handler::DoGet() {
 
-		auto id = GetBinding("id", "");
+        auto id = GetBinding("id","");
 
-		if (id.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingUUID);
-		}
+        if(id.empty()) {
+            return BadRequest(RESTAPI::Errors::MissingUUID);
+        }
 
-		AnalyticsObjects::BoardInfo BI;
-		if (!StorageService()->BoardsDB().GetRecord("id", id, BI)) {
-			return NotFound();
-		}
+        AnalyticsObjects::BoardInfo BI;
+        if(!StorageService()->BoardsDB().GetRecord("id",id,BI)) {
+            return NotFound();
+        }
 
-		AnalyticsObjects::DeviceInfoList DIL;
-		VenueCoordinator()->GetDevices(id, DIL);
+        AnalyticsObjects::DeviceInfoList    DIL;
+        VenueCoordinator()->GetDevices(id,DIL);
 
-		Poco::JSON::Object Answer;
-		DIL.to_json(Answer);
-		return ReturnObject(Answer);
-	}
-} // namespace OpenWifi
+        Poco::JSON::Object  Answer;
+        DIL.to_json(Answer);
+        return ReturnObject(Answer);
+    }
+}

src/RESTAPI/RESTAPI_board_devices_handler.h

@@ -4,28 +4,29 @@
 
 #pragma once
 
+#include "framework/MicroService.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
 
-	class RESTAPI_board_devices_handler : public RESTAPIHandler {
-	  public:
-		RESTAPI_board_devices_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
-									  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) {}
+    class RESTAPI_board_devices_handler : public RESTAPIHandler {
+    public:
+        RESTAPI_board_devices_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & 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){}
 
-		static auto PathName() { return std::list<std::string>{"/api/v1/board/{id}/devices"}; };
+        static auto PathName() { return std::list<std::string>{"/api/v1/board/{id}/devices"}; };
 
-	  private:
-		BoardsDB &DB_ = StorageService()->BoardsDB();
-		void DoGet() final;
-		void DoPost() final{};
-		void DoPut() final{};
-		void DoDelete() final{};
-	};
-} // namespace OpenWifi
+    private:
+        BoardsDB   & DB_=StorageService()->BoardsDB();
+        void DoGet() final;
+        void DoPost() final {};
+        void DoPut() final {};
+        void DoDelete() final {};
+    };
+}

src/RESTAPI/RESTAPI_board_handler.cpp

@@ -6,97 +6,97 @@
 #include "VenueCoordinator.h"
 
 namespace OpenWifi {
-	void RESTAPI_board_handler::DoGet() {
-		auto id = GetBinding("id", "");
-		if (id.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingUUID);
-		}
+    void RESTAPI_board_handler::DoGet() {
+        auto id = GetBinding("id","");
+        if(id.empty()) {
+            return BadRequest(RESTAPI::Errors::MissingUUID);
+        }
 
-		AnalyticsObjects::BoardInfo B;
-		if (!StorageService()->BoardsDB().GetRecord("id", id, B)) {
-			return NotFound();
-		}
+        AnalyticsObjects::BoardInfo B;
+        if(!StorageService()->BoardsDB().GetRecord("id",id,B)) {
+            return NotFound();
+        }
 
-		Poco::JSON::Object Answer;
-		B.to_json(Answer);
-		return ReturnObject(Answer);
-	}
+        Poco::JSON::Object  Answer;
+        B.to_json(Answer);
+        return ReturnObject(Answer);
+    }
 
-	void RESTAPI_board_handler::DoDelete() {
-		auto id = GetBinding("id", "");
-		if (id.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingUUID);
-		}
+    void RESTAPI_board_handler::DoDelete() {
+        auto id = GetBinding("id","");
+        if(id.empty()) {
+            return BadRequest(RESTAPI::Errors::MissingUUID);
+        }
 
-		AnalyticsObjects::BoardInfo B;
-		if (!StorageService()->BoardsDB().GetRecord("id", id, B)) {
-			return NotFound();
-		}
-		VenueCoordinator()->StopBoard(id);
-		StorageService()->BoardsDB().DeleteRecord("id", id);
-		StorageService()->TimePointsDB().DeleteBoard(id);
-		return OK();
-	}
+        AnalyticsObjects::BoardInfo B;
+        if(!StorageService()->BoardsDB().GetRecord("id",id,B)) {
+            return NotFound();
+        }
+        VenueCoordinator()->StopBoard(id);
+        StorageService()->BoardsDB().DeleteRecord("id",id);
+        StorageService()->TimePointsDB().DeleteBoard(id);
+        return OK();
+    }
 
-	void RESTAPI_board_handler::DoPost() {
-		auto id = GetBinding("id", "");
-		if (id.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingUUID);
-		}
+    void RESTAPI_board_handler::DoPost() {
+        auto id= GetBinding("id","");
+        if(id.empty()) {
+            return BadRequest(RESTAPI::Errors::MissingUUID);
+        }
 
-		const auto &RawObject = ParsedBody_;
-		AnalyticsObjects::BoardInfo NewObject;
-		if (!NewObject.from_json(RawObject)) {
-			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-		}
+        const auto & RawObject = ParsedBody_;
+        AnalyticsObjects::BoardInfo NewObject;
+        if(!NewObject.from_json(RawObject)) {
+            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
+        }
 
-		ProvObjects::CreateObjectInfo(RawObject, UserInfo_.userinfo, NewObject.info);
+        ProvObjects::CreateObjectInfo(RawObject,UserInfo_.userinfo,NewObject.info);
 
-		if (StorageService()->BoardsDB().CreateRecord(NewObject)) {
-			VenueCoordinator()->AddBoard(NewObject.info.id);
-			AnalyticsObjects::BoardInfo NewBoard;
-			StorageService()->BoardsDB().GetRecord("id", NewObject.info.id, NewBoard);
-			Poco::JSON::Object Answer;
-			NewBoard.to_json(Answer);
-			return ReturnObject(Answer);
-		}
-		return InternalError(RESTAPI::Errors::RecordNotCreated);
-	}
+        if(StorageService()->BoardsDB().CreateRecord(NewObject)) {
+            VenueCoordinator()->AddBoard(NewObject.info.id);
+            AnalyticsObjects::BoardInfo NewBoard;
+            StorageService()->BoardsDB().GetRecord("id",NewObject.info.id,NewBoard);
+            Poco::JSON::Object  Answer;
+            NewBoard.to_json(Answer);
+            return ReturnObject(Answer);
+        }
+        return InternalError(RESTAPI::Errors::RecordNotCreated);
+    }
 
-	void RESTAPI_board_handler::DoPut() {
-		auto id = GetBinding("id", "");
-		if (id.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingUUID);
-		}
+    void RESTAPI_board_handler::DoPut() {
+        auto id= GetBinding("id","");
+        if(id.empty()) {
+            return BadRequest(RESTAPI::Errors::MissingUUID);
+        }
 
-		AnalyticsObjects::BoardInfo Existing;
-		if (!StorageService()->BoardsDB().GetRecord("id", id, Existing)) {
-			return NotFound();
-		}
+        AnalyticsObjects::BoardInfo Existing;
+        if(!StorageService()->BoardsDB().GetRecord("id",id,Existing)) {
+            return NotFound();
+        }
 
-		const auto &RawObject = ParsedBody_;
-		AnalyticsObjects::BoardInfo NewObject;
-		if (!NewObject.from_json(RawObject)) {
-			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-		}
+        const auto & RawObject = ParsedBody_;
+        AnalyticsObjects::BoardInfo NewObject;
+        if(!NewObject.from_json(RawObject)) {
+            return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
+        }
 
-		ProvObjects::UpdateObjectInfo(RawObject, UserInfo_.userinfo, Existing.info);
+        ProvObjects::UpdateObjectInfo(RawObject,UserInfo_.userinfo,Existing.info);
 
-		if (RawObject->has("venueList")) {
-			if (NewObject.venueList.empty()) {
-				return BadRequest(RESTAPI::Errors::VenueMustExist);
-			}
-			Existing.venueList = NewObject.venueList;
-		}
+        if(RawObject->has("venueList")) {
+            if(NewObject.venueList.empty()) {
+                return BadRequest(RESTAPI::Errors::VenueMustExist);
+            }
+            Existing.venueList = NewObject.venueList;
+        }
 
-		if (StorageService()->BoardsDB().UpdateRecord("id", Existing.info.id, Existing)) {
-			VenueCoordinator()->UpdateBoard(Existing.info.id);
-			AnalyticsObjects::BoardInfo NewBoard;
-			StorageService()->BoardsDB().GetRecord("id", Existing.info.id, NewBoard);
-			Poco::JSON::Object Answer;
-			NewBoard.to_json(Answer);
-			return ReturnObject(Answer);
-		}
-		return InternalError(RESTAPI::Errors::RecordNotUpdated);
-	}
-} // namespace OpenWifi
+        if(StorageService()->BoardsDB().UpdateRecord("id",Existing.info.id,Existing)) {
+            VenueCoordinator()->ModifyBoard(Existing.info.id);
+            AnalyticsObjects::BoardInfo NewBoard;
+            StorageService()->BoardsDB().GetRecord("id",Existing.info.id,NewBoard);
+            Poco::JSON::Object  Answer;
+            NewBoard.to_json(Answer);
+            return ReturnObject(Answer);
+        }
+        return InternalError(RESTAPI::Errors::RecordNotUpdated);
+    }
+}

src/RESTAPI/RESTAPI_board_handler.h

@@ -4,31 +4,32 @@
 
 #pragma once
 
+#include "framework/MicroService.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
 
 namespace OpenWifi {
 
-	class RESTAPI_board_handler : public RESTAPIHandler {
-	  public:
-		RESTAPI_board_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
-							  RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-							  bool Internal)
-			: RESTAPIHandler(bindings, L,
-							 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) {}
+    class RESTAPI_board_handler : public RESTAPIHandler {
+    public:
+        RESTAPI_board_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
+                : RESTAPIHandler(bindings, L,
+                                 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){}
 
-		static auto PathName() { return std::list<std::string>{"/api/v1/board/{id}"}; };
+        static auto PathName() { return std::list<std::string>{"/api/v1/board/{id}"}; };
 
-	  private:
-		BoardsDB &DB_ = StorageService()->BoardsDB();
-		void DoGet() final;
-		void DoPost() final;
-		void DoPut() final;
-		void DoDelete() final;
-	};
-} // namespace OpenWifi
+    private:
+        BoardsDB   & DB_=StorageService()->BoardsDB();
+        void DoGet() final;
+        void DoPost() final;
+        void DoPut() final;
+        void DoDelete() final;
+    };
+}

src/RESTAPI/RESTAPI_board_list_handler.cpp

@@ -3,31 +3,31 @@
 //
 
 #include "RESTAPI_board_list_handler.h"
-#include "RESTAPI/RESTAPI_analytics_db_helpers.h"
 #include "StorageService.h"
+#include "RESTAPI/RESTAPI_analytics_db_helpers.h"
 
 namespace OpenWifi {
-	void RESTAPI_board_list_handler::DoGet() {
-		auto forVenue = GetParameter("forVenue", "");
+    void RESTAPI_board_list_handler::DoGet() {
+        auto forVenue = GetParameter("forVenue","");
 
-		if (!forVenue.empty()) {
-			std::vector<AnalyticsObjects::BoardInfo> Boards;
-			auto F = [&](const AnalyticsObjects::BoardInfo &B) -> bool {
-				if (!B.venueList.empty()) {
-					for (const auto &venue : B.venueList) {
-						if (venue.id == forVenue) {
-							Boards.emplace_back(B);
-							break;
-						}
-					}
-				}
-				return true;
-			};
-			DB_.Iterate(F);
-			return ReturnObject("boards", Boards);
-		}
+        if(!forVenue.empty()) {
+            std::vector<AnalyticsObjects::BoardInfo>    Boards;
+            auto F = [&](const AnalyticsObjects::BoardInfo &B) -> bool {
+                if(!B.venueList.empty()) {
+                    for(const auto &venue:B.venueList) {
+                        if(venue.id == forVenue) {
+                           Boards.emplace_back(B);
+                           break;
+                        }
+                    }
+                }
+                return true;
+            };
+            DB_.Iterate(F);
+            return ReturnObject("boards",Boards);
+        }
 
-		return ListHandler<BoardsDB>("boards", DB_, *this);
-	}
+        return ListHandler<BoardsDB>("boards", DB_, *this);
+    }
 
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_board_list_handler.h

@@ -4,28 +4,30 @@
 
 #pragma once
 
+#include "framework/MicroService.h"
 #include "StorageService.h"
-#include "framework/RESTAPI_Handler.h"
+#include "RESTObjects/RESTAPI_AnalyticsObjects.h"
 
 namespace OpenWifi {
 
-	class RESTAPI_board_list_handler : public RESTAPIHandler {
-	  public:
-		RESTAPI_board_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
-								   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) {}
+    class RESTAPI_board_list_handler : public RESTAPIHandler {
+    public:
+        RESTAPI_board_list_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & 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){}
 
-		static auto PathName() { return std::list<std::string>{"/api/v1/boards"}; };
+        static auto PathName() { return std::list<std::string>{"/api/v1/boards"}; };
 
-	  private:
-		BoardsDB &DB_ = StorageService()->BoardsDB();
-		void DoGet() final;
-		void DoPost() final{};
-		void DoPut() final{};
-		void DoDelete() final{};
-	};
-} // namespace OpenWifi
+    private:
+        BoardsDB   & DB_=StorageService()->BoardsDB();
+        void DoGet() final;
+        void DoPost() final {};
+        void DoPut() final {};
+        void DoDelete() final {};
+    };
+}

src/RESTAPI/RESTAPI_board_timepoint_handler.cpp

@@ -5,249 +5,225 @@
 #include "RESTAPI_board_timepoint_handler.h"
 #include "StorageService.h"
 
-#include <algorithm>
-
 namespace OpenWifi {
-	typedef std::vector<std::pair<std::uint64_t, std::uint64_t>> bucket_timespans;
-	typedef std::vector<std::vector<AnalyticsObjects::DeviceTimePoint>> split_points;
+    static auto find_number_of_buckets(std::vector<AnalyticsObjects::DeviceTimePoint> &p) {
+        uint32_t buckets=0,cur_buckets=0;
+        std::string current_serialNumber;
+        for(const auto &i:p) {
+            if(current_serialNumber.empty()) {
+                current_serialNumber = i.device_info.serialNumber;
+                cur_buckets=0;
+            }
+            if(current_serialNumber==i.device_info.serialNumber) {
+                cur_buckets++;
+            } else {
+                buckets = std::max(buckets,cur_buckets);
+                current_serialNumber=i.device_info.serialNumber;
+                cur_buckets=1;
+            }
+        }
+        return std::max(buckets,cur_buckets);
+    }
 
-	template <typename X, typename M>
-	void AverageAPData(X T, const std::vector<M> &Values, AnalyticsObjects::AveragePoint &P) {
-		if (Values.empty())
-			return;
-		double sum = 0.0;
-		for (const auto &v : Values) {
-			sum += (v.ap_data.*T);
-			if ((v.ap_data.*T) != 0) {
-				P.min = std::min(P.min, (v.ap_data.*T));
-			}
-			P.max = std::min(P.max, (v.ap_data.*T));
-		}
-		P.avg = sum / (double)Values.size();
-	}
+    typedef std::vector< std::vector<AnalyticsObjects::DeviceTimePoint>> split_points;
 
-	template <typename X, typename M>
-	void AverageRadioData(X T, const std::vector<M> &Values, AnalyticsObjects::AveragePoint &P) {
-		if (Values.empty())
-			return;
-		double sum = 0.0;
-		uint32_t num_values = 0;
-		for (const auto &value : Values) {
-			for (const auto &radio : value.radio_data) {
-				num_values++;
-				sum += (radio.*T);
-				if ((radio.*T) != 0) {
-					P.min = std::min((double)P.min, (double)(radio.*T));
-				}
-				P.max = std::max((double)P.max, (double)(radio.*T));
-			}
-		}
-		if (num_values)
-			P.avg = sum / (double)num_values;
-		else
-			P.avg = 0.0;
-	}
+    static void split_in_buckets([[maybe_unused]] uint32_t buckets,std::vector<AnalyticsObjects::DeviceTimePoint> &p,split_points &sp) {
+        std::string cur_sn;
+        uint32_t cur_bucket=0;
+        for(const auto &i:p) {
+            if(cur_sn.empty()) {
+                cur_bucket=1;
+                cur_sn=i.device_info.serialNumber;
+            }
+            if(cur_sn==i.device_info.serialNumber) {
+                if (cur_bucket>sp.size()) {
+                    std::vector<AnalyticsObjects::DeviceTimePoint>  tmp_p;
+                    tmp_p.push_back(i);
+                    sp.push_back(tmp_p);
+                    cur_bucket++;
+                } else {
+                    sp[cur_bucket-1].push_back(i);
+                    cur_bucket++;
+                }
+            } else {
+                cur_bucket=1;
+                sp[cur_bucket-1].push_back(i);
+                cur_bucket++;
+                cur_sn=i.device_info.serialNumber;
+            }
+        }
+    }
 
-	static void NewSort(const AnalyticsObjects::DeviceTimePointList &l, split_points &sp) {
+    template <typename X, typename M> void AverageAPData( X T, const std::vector<M> &Values, AnalyticsObjects::AveragePoint &P) {
+        if(Values.empty())
+            return;
+        double sum = 0.0;
+        for(const auto &v:Values) {
+            sum += (v.ap_data.*T);
+            if((v.ap_data.*T)!=0) {
+                P.min = std::min(P.min, (v.ap_data.*T));
+            }
+            P.max = std::min(P.max,(v.ap_data.*T));
+        }
+        P.avg = sum / (double) Values.size();
+    }
 
-		struct {
-			bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs,
-							const AnalyticsObjects::DeviceTimePoint &rhs) const {
-				if (lhs.device_info.serialNumber < rhs.device_info.serialNumber)
-					return true;
-				if (lhs.device_info.serialNumber > rhs.device_info.serialNumber)
-					return false;
-				return lhs.timestamp < rhs.timestamp;
-			}
-		} sort_serial_ts;
+    template <typename X, typename M> void AverageRadioData( X T, const std::vector<M> &Values, AnalyticsObjects::AveragePoint &P) {
+        if(Values.empty())
+            return;
+        double sum = 0.0;
+        uint32_t num_values = 0;
+        for(const auto &value:Values) {
+            for(const auto &radio:value.radio_data) {
+                num_values++;
+                sum += (radio.*T);
+                if((radio.*T)!=0) {
+                    P.min = std::min((double) P.min, (double) (radio.*T));
+                }
+                P.max = std::max((double)P.max, (double)(radio.*T));
+            }
+        }
+        if(num_values)
+            P.avg = sum / (double) num_values;
+        else
+            P.avg = 0.0;
+    }
 
-		// attempt at finding an interval
-		AnalyticsObjects::DeviceTimePointList tmp{l};
-		std::sort(tmp.points.begin(), tmp.points.end(), sort_serial_ts);
+    void RESTAPI_board_timepoint_handler::DoGet() {
+        auto id = GetBinding("id","");
+        if(id.empty() || !Utils::ValidUUID(id)) {
+            return BadRequest(RESTAPI::Errors::MissingUUID);
+        }
 
-		std::string cur_ser;
-		std::uint64_t cur_int = 0, start_val, last_val, first_val = 0;
-		for (const auto &point : tmp.points) {
-			if (cur_ser.empty()) {
-				start_val = point.timestamp;
-				cur_ser = point.serialNumber;
-				first_val = point.timestamp;
-				continue;
-			}
+        AnalyticsObjects::BoardInfo B;
+        if(!StorageService()->BoardsDB().GetRecord("id",id,B)) {
+            return NotFound();
+        }
 
-			if (cur_ser == point.serialNumber) {
-				auto this_int = point.timestamp - start_val;
-				if (cur_int) {
-					if (this_int < cur_int) {
-						cur_int = this_int;
-					}
-				} else {
-					cur_int = this_int;
-				}
-				start_val = point.timestamp;
-			} else {
-				cur_ser = point.serialNumber;
-				start_val = point.timestamp;
-			}
-			last_val = point.timestamp;
-		}
+        auto fromDate = GetParameter("fromDate",0);
+        auto endDate = GetParameter("endDate",0);
+        auto maxRecords = GetParameter("maxRecords",1000);
+        auto statsOnly = GetBoolParameter("statsOnly");
+        auto pointsOnly = GetBoolParameter("pointsOnly");
+        auto pointsStatsOnly = GetBoolParameter("pointsStatsOnly");
 
-		// std::cout << "Intervals: " << cur_int << std::endl;
+        if(statsOnly) {
+            AnalyticsObjects::DeviceTimePointStats  DTPS;
+            Poco::JSON::Object  Answer;
+            DB_.GetStats(id,DTPS);
+            DTPS.to_json(Answer);
+            return ReturnObject(Answer);
+        }
 
-		std::vector<std::pair<std::uint64_t, std::uint64_t>> time_slots; //  timeslot 0 has <t1,t2>
-		std::vector<std::set<std::string>> serial_numbers; //  serial number already in a timeslot.
+        auto Points = std::make_unique<AnalyticsObjects::DeviceTimePointList>();
+        StorageService()->TimePointsDB().SelectRecords(id,fromDate, endDate, maxRecords, Points->points);
 
-		std::uint64_t cur_first = first_val, cur_end = 0;
-		sp.clear();
-		while (cur_end < last_val) {
-			std::pair<std::uint64_t, std::uint64_t> e;
-			e.first = cur_first;
-			e.second = e.first + cur_int - 1;
-			cur_first = e.second + 1;
-			cur_end = e.second;
-			time_slots.emplace_back(e);
-			std::set<std::string> q;
-			serial_numbers.emplace_back(q);
-			std::vector<AnalyticsObjects::DeviceTimePoint> qq;
-			sp.emplace_back(qq);
-		}
+        // sort by timestamp & serial number.
+        struct {
+            bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const {
+                if(lhs.device_info.serialNumber < rhs.device_info.serialNumber) return true;
+                if(lhs.device_info.serialNumber > rhs.device_info.serialNumber) return false;
+                return lhs.timestamp < rhs.timestamp;
+            }
+        } DeviceTimePoint_sort;
 
-		for (const auto &point : tmp.points) {
-			std::uint64_t slot_index = 0;
-			for (const auto &slot : time_slots) {
-				if (point.timestamp >= slot.first && point.timestamp <= slot.second) {
-					serial_numbers[slot_index].insert(point.serialNumber);
-					sp[slot_index].emplace_back(point);
-				}
-				slot_index++;
-			}
-		}
-	}
+        struct {
+            bool operator()(const AnalyticsObjects::SSIDTimePoint &lhs, const AnalyticsObjects::SSIDTimePoint &rhs) const {
+                if(lhs.ssid < rhs.ssid) return true;
+                if(lhs.ssid > rhs.ssid) return false;
+                return lhs.bssid < rhs.bssid;
+            }
+        } SSID_sort;
 
-	void RESTAPI_board_timepoint_handler::DoGet() {
-		auto id = GetBinding("id", "");
-		if (id.empty() || !Utils::ValidUUID(id)) {
-			return BadRequest(RESTAPI::Errors::MissingUUID);
-		}
+        struct {
+            bool operator()(const AnalyticsObjects::UETimePoint &lhs, const AnalyticsObjects::UETimePoint &rhs) const {
+                if(lhs.station < rhs.station) return true;
+                return false;
+            }
+        } Association_sort;
 
-		AnalyticsObjects::BoardInfo B;
-		if (!StorageService()->BoardsDB().GetRecord("id", id, B)) {
-			return NotFound();
-		}
+        std::sort( Points->points.begin(), Points->points.end(), DeviceTimePoint_sort);
+        auto BucketsNeeded = find_number_of_buckets(Points->points);
 
-		auto fromDate = GetParameter("fromDate", 0);
-		auto endDate = GetParameter("endDate", 0);
-		std::uint64_t maxRecords;
-		if (Request->has("limit"))
-			maxRecords = QB_.Limit;
-		else
-			maxRecords = GetParameter("maxRecords", 1000);
+        auto sp = std::make_unique<split_points>();
+        split_in_buckets(BucketsNeeded,Points->points, *sp);
+        // must sort each bucket according to serial number.
+        for(auto &i: *sp) {
+            std::sort(i.begin(),i.end(),DeviceTimePoint_sort);
+            // now sort according to UEs within a block
+            for(auto &j:i) {
+                std::sort(j.ssid_data.begin(),j.ssid_data.end(),SSID_sort);
+                for(auto &k:j.ssid_data) {
+                    std::sort(k.associations.begin(),k.associations.end(),Association_sort);
+                }
+            }
+        }
 
-		auto statsOnly = GetBoolParameter("statsOnly");
-		auto pointsOnly = GetBoolParameter("pointsOnly");
-		auto pointsStatsOnly = GetBoolParameter("pointsStatsOnly");
+        auto Answer = std::make_unique<Poco::JSON::Object>();
+        if(!pointsStatsOnly) {
+            auto Points_OuterArray = std::make_unique<Poco::JSON::Array>();
+            for (const auto &point_list:*sp) {
+                Poco::JSON::Array Points_InnerArray;
+                for (const auto &point: point_list) {
+                    Poco::JSON::Object O;
+                    point.to_json(O);
+                    Points_InnerArray.add(O);
+                }
+                Points_OuterArray->add(Points_InnerArray);
+            }
+            Answer->set("points",*Points_OuterArray);
+        }
 
-		if (statsOnly) {
-			AnalyticsObjects::DeviceTimePointStats DTPS;
-			Poco::JSON::Object Answer;
-			DB_.GetStats(id, DTPS);
-			DTPS.to_json(Answer);
-			return ReturnObject(Answer);
-		}
+        //  calculate the stats for each time slot
+        if(!pointsOnly) {
+            auto Stats_Array = std::make_unique<Poco::JSON::Array>();
+            for (const auto &point_list:*sp) {
+                AnalyticsObjects::DeviceTimePointAnalysis DTPA;
 
-		AnalyticsObjects::DeviceTimePointList Points;
-		StorageService()->TimePointsDB().SelectRecords(id, fromDate, endDate, maxRecords,
-													   Points.points);
-		std::cout << "1 MaxRecords=" << maxRecords << " retrieved=" << Points.points.size()
-				  << std::endl;
+                DTPA.timestamp = point_list[0].timestamp;
+                AverageAPData(&AnalyticsObjects::APTimePoint::tx_bytes_bw, point_list, DTPA.tx_bytes_bw);
+                AverageAPData(&AnalyticsObjects::APTimePoint::rx_bytes_bw, point_list, DTPA.rx_bytes_bw);
+                AverageAPData(&AnalyticsObjects::APTimePoint::rx_dropped_pct, point_list, DTPA.rx_dropped_pct);
+                AverageAPData(&AnalyticsObjects::APTimePoint::tx_dropped_pct, point_list, DTPA.tx_dropped_pct);
+                AverageAPData(&AnalyticsObjects::APTimePoint::rx_packets_bw, point_list, DTPA.rx_packets_bw);
+                AverageAPData(&AnalyticsObjects::APTimePoint::tx_packets_bw, point_list, DTPA.tx_packets_bw);
+                AverageAPData(&AnalyticsObjects::APTimePoint::rx_errors_pct, point_list, DTPA.rx_errors_pct);
+                AverageAPData(&AnalyticsObjects::APTimePoint::tx_errors_pct, point_list, DTPA.tx_errors_pct);
 
-		split_points sp;
+                AverageRadioData(&AnalyticsObjects::RadioTimePoint::noise, point_list, DTPA.noise);
+                AverageRadioData(&AnalyticsObjects::RadioTimePoint::temperature, point_list, DTPA.temperature);
+                AverageRadioData(&AnalyticsObjects::RadioTimePoint::tx_power, point_list, DTPA.tx_power);
+                AverageRadioData(&AnalyticsObjects::RadioTimePoint::active_pct, point_list, DTPA.active_pct);
+                AverageRadioData(&AnalyticsObjects::RadioTimePoint::busy_pct, point_list, DTPA.busy_pct);
+                AverageRadioData(&AnalyticsObjects::RadioTimePoint::receive_pct, point_list, DTPA.receive_pct);
+                AverageRadioData(&AnalyticsObjects::RadioTimePoint::transmit_pct, point_list, DTPA.transmit_pct);
 
-		NewSort(Points, sp);
-		std::cout << __LINE__ << std::endl;
+                Poco::JSON::Object Stats_point;
+                DTPA.to_json(Stats_point);
+                Stats_Array->add(Stats_point);
+            }
+            Answer->set("stats", *Stats_Array);
+        }
 
-		Poco::JSON::Object Answer;
-		if (!pointsStatsOnly) {
-			Poco::JSON::Array Points_OuterArray;
-			for (const auto &point_list : sp) {
-				Poco::JSON::Array Points_InnerArray;
-				for (const auto &point : point_list) {
-					Poco::JSON::Object O;
-					point.to_json(O);
-					Points_InnerArray.add(O);
-				}
-				Points_OuterArray.add(Points_InnerArray);
-			}
-			Answer.set("points", Points_OuterArray);
-		}
+        return ReturnObject(*Answer);
+    }
 
-		//  calculate the stats for each time slot
-		if (!pointsOnly) {
-			Poco::JSON::Array Stats_Array;
-			for (const auto &point_list : sp) {
-				AnalyticsObjects::DeviceTimePointAnalysis DTPA;
+    void RESTAPI_board_timepoint_handler::DoDelete() {
+        auto id = GetBinding("id","");
+        if(id.empty() || !Utils::ValidUUID(id)) {
+            return BadRequest(RESTAPI::Errors::MissingUUID);
+        }
 
-				if (point_list.empty())
-					continue;
+        AnalyticsObjects::BoardInfo B;
+        if(!StorageService()->BoardsDB().GetRecord("id",id,B)) {
+            return NotFound();
+        }
 
-				DTPA.timestamp = point_list[0].timestamp;
-				AverageAPData(&AnalyticsObjects::APTimePoint::tx_bytes_bw, point_list,
-							  DTPA.tx_bytes_bw);
-				AverageAPData(&AnalyticsObjects::APTimePoint::rx_bytes_bw, point_list,
-							  DTPA.rx_bytes_bw);
-				AverageAPData(&AnalyticsObjects::APTimePoint::rx_dropped_pct, point_list,
-							  DTPA.rx_dropped_pct);
-				AverageAPData(&AnalyticsObjects::APTimePoint::tx_dropped_pct, point_list,
-							  DTPA.tx_dropped_pct);
-				AverageAPData(&AnalyticsObjects::APTimePoint::rx_packets_bw, point_list,
-							  DTPA.rx_packets_bw);
-				AverageAPData(&AnalyticsObjects::APTimePoint::tx_packets_bw, point_list,
-							  DTPA.tx_packets_bw);
-				AverageAPData(&AnalyticsObjects::APTimePoint::rx_errors_pct, point_list,
-							  DTPA.rx_errors_pct);
-				AverageAPData(&AnalyticsObjects::APTimePoint::tx_errors_pct, point_list,
-							  DTPA.tx_errors_pct);
+        auto fromDate = GetParameter("fromDate",0);
+        auto endDate = GetParameter("endDate",0);
 
-				AverageRadioData(&AnalyticsObjects::RadioTimePoint::noise, point_list, DTPA.noise);
-				AverageRadioData(&AnalyticsObjects::RadioTimePoint::temperature, point_list,
-								 DTPA.temperature);
-				AverageRadioData(&AnalyticsObjects::RadioTimePoint::tx_power, point_list,
-								 DTPA.tx_power);
-				AverageRadioData(&AnalyticsObjects::RadioTimePoint::active_pct, point_list,
-								 DTPA.active_pct);
-				AverageRadioData(&AnalyticsObjects::RadioTimePoint::busy_pct, point_list,
-								 DTPA.busy_pct);
-				AverageRadioData(&AnalyticsObjects::RadioTimePoint::receive_pct, point_list,
-								 DTPA.receive_pct);
-				AverageRadioData(&AnalyticsObjects::RadioTimePoint::transmit_pct, point_list,
-								 DTPA.transmit_pct);
+        StorageService()->TimePointsDB().DeleteTimeLine(id,fromDate,endDate);
+        return OK();
+    }
 
-				Poco::JSON::Object Stats_point;
-				DTPA.to_json(Stats_point);
-				Stats_Array.add(Stats_point);
-			}
-			Answer.set("stats", Stats_Array);
-		}
-
-		return ReturnObject(Answer);
-	}
-
-	void RESTAPI_board_timepoint_handler::DoDelete() {
-		auto id = GetBinding("id", "");
-		if (id.empty() || !Utils::ValidUUID(id)) {
-			return BadRequest(RESTAPI::Errors::MissingUUID);
-		}
-
-		AnalyticsObjects::BoardInfo B;
-		if (!StorageService()->BoardsDB().GetRecord("id", id, B)) {
-			return NotFound();
-		}
-
-		auto fromDate = GetParameter("fromDate", 0);
-		auto endDate = GetParameter("endDate", 0);
-
-		StorageService()->TimePointsDB().DeleteTimeLine(id, fromDate, endDate);
-		return OK();
-	}
-
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_board_timepoint_handler.h

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

src/RESTAPI/RESTAPI_routers.cpp

@@ -2,34 +2,39 @@
 // Created by stephane bourque on 2021-10-23.
 //
 
-#include "RESTAPI/RESTAPI_board_devices_handler.h"
-#include "RESTAPI/RESTAPI_board_handler.h"
+#include "framework/MicroService.h"
 #include "RESTAPI/RESTAPI_board_list_handler.h"
+#include "RESTAPI/RESTAPI_board_handler.h"
+#include "RESTAPI/RESTAPI_board_devices_handler.h"
 #include "RESTAPI/RESTAPI_board_timepoint_handler.h"
 #include "RESTAPI/RESTAPI_wificlienthistory_handler.h"
 
-#include "framework/RESTAPI_SystemCommand.h"
-#include "framework/RESTAPI_WebSocketServer.h"
-#include "framework/RESTAPI_SystemConfiguration.h"
-
 namespace OpenWifi {
 
-	Poco::Net::HTTPRequestHandler *
-	RESTAPI_ExtRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
-					  Poco::Logger &L, RESTAPI_GenericServerAccounting &S, uint64_t TransactionId) {
-		return RESTAPI_Router<RESTAPI_system_command, RESTAPI_system_configuration, RESTAPI_board_devices_handler,
-							  RESTAPI_board_timepoint_handler, RESTAPI_board_handler,
-							  RESTAPI_board_list_handler, RESTAPI_wificlienthistory_handler,
-							  RESTAPI_webSocketServer>(Path, Bindings, L, S, TransactionId);
-	}
+    Poco::Net::HTTPRequestHandler * RESTAPI_ExtRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
+                                                            Poco::Logger & L, RESTAPI_GenericServer & S,
+                                                            uint64_t TransactionId) {
+        return  RESTAPI_Router<
+                    RESTAPI_system_command,
+                    RESTAPI_board_devices_handler,
+                    RESTAPI_board_timepoint_handler,
+                    RESTAPI_board_handler,
+                    RESTAPI_board_list_handler,
+                    RESTAPI_wificlienthistory_handler
+                >(Path,Bindings,L, S, TransactionId);
+    }
 
-	Poco::Net::HTTPRequestHandler *
-	RESTAPI_IntRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
-					  Poco::Logger &L, RESTAPI_GenericServerAccounting &S, uint64_t TransactionId) {
-		return RESTAPI_Router_I<RESTAPI_system_command, RESTAPI_system_configuration, RESTAPI_board_devices_handler,
-								RESTAPI_board_timepoint_handler, RESTAPI_board_handler,
-								RESTAPI_board_list_handler, RESTAPI_wificlienthistory_handler>(
-			Path, Bindings, L, S, TransactionId);
-	}
+    Poco::Net::HTTPRequestHandler * RESTAPI_IntRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
+                                                            Poco::Logger & L, RESTAPI_GenericServer & S,
+                                                            uint64_t TransactionId) {
+        return RESTAPI_Router_I<
+                RESTAPI_system_command,
+                RESTAPI_board_devices_handler,
+                RESTAPI_board_timepoint_handler,
+                RESTAPI_board_handler,
+                RESTAPI_board_list_handler,
+                RESTAPI_wificlienthistory_handler
+            >(Path, Bindings, L, S, TransactionId);
+    }
 
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_wificlienthistory_handler.cpp

@@ -3,114 +3,105 @@
 //
 
 #include "RESTAPI_wificlienthistory_handler.h"
-#include "RESTAPI_analytics_db_helpers.h"
 #include "WifiClientCache.h"
+#include "RESTAPI_analytics_db_helpers.h"
 
 namespace OpenWifi {
 
-	void RESTAPI_wificlienthistory_handler::DoGet() {
+    void RESTAPI_wificlienthistory_handler::DoGet() {
 
-		if (GetBoolParameter("orderSpec")) {
-			return ReturnFieldList(DB_, *this);
-		}
+        if(GetBoolParameter("orderSpec")) {
+            return ReturnFieldList(DB_,*this);
+        }
 
-		auto venue = ORM::Escape(GetParameter("venue", ""));
-		if (venue.empty()) {
-			return BadRequest(RESTAPI::Errors::VenueMustExist);
-		}
+        auto venue = GetParameter("venue","");
+        if(venue.empty()) {
+            return BadRequest(RESTAPI::Errors::VenueMustExist);
+        }
 
-		if (GetBoolParameter("macsOnly")) {
-			auto macFilter = GetParameter("macFilter", "");
-			std::vector<uint64_t> Macs;
-			WifiClientCache()->FindNumbers(venue, macFilter, QB_.Offset, QB_.Limit, Macs);
-			Poco::JSON::Array Arr;
-			for (const auto &mac : Macs)
-				Arr.add(Utils::IntToSerialNumber(mac));
-			Poco::JSON::Object Answer;
-			Answer.set("entries", Arr);
-			return ReturnObject(Answer);
-		}
+        if(GetBoolParameter("macsOnly")) {
 
-		auto stationId = GetBinding("client");
-		if (!Utils::ValidSerialNumber(stationId)) {
-			return BadRequest(RESTAPI::Errors::InvalidSerialNumber);
-		}
+            auto macFilter = GetParameter("macFilter","");
+            std::vector<uint64_t>    Macs;
+            WifiClientCache()->FindNumbers(venue,macFilter,500,Macs);
+            Poco::JSON::Array   Arr;
+            for(const auto &mac: Macs)
+                Arr.add(Utils::IntToSerialNumber(mac));
+            Poco::JSON::Object  Answer;
+            Answer.set("entries", Arr);
+            return ReturnObject(Answer);
+        }
 
-		std::string OrderBy{" ORDER BY timestamp DESC "}, Arg;
-		if (HasParameter("orderBy", Arg)) {
-			if (!DB_.PrepareOrderBy(Arg, OrderBy)) {
-				return BadRequest(RESTAPI::Errors::InvalidLOrderBy);
-			}
-		}
+        auto stationId = GetBinding("client");
+        if(!Utils::ValidSerialNumber(stationId)) {
+            return BadRequest(RESTAPI::Errors::InvalidSerialNumber);
+        }
 
-		auto fromDate = GetParameter("fromDate", 0);
-		auto endDate = GetParameter("endDate", 0);
+        std::string OrderBy{" ORDER BY timestamp DESC "}, Arg;
+        if(HasParameter("orderBy",Arg)) {
+            if(!DB_.PrepareOrderBy(Arg,OrderBy)) {
+                return BadRequest(RESTAPI::Errors::InvalidLOrderBy);
+            }
+        }
 
-		WifiClientHistoryDB::RecordVec Results;
-		std::string Where;
-		if (fromDate != 0 && endDate != 0)
-			Where = fmt::format(
-				" venue_id='{}' and station_id='{}' and timestamp>={} and timestamp<={} ", venue,
-				stationId, fromDate, endDate);
-		else if (fromDate != 0 && endDate == 0)
-			Where = fmt::format(" venue_id='{}' and station_id='{}' and timestamp>={} ", venue,
-								stationId, fromDate);
-		else if (fromDate == 0 && endDate != 0)
-			Where = fmt::format(" venue_id='{}' and station_id='{}' and timestamp<={} ", venue,
-								stationId, endDate);
-		else
-			Where = fmt::format(" venue_id='{}' and station_id='{}' ", venue, stationId);
+        auto fromDate = GetParameter("fromDate",0);
+        auto endDate = GetParameter("endDate",0);
 
-		if (GetBoolParameter("countOnly")) {
-			auto Count = DB_.Count(Where);
-			return ReturnCountOnly(Count);
-		}
+        WifiClientHistoryDB::RecordVec Results;
+        std::string Where;
+        if(fromDate!=0 && endDate!=0)
+            Where = fmt::format(" venue_id='{}' and station_id='{}' and timestamp>={} and timestamp<={} ", venue, stationId, fromDate, endDate);
+        else if(fromDate!=0 && endDate==0)
+            Where = fmt::format(" venue_id='{}' and station_id='{}' and timestamp>={} ", venue, stationId, fromDate);
+        else if(fromDate==0 && endDate!=0)
+            Where = fmt::format(" venue_id='{}' and station_id='{}' and timestamp<={} ", venue, stationId, endDate);
+        else
+            Where = fmt::format(" venue_id='{}' and station_id='{}' ", venue, stationId);
 
-		StorageService()->WifiClientHistoryDB().GetRecords(QB_.Offset, QB_.Limit, Results, Where,
-														   OrderBy);
-		return ReturnObject("entries", Results);
-	}
+        if(GetBoolParameter("countOnly")) {
+            auto Count = DB_.Count(Where);
+            return ReturnCountOnly(Count);
+        }
 
-	void RESTAPI_wificlienthistory_handler::DoDelete() {
+        StorageService()->WifiClientHistoryDB().GetRecords(QB_.Offset,QB_.Limit, Results, Where, OrderBy);
+        return ReturnObject("entries",Results);
+    }
 
-		if (UserInfo_.userinfo.userRole != SecurityObjects::ADMIN &&
-			UserInfo_.userinfo.userRole != SecurityObjects::ROOT) {
-			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
-		}
+    void RESTAPI_wificlienthistory_handler::DoDelete() {
 
-		auto venue = ORM::Escape(GetParameter("venue", ""));
-		if (venue.empty()) {
-			return BadRequest(RESTAPI::Errors::VenueMustExist);
-		}
+        if(UserInfo_.userinfo.userRole!=SecurityObjects::ADMIN && UserInfo_.userinfo.userRole!=SecurityObjects::ROOT) {
+            return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
+        }
 
-		auto stationId = GetBinding("client");
-		if (!Utils::ValidSerialNumber(stationId)) {
-			return BadRequest(RESTAPI::Errors::InvalidSerialNumber);
-		}
+        auto venue = GetParameter("venue","");
+        if(venue.empty()) {
+            return BadRequest(RESTAPI::Errors::VenueMustExist);
+        }
 
-		auto fromDate = GetParameter("fromDate", 0);
-		auto endDate = GetParameter("endDate", 0);
+        auto stationId = GetBinding("client");
+        if(!Utils::ValidSerialNumber(stationId)) {
+            return BadRequest(RESTAPI::Errors::InvalidSerialNumber);
+        }
 
-		WifiClientHistoryDB::RecordVec Results;
-		std::string Where;
-		if (fromDate && endDate)
-			Where = fmt::format(
-				" venue_id='{}' and station_id='{}' and timestamp>={} and timestamp<={} ", venue,
-				stationId, fromDate, endDate);
-		else if (fromDate && !endDate)
-			Where = fmt::format(" venue_id='{}' and station_id='{}' and timestamp>={} ", venue,
-								stationId, fromDate);
-		else if (!fromDate && endDate)
-			Where = fmt::format(" venue_id='{}' and station_id='{}' and timestamp<={} ", venue,
-								stationId, endDate);
-		else
-			Where = fmt::format("venue_id='{}' and  station_id='{}' ", stationId);
+        auto fromDate = GetParameter("fromDate",0);
+        auto endDate = GetParameter("endDate",0);
 
-		if (StorageService()->WifiClientHistoryDB().DeleteRecords(Where)) {
-			return OK();
-		}
+        WifiClientHistoryDB::RecordVec Results;
+        std::string Where;
+        if(fromDate && endDate)
+            Where = fmt::format(" venue_id='{}' and station_id='{}' and timestamp>={} and timestamp<={} ", venue, stationId, fromDate, endDate);
+        else if(fromDate && !endDate)
+            Where = fmt::format(" venue_id='{}' and station_id='{}' and timestamp>={} ", venue, stationId, fromDate);
+        else if(!fromDate && endDate)
+            Where = fmt::format(" venue_id='{}' and station_id='{}' and timestamp<={} ", venue, stationId, endDate);
+        else
+            Where = fmt::format("venue_id='{}' and  station_id='{}' ", stationId);
 
-		return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-	}
+        if(StorageService()->WifiClientHistoryDB().DeleteRecords(Where)) {
+            return OK();
+        }
 
-} // namespace OpenWifi
+        return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
+    }
+
+}

src/RESTAPI/RESTAPI_wificlienthistory_handler.h

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

src/RESTObjects/RESTAPI_AnalyticsObjects.h

@@ -5,339 +5,418 @@
 #pragma once
 
 #include "RESTAPI_ProvObjects.h"
-#include "framework/utils.h"
 #include <vector>
 
 namespace OpenWifi {
 
-	namespace AnalyticsObjects {
+    namespace AnalyticsObjects {
 
-		struct Report {
-			uint64_t snapShot = 0;
+        struct Report {
+            uint64_t snapShot = 0;
 
-			void reset();
+            void reset();
 
-			void to_json(Poco::JSON::Object &Obj) const;
-		};
+            void to_json(Poco::JSON::Object &Obj) const;
+        };
 
-		struct VenueInfo {
-			OpenWifi::Types::UUID_t id;
-			std::string name;
-			std::string description;
-			uint64_t retention = 0;
-			uint64_t interval = 0;
-			bool monitorSubVenues = false;
+        struct VenueInfo {
+            OpenWifi::Types::UUID_t id;
+            std::string name;
+            std::string description;
+            uint64_t retention = 0;
+            uint64_t interval = 0;
+            bool monitorSubVenues = false;
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-		struct BoardInfo {
-			ProvObjects::ObjectInfo info;
-			std::vector<VenueInfo> venueList;
+        struct BoardInfo {
+            ProvObjects::ObjectInfo info;
+            std::vector<VenueInfo> venueList;
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
 
-			inline bool operator<(const BoardInfo &bb) const { return info.id < bb.info.id; }
+            inline bool operator<(const BoardInfo &bb) const {
+                return info.id < bb.info.id;
+            }
 
-			inline bool operator==(const BoardInfo &bb) const { return info.id == bb.info.id; }
-		};
+            inline bool operator==(const BoardInfo &bb) const {
+                return info.id == bb.info.id;
+            }
+        };
 
-		struct DeviceInfo {
-			std::string boardId;
-			std::string type;
-			std::string serialNumber;
-			std::string deviceType;
-			uint64_t lastContact = 0;
-			uint64_t lastPing = 0;
-			uint64_t lastState = 0;
-			std::string lastFirmware;
-			uint64_t lastFirmwareUpdate = 0;
-			uint64_t lastConnection = 0;
-			uint64_t lastDisconnection = 0;
-			uint64_t pings = 0;
-			uint64_t states = 0;
-			bool connected = false;
-			std::string connectionIp;
-			uint64_t associations_2g = 0;
-			uint64_t associations_5g = 0;
-			uint64_t associations_6g = 0;
-			uint64_t health = 0;
-			uint64_t lastHealth = 0;
-			std::string locale;
-			uint64_t uptime = 0;
-			double memory = 0.0;
+        struct DeviceInfo {
+            std::string boardId;
+            std::string type;
+            std::string serialNumber;
+            std::string deviceType;
+            uint64_t lastContact = 0 ;
+            uint64_t lastPing = 0;
+            uint64_t lastState = 0;
+            std::string lastFirmware;
+            uint64_t lastFirmwareUpdate = 0;
+            uint64_t lastConnection = 0;
+            uint64_t lastDisconnection = 0;
+            uint64_t pings = 0;
+            uint64_t states = 0;
+            bool connected = false;
+            std::string connectionIp;
+            uint64_t associations_2g = 0;
+            uint64_t associations_5g = 0;
+            uint64_t associations_6g = 0;
+            uint64_t health = 0;
+            uint64_t lastHealth = 0;
+            std::string locale;
+            uint64_t uptime = 0;
+            double memory = 0.0;
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-		struct DeviceInfoList {
-			std::vector<DeviceInfo> devices;
+        struct DeviceInfoList {
+            std::vector<DeviceInfo> devices;
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-		enum wifi_band { band_2g = 0, band_5g = 1, band_6g = 2 };
+        enum wifi_band {
+            band_2g = 0, band_5g = 1, band_6g = 2
+        };
 
-		struct TIDstat_entry {
-			uint64_t rx_msdu = 0, tx_msdu = 0, tx_msdu_failed = 0, tx_msdu_retries = 0;
+        struct TIDstat_entry {
+            uint64_t rx_msdu = 0,
+                    tx_msdu = 0,
+                    tx_msdu_failed = 0,
+                    tx_msdu_retries = 0;
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-		struct UE_rate {
-			uint64_t bitrate = 0;
-			uint64_t mcs = 0;
-			uint64_t nss = 0;
-			bool ht = false;
-			bool sgi = false;
-			uint64_t chwidth = 0;
+        struct UE_rate {
+            uint64_t    bitrate=0;
+            uint64_t    mcs=0;
+            uint64_t    nss=0;
+            bool        ht=false;
+            bool        sgi=false;
+            uint64_t    chwidth=0;
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-		struct AveragePoint {
-			double min = 0.0, max = 0.0, avg = 0.0;
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+        struct AveragePoint {
+            double      min = 0.0,
+                        max = 0.0,
+                        avg = 0.0;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-		struct UETimePoint {
-			std::string station;
-			int64_t rssi = 0;
-			uint64_t tx_bytes = 0, rx_bytes = 0, tx_duration = 0, rx_packets = 0, tx_packets = 0,
-					 tx_retries = 0, tx_failed = 0, connected = 0, inactive = 0;
+        struct UETimePoint {
+            std::string station;
+            int64_t rssi = 0;
+            uint64_t tx_bytes = 0,
+                    rx_bytes = 0,
+                    tx_duration = 0,
+                    rx_packets = 0,
+                    tx_packets = 0,
+                    tx_retries = 0,
+                    tx_failed = 0,
+                    connected = 0,
+                    inactive = 0;
 
-			double tx_bytes_bw = 0.0, rx_bytes_bw = 0.0, tx_packets_bw = 0.0, rx_packets_bw = 0.0,
-				   tx_failed_pct = 0.0, tx_retries_pct = 0.0, tx_duration_pct = 0.0;
+            double  tx_bytes_bw = 0.0 ,
+                    rx_bytes_bw = 0.0 ,
+                    tx_packets_bw = 0.0 ,
+                    rx_packets_bw = 0.0 ,
+                    tx_failed_pct = 0.0 ,
+                    tx_retries_pct = 0.0 ,
+                    tx_duration_pct = 0.0;
 
-			uint64_t tx_bytes_delta = 0, rx_bytes_delta = 0, tx_duration_delta = 0,
-					 rx_packets_delta = 0, tx_packets_delta = 0, tx_retries_delta = 0,
-					 tx_failed_delta = 0;
+            uint64_t    tx_bytes_delta = 0,
+                        rx_bytes_delta = 0,
+                        tx_duration_delta = 0,
+                        rx_packets_delta = 0,
+                        tx_packets_delta = 0,
+                        tx_retries_delta = 0,
+                        tx_failed_delta = 0;
 
-			UE_rate tx_rate, rx_rate;
-			std::vector<TIDstat_entry> tidstats;
+            UE_rate tx_rate,
+                    rx_rate;
+            std::vector<TIDstat_entry> tidstats;
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-		enum SSID_MODES { unknown = 0, ap, mesh, sta, wds_ap, wds_sta, wds_repeater };
+        enum SSID_MODES {
+            unknown = 0,
+            ap,
+            mesh,
+            sta,
+            wds_ap,
+            wds_sta,
+            wds_repeater
+        };
 
-		inline SSID_MODES SSID_Mode(const std::string &m) {
-			if (m == "ap")
-				return ap;
-			if (m == "sta")
-				return sta;
-			if (m == "mesh")
-				return mesh;
-			if (m == "wds-ap")
-				return wds_ap;
-			if (m == "wds-sta")
-				return wds_sta;
-			if (m == "wds-repeater")
-				return wds_repeater;
-			return unknown;
-		}
+        inline SSID_MODES SSID_Mode(const std::string &m) {
+            if (m == "ap")
+                return ap;
+            if (m == "sta")
+                return sta;
+            if (m == "mesh")
+                return mesh;
+            if (m == "wds-ap")
+                return wds_ap;
+            if (m == "wds-sta")
+                return wds_sta;
+            if (m == "wds-repeater")
+                return wds_repeater;
+            return unknown;
+        }
 
-		struct SSIDTimePoint {
-			std::string bssid, mode, ssid;
-			uint64_t band = 0, channel = 0;
-			std::vector<UETimePoint> associations;
+        struct SSIDTimePoint {
+            std::string bssid,
+                        mode,
+                        ssid;
+            uint64_t    band=0,
+                        channel=0;
+            std::vector<UETimePoint> associations;
 
-			AveragePoint tx_bytes_bw, rx_bytes_bw, tx_packets_bw, rx_packets_bw, tx_failed_pct,
-				tx_retries_pct, tx_duration_pct;
+            AveragePoint    tx_bytes_bw,
+                            rx_bytes_bw,
+                            tx_packets_bw,
+                            rx_packets_bw,
+                            tx_failed_pct,
+                            tx_retries_pct,
+                            tx_duration_pct;
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-		struct APTimePoint {
-			uint64_t collisions = 0, multicast = 0, rx_bytes = 0, rx_dropped = 0, rx_errors = 0,
-					 rx_packets = 0, tx_bytes = 0, tx_dropped = 0, tx_errors = 0, tx_packets = 0;
 
-			double tx_bytes_bw = 0.0, rx_bytes_bw = 0.0, rx_dropped_pct = 0.0, tx_dropped_pct = 0.0,
-				   rx_packets_bw = 0.0, tx_packets_bw = 0.0, rx_errors_pct = 0.0,
-				   tx_errors_pct = 0.0;
+        struct APTimePoint {
+            uint64_t    collisions = 0,
+                        multicast = 0,
+                        rx_bytes = 0,
+                        rx_dropped = 0,
+                        rx_errors = 0,
+                        rx_packets = 0,
+                        tx_bytes = 0,
+                        tx_dropped = 0,
+                        tx_errors = 0,
+                        tx_packets = 0;
 
-			uint64_t tx_bytes_delta = 0, rx_bytes_delta = 0, rx_dropped_delta = 0,
-					 tx_dropped_delta = 0, rx_packets_delta = 0, tx_packets_delta = 0,
-					 rx_errors_delta = 0, tx_errors_delta = 0;
+            double      tx_bytes_bw = 0.0 ,
+                        rx_bytes_bw = 0.0 ,
+                        rx_dropped_pct = 0.0,
+                        tx_dropped_pct = 0.0,
+                        rx_packets_bw = 0.0,
+                        tx_packets_bw = 0.0,
+                        rx_errors_pct = 0.0 ,
+                        tx_errors_pct = 0.0;
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+            uint64_t    tx_bytes_delta = 0,
+                        rx_bytes_delta = 0 ,
+                        rx_dropped_delta = 0,
+                        tx_dropped_delta = 0,
+                        rx_packets_delta = 0,
+                        tx_packets_delta = 0,
+                        rx_errors_delta = 0,
+                        tx_errors_delta = 0;
 
-		struct RadioTimePoint {
-			uint64_t band = 0, channel_width = 0;
-			uint64_t active_ms = 0, busy_ms = 0, receive_ms = 0, transmit_ms = 0, tx_power = 0,
-					 channel = 0;
-			int64_t temperature = 0, noise = 0;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-			double active_pct = 0.0, busy_pct = 0.0, receive_pct = 0.0, transmit_pct = 0.0;
+        struct RadioTimePoint {
+            uint64_t    band = 0,
+                        channel_width = 0;
+            uint64_t    active_ms = 0,
+                        busy_ms = 0,
+                        receive_ms = 0,
+                        transmit_ms = 0,
+                        tx_power = 0,
+                        channel = 0;
+            int64_t     temperature = 0,
+                        noise = 0;
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+            double      active_pct = 0.0 ,
+                        busy_pct = 0.0,
+                        receive_pct = 0.0,
+                        transmit_pct = 0.0;
 
-		struct DeviceTimePoint {
-			std::string id;
-			std::string boardId;
-			uint64_t timestamp = 0;
-			APTimePoint ap_data;
-			std::vector<SSIDTimePoint> ssid_data;
-			std::vector<RadioTimePoint> radio_data;
-			AnalyticsObjects::DeviceInfo device_info;
-			std::string serialNumber;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
 
-			inline bool operator<(const DeviceTimePoint &rhs) const {
-				if (timestamp < rhs.timestamp)
-					return true;
-				if (timestamp > rhs.timestamp)
-					return false;
-				if (device_info.serialNumber < rhs.device_info.serialNumber)
-					return true;
-				return false;
-			}
+        struct DeviceTimePoint {
+            std::string                     id;
+            std::string                     boardId;
+            uint64_t                        timestamp = 0;
+            APTimePoint                     ap_data;
+            std::vector<SSIDTimePoint>      ssid_data;
+            std::vector<RadioTimePoint>     radio_data;
+            AnalyticsObjects::DeviceInfo    device_info;
+            std::string                     serialNumber;
 
-			inline bool operator==(const DeviceTimePoint &rhs) const {
-				return timestamp == rhs.timestamp &&
-					   device_info.serialNumber == rhs.device_info.serialNumber;
-			}
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
 
-			inline bool operator>(const DeviceTimePoint &rhs) const {
-				if (timestamp > rhs.timestamp)
-					return true;
-				if (timestamp < rhs.timestamp)
-					return false;
-				if (device_info.serialNumber > rhs.device_info.serialNumber)
-					return true;
-				return false;
-			}
-		};
+            inline bool operator<(const DeviceTimePoint &rhs) const {
+                if(timestamp < rhs.timestamp)
+                    return true;
+                if(timestamp > rhs.timestamp)
+                    return false;
+                if(device_info.serialNumber < rhs.device_info.serialNumber)
+                    return true;
+                return false;
+            }
 
-		struct DeviceTimePointAnalysis {
-			uint64_t timestamp;
+            inline bool operator==(const DeviceTimePoint &rhs) const {
+                return timestamp==rhs.timestamp && device_info.serialNumber==rhs.device_info.serialNumber;
+            }
 
-			AveragePoint noise;
-			AveragePoint temperature;
-			AveragePoint active_pct;
-			AveragePoint busy_pct;
-			AveragePoint receive_pct;
-			AveragePoint transmit_pct;
-			AveragePoint tx_power;
+            inline bool operator>(const DeviceTimePoint &rhs) const {
+                if(timestamp > rhs.timestamp)
+                    return true;
+                if(timestamp < rhs.timestamp)
+                    return false;
+                if(device_info.serialNumber > rhs.device_info.serialNumber)
+                    return true;
+                return false;
+            }
 
-			AveragePoint tx_bytes_bw;
-			AveragePoint rx_bytes_bw;
-			AveragePoint rx_dropped_pct;
-			AveragePoint tx_dropped_pct;
-			AveragePoint rx_packets_bw;
-			AveragePoint tx_packets_bw;
-			AveragePoint rx_errors_pct;
-			AveragePoint tx_errors_pct;
+        };
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+        struct DeviceTimePointAnalysis {
+            uint64_t        timestamp;
 
-		struct DeviceTimePointList {
-			std::vector<DeviceTimePoint> points;
-			std::vector<DeviceTimePointAnalysis> stats;
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+            AveragePoint    noise;
+            AveragePoint    temperature;
+            AveragePoint    active_pct;
+            AveragePoint    busy_pct;
+            AveragePoint    receive_pct;
+            AveragePoint    transmit_pct;
+            AveragePoint    tx_power;
 
-		struct BandwidthAnalysisEntry {
-			uint64_t timestamp = 0;
-		};
+            AveragePoint    tx_bytes_bw;
+            AveragePoint    rx_bytes_bw;
+            AveragePoint    rx_dropped_pct;
+            AveragePoint    tx_dropped_pct;
+            AveragePoint    rx_packets_bw;
+            AveragePoint    tx_packets_bw;
+            AveragePoint    rx_errors_pct;
+            AveragePoint    tx_errors_pct;
 
-		struct BandwidthAnalysis {};
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
 
-		struct AverageValueSigned {
-			int64_t peak = 0, avg = 0, low = 0;
-		};
+        };
 
-		struct AverageValueUnsigned {
-			uint64_t peak = 0, avg = 0, low = 0;
-		};
+        struct DeviceTimePointList {
+            std::vector<DeviceTimePoint>            points;
+            std::vector<DeviceTimePointAnalysis>    stats;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
 
-		struct RadioAnalysis {
-			uint64_t timestamp = 0;
-			AverageValueSigned noise, temperature;
-			AverageValueUnsigned active_ms, busy_ms, transmit_ms, receive_ms;
-		};
+        struct BandwidthAnalysisEntry {
+            uint64_t    timestamp = 0;
 
-		struct DeviceTimePointStats {
-			uint64_t firstPoint = 0;
-			uint64_t lastPoint = 0;
-			uint64_t count = 0;
+        };
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+        struct BandwidthAnalysis {
 
-		struct WifiClientRate {
-			uint32_t bitrate = 0;
-			uint32_t chwidth = 0;
-			uint16_t mcs = 0;
-			uint16_t nss = 0;
-			bool vht = false;
+        };
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+        struct AverageValueSigned {
+            int64_t     peak=0, avg=0, low=0;
+        };
 
-		struct WifiClientHistory {
-			uint64_t timestamp = Utils::Now();
-			std::string station_id;
-			std::string bssid;
-			std::string ssid;
-			int64_t rssi = 0;
-			uint32_t rx_bitrate = 0;
-			uint32_t rx_chwidth = 0;
-			uint16_t rx_mcs = 0;
-			uint16_t rx_nss = 0;
-			bool rx_vht = false;
-			uint32_t tx_bitrate = 0;
-			uint32_t tx_chwidth = 0;
-			uint16_t tx_mcs = 0;
-			uint16_t tx_nss = 0;
-			bool tx_vht = false;
-			uint64_t rx_bytes = 0;
-			uint64_t tx_bytes = 0;
-			uint64_t rx_duration = 0;
-			uint64_t tx_duration = 0;
-			uint64_t rx_packets = 0;
-			uint64_t tx_packets = 0;
-			std::string ipv4;
-			std::string ipv6;
-			uint64_t channel_width = 0;
-			int64_t noise = 0;
-			uint64_t tx_power = 0;
-			uint64_t channel = 0;
-			uint64_t active_ms = 0;
-			uint64_t busy_ms = 0;
-			uint64_t receive_ms = 0;
-			std::string mode;
-			int64_t ack_signal = 0;
-			int64_t ack_signal_avg = 0;
-			uint64_t connected = 0;
-			uint64_t inactive = 0;
-			uint64_t tx_retries = 0;
-			std::string venue_id;
+        struct AverageValueUnsigned {
+            uint64_t     peak=0, avg=0, low=0;
+        };
 
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
+        struct RadioAnalysis {
+            uint64_t                timestamp=0;
+            AverageValueSigned      noise, temperature;
+            AverageValueUnsigned    active_ms,
+                                    busy_ms,
+                                    transmit_ms,
+                                    receive_ms;
+        };
 
-	} // namespace AnalyticsObjects
+        struct DeviceTimePointStats {
+            uint64_t                firstPoint=0;
+            uint64_t                lastPoint=0;
+            uint64_t                count=0;
 
-} // namespace OpenWifi
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct WifiClientRate {
+            uint32_t    bitrate=0;
+            uint32_t    chwidth=0;
+            uint16_t    mcs=0;
+            uint16_t    nss=0;
+            bool        vht=false;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct WifiClientHistory {
+            uint64_t        timestamp=OpenWifi::Now();
+            std::string     station_id;
+            std::string     bssid;
+            std::string     ssid;
+            int64_t         rssi=0;
+            uint32_t        rx_bitrate=0;
+            uint32_t        rx_chwidth=0;
+            uint16_t        rx_mcs=0;
+            uint16_t        rx_nss=0;
+            bool            rx_vht=false;
+            uint32_t        tx_bitrate=0;
+            uint32_t        tx_chwidth=0;
+            uint16_t        tx_mcs=0;
+            uint16_t        tx_nss=0;
+            bool            tx_vht=false;
+            uint64_t        rx_bytes=0;
+            uint64_t        tx_bytes=0;
+            uint64_t        rx_duration=0;
+            uint64_t        tx_duration=0;
+            uint64_t        rx_packets=0;
+            uint64_t        tx_packets=0;
+            std::string     ipv4;
+            std::string     ipv6;
+            uint64_t        channel_width=0;
+            int64_t         noise=0;
+            uint64_t        tx_power=0;
+            uint64_t        channel=0;
+            uint64_t        active_ms=0;
+            uint64_t        busy_ms=0;
+            uint64_t        receive_ms=0;
+            std::string     mode;
+            int64_t         ack_signal=0;
+            int64_t         ack_signal_avg=0;
+            uint64_t        connected=0;
+            uint64_t        inactive=0;
+            uint64_t        tx_retries=0;
+            std::string     venue_id;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+    }
+
+}

src/RESTObjects/RESTAPI_CertObjects.cpp

@@ -3,210 +3,206 @@
 //
 
 #include "RESTAPI_CertObjects.h"
-#include "framework/RESTAPI_utils.h"
+#include "framework/MicroService.h"
 
-using OpenWifi::RESTAPI_utils::field_from_json;
 using OpenWifi::RESTAPI_utils::field_to_json;
+using OpenWifi::RESTAPI_utils::field_from_json;
 
 namespace OpenWifi::CertObjects {
-	void CertificateEntry::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "entity", entity);
-		field_to_json(Obj, "creator", creator);
-		field_to_json(Obj, "type", type);
-		field_to_json(Obj, "status", status);
-		field_to_json(Obj, "certificate", certificate);
-		field_to_json(Obj, "key", key);
-		field_to_json(Obj, "devid", devid);
-		field_to_json(Obj, "cas", cas);
-		field_to_json(Obj, "manufacturer", manufacturer);
-		field_to_json(Obj, "model", model);
-		field_to_json(Obj, "redirector", redirector);
-		field_to_json(Obj, "commonName", commonName);
-		field_to_json(Obj, "certificateId", certificateId);
-		field_to_json(Obj, "batch", batch);
-		field_to_json(Obj, "created", created);
-		field_to_json(Obj, "modified", modified);
-		field_to_json(Obj, "revoked", revoked);
-		field_to_json(Obj, "revokeCount", revokeCount);
-		field_to_json(Obj, "synched", synched);
-		field_to_json(Obj, "expiryDate", expiryDate);
-	}
+    void CertificateEntry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"id", id);
+        field_to_json(Obj,"entity", entity);
+        field_to_json(Obj,"creator", creator);
+        field_to_json(Obj,"type", type);
+        field_to_json(Obj,"status", status);
+        field_to_json(Obj,"certificate", certificate);
+        field_to_json(Obj,"key", key);
+        field_to_json(Obj,"devid", devid);
+        field_to_json(Obj,"cas", cas);
+        field_to_json(Obj,"manufacturer", manufacturer);
+        field_to_json(Obj,"model", model);
+        field_to_json(Obj,"redirector", redirector);
+        field_to_json(Obj,"commonName", commonName);
+        field_to_json(Obj,"certificateId", certificateId);
+        field_to_json(Obj,"batch", batch);
+        field_to_json(Obj,"created", created);
+        field_to_json(Obj,"modified", modified);
+        field_to_json(Obj,"revoked", revoked);
+        field_to_json(Obj,"revokeCount", revokeCount);
+        field_to_json(Obj,"synched", synched);
+    }
 
-	bool CertificateEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "entity", entity);
-			field_from_json(Obj, "creator", creator);
-			field_from_json(Obj, "type", type);
-			field_from_json(Obj, "status", status);
-			field_from_json(Obj, "certificate", certificate);
-			field_from_json(Obj, "key", key);
-			field_from_json(Obj, "devid", devid);
-			field_from_json(Obj, "cas", cas);
-			field_from_json(Obj, "manufacturer", manufacturer);
-			field_from_json(Obj, "model", model);
-			field_from_json(Obj, "redirector", redirector);
-			field_from_json(Obj, "commonName", commonName);
-			field_from_json(Obj, "certificateId", certificateId);
-			field_from_json(Obj, "batch", batch);
-			field_from_json(Obj, "created", created);
-			field_from_json(Obj, "modified", modified);
-			field_from_json(Obj, "revoked", revoked);
-			field_from_json(Obj, "revokeCount", revokeCount);
-			field_from_json(Obj, "synched", synched);
-			field_from_json(Obj, "expiryDate", expiryDate);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    bool CertificateEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"id", id);
+            field_from_json(Obj,"entity", entity);
+            field_from_json(Obj,"creator", creator);
+            field_from_json(Obj,"type", type);
+            field_from_json(Obj,"status", status);
+            field_from_json(Obj,"certificate", certificate);
+            field_from_json(Obj,"key", key);
+            field_from_json(Obj,"devid", devid);
+            field_from_json(Obj,"cas", cas);
+            field_from_json(Obj,"manufacturer", manufacturer);
+            field_from_json(Obj,"model", model);
+            field_from_json(Obj,"redirector", redirector);
+            field_from_json(Obj,"commonName", commonName);
+            field_from_json(Obj,"certificateId", certificateId);
+            field_from_json(Obj,"batch", batch);
+            field_from_json(Obj,"created", created);
+            field_from_json(Obj,"modified", modified);
+            field_from_json(Obj,"revoked", revoked);
+            field_from_json(Obj,"revokeCount", revokeCount);
+            field_from_json(Obj,"synched", synched);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
 
-	void EntityEntry::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "creator", creator);
-		field_to_json(Obj, "name", name);
-		field_to_json(Obj, "description", description);
-		field_to_json(Obj, "defaultRedirector", defaultRedirector);
-		field_to_json(Obj, "apiKey", apiKey);
-		field_to_json(Obj, "serverEnrollmentProfile", serverEnrollmentProfile);
-		field_to_json(Obj, "clientEnrollmentProfile", clientEnrollmentProfile);
-		field_to_json(Obj, "organization", organization);
-		field_to_json(Obj, "created", created);
-		field_to_json(Obj, "modified", modified);
-		field_to_json(Obj, "suspended", suspended);
-		field_to_json(Obj, "deleted", deleted);
-		field_to_json(Obj, "notes", notes);
-	}
+    void EntityEntry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"id", id);
+        field_to_json(Obj,"creator", creator);
+        field_to_json(Obj,"name", name);
+        field_to_json(Obj,"description", description);
+        field_to_json(Obj,"defaultRedirector", defaultRedirector);
+        field_to_json(Obj,"apiKey", apiKey);
+        field_to_json(Obj,"serverEnrollmentProfile", serverEnrollmentProfile);
+        field_to_json(Obj,"clientEnrollmentProfile", clientEnrollmentProfile);
+        field_to_json(Obj,"organization", organization);
+        field_to_json(Obj,"created", created);
+        field_to_json(Obj,"modified", modified);
+        field_to_json(Obj,"suspended", suspended);
+        field_to_json(Obj,"deleted", deleted);
+        field_to_json(Obj,"notes", notes);
+    }
 
-	bool EntityEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "creator", creator);
-			field_from_json(Obj, "name", name);
-			field_from_json(Obj, "description", description);
-			field_from_json(Obj, "defaultRedirector", defaultRedirector);
-			field_from_json(Obj, "apiKey", apiKey);
-			field_from_json(Obj, "serverEnrollmentProfile", serverEnrollmentProfile);
-			field_from_json(Obj, "clientEnrollmentProfile", clientEnrollmentProfile);
-			field_from_json(Obj, "organization", organization);
-			field_from_json(Obj, "created", created);
-			field_from_json(Obj, "modified", modified);
-			field_from_json(Obj, "suspended", suspended);
-			field_from_json(Obj, "deleted", deleted);
-			field_from_json(Obj, "notes", notes);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    bool EntityEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"id", id);
+            field_from_json(Obj,"creator", creator);
+            field_from_json(Obj,"name", name);
+            field_from_json(Obj,"description", description);
+            field_from_json(Obj,"defaultRedirector", defaultRedirector);
+            field_from_json(Obj,"apiKey", apiKey);
+            field_from_json(Obj,"serverEnrollmentProfile", serverEnrollmentProfile);
+            field_from_json(Obj,"clientEnrollmentProfile", clientEnrollmentProfile);
+            field_from_json(Obj,"organization", organization);
+            field_from_json(Obj,"created", created);
+            field_from_json(Obj,"modified", modified);
+            field_from_json(Obj,"suspended", suspended);
+            field_from_json(Obj,"deleted", deleted);
+            field_from_json(Obj,"notes", notes);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
 
-	void BatchEntry::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "entity", entity);
-		field_to_json(Obj, "creator", creator);
-		field_to_json(Obj, "name", name);
-		field_to_json(Obj, "description", description);
-		field_to_json(Obj, "manufacturer", manufacturer);
-		field_to_json(Obj, "model", model);
-		field_to_json(Obj, "redirector", redirector);
-		field_to_json(Obj, "commonNames", commonNames);
-		field_to_json(Obj, "jobHistory", jobHistory);
-		field_to_json(Obj, "notes", notes);
-		field_to_json(Obj, "submitted", submitted);
-		field_to_json(Obj, "started", started);
-		field_to_json(Obj, "completed", completed);
-		field_to_json(Obj, "modified", modified);
-	}
+    void BatchEntry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"id", id);
+        field_to_json(Obj,"entity", entity);
+        field_to_json(Obj,"creator", creator);
+        field_to_json(Obj,"name", name);
+        field_to_json(Obj,"description", description);
+        field_to_json(Obj,"manufacturer", manufacturer);
+        field_to_json(Obj,"model", model);
+        field_to_json(Obj,"redirector", redirector);
+        field_to_json(Obj,"commonNames", commonNames);
+        field_to_json(Obj,"jobHistory", jobHistory);
+        field_to_json(Obj,"notes", notes);
+        field_to_json(Obj,"submitted", submitted);
+        field_to_json(Obj,"started", started);
+        field_to_json(Obj,"completed", completed);
+        field_to_json(Obj,"modified", modified);
+    }
 
-	bool BatchEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "entity", entity);
-			field_from_json(Obj, "creator", creator);
-			field_from_json(Obj, "name", name);
-			field_from_json(Obj, "description", description);
-			field_from_json(Obj, "manufacturer", manufacturer);
-			field_from_json(Obj, "model", model);
-			field_from_json(Obj, "redirector", redirector);
-			field_from_json(Obj, "commonNames", commonNames);
-			field_from_json(Obj, "jobHistory", jobHistory);
-			field_from_json(Obj, "notes", notes);
-			field_from_json(Obj, "submitted", submitted);
-			field_from_json(Obj, "started", started);
-			field_from_json(Obj, "completed", completed);
-			field_from_json(Obj, "modified", modified);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    bool BatchEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"id", id);
+            field_from_json(Obj,"entity", entity);
+            field_from_json(Obj,"creator", creator);
+            field_from_json(Obj,"name", name);
+            field_from_json(Obj,"description", description);
+            field_from_json(Obj,"manufacturer", manufacturer);
+            field_from_json(Obj,"model", model);
+            field_from_json(Obj,"redirector", redirector);
+            field_from_json(Obj,"commonNames", commonNames);
+            field_from_json(Obj,"jobHistory", jobHistory);
+            field_from_json(Obj,"notes", notes);
+            field_from_json(Obj,"submitted", submitted);
+            field_from_json(Obj,"started", started);
+            field_from_json(Obj,"completed", completed);
+            field_from_json(Obj,"modified", modified);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
 
-	void JobEntry::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "entity", entity);
-		field_to_json(Obj, "creator", creator);
-		field_to_json(Obj, "batch", batch);
-		field_to_json(Obj, "commonNames", commonNames);
-		field_to_json(Obj, "completedNames", completedNames);
-		field_to_json(Obj, "errorNames", errorNames);
-		field_to_json(Obj, "status", status);
-		field_to_json(Obj, "command", command);
-		field_to_json(Obj, "parameters", parameters);
-		field_to_json(Obj, "submitted", submitted);
-		field_to_json(Obj, "started", started);
-		field_to_json(Obj, "completed", completed);
-		field_to_json(Obj, "requesterUsername", requesterUsername);
-	}
+    void JobEntry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"id", id);
+        field_to_json(Obj,"entity", entity);
+        field_to_json(Obj,"creator", creator);
+        field_to_json(Obj,"batch", batch);
+        field_to_json(Obj,"commonNames", commonNames);
+        field_to_json(Obj,"completedNames", completedNames);
+        field_to_json(Obj,"errorNames", errorNames);
+        field_to_json(Obj,"status", status);
+        field_to_json(Obj,"command", command);
+        field_to_json(Obj,"parameters", parameters);
+        field_to_json(Obj,"submitted", submitted);
+        field_to_json(Obj,"started", started);
+        field_to_json(Obj,"completed", completed);
+    }
 
-	bool JobEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "entity", entity);
-			field_from_json(Obj, "creator", creator);
-			field_from_json(Obj, "batch", batch);
-			field_from_json(Obj, "commonNames", commonNames);
-			field_from_json(Obj, "completedNames", completedNames);
-			field_from_json(Obj, "errorNames", errorNames);
-			field_from_json(Obj, "status", status);
-			field_from_json(Obj, "command", command);
-			field_from_json(Obj, "parameters", parameters);
-			field_from_json(Obj, "submitted", submitted);
-			field_from_json(Obj, "started", started);
-			field_from_json(Obj, "completed", completed);
-			field_from_json(Obj, "requesterUsername", requesterUsername);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    bool JobEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"id", id);
+            field_from_json(Obj,"entity", entity);
+            field_from_json(Obj,"creator", creator);
+            field_from_json(Obj,"batch", batch);
+            field_from_json(Obj,"commonNames", commonNames);
+            field_from_json(Obj,"completedNames", completedNames);
+            field_from_json(Obj,"errorNames", errorNames);
+            field_from_json(Obj,"status", status);
+            field_from_json(Obj,"command", command);
+            field_from_json(Obj,"parameters", parameters);
+            field_from_json(Obj,"submitted", submitted);
+            field_from_json(Obj,"started", started);
+            field_from_json(Obj,"completed", completed);
+            return true;
+        } catch (...) {
+        }
+        return false;
+    }
 
-	void DashBoardYearlyStats::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "year", year);
-		field_to_json(Obj, "activeCerts", activeCerts);
-		field_to_json(Obj, "revokedCerts", revokedCerts);
-	}
+    void DashBoardYearlyStats::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "year", year);
+        field_to_json(Obj, "activeCerts", activeCerts);
+        field_to_json(Obj, "revokedCerts", revokedCerts);
+    }
 
-	void Dashboard::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "snapshot", snapshot);
-		field_to_json(Obj, "numberOfIssuedCerts", numberOfIssuedCerts);
-		field_to_json(Obj, "numberOfRevokedCerts", numberOfRevokedCerts);
-		field_to_json(Obj, "activeCertsPerOrganization", activeCertsPerOrganization);
-		field_to_json(Obj, "revokedCertsPerOrganization", revokedCertsPerOrganization);
-		field_to_json(Obj, "numberOfRedirectors", numberOfRedirectors);
-		field_to_json(Obj, "deviceTypes", deviceTypes);
-		field_to_json(Obj, "monthlyNumberOfCerts", monthlyNumberOfCerts);
-		field_to_json(Obj, "monthlyNumberOfCertsPerOrgPerYear", monthlyNumberOfCertsPerOrgPerYear);
-	}
+    void Dashboard::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"snapshot", snapshot);
+        field_to_json(Obj,"numberOfIssuedCerts", numberOfIssuedCerts);
+        field_to_json(Obj,"numberOfRevokedCerts", numberOfRevokedCerts);
+        field_to_json(Obj,"activeCertsPerOrganization", activeCertsPerOrganization);
+        field_to_json(Obj,"revokedCertsPerOrganization", revokedCertsPerOrganization);
+        field_to_json(Obj,"numberOfRedirectors", numberOfRedirectors);
+        field_to_json(Obj,"deviceTypes", deviceTypes);
+        field_to_json(Obj,"monthlyNumberOfCerts", monthlyNumberOfCerts);
+        field_to_json(Obj,"monthlyNumberOfCertsPerOrgPerYear", monthlyNumberOfCertsPerOrgPerYear);
+    }
 
-	void Dashboard::reset() {
-		snapshot = 0;
-		numberOfRevokedCerts = numberOfIssuedCerts = 0;
-		activeCertsPerOrganization.clear();
-		revokedCertsPerOrganization.clear();
-		numberOfRedirectors.clear();
-		deviceTypes.clear();
-		monthlyNumberOfCerts.clear();
-		monthlyNumberOfCertsPerOrgPerYear.clear();
-	}
-} // namespace OpenWifi::CertObjects
+    void Dashboard::reset() {
+        snapshot=0;
+        numberOfRevokedCerts = numberOfIssuedCerts = 0;
+        activeCertsPerOrganization.clear();
+        revokedCertsPerOrganization.clear();
+        numberOfRedirectors.clear();
+        deviceTypes.clear();
+        monthlyNumberOfCerts.clear();
+        monthlyNumberOfCertsPerOrgPerYear.clear();
+    }
+}

src/RESTObjects/RESTAPI_CertObjects.h

@@ -4,121 +4,119 @@
 
 #pragma once
 
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "framework/OpenWifiTypes.h"
 #include <string>
+#include "framework/OpenWifiTypes.h"
+#include "RESTObjects/RESTAPI_SecurityObjects.h"
 
 namespace OpenWifi::CertObjects {
 
-	struct CertificateEntry {
-		OpenWifi::Types::UUID_t id;
-		OpenWifi::Types::UUID_t entity;
-		OpenWifi::Types::UUID_t creator;
-		std::string type;
-		std::string status;
-		std::string certificate;
-		std::string key;
-		std::string devid;
-		std::string cas;
-		std::string manufacturer;
-		std::string model;
-		std::string redirector;
-		std::string commonName;
-		std::string certificateId;
-		OpenWifi::Types::UUID_t batch;
-		uint64_t created = 0;
-		uint64_t modified = 0;
-		uint64_t revoked = 0;
-		uint64_t revokeCount = 0;
-		uint64_t synched = 0;
-		uint64_t expiryDate = 0;
+    struct CertificateEntry {
+        OpenWifi::Types::UUID_t         id;
+        OpenWifi::Types::UUID_t         entity;
+        OpenWifi::Types::UUID_t         creator;
+        std::string                     type;
+        std::string                     status;
+        std::string                     certificate;
+        std::string                     key;
+        std::string                     devid;
+        std::string                     cas;
+        std::string                     manufacturer;
+        std::string                     model;
+        std::string                     redirector;
+        std::string                     commonName;
+        std::string                     certificateId;
+        OpenWifi::Types::UUID_t         batch;
+        uint64_t                        created = 0;
+        uint64_t                        modified = 0;
+        uint64_t                        revoked = 0;
+        uint64_t                        revokeCount = 0;
+        uint64_t                        synched = 0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct EntityEntry {
-		OpenWifi::Types::UUID_t id;
-		OpenWifi::Types::UUID_t creator;
-		std::string name;
-		std::string description;
-		std::string defaultRedirector;
-		std::string apiKey;
-		std::string serverEnrollmentProfile;
-		std::string clientEnrollmentProfile;
-		std::string organization;
-		SecurityObjects::NoteInfoVec notes;
-		bool suspended = false;
-		bool deleted = false;
-		uint64_t created = 0;
-		uint64_t modified = 0;
+    struct EntityEntry {
+        OpenWifi::Types::UUID_t         id;
+        OpenWifi::Types::UUID_t         creator;
+        std::string                     name;
+        std::string                     description;
+        std::string                     defaultRedirector;
+        std::string                     apiKey;
+        std::string                     serverEnrollmentProfile;
+        std::string                     clientEnrollmentProfile;
+        std::string                     organization;
+        SecurityObjects::NoteInfoVec    notes;
+        bool                            suspended=false;
+        bool                            deleted=false;
+        uint64_t                        created = 0 ;
+        uint64_t                        modified = 0 ;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct BatchEntry {
-		OpenWifi::Types::UUID_t id;
-		OpenWifi::Types::UUID_t entity;
-		OpenWifi::Types::UUID_t creator;
-		std::string name;
-		std::string description;
-		std::string manufacturer;
-		std::string model;
-		std::string redirector;
-		std::vector<std::string> commonNames;
-		std::vector<std::string> jobHistory;
-		SecurityObjects::NoteInfoVec notes;
-		uint64_t submitted = 0;
-		uint64_t started = 0;
-		uint64_t completed = 0;
-		uint64_t modified = 0;
+    struct BatchEntry {
+        OpenWifi::Types::UUID_t         id;
+        OpenWifi::Types::UUID_t         entity;
+        OpenWifi::Types::UUID_t         creator;
+        std::string                     name;
+        std::string                     description;
+        std::string                     manufacturer;
+        std::string                     model;
+        std::string                     redirector;
+        std::vector<std::string>        commonNames;
+        std::vector<std::string>        jobHistory;
+        SecurityObjects::NoteInfoVec    notes;
+        uint64_t                        submitted = 0 ;
+        uint64_t                        started = 0 ;
+        uint64_t                        completed = 0 ;
+        uint64_t                        modified = 0 ;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct JobEntry {
-		OpenWifi::Types::UUID_t id;
-		OpenWifi::Types::UUID_t entity;
-		OpenWifi::Types::UUID_t creator;
-		OpenWifi::Types::UUID_t batch;
-		std::string command;
-		OpenWifi::Types::StringVec commonNames;
-		OpenWifi::Types::StringVec completedNames;
-		OpenWifi::Types::StringVec errorNames;
-		Types::StringPairVec parameters;
-		std::string status;
-		uint64_t submitted = 0;
-		uint64_t started = 0;
-		uint64_t completed = 0;
-		std::string requesterUsername;
+    struct JobEntry {
+        OpenWifi::Types::UUID_t         id;
+        OpenWifi::Types::UUID_t         entity;
+        OpenWifi::Types::UUID_t         creator;
+        OpenWifi::Types::UUID_t         batch;
+        std::string                     command;
+        OpenWifi::Types::StringVec      commonNames;
+        OpenWifi::Types::StringVec      completedNames;
+        OpenWifi::Types::StringVec      errorNames;
+        Types::StringPairVec            parameters;
+        std::string                     status;
+        uint64_t                        submitted=0;
+        uint64_t                        started=0;
+        uint64_t                        completed=0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct DashBoardYearlyStats {
-		uint64_t year = 0;
-		OpenWifi::Types::Counted3DMapSII activeCerts;
-		OpenWifi::Types::Counted3DMapSII revokedCerts;
+    struct DashBoardYearlyStats {
+        uint64_t                            year=0;
+        OpenWifi::Types::Counted3DMapSII    activeCerts;
+        OpenWifi::Types::Counted3DMapSII    revokedCerts;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+    };
 
-	struct Dashboard {
-		uint64_t snapshot = 0;
-		uint64_t numberOfIssuedCerts = 0;
-		uint64_t numberOfRevokedCerts = 0;
-		OpenWifi::Types::CountedMap activeCertsPerOrganization;
-		OpenWifi::Types::CountedMap revokedCertsPerOrganization;
-		OpenWifi::Types::CountedMap numberOfRedirectors;
-		OpenWifi::Types::CountedMap deviceTypes;
-		OpenWifi::Types::CountedMap monthlyNumberOfCerts;
-		std::vector<DashBoardYearlyStats> monthlyNumberOfCertsPerOrgPerYear;
+    struct Dashboard {
+        uint64_t                            snapshot=0;
+        uint64_t                            numberOfIssuedCerts=0;
+        uint64_t                            numberOfRevokedCerts=0;
+        OpenWifi::Types::CountedMap         activeCertsPerOrganization;
+        OpenWifi::Types::CountedMap         revokedCertsPerOrganization;
+        OpenWifi::Types::CountedMap         numberOfRedirectors;
+        OpenWifi::Types::CountedMap         deviceTypes;
+        OpenWifi::Types::CountedMap         monthlyNumberOfCerts;
+        std::vector<DashBoardYearlyStats>   monthlyNumberOfCertsPerOrgPerYear;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		void reset();
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        void reset();
+    };
 
-} // namespace OpenWifi::CertObjects
+}

src/RESTObjects/RESTAPI_FMSObjects.cpp

@@ -3,296 +3,307 @@
 //
 
 #include "RESTAPI_FMSObjects.h"
-#include "framework/RESTAPI_utils.h"
-#include "framework/utils.h"
+#include "framework/MicroService.h"
 
-using OpenWifi::RESTAPI_utils::field_from_json;
 using OpenWifi::RESTAPI_utils::field_to_json;
+using OpenWifi::RESTAPI_utils::field_from_json;
 
 namespace OpenWifi::FMSObjects {
 
-	void Firmware::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "release", release);
-		field_to_json(Obj, "deviceType", deviceType);
-		field_to_json(Obj, "description", description);
-		field_to_json(Obj, "revision", revision);
-		field_to_json(Obj, "uri", uri);
-		field_to_json(Obj, "image", image);
-		field_to_json(Obj, "imageDate", imageDate);
-		field_to_json(Obj, "size", size);
-		field_to_json(Obj, "downloadCount", downloadCount);
-		field_to_json(Obj, "firmwareHash", firmwareHash);
-		field_to_json(Obj, "owner", owner);
-		field_to_json(Obj, "location", location);
-		field_to_json(Obj, "uploader", uploader);
-		field_to_json(Obj, "digest", digest);
-		field_to_json(Obj, "latest", latest);
-		field_to_json(Obj, "notes", notes);
-		field_to_json(Obj, "created", created);
-	};
+    void Firmware::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "id", id);
+        field_to_json(Obj, "release", release);
+        field_to_json(Obj, "deviceType", deviceType);
+        field_to_json(Obj, "description", description);
+        field_to_json(Obj, "revision", revision);
+        field_to_json(Obj, "uri", uri);
+        field_to_json(Obj, "image", image);
+        field_to_json(Obj, "imageDate", imageDate);
+        field_to_json(Obj, "size", size);
+        field_to_json(Obj, "downloadCount", downloadCount);
+        field_to_json(Obj, "firmwareHash", firmwareHash);
+        field_to_json(Obj, "owner", owner);
+        field_to_json(Obj, "location", location);
+        field_to_json(Obj, "uploader", uploader);
+        field_to_json(Obj, "digest", digest);
+        field_to_json(Obj, "latest", latest);
+        field_to_json(Obj, "notes", notes);
+        field_to_json(Obj, "created", created);
+    };
 
-	bool Firmware::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "release", release);
-			field_from_json(Obj, "deviceType", deviceType);
-			field_from_json(Obj, "description", description);
-			field_from_json(Obj, "revision", revision);
-			field_from_json(Obj, "uri", uri);
-			field_from_json(Obj, "image", image);
-			field_from_json(Obj, "imageDate", imageDate);
-			field_from_json(Obj, "size", size);
-			field_from_json(Obj, "downloadCount", downloadCount);
-			field_from_json(Obj, "firmwareHash", firmwareHash);
-			field_from_json(Obj, "owner", owner);
-			field_from_json(Obj, "location", location);
-			field_from_json(Obj, "uploader", uploader);
-			field_from_json(Obj, "digest", digest);
-			field_from_json(Obj, "latest", latest);
-			field_from_json(Obj, "notes", notes);
-			field_from_json(Obj, "created", created);
-			return true;
-		} catch (...) {
-		}
-		return true;
-	}
+    bool Firmware::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "id", id);
+            field_from_json(Obj, "release", release);
+            field_from_json(Obj, "deviceType", deviceType);
+            field_from_json(Obj, "description", description);
+            field_from_json(Obj, "revision", revision);
+            field_from_json(Obj, "uri", uri);
+            field_from_json(Obj, "image", image);
+            field_from_json(Obj, "imageDate", imageDate);
+            field_from_json(Obj, "size", size);
+            field_from_json(Obj, "downloadCount", downloadCount);
+            field_from_json(Obj, "firmwareHash", firmwareHash);
+            field_from_json(Obj, "owner", owner);
+            field_from_json(Obj, "location", location);
+            field_from_json(Obj, "uploader", uploader);
+            field_from_json(Obj, "digest", digest);
+            field_from_json(Obj, "latest", latest);
+            field_from_json(Obj, "notes", notes);
+            field_from_json(Obj, "created", created);
+            return true;
+        } catch (...) {
 
-	void FirmwareList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "firmwares", firmwares);
-	}
+        }
+        return true;
+    }
 
-	bool FirmwareList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "firmwares", firmwares);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    void FirmwareList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"firmwares",firmwares);
+    }
 
-	void DeviceType::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "deviceType", deviceType);
-		field_to_json(Obj, "manufacturer", manufacturer);
-		field_to_json(Obj, "model", model);
-		field_to_json(Obj, "policy", policy);
-		field_to_json(Obj, "notes", notes);
-		field_to_json(Obj, "lastUpdate", lastUpdate);
-		field_to_json(Obj, "created", created);
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "id", id);
-	}
+    bool FirmwareList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "firmwares", firmwares);
+            return true;
+        } catch (...) {
 
-	bool DeviceType::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "deviceType", deviceType);
-			field_from_json(Obj, "manufacturer", manufacturer);
-			field_from_json(Obj, "model", model);
-			field_from_json(Obj, "policy", policy);
-			field_from_json(Obj, "notes", notes);
-			field_from_json(Obj, "lastUpdate", lastUpdate);
-			field_from_json(Obj, "created", created);
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "id", id);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+        }
+        return false;
+    }
 
-	void DeviceTypeList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "deviceTypes", deviceTypes);
-	}
+    void DeviceType::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "id", id);
+        field_to_json(Obj, "deviceType", deviceType);
+        field_to_json(Obj, "manufacturer", manufacturer);
+        field_to_json(Obj, "model", model);
+        field_to_json(Obj, "policy", policy);
+        field_to_json(Obj, "notes", notes);
+        field_to_json(Obj, "lastUpdate", lastUpdate);
+        field_to_json(Obj, "created", created);
+        field_to_json(Obj, "id", id);
+        field_to_json(Obj, "id", id);
+        field_to_json(Obj, "id", id);
+    }
 
-	bool DeviceTypeList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "deviceTypes", deviceTypes);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    bool DeviceType::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "id", id);
+            field_from_json(Obj, "deviceType", deviceType);
+            field_from_json(Obj, "manufacturer", manufacturer);
+            field_from_json(Obj, "model", model);
+            field_from_json(Obj, "policy", policy);
+            field_from_json(Obj, "notes", notes);
+            field_from_json(Obj, "lastUpdate", lastUpdate);
+            field_from_json(Obj, "created", created);
+            field_from_json(Obj, "id", id);
+            field_from_json(Obj, "id", id);
+            field_from_json(Obj, "id", id);
+            return true;
+        } catch (...) {
 
-	void RevisionHistoryEntry::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "serialNumber", serialNumber);
-		field_to_json(Obj, "fromRelease", fromRelease);
-		field_to_json(Obj, "toRelease", toRelease);
-		field_to_json(Obj, "commandUUID", commandUUID);
-		field_to_json(Obj, "revisionId", revisionId);
-		field_to_json(Obj, "upgraded", upgraded);
-	}
+        }
+        return false;
+    }
 
-	bool RevisionHistoryEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "fromRelease", fromRelease);
-			field_from_json(Obj, "toRelease", toRelease);
-			field_from_json(Obj, "commandUUID", commandUUID);
-			field_from_json(Obj, "revisionId", revisionId);
-			field_from_json(Obj, "upgraded", upgraded);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    void DeviceTypeList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"deviceTypes", deviceTypes);
+    }
 
-	void RevisionHistoryEntryList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "deviceTypes", history);
-	}
+    bool DeviceTypeList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"deviceTypes", deviceTypes);
+            return true;
+        } catch(...) {
 
-	bool RevisionHistoryEntryList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "deviceTypes", history);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+        }
+        return false;
+    }
 
-	void FirmwareAgeDetails::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "latestId", latestId);
-		field_to_json(Obj, "image", image);
-		field_to_json(Obj, "imageDate", imageDate);
-		field_to_json(Obj, "revision", revision);
-		field_to_json(Obj, "uri", uri);
-		field_to_json(Obj, "age", age);
-		field_to_json(Obj, "latest", latest);
-	}
+    void RevisionHistoryEntry::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "id", id);
+        field_to_json(Obj, "serialNumber", serialNumber);
+        field_to_json(Obj, "fromRelease", fromRelease);
+        field_to_json(Obj, "toRelease", toRelease);
+        field_to_json(Obj, "commandUUID", commandUUID);
+        field_to_json(Obj, "revisionId", revisionId);
+        field_to_json(Obj, "upgraded", upgraded);
+    }
 
-	bool FirmwareAgeDetails::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "latestId", latestId);
-			field_from_json(Obj, "image", image);
-			field_from_json(Obj, "imageDate", imageDate);
-			field_from_json(Obj, "revision", revision);
-			field_from_json(Obj, "uri", uri);
-			field_from_json(Obj, "age", age);
-			field_from_json(Obj, "latest", latest);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    bool RevisionHistoryEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "id", id);
+            field_from_json(Obj, "serialNumber", serialNumber);
+            field_from_json(Obj, "fromRelease", fromRelease);
+            field_from_json(Obj, "toRelease", toRelease);
+            field_from_json(Obj, "commandUUID", commandUUID);
+            field_from_json(Obj, "revisionId", revisionId);
+            field_from_json(Obj, "upgraded", upgraded);
+            return true;
+        } catch(...) {
 
-	void DeviceConnectionInformation::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "serialNumber", serialNumber);
-		field_to_json(Obj, "revision", revision);
-		field_to_json(Obj, "deviceType", deviceType);
-		field_to_json(Obj, "endPoint", endPoint);
-		field_to_json(Obj, "lastUpdate", lastUpdate);
-		field_to_json(Obj, "status", status);
-	}
+        }
+        return false;
+    }
 
-	bool DeviceConnectionInformation::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "revision", revision);
-			field_from_json(Obj, "deviceType", deviceType);
-			field_from_json(Obj, "endPoint", endPoint);
-			field_from_json(Obj, "lastUpdate", lastUpdate);
-			field_from_json(Obj, "status", status);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    void RevisionHistoryEntryList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"deviceTypes", history);
+    }
 
-	void DeviceReport::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "ouis", OUI_);
-		field_to_json(Obj, "revisions", Revisions_);
-		field_to_json(Obj, "deviceTypes", DeviceTypes_);
-		field_to_json(Obj, "status", Status_);
-		field_to_json(Obj, "endPoints", EndPoints_);
-		field_to_json(Obj, "usingLatest", UsingLatest_);
-		field_to_json(Obj, "unknownFirmwares", UnknownFirmwares_);
-		field_to_json(Obj, "snapshot", snapshot);
-		field_to_json(Obj, "numberOfDevices", numberOfDevices);
-		field_to_json(Obj, "totalSecondsOld", totalSecondsOld_);
-	}
+    bool RevisionHistoryEntryList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"deviceTypes", history);
+            return true;
+        } catch(...) {
 
-	void DeviceReport::reset() {
-		OUI_.clear();
-		Revisions_.clear();
-		DeviceTypes_.clear();
-		Status_.clear();
-		EndPoints_.clear();
-		UsingLatest_.clear();
-		UnknownFirmwares_.clear();
-		totalSecondsOld_.clear();
-		numberOfDevices = 0;
-		snapshot = Utils::Now();
-	}
+        }
+        return false;
+    }
 
-	bool DeviceReport::from_json([[maybe_unused]] const Poco::JSON::Object::Ptr &Obj) {
-		try {
+    void FirmwareAgeDetails::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj,"latestId", latestId);
+        field_to_json(Obj,"image", image);
+        field_to_json(Obj,"imageDate", imageDate);
+        field_to_json(Obj,"revision", revision);
+        field_to_json(Obj,"uri", uri);
+        field_to_json(Obj,"age", age);
+        field_to_json(Obj,"latest",latest);
+    }
 
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    bool FirmwareAgeDetails::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj,"latestId", latestId);
+            field_from_json(Obj,"image", image);
+            field_from_json(Obj,"imageDate", imageDate);
+            field_from_json(Obj,"revision", revision);
+            field_from_json(Obj,"uri", uri);
+            field_from_json(Obj,"age", age);
+            field_from_json(Obj,"latest", latest);
+            return true;
+        } catch(...) {
 
-	void DeviceInformation::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "serialNumber", serialNumber);
-		field_to_json(Obj, "history", history);
-		field_to_json(Obj, "currentFirmware", currentFirmware);
-		field_to_json(Obj, "currentFirmwareDate", currentFirmwareDate);
-		field_to_json(Obj, "latestFirmware", latestFirmware);
-		field_to_json(Obj, "latestFirmwareDate", latestFirmwareDate);
-		field_to_json(Obj, "latestFirmwareAvailable", latestFirmwareAvailable);
-		field_to_json(Obj, "latestFirmwareURI", latestFirmwareURI);
-	}
+        }
+        return false;
+    }
 
-	bool DeviceInformation::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "history", history);
-			field_from_json(Obj, "currentFirmware", currentFirmware);
-			field_from_json(Obj, "currentFirmwareDate", currentFirmwareDate);
-			field_from_json(Obj, "latestFirmware", latestFirmware);
-			field_from_json(Obj, "latestFirmwareDate", latestFirmwareDate);
-			field_from_json(Obj, "latestFirmwareAvailable", latestFirmwareAvailable);
-			field_from_json(Obj, "latestFirmwareURI", latestFirmwareURI);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    void DeviceConnectionInformation::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "serialNumber", serialNumber);
+        field_to_json(Obj, "revision", revision);
+        field_to_json(Obj, "deviceType", deviceType);
+        field_to_json(Obj, "endPoint", endPoint);
+        field_to_json(Obj, "lastUpdate", lastUpdate);
+        field_to_json(Obj, "status", status);
+    }
 
-	void DeviceCurrentInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "serialNumber", serialNumber);
-		field_to_json(Obj, "revision", revision);
-		field_to_json(Obj, "upgraded", upgraded);
-	}
+    bool DeviceConnectionInformation::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "serialNumber", serialNumber);
+            field_from_json(Obj, "revision", revision);
+            field_from_json(Obj, "deviceType", deviceType);
+            field_from_json(Obj, "endPoint", endPoint);
+            field_from_json(Obj, "lastUpdate", lastUpdate);
+            field_from_json(Obj, "status", status);
+            return true;
+        } catch(...) {
 
-	bool DeviceCurrentInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "revision", revision);
-			field_from_json(Obj, "upgraded", upgraded);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+        }
+        return false;
+    }
 
-	void DeviceCurrentInfoList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "devices", devices);
-	}
+    void DeviceReport::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "ouis",OUI_);
+        field_to_json(Obj, "revisions", Revisions_);
+        field_to_json(Obj, "deviceTypes", DeviceTypes_);
+        field_to_json(Obj, "status", Status_);
+        field_to_json(Obj, "endPoints", EndPoints_);
+        field_to_json(Obj, "usingLatest", UsingLatest_);
+        field_to_json(Obj, "unknownFirmwares", UnknownFirmwares_);
+        field_to_json(Obj,"snapshot",snapshot);
+        field_to_json(Obj,"numberOfDevices",numberOfDevices);
+        field_to_json(Obj, "totalSecondsOld", totalSecondsOld_);
+    }
 
-	bool DeviceCurrentInfoList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "devices", devices);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
+    void DeviceReport::reset() {
+        OUI_.clear();
+        Revisions_.clear();
+        DeviceTypes_.clear();
+        Status_.clear();
+        EndPoints_.clear();
+        UsingLatest_.clear();
+        UnknownFirmwares_.clear();
+        totalSecondsOld_.clear();
+        numberOfDevices = 0 ;
+        snapshot = OpenWifi::Now();
+    }
 
-} // namespace OpenWifi::FMSObjects
+    bool DeviceReport::from_json([[maybe_unused]] const Poco::JSON::Object::Ptr &Obj) {
+        try {
+
+            return true;
+        } catch (...) {
+
+        }
+        return false;
+    }
+
+    void DeviceInformation::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "serialNumber",serialNumber);
+        field_to_json(Obj, "history", history);
+        field_to_json(Obj, "currentFirmware", currentFirmware);
+        field_to_json(Obj, "currentFirmwareDate", currentFirmwareDate);
+        field_to_json(Obj, "latestFirmware", latestFirmware);
+        field_to_json(Obj, "latestFirmwareDate", latestFirmwareDate);
+        field_to_json(Obj, "latestFirmwareAvailable",latestFirmwareAvailable);
+        field_to_json(Obj, "latestFirmwareURI",latestFirmwareURI);
+    }
+
+    bool DeviceInformation::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "serialNumber",serialNumber);
+            field_from_json(Obj, "history", history);
+            field_from_json(Obj, "currentFirmware", currentFirmware);
+            field_from_json(Obj, "currentFirmwareDate", currentFirmwareDate);
+            field_from_json(Obj, "latestFirmware", latestFirmware);
+            field_from_json(Obj, "latestFirmwareDate", latestFirmwareDate);
+            field_from_json(Obj, "latestFirmwareAvailable",latestFirmwareAvailable);
+            field_from_json(Obj, "latestFirmwareURI",latestFirmwareURI);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void DeviceCurrentInfo::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "serialNumber",serialNumber);
+        field_to_json(Obj, "revision", revision);
+        field_to_json(Obj, "upgraded", upgraded);
+    }
+
+    bool DeviceCurrentInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "serialNumber",serialNumber);
+            field_from_json(Obj, "revision", revision);
+            field_from_json(Obj, "upgraded", upgraded);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+    void DeviceCurrentInfoList::to_json(Poco::JSON::Object &Obj) const {
+        field_to_json(Obj, "devices",devices);
+    }
+
+    bool DeviceCurrentInfoList::from_json(const Poco::JSON::Object::Ptr &Obj) {
+        try {
+            field_from_json(Obj, "devices",devices);
+            return true;
+        } catch(...) {
+
+        }
+        return false;
+    }
+
+}

src/RESTObjects/RESTAPI_FMSObjects.h

@@ -11,149 +11,149 @@
 
 namespace OpenWifi::FMSObjects {
 
-	struct Firmware {
-		std::string id;
-		std::string release;
-		std::string deviceType;
-		std::string description;
-		std::string revision;
-		std::string uri;
-		std::string image;
-		uint64_t imageDate = 0;
-		uint64_t size = 0;
-		uint64_t downloadCount = 0;
-		std::string firmwareHash;
-		std::string owner;
-		std::string location;
-		std::string uploader;
-		std::string digest;
-		bool latest = false;
-		SecurityObjects::NoteInfoVec notes;
-		uint64_t created = 0;
+    struct Firmware {
+        std::string     id;
+        std::string     release;
+        std::string     deviceType;
+        std::string     description;
+        std::string     revision;
+        std::string     uri;
+        std::string     image;
+        uint64_t        imageDate=0;
+        uint64_t        size=0;
+        uint64_t        downloadCount=0;
+        std::string     firmwareHash;
+        std::string     owner;
+        std::string     location;
+        std::string     uploader;
+        std::string     digest;
+        bool            latest=false;
+        SecurityObjects::NoteInfoVec    notes;
+        uint64_t        created=0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-	typedef std::vector<Firmware> FirmwareVec;
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<Firmware>    FirmwareVec;
 
-	struct FirmwareList {
-		FirmwareVec firmwares;
+    struct FirmwareList {
+        FirmwareVec  firmwares;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct DeviceType {
-		std::string id;
-		std::string deviceType;
-		std::string manufacturer;
-		std::string model;
-		std::string policy;
-		SecurityObjects::NoteInfoVec notes;
-		uint64_t lastUpdate = 0;
-		uint64_t created = 0;
+    struct DeviceType {
+        std::string id;
+        std::string deviceType;
+        std::string manufacturer;
+        std::string model;
+        std::string policy;
+        SecurityObjects::NoteInfoVec notes;
+        uint64_t lastUpdate=0;
+        uint64_t created=0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-	typedef std::vector<DeviceType> DeviceTypeVec;
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<DeviceType> DeviceTypeVec;
 
-	struct DeviceTypeList {
-		DeviceTypeVec deviceTypes;
+    struct DeviceTypeList {
+        DeviceTypeVec   deviceTypes;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct RevisionHistoryEntry {
-		std::string id;
-		std::string serialNumber;
-		std::string fromRelease;
-		std::string toRelease;
-		std::string commandUUID;
-		std::string revisionId;
-		uint64_t upgraded;
+    struct RevisionHistoryEntry {
+        std::string id;
+        std::string serialNumber;
+        std::string fromRelease;
+        std::string toRelease;
+        std::string commandUUID;
+        std::string revisionId;
+        uint64_t    upgraded;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-	typedef std::vector<RevisionHistoryEntry> RevisionHistoryEntryVec;
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+    typedef std::vector<RevisionHistoryEntry>   RevisionHistoryEntryVec;
 
-	struct RevisionHistoryEntryList {
-		RevisionHistoryEntryVec history;
+    struct RevisionHistoryEntryList {
+        RevisionHistoryEntryVec history;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct FirmwareAgeDetails {
-		std::string latestId;
-		std::string image;
-		uint64_t imageDate;
-		std::string revision;
-		std::string uri;
-		uint64_t age = 0;
-		bool latest = true;
+    struct FirmwareAgeDetails {
+        std::string latestId;
+        std::string image;
+        uint64_t imageDate;
+        std::string revision;
+        std::string uri;
+        uint64_t age=0;
+        bool latest=true;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct DeviceConnectionInformation {
-		std::string serialNumber;
-		std::string revision;
-		std::string deviceType;
-		std::string endPoint;
-		uint64_t lastUpdate;
-		std::string status;
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+    struct DeviceConnectionInformation {
+        std::string serialNumber;
+        std::string revision;
+        std::string deviceType;
+        std::string endPoint;
+        uint64_t    lastUpdate;
+        std::string status;
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct DeviceReport {
-		uint64_t snapshot = 0;
-		uint64_t numberOfDevices = 0;
-		Types::CountedMap OUI_;
-		Types::CountedMap Revisions_;
-		Types::CountedMap DeviceTypes_;
-		Types::CountedMap Status_;
-		Types::CountedMap EndPoints_;
-		Types::CountedMap UsingLatest_;
-		Types::CountedMap UnknownFirmwares_;
-		Types::CountedMap totalSecondsOld_;
-		void to_json(Poco::JSON::Object &Obj) const;
-		void reset();
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+    struct DeviceReport {
+        uint64_t               snapshot=0;
+        uint64_t               numberOfDevices=0;
+        Types::CountedMap      OUI_;
+        Types::CountedMap      Revisions_;
+        Types::CountedMap      DeviceTypes_;
+        Types::CountedMap      Status_;
+        Types::CountedMap      EndPoints_;
+        Types::CountedMap      UsingLatest_;
+        Types::CountedMap      UnknownFirmwares_;
+        Types::CountedMap      totalSecondsOld_;
+        void to_json(Poco::JSON::Object &Obj) const;
+        void reset();
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct DeviceInformation {
-		std::string serialNumber;
-		RevisionHistoryEntryList history;
-		std::string currentFirmware;
-		uint64_t currentFirmwareDate = 0;
-		std::string latestFirmware;
-		uint64_t latestFirmwareDate = 0;
-		bool latestFirmwareAvailable;
-		std::string latestFirmwareURI;
+    struct DeviceInformation {
+        std::string                 serialNumber;
+        RevisionHistoryEntryList    history;
+        std::string                 currentFirmware;
+        uint64_t                    currentFirmwareDate=0;
+        std::string                 latestFirmware;
+        uint64_t                    latestFirmwareDate=0;
+        bool                        latestFirmwareAvailable;
+        std::string                 latestFirmwareURI;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct DeviceCurrentInfo {
-		std::string serialNumber;
-		std::string revision;
-		uint64_t upgraded = 0;
+    struct DeviceCurrentInfo {
+        std::string                 serialNumber;
+        std::string                 revision;
+        uint64_t                    upgraded=0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct DeviceCurrentInfoList {
-		std::vector<DeviceCurrentInfo> devices;
+    struct DeviceCurrentInfoList {
+        std::vector<DeviceCurrentInfo>  devices;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-} // namespace OpenWifi::FMSObjects
+}

src/RESTObjects/RESTAPI_GWobjects.cpp

@@ -10,55 +10,45 @@
 #include "Poco/JSON/Stringifier.h"
 
 #include "Daemon.h"
-#ifdef TIP_GATEWAY_SERVICE
-#include "AP_WS_Server.h"
+#ifdef	TIP_GATEWAY_SERVICE
+#include "DeviceRegistry.h"
 #include "CapabilitiesCache.h"
-#include "RADIUSSessionTracker.h"
 #endif
 
 #include "RESTAPI_GWobjects.h"
-#include "framework/RESTAPI_utils.h"
-#include "framework/utils.h"
+#include "framework/MicroService.h"
 
-using OpenWifi::RESTAPI_utils::EmbedDocument;
-using OpenWifi::RESTAPI_utils::field_from_json;
 using OpenWifi::RESTAPI_utils::field_to_json;
+using OpenWifi::RESTAPI_utils::field_from_json;
+using OpenWifi::RESTAPI_utils::EmbedDocument;
 
 namespace OpenWifi::GWObjects {
 
 	void Device::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "serialNumber", SerialNumber);
+		field_to_json(Obj,"serialNumber", SerialNumber);
 #ifdef TIP_GATEWAY_SERVICE
-		field_to_json(Obj, "deviceType", CapabilitiesCache::instance()->GetPlatform(Compatible));
-		field_to_json(Obj, "hasRADIUSSessions", RADIUSSessionTracker()->HasSessions(SerialNumber));
+		field_to_json(Obj,"deviceType", CapabilitiesCache::instance()->GetPlatform(Compatible));
 #endif
-		field_to_json(Obj, "macAddress", MACAddress);
-		field_to_json(Obj, "manufacturer", Manufacturer);
-		field_to_json(Obj, "UUID", UUID);
+		field_to_json(Obj,"macAddress", MACAddress);
+		field_to_json(Obj,"manufacturer", Manufacturer);
+		field_to_json(Obj,"UUID", UUID);
 		EmbedDocument("configuration", Obj, Configuration);
-		field_to_json(Obj, "notes", Notes);
-		field_to_json(Obj, "createdTimestamp", CreationTimestamp);
-		field_to_json(Obj, "lastConfigurationChange", LastConfigurationChange);
-		field_to_json(Obj, "lastConfigurationDownload", LastConfigurationDownload);
-		field_to_json(Obj, "lastFWUpdate", LastFWUpdate);
-		field_to_json(Obj, "owner", Owner);
-		field_to_json(Obj, "location", Location);
-		field_to_json(Obj, "venue", Venue);
-		field_to_json(Obj, "firmware", Firmware);
-		field_to_json(Obj, "compatible", Compatible);
-		field_to_json(Obj, "fwUpdatePolicy", FWUpdatePolicy);
-		field_to_json(Obj, "devicePassword", DevicePassword);
-		field_to_json(Obj, "subscriber", subscriber);
-		field_to_json(Obj, "entity", entity);
-		field_to_json(Obj, "modified", modified);
-		field_to_json(Obj, "locale", locale);
-		field_to_json(Obj, "restrictedDevice", restrictedDevice);
-		field_to_json(Obj, "pendingConfiguration", pendingConfiguration);
-		field_to_json(Obj, "pendingConfigurationCmd", pendingConfigurationCmd);
-		field_to_json(Obj, "restrictionDetails", restrictionDetails);
-		field_to_json(Obj, "pendingUUID", pendingUUID);
-		field_to_json(Obj, "simulated", simulated);
-		field_to_json(Obj, "lastRecordedContact", lastRecordedContact);
+		field_to_json(Obj,"notes", Notes);
+		field_to_json(Obj,"createdTimestamp", CreationTimestamp);
+		field_to_json(Obj,"lastConfigurationChange", LastConfigurationChange);
+		field_to_json(Obj,"lastConfigurationDownload", LastConfigurationDownload);
+		field_to_json(Obj,"lastFWUpdate", LastFWUpdate);
+		field_to_json(Obj,"owner", Owner);
+		field_to_json(Obj,"location", Location);
+		field_to_json(Obj,"venue", Venue);
+		field_to_json(Obj,"firmware", Firmware);
+		field_to_json(Obj,"compatible", Compatible);
+		field_to_json(Obj,"fwUpdatePolicy", FWUpdatePolicy);
+		field_to_json(Obj,"devicePassword", DevicePassword);
+		field_to_json(Obj,"subscriber", subscriber);
+		field_to_json(Obj,"entity", entity);
+		field_to_json(Obj,"modified", modified);
+		field_to_json(Obj,"locale", locale);
 	}
 
 	void Device::to_json_with_status(Poco::JSON::Object &Obj) const {
@@ -67,61 +57,37 @@ namespace OpenWifi::GWObjects {
 #ifdef TIP_GATEWAY_SERVICE
 		ConnectionState ConState;
 
-		if (AP_WS_Server()->GetState(SerialNumber, ConState)) {
-			ConState.to_json(SerialNumber,Obj);
+		if (DeviceRegistry()->GetState(SerialNumber, ConState)) {
+			ConState.to_json(Obj);
 		} else {
-			field_to_json(Obj, "ipAddress", "");
-			field_to_json(Obj, "txBytes", (uint64_t)0);
-			field_to_json(Obj, "rxBytes", (uint64_t)0);
-			field_to_json(Obj, "messageCount", (uint64_t)0);
-			field_to_json(Obj, "connected", false);
-			field_to_json(Obj, "lastContact", "");
-			field_to_json(Obj, "verifiedCertificate", "NO_CERTIFICATE");
-			field_to_json(Obj, "associations_2G", (uint64_t)0);
-			field_to_json(Obj, "associations_5G", (uint64_t)0);
-			field_to_json(Obj, "associations_6G", (uint64_t)0);
-			field_to_json(Obj, "hasRADIUSSessions", false);
-			field_to_json(Obj, "hasGPS", ConState.hasGPS);
-			field_to_json(Obj, "sanity", ConState.sanity);
-			field_to_json(Obj, "memoryUsed", ConState.memoryUsed);
-			field_to_json(Obj, "sanity", ConState.sanity);
-			field_to_json(Obj, "load", ConState.load);
-			field_to_json(Obj, "temperature", ConState.temperature);
+			field_to_json(Obj,"ipAddress", "");
+			field_to_json(Obj,"txBytes", (uint64_t) 0);
+			field_to_json(Obj,"rxBytes", (uint64_t )0);
+			field_to_json(Obj,"messageCount", (uint64_t )0);
+			field_to_json(Obj,"connected", false);
+			field_to_json(Obj,"lastContact", "");
+			field_to_json(Obj,"verifiedCertificate", "NO_CERTIFICATE");
+			field_to_json(Obj,"associations_2G", (uint64_t) 0);
+			field_to_json(Obj,"associations_5G", (uint64_t) 0);
 		}
 #endif
 	}
 
 	bool Device::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
-			field_from_json(Obj, "serialNumber", SerialNumber);
-			field_from_json(Obj, "deviceType", DeviceType);
-			field_from_json(Obj, "macAddress", MACAddress);
-			field_from_json(Obj, "manufacturer", Manufacturer);
-			field_from_json(Obj, "UUID", UUID);
-			field_from_json(Obj, "configuration", Configuration);
-			field_from_json(Obj, "notes", Notes);
-			field_from_json(Obj, "createdTimestamp", CreationTimestamp);
-			field_from_json(Obj, "lastConfigurationChange", LastConfigurationChange);
-			field_from_json(Obj, "lastConfigurationDownload", LastConfigurationDownload);
-			field_from_json(Obj, "lastFWUpdate", LastFWUpdate);
-			field_from_json(Obj, "owner", Owner);
-			field_from_json(Obj, "location", Location);
-			field_from_json(Obj, "venue", Venue);
-			field_from_json(Obj, "firmware", Firmware);
-			field_from_json(Obj, "compatible", Compatible);
-			field_from_json(Obj, "fwUpdatePolicy", FWUpdatePolicy);
-			field_from_json(Obj, "devicePassword", DevicePassword);
-			field_from_json(Obj, "subscriber", subscriber);
-			field_from_json(Obj, "entity", entity);
-			field_from_json(Obj, "modified", modified);
-			field_from_json(Obj, "locale", locale);
-			field_from_json(Obj, "restrictedDevice", restrictedDevice);
-			field_from_json(Obj, "pendingConfiguration", pendingConfiguration);
-			field_from_json(Obj, "pendingConfigurationCmd", pendingConfigurationCmd);
-			field_from_json(Obj, "restrictionDetails", restrictionDetails);
-			field_from_json(Obj, "pendingUUID", pendingUUID);
-			field_from_json(Obj, "simulated", simulated);
-			field_from_json(Obj, "lastRecordedContact", lastRecordedContact);
+			field_from_json(Obj,"serialNumber",SerialNumber);
+			field_from_json(Obj,"deviceType",DeviceType);
+			field_from_json(Obj,"macAddress",MACAddress);
+			field_from_json(Obj,"configuration",Configuration);
+			field_from_json(Obj,"notes",Notes);
+			field_from_json(Obj,"manufacturer",Manufacturer);
+			field_from_json(Obj,"owner",Owner);
+			field_from_json(Obj,"location",Location);
+			field_from_json(Obj,"venue",Venue);
+			field_from_json(Obj,"compatible",Compatible);
+			field_from_json(Obj,"subscriber", subscriber);
+			field_from_json(Obj,"entity", entity);
+			field_from_json(Obj,"locale", locale);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -129,101 +95,73 @@ namespace OpenWifi::GWObjects {
 	}
 
 	void Device::Print() const {
-		std::cout << "Device: " << SerialNumber << " DeviceType:" << DeviceType
-				  << " MACAddress:" << MACAddress << " Manufacturer:" << Manufacturer << " "
-				  << Configuration << std::endl;
+		std::cout << "Device: " << SerialNumber << " DeviceType:" << DeviceType << " MACAddress:" << MACAddress << " Manufacturer:"
+				  << Manufacturer << " " << Configuration << std::endl;
 	}
 
 	void Statistics::to_json(Poco::JSON::Object &Obj) const {
 		EmbedDocument("data", Obj, Data);
-		field_to_json(Obj, "UUID", UUID);
-		field_to_json(Obj, "recorded", Recorded);
+		field_to_json(Obj,"UUID", UUID);
+		field_to_json(Obj,"recorded", Recorded);
 	}
 
 	void Capabilities::to_json(Poco::JSON::Object &Obj) const {
 		EmbedDocument("capabilities", Obj, Capabilities);
-		field_to_json(Obj, "firstUpdate", FirstUpdate);
-		field_to_json(Obj, "lastUpdate", LastUpdate);
+		field_to_json(Obj,"firstUpdate", FirstUpdate);
+		field_to_json(Obj,"lastUpdate", LastUpdate);
 	}
 
 	void DeviceLog::to_json(Poco::JSON::Object &Obj) const {
 		EmbedDocument("data", Obj, Data);
-		field_to_json(Obj, "log", Log);
-		field_to_json(Obj, "severity", Severity);
-		field_to_json(Obj, "recorded", Recorded);
-		field_to_json(Obj, "logType", LogType);
-		field_to_json(Obj, "UUID", UUID);
+		field_to_json(Obj,"log", Log);
+		field_to_json(Obj,"severity", Severity);
+		field_to_json(Obj,"recorded", Recorded);
+		field_to_json(Obj,"logType", LogType);
+		field_to_json(Obj,"UUID", UUID);
 	}
 
 	void HealthCheck::to_json(Poco::JSON::Object &Obj) const {
 		EmbedDocument("values", Obj, Data);
-		field_to_json(Obj, "UUID", UUID);
-		field_to_json(Obj, "sanity", Sanity);
-		field_to_json(Obj, "recorded", Recorded);
+		field_to_json(Obj,"UUID", UUID);
+		field_to_json(Obj,"sanity", Sanity);
+		field_to_json(Obj,"recorded", Recorded);
 	}
 
 	void DefaultConfiguration::to_json(Poco::JSON::Object &Obj) const {
 		EmbedDocument("configuration", Obj, Configuration);
-		field_to_json(Obj, "name", Name);
-		field_to_json(Obj, "modelIds", Models);
-		field_to_json(Obj, "description", Description);
-		field_to_json(Obj, "created", Created);
-		field_to_json(Obj, "lastModified", LastModified);
-	}
-
-	void DefaultFirmware::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "deviceType", deviceType);
-		field_to_json(Obj, "description", Description);
-		field_to_json(Obj, "uri", uri);
-		field_to_json(Obj, "revision", revision);
-		field_to_json(Obj, "imageCreationDate", imageCreationDate);
-		field_to_json(Obj, "created", Created);
-		field_to_json(Obj, "lastModified", LastModified);
-	}
-
-	bool DefaultFirmware::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "deviceType", deviceType);
-			field_from_json(Obj, "description", Description);
-			field_from_json(Obj, "uri", uri);
-			field_from_json(Obj, "revision", revision);
-			field_from_json(Obj, "imageCreationDate", imageCreationDate);
-			field_from_json(Obj, "created", Created);
-			field_from_json(Obj, "lastModified", LastModified);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
+		field_to_json(Obj,"name", Name);
+		field_to_json(Obj,"modelIds", Models);
+		field_to_json(Obj,"description", Description);
+		field_to_json(Obj,"created", Created);
+		field_to_json(Obj,"lastModified", LastModified);
 	}
 
 	void CommandDetails::to_json(Poco::JSON::Object &Obj) const {
 		EmbedDocument("details", Obj, Details);
 		EmbedDocument("results", Obj, Results);
-		field_to_json(Obj, "UUID", UUID);
-		field_to_json(Obj, "serialNumber", SerialNumber);
-		field_to_json(Obj, "command", Command);
-		field_to_json(Obj, "errorText", ErrorText);
-		field_to_json(Obj, "submittedBy", SubmittedBy);
-		field_to_json(Obj, "status", Status);
-		field_to_json(Obj, "submitted", Submitted);
-		field_to_json(Obj, "executed", Executed);
-		field_to_json(Obj, "completed", Completed);
-		field_to_json(Obj, "when", RunAt);
-		field_to_json(Obj, "errorCode", ErrorCode);
-		field_to_json(Obj, "custom", Custom);
-		field_to_json(Obj, "waitingForFile", WaitingForFile);
-		field_to_json(Obj, "attachFile", AttachDate);
-		field_to_json(Obj, "executionTime", executionTime);
-		field_to_json(Obj, "lastTry", lastTry);
-		field_to_json(Obj, "deferred", deferred);
+		field_to_json(Obj,"UUID", UUID);
+		field_to_json(Obj,"serialNumber", SerialNumber);
+		field_to_json(Obj,"command", Command);
+		field_to_json(Obj,"errorText", ErrorText);
+		field_to_json(Obj,"submittedBy", SubmittedBy);
+		field_to_json(Obj,"status", Status);
+		field_to_json(Obj,"submitted", Submitted);
+		field_to_json(Obj,"executed", Executed);
+		field_to_json(Obj,"completed", Completed);
+		field_to_json(Obj,"when", RunAt);
+		field_to_json(Obj,"errorCode", ErrorCode);
+		field_to_json(Obj,"custom", Custom);
+		field_to_json(Obj,"waitingForFile", WaitingForFile);
+		field_to_json(Obj,"attachFile", AttachDate);
+		field_to_json(Obj,"executionTime", executionTime);
 	}
 
 	bool DefaultConfiguration::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
-			field_from_json(Obj, "name", Name);
-			field_from_json(Obj, "configuration", Configuration);
-			field_from_json(Obj, "modelIds", Models);
-			field_from_json(Obj, "description", Description);
+			field_from_json(Obj,"name",Name);
+			field_from_json(Obj,"configuration",Configuration);
+			field_from_json(Obj,"modelIds",Models);
+			field_from_json(Obj,"description",Description);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -231,134 +169,87 @@ namespace OpenWifi::GWObjects {
 	}
 
 	void BlackListedDevice::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "serialNumber", serialNumber);
-		field_to_json(Obj, "author", author);
-		field_to_json(Obj, "reason", reason);
-		field_to_json(Obj, "created", created);
+		field_to_json(Obj,"serialNumber", serialNumber);
+		field_to_json(Obj,"author", author);
+		field_to_json(Obj,"reason", reason);
+		field_to_json(Obj,"created", created);
 	}
 
 	bool BlackListedDevice::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "author", author);
-			field_from_json(Obj, "reason", reason);
-			field_from_json(Obj, "created", created);
+			field_from_json(Obj,"serialNumber",serialNumber);
+			field_from_json(Obj,"author",author);
+			field_from_json(Obj,"reason",reason);
+			field_from_json(Obj,"created",created);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
 		return false;
 	}
 
-	void ConnectionState::to_json([[maybe_unused]] const std::string &SerialNumber, Poco::JSON::Object &Obj)  {
-		field_to_json(Obj, "ipAddress", Address);
-		field_to_json(Obj, "txBytes", TX);
-		field_to_json(Obj, "rxBytes", RX);
-		field_to_json(Obj, "messageCount", MessageCount);
-		field_to_json(Obj, "UUID", UUID);
-		field_to_json(Obj, "connected", Connected);
-		field_to_json(Obj, "firmware", Firmware);
-		field_to_json(Obj, "lastContact", LastContact);
-		field_to_json(Obj, "associations_2G", Associations_2G);
-		field_to_json(Obj, "associations_5G", Associations_5G);
-		field_to_json(Obj, "associations_6G", Associations_6G);
-		field_to_json(Obj, "webSocketClients", webSocketClients);
-		field_to_json(Obj, "websocketPackets", websocketPackets);
-		field_to_json(Obj, "kafkaClients", kafkaClients);
-		field_to_json(Obj, "kafkaPackets", kafkaPackets);
-		field_to_json(Obj, "locale", locale);
-		field_to_json(Obj, "started", started);
-		field_to_json(Obj, "sessionId", sessionId);
-		field_to_json(Obj, "connectionCompletionTime", connectionCompletionTime);
-		field_to_json(Obj, "totalConnectionTime", Utils::Now() - started);
-		field_to_json(Obj, "certificateExpiryDate", certificateExpiryDate);
-		field_to_json(Obj, "connectReason", connectReason);
+	void ConnectionState::to_json(Poco::JSON::Object &Obj) const {
+		field_to_json(Obj,"ipAddress", Address);
+		field_to_json(Obj,"txBytes", TX);
+		field_to_json(Obj,"rxBytes", RX);
+		field_to_json(Obj,"messageCount", MessageCount);
+		field_to_json(Obj,"UUID", UUID);
+		field_to_json(Obj,"connected", Connected);
+		field_to_json(Obj,"firmware", Firmware);
+		field_to_json(Obj,"lastContact", LastContact);
+		field_to_json(Obj,"associations_2G", Associations_2G);
+		field_to_json(Obj,"associations_5G", Associations_5G);
+		field_to_json(Obj,"webSocketClients", webSocketClients);
+		field_to_json(Obj,"websocketPackets", websocketPackets);
+		field_to_json(Obj,"kafkaClients", kafkaClients);
+		field_to_json(Obj,"kafkaPackets", kafkaPackets);
+		field_to_json(Obj,"locale", locale);
 
-#ifdef TIP_GATEWAY_SERVICE
-		hasRADIUSSessions = RADIUSSessionTracker()->HasSessions(SerialNumber);
-		AP_WS_Server()->ExtendedAttributes(SerialNumber, hasGPS, sanity,
-										   memoryUsed,
-										   load,
-										   temperature);
-#endif
-		field_to_json(Obj, "hasRADIUSSessions", hasRADIUSSessions );
-		field_to_json(Obj, "hasGPS", hasGPS);
-		field_to_json(Obj, "sanity", sanity);
-		field_to_json(Obj, "memoryUsed", memoryUsed);
-		field_to_json(Obj, "sanity", sanity);
-		field_to_json(Obj, "load", load);
-		field_to_json(Obj, "temperature", temperature);
-
-		switch (VerifiedCertificate) {
-		case NO_CERTIFICATE:
-			field_to_json(Obj, "verifiedCertificate", "NO_CERTIFICATE");
-			break;
-		case VALID_CERTIFICATE:
-			field_to_json(Obj, "verifiedCertificate", "VALID_CERTIFICATE");
-			break;
-		case MISMATCH_SERIAL:
-			field_to_json(Obj, "verifiedCertificate", "MISMATCH_SERIAL");
-			break;
-		case VERIFIED:
-			field_to_json(Obj, "verifiedCertificate", "VERIFIED");
-			break;
-		case SIMULATED:
-			field_to_json(Obj, "verifiedCertificate", "SIMULATED");
-			break;
-		default:
-			field_to_json(Obj, "verifiedCertificate", "NO_CERTIFICATE");
-			break;
+		switch(VerifiedCertificate) {
+			case NO_CERTIFICATE:
+				field_to_json(Obj,"verifiedCertificate", "NO_CERTIFICATE"); break;
+			case VALID_CERTIFICATE:
+				field_to_json(Obj,"verifiedCertificate", "VALID_CERTIFICATE"); break;
+			case MISMATCH_SERIAL:
+				field_to_json(Obj,"verifiedCertificate", "MISMATCH_SERIAL"); break;
+			case VERIFIED:
+				field_to_json(Obj,"verifiedCertificate", "VERIFIED"); break;
+			default:
+				field_to_json(Obj,"verifiedCertificate", "NO_CERTIFICATE"); break;
 		}
 	}
 
-	void DeviceConnectionStatistics::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "averageConnectionTime", averageConnectionTime);
-		field_to_json(Obj, "connectedDevices", connectedDevices);
-		field_to_json(Obj, "connectingDevices", connectingDevices);
-	}
-
-	bool DeviceConnectionStatistics::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "averageConnectionTime", averageConnectionTime);
-			field_from_json(Obj, "connectedDevices", connectedDevices);
-			field_from_json(Obj, "connectingDevices", connectingDevices);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
 	void RttySessionDetails::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "serialNumber", SerialNumber);
-		field_to_json(Obj, "server", Server);
-		field_to_json(Obj, "port", Port);
-		field_to_json(Obj, "token", Token);
-		field_to_json(Obj, "timeout", TimeOut);
-		field_to_json(Obj, "connectionId", ConnectionId);
-		field_to_json(Obj, "commandUUID", CommandUUID);
-		field_to_json(Obj, "started", Started);
-		field_to_json(Obj, "viewport", ViewPort);
-		field_to_json(Obj, "password", DevicePassword);
+		field_to_json(Obj,"serialNumber", SerialNumber);
+		field_to_json(Obj,"server", Server);
+		field_to_json(Obj,"port", Port);
+		field_to_json(Obj,"token",Token);
+		field_to_json(Obj,"timeout", TimeOut);
+		field_to_json(Obj,"connectionId",ConnectionId);
+		field_to_json(Obj,"commandUUID",CommandUUID);
+		field_to_json(Obj,"started", Started);
+		field_to_json(Obj,"viewport",ViewPort);
+		field_to_json(Obj,"password",DevicePassword);
 	}
 
 	void Dashboard::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "commands", commands);
-		field_to_json(Obj, "upTimes", upTimes);
-		field_to_json(Obj, "memoryUsed", memoryUsed);
-		field_to_json(Obj, "load1", load1);
-		field_to_json(Obj, "load5", load5);
-		field_to_json(Obj, "load15", load15);
-		field_to_json(Obj, "vendors", vendors);
-		field_to_json(Obj, "status", status);
-		field_to_json(Obj, "deviceType", deviceType);
-		field_to_json(Obj, "healths", healths);
-		field_to_json(Obj, "certificates", certificates);
-		field_to_json(Obj, "lastContact", lastContact);
-		field_to_json(Obj, "associations", associations);
-		field_to_json(Obj, "snapshot", snapshot);
-		field_to_json(Obj, "numberOfDevices", numberOfDevices);
+		field_to_json(Obj,"commands",commands);
+		field_to_json(Obj,"upTimes",upTimes);
+		field_to_json(Obj,"memoryUsed",memoryUsed);
+		field_to_json(Obj,"load1",load1);
+		field_to_json(Obj,"load5",load5);
+		field_to_json(Obj,"load15",load15);
+		field_to_json(Obj,"vendors",vendors);
+		field_to_json(Obj,"status",status);
+		field_to_json(Obj,"deviceType",deviceType);
+		field_to_json(Obj,"healths",healths);
+		field_to_json(Obj,"certificates",certificates);
+		field_to_json(Obj,"lastContact",lastContact);
+		field_to_json(Obj,"associations",associations);
+		field_to_json(Obj,"snapshot",snapshot);
+		field_to_json(Obj,"numberOfDevices",numberOfDevices);
 	}
 
-	void Dashboard::reset() {
+	void Dashboard::reset()  {
 		commands.clear();
 		upTimes.clear();
 		memoryUsed.clear();
@@ -372,51 +263,46 @@ namespace OpenWifi::GWObjects {
 		certificates.clear();
 		lastContact.clear();
 		associations.clear();
-		numberOfDevices = 0;
-		snapshot = Utils::Now();
+		numberOfDevices = 0 ;
+		snapshot = OpenWifi::Now();
 	}
 
-	void CapabilitiesModel::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "deviceType", deviceType);
-		field_to_json(Obj, "capabilities", capabilities);
+	void CapabilitiesModel::to_json(Poco::JSON::Object &Obj) const{
+		field_to_json(Obj,"deviceType", deviceType);
+		field_to_json(Obj,"capabilities", capabilities);
 	};
 
 	void ScriptRequest::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "serialNumber", serialNumber);
-		field_to_json(Obj, "timeout", timeout);
-		field_to_json(Obj, "type", type);
-		field_to_json(Obj, "scriptId", scriptId);
-		field_to_json(Obj, "script", script);
-		field_to_json(Obj, "when", when);
-		field_to_json(Obj, "signature", signature);
-		field_to_json(Obj, "deferred", deferred);
-		field_to_json(Obj, "uri", uri);
+		field_to_json(Obj,"serialNumber",serialNumber);
+		field_to_json(Obj,"timeout",timeout);
+		field_to_json(Obj,"type",type);
+		field_to_json(Obj,"script",script);
+		field_to_json(Obj,"scriptId",scriptId);
+		field_to_json(Obj,"when",when);
 	}
 
 	bool ScriptRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "timeout", timeout);
-			field_from_json(Obj, "type", type);
-			field_from_json(Obj, "script", script);
-			field_from_json(Obj, "scriptId", scriptId);
-			field_from_json(Obj, "when", when);
-			field_from_json(Obj, "signature", signature);
-			field_from_json(Obj, "deferred", deferred);
-			field_from_json(Obj, "uri", uri);
+			field_from_json(Obj,"serialNumber",serialNumber);
+			field_from_json(Obj,"timeout",timeout);
+			field_from_json(Obj,"type",type);
+			field_from_json(Obj,"script",script);
+			field_from_json(Obj,"scriptId",scriptId);
+			field_from_json(Obj,"when",when);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
 		return false;
+
 	}
 
 	void RadiusProxyPoolList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "pools", pools);
+		field_to_json(Obj,"pools",pools);
 	}
 
 	bool RadiusProxyPoolList::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
-			field_from_json(Obj, "pools", pools);
+			field_from_json(Obj,"pools",pools);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -424,30 +310,18 @@ namespace OpenWifi::GWObjects {
 	}
 
 	void RadiusProxyPool::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "name", name);
-		field_to_json(Obj, "description", description);
-		field_to_json(Obj, "authConfig", authConfig);
-		field_to_json(Obj, "acctConfig", acctConfig);
-		field_to_json(Obj, "coaConfig", coaConfig);
-		field_to_json(Obj, "useByDefault", useByDefault);
-		field_to_json(Obj, "radsecKeepAlive", radsecKeepAlive);
-		field_to_json(Obj, "poolProxyIp", poolProxyIp);
-		field_to_json(Obj, "radsecPoolType", radsecPoolType);
-		field_to_json(Obj, "enabled", enabled);
+		field_to_json(Obj,"name",name);
+		field_to_json(Obj,"description",description);
+		field_to_json(Obj,"authConfig",authConfig);
+		field_to_json(Obj,"acctConfig",acctConfig);
 	}
 
 	bool RadiusProxyPool::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
-			field_from_json(Obj, "name", name);
-			field_from_json(Obj, "description", description);
-			field_from_json(Obj, "authConfig", authConfig);
-			field_from_json(Obj, "acctConfig", acctConfig);
-			field_from_json(Obj, "coaConfig", coaConfig);
-			field_from_json(Obj, "useByDefault", useByDefault);
-			field_from_json(Obj, "radsecKeepAlive", radsecKeepAlive);
-			field_from_json(Obj, "poolProxyIp", poolProxyIp);
-			field_from_json(Obj, "radsecPoolType", radsecPoolType);
-			field_from_json(Obj, "enabled", enabled);
+			field_from_json(Obj,"name",name);
+			field_from_json(Obj,"description",description);
+			field_from_json(Obj,"authConfig",authConfig);
+			field_from_json(Obj,"acctConfig",acctConfig);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -455,20 +329,20 @@ namespace OpenWifi::GWObjects {
 	}
 
 	void RadiusProxyServerConfig::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "strategy", strategy);
-		field_to_json(Obj, "monitor", monitor);
-		field_to_json(Obj, "monitorMethod", monitorMethod);
-		field_to_json(Obj, "methodParameters", methodParameters);
-		field_to_json(Obj, "servers", servers);
+		field_to_json(Obj,"policy",strategy);
+		field_to_json(Obj,"monitor",monitor);
+		field_to_json(Obj,"monitorMethod",monitorMethod);
+		field_to_json(Obj,"methodParameters",methodParameters);
+		field_to_json(Obj,"servers",servers);
 	}
 
 	bool RadiusProxyServerConfig::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
-			field_from_json(Obj, "strategy", strategy);
-			field_from_json(Obj, "monitor", monitor);
-			field_from_json(Obj, "monitorMethod", monitorMethod);
-			field_from_json(Obj, "methodParameters", methodParameters);
-			field_from_json(Obj, "servers", servers);
+			field_from_json(Obj,"policy",strategy);
+			field_from_json(Obj,"monitor",monitor);
+			field_from_json(Obj,"monitorMethod",monitorMethod);
+			field_from_json(Obj,"methodParameters",methodParameters);
+			field_from_json(Obj,"servers",servers);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
@@ -476,243 +350,22 @@ namespace OpenWifi::GWObjects {
 	}
 
 	void RadiusProxyServerEntry::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "name", name);
-		field_to_json(Obj, "ip", ip);
-		field_to_json(Obj, "port", port);
-		field_to_json(Obj, "weight", weight);
-		field_to_json(Obj, "secret", secret);
-		field_to_json(Obj, "certificate", certificate);
-		field_to_json(Obj, "radsec", radsec);
-		field_to_json(Obj, "allowSelfSigned", allowSelfSigned);
-		field_to_json(Obj, "radsecPort", radsecPort);
-		field_to_json(Obj, "radsecSecret", radsecSecret);
-		field_to_json(Obj, "radsecCacerts", radsecCacerts);
-		field_to_json(Obj, "radsecCert", radsecCert);
-		field_to_json(Obj, "radsecKey", radsecKey);
-		field_to_json(Obj, "radsecRealms", radsecRealms);
-		field_to_json(Obj, "ignore", ignore);
+		field_to_json(Obj,"name",name);
+		field_to_json(Obj,"ip",ip);
+		field_to_json(Obj,"port",port);
+		field_to_json(Obj,"weight",weight);
 	}
 
 	bool RadiusProxyServerEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
 		try {
-			field_from_json(Obj, "name", name);
-			field_from_json(Obj, "ip", ip);
-			field_from_json(Obj, "port", port);
-			field_from_json(Obj, "weight", weight);
-			field_from_json(Obj, "secret", secret);
-			field_from_json(Obj, "certificate", certificate);
-			field_from_json(Obj, "radsec", radsec);
-			field_from_json(Obj, "allowSelfSigned", allowSelfSigned);
-			field_from_json(Obj, "radsecSecret", radsecSecret);
-			field_from_json(Obj, "radsecPort", radsecPort);
-			field_from_json(Obj, "radsecCacerts", radsecCacerts);
-			field_from_json(Obj, "radsecCert", radsecCert);
-			field_from_json(Obj, "radsecKey", radsecKey);
-			field_from_json(Obj, "radsecRealms", radsecRealms);
-			field_from_json(Obj, "ignore", ignore);
+			field_from_json(Obj,"name",name);
+			field_from_json(Obj,"ip",ip);
+			field_from_json(Obj,"port",port);
+			field_from_json(Obj,"weight",weight);
 			return true;
 		} catch (const Poco::Exception &E) {
 		}
 		return false;
 	}
+}
 
-	void ScriptEntry::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "name", name);
-		field_to_json(Obj, "description", description);
-		field_to_json(Obj, "uri", uri);
-		field_to_json(Obj, "content", content);
-		field_to_json(Obj, "version", version);
-		field_to_json(Obj, "type", type);
-		field_to_json(Obj, "created", created);
-		field_to_json(Obj, "modified", modified);
-		field_to_json(Obj, "author", author);
-		field_to_json(Obj, "restricted", restricted);
-		field_to_json(Obj, "deferred", deferred);
-		field_to_json(Obj, "timeout", timeout);
-		field_to_json(Obj, "defaultUploadURI", defaultUploadURI);
-	}
-
-	bool ScriptEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "name", name);
-			field_from_json(Obj, "description", description);
-			field_from_json(Obj, "uri", uri);
-			field_from_json(Obj, "content", content);
-			field_from_json(Obj, "version", version);
-			field_from_json(Obj, "type", type);
-			field_from_json(Obj, "created", created);
-			field_from_json(Obj, "modified", modified);
-			field_from_json(Obj, "author", author);
-			field_from_json(Obj, "restricted", restricted);
-			field_from_json(Obj, "deferred", deferred);
-			field_from_json(Obj, "timeout", timeout);
-			field_from_json(Obj, "defaultUploadURI", defaultUploadURI);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void ScriptEntryList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "scripts", scripts);
-	}
-
-	bool ScriptEntryList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "scripts", scripts);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void RangeOptions::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "NO_IR", NO_IR);
-		field_to_json(Obj, "AUTO_BW", AUTO_BW);
-		field_to_json(Obj, "DFS", DFS);
-		field_to_json(Obj, "NO_OUTDOOR", NO_OUTDOOR);
-		field_to_json(Obj, "wmmrule_ETSI", wmmrule_ETSI);
-		field_to_json(Obj, "NO_OFDM", NO_OFDM);
-	}
-
-	void FrequencyRange::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "from", from);
-		field_to_json(Obj, "to", to);
-		field_to_json(Obj, "channelWidth", channelWidth);
-		field_to_json(Obj, "powerDb", powerDb);
-		field_to_json(Obj, "options", options);
-	}
-
-	void RegulatoryCountryInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "country", country);
-		field_to_json(Obj, "domain", domain);
-		field_to_json(Obj, "ranges", ranges);
-	}
-
-	void DeviceRestrictionsKeyInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "vendor", vendor);
-		field_to_json(Obj, "algo", algo);
-	}
-
-	bool DeviceRestrictionsKeyInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "vendor", vendor);
-			field_from_json(Obj, "algo", algo);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	void DeviceRestrictions::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "dfs", dfs);
-		field_to_json(Obj, "ssh", ssh);
-		field_to_json(Obj, "rtty", rtty);
-		field_to_json(Obj, "tty", tty);
-		field_to_json(Obj, "developer", developer);
-		field_to_json(Obj, "upgrade", upgrade);
-		field_to_json(Obj, "commands", commands);
-		field_to_json(Obj, "country", country);
-		field_to_json(Obj, "key_info", key_info);
-	}
-
-	bool DeviceRestrictions::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "dfs", dfs);
-			field_from_json(Obj, "ssh", ssh);
-			field_from_json(Obj, "rtty", rtty);
-			field_from_json(Obj, "tty", tty);
-			field_from_json(Obj, "developer", developer);
-			field_from_json(Obj, "upgrade", upgrade);
-			field_from_json(Obj, "commands", commands);
-			field_from_json(Obj, "country", country);
-			field_from_json(Obj, "key_info", key_info);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool DeviceRestrictionsKeyInfo::operator!=(
-		const OpenWifi::GWObjects::DeviceRestrictionsKeyInfo &T) const {
-		return (T.algo != algo) || (T.vendor != vendor);
-	}
-
-	bool DeviceRestrictions::operator!=(const OpenWifi::GWObjects::DeviceRestrictions &T) const {
-		return ((T.dfs != dfs) || (T.rtty != rtty) || (T.upgrade != upgrade) ||
-				(T.commands != commands) || (T.developer != developer) || (T.ssh != ssh) ||
-				(T.key_info != key_info) || (T.country != country));
-	}
-
-	void RADIUSSession::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "started", started);
-		field_to_json(Obj, "lastTransaction", lastTransaction);
-		field_to_json(Obj, "destination", destination);
-		field_to_json(Obj, "serialNumber", serialNumber);
-		field_to_json(Obj, "userName", userName);
-		field_to_json(Obj, "accountingSessionId", accountingSessionId);
-		field_to_json(Obj, "accountingMultiSessionId", accountingMultiSessionId);
-		field_to_json(Obj, "inputPackets", inputPackets);
-		field_to_json(Obj, "outputPackets", outputPackets);
-		field_to_json(Obj, "inputOctets", inputOctets);
-		field_to_json(Obj, "outputOctets", outputOctets);
-		field_to_json(Obj, "inputGigaWords", inputGigaWords);
-		field_to_json(Obj, "outputGigaWords", outputGigaWords);
-		field_to_json(Obj, "sessionTime", sessionTime);
-		field_to_json(Obj, "callingStationId", callingStationId);
-		field_to_json(Obj, "chargeableUserIdentity", chargeableUserIdentity);
-		field_to_json(Obj, "interface", interface);
-		field_to_json(Obj, "secret", secret);
-		field_to_json(Obj, "nasId", nasId);
-		field_to_json(Obj, "calledStationId", calledStationId);
-	}
-
-	void RADIUSSessionList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "sessions", sessions);
-	}
-
-	void RadiusCoADMParameters::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "accountingSessionId", accountingSessionId);
-		field_to_json(Obj, "accountingMultiSessionId", accountingMultiSessionId);
-		field_to_json(Obj, "callingStationId", callingStationId);
-		field_to_json(Obj, "chargeableUserIdentity", chargeableUserIdentity);
-		field_to_json(Obj, "userName", userName);
-	}
-
-	bool RadiusCoADMParameters::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "accountingSessionId", accountingSessionId);
-			field_from_json(Obj, "accountingMultiSessionId", accountingMultiSessionId);
-			field_from_json(Obj, "callingStationId", callingStationId);
-			field_from_json(Obj, "chargeableUserIdentity", chargeableUserIdentity);
-			field_from_json(Obj, "userName", userName);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool DeviceTransferRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "server", server);
-			field_from_json(Obj, "port", port);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-	bool DeviceCertificateUpdateRequest::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "encodedCertificate", encodedCertificate);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
-	}
-
-} // namespace OpenWifi::GWObjects

src/RESTObjects/RESTAPI_GWobjects.h

@@ -11,73 +11,34 @@
 #include "Poco/JSON/Object.h"
 #include "RESTAPI_SecurityObjects.h"
 
-#ifdef TIP_GATEWAY_SERVICE
-#include <RADIUS_helpers.h>
-#endif
-
 namespace OpenWifi::GWObjects {
 
-	enum CertificateValidation { NO_CERTIFICATE, VALID_CERTIFICATE, MISMATCH_SERIAL, VERIFIED, SIMULATED };
+	enum CertificateValidation {
+		NO_CERTIFICATE,
+		VALID_CERTIFICATE,
+		MISMATCH_SERIAL,
+		VERIFIED
+	};
 
 	struct ConnectionState {
-		uint64_t MessageCount = 0;
+		uint64_t MessageCount = 0 ;
 		std::string Address;
-		uint64_t UUID = 0;
-		uint64_t PendingUUID = 0;
+		uint64_t UUID = 0 ;
+		uint64_t PendingUUID = 0 ;
 		uint64_t TX = 0, RX = 0;
-		uint64_t Associations_2G = 0;
-		uint64_t Associations_5G = 0;
-		uint64_t Associations_6G = 0;
+		uint64_t Associations_2G=0;
+		uint64_t Associations_5G=0;
 		bool Connected = false;
-		uint64_t LastContact = 0;
+		uint64_t LastContact=0;
 		std::string Firmware;
 		CertificateValidation VerifiedCertificate = NO_CERTIFICATE;
 		std::string Compatible;
-		uint64_t kafkaClients = 0;
-		uint64_t webSocketClients = 0;
-		uint64_t kafkaPackets = 0;
-		uint64_t websocketPackets = 0;
+		uint64_t 	kafkaClients=0;
+		uint64_t 	webSocketClients=0;
+		uint64_t 	kafkaPackets=0;
+		uint64_t 	websocketPackets=0;
 		std::string locale;
-		uint64_t started = 0;
-		uint64_t sessionId = 0;
-		double connectionCompletionTime = 0.0;
-		std::uint64_t certificateExpiryDate = 0;
-		std::uint64_t hasRADIUSSessions = 0;
-		bool hasGPS = false;
-		std::uint64_t sanity=0;
-		std::double_t memoryUsed=0.0;
-		std::double_t load=0.0;
-		std::double_t temperature=0.0;
-		std::string 	connectReason;
-
-		void to_json(const std::string &SerialNumber, Poco::JSON::Object &Obj) ;
-	};
-
-	struct DeviceRestrictionsKeyInfo {
-		std::string vendor;
-		std::string algo;
-
-		bool operator!=(const DeviceRestrictionsKeyInfo &b) const;
-
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct DeviceRestrictions {
-		bool dfs = false;
-		bool ssh = false;
-		bool rtty = false;
-		bool tty = false;
-		bool developer = false;
-		bool upgrade = false;
-		bool commands = false;
-		std::vector<std::string> country;
-		DeviceRestrictionsKeyInfo key_info;
-
-		bool operator!=(const DeviceRestrictions &D) const;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct Device {
@@ -86,30 +47,23 @@ namespace OpenWifi::GWObjects {
 		std::string MACAddress;
 		std::string Manufacturer;
 		std::string Configuration;
-		SecurityObjects::NoteInfoVec Notes;
+		SecurityObjects::NoteInfoVec 	Notes;
 		std::string Owner;
 		std::string Location;
 		std::string Firmware;
 		std::string Compatible;
 		std::string FWUpdatePolicy;
-		uint64_t UUID = 0;
-		uint64_t CreationTimestamp = 0;
-		uint64_t LastConfigurationChange = 0;
-		uint64_t LastConfigurationDownload = 0;
-		uint64_t LastFWUpdate = 0;
+		uint64_t UUID = 0 ;
+		uint64_t CreationTimestamp = 0 ;
+		uint64_t LastConfigurationChange = 0 ;
+		uint64_t LastConfigurationDownload = 0 ;
+		uint64_t LastFWUpdate = 0 ;
 		std::string Venue;
 		std::string DevicePassword;
 		std::string subscriber;
 		std::string entity;
-		uint64_t modified = 0;
+		uint64_t 	modified=0;
 		std::string locale;
-		bool restrictedDevice = false;
-		std::string pendingConfiguration;
-		std::string pendingConfigurationCmd;
-		DeviceRestrictions restrictionDetails;
-		std::uint64_t pendingUUID = 0;
-		bool simulated=false;
-		std::uint64_t lastRecordedContact=0;
 
 		void to_json(Poco::JSON::Object &Obj) const;
 		void to_json_with_status(Poco::JSON::Object &Obj) const;
@@ -117,37 +71,28 @@ namespace OpenWifi::GWObjects {
 		void Print() const;
 	};
 
-	struct DeviceConnectionStatistics {
-		std::uint64_t connectedDevices = 0;
-		std::uint64_t averageConnectionTime = 0;
-		std::uint64_t connectingDevices = 0;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
 	struct Statistics {
 		std::string SerialNumber;
-		uint64_t UUID = 0;
+		uint64_t 	UUID = 0 ;
 		std::string Data;
-		uint64_t Recorded = 0;
+		uint64_t 	Recorded = 0;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct HealthCheck {
 		std::string SerialNumber;
-		uint64_t UUID = 0;
+		uint64_t 	UUID = 0 ;
 		std::string Data;
-		uint64_t Recorded = 0;
-		uint64_t Sanity = 0;
+		uint64_t 	Recorded = 0 ;
+		uint64_t 	Sanity = 0 ;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct Capabilities {
 		std::string Capabilities;
-		uint64_t FirstUpdate = 0;
-		uint64_t LastUpdate = 0;
-		void to_json(Poco::JSON::Object &Obj) const;
+		uint64_t 	FirstUpdate = 0 ;
+		uint64_t 	LastUpdate = 0 ;
+		void 		to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct DeviceLog {
@@ -164,11 +109,11 @@ namespace OpenWifi::GWObjects {
 		std::string SerialNumber;
 		std::string Log;
 		std::string Data;
-		uint64_t Severity = 0;
-		uint64_t Recorded = 0;
-		uint64_t LogType = 0;
-		uint64_t UUID = 0;
-		void to_json(Poco::JSON::Object &Obj) const;
+		uint64_t 	Severity = 0 ;
+		uint64_t 	Recorded = 0 ;
+		uint64_t 	LogType = 0 ;
+		uint64_t 	UUID = 0 ;
+		void 		to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct DefaultConfiguration {
@@ -176,30 +121,10 @@ namespace OpenWifi::GWObjects {
 		std::string Configuration;
 		Types::StringVec Models;
 		std::string Description;
-		uint64_t Created;
-		uint64_t LastModified;
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct DefaultFirmware {
-		std::string deviceType;
-		std::string Description;
-		std::string uri;
-		std::string revision;
-		uint64_t imageCreationDate;
-		uint64_t Created;
-		uint64_t LastModified;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct DefaultFirmwareList {
-		std::vector<DefaultFirmware>	firmwares;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
+		uint64_t 	Created;
+		uint64_t 	LastModified;
+		void 		to_json(Poco::JSON::Object &Obj) const;
+		bool 		from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct CommandDetails {
@@ -213,20 +138,16 @@ namespace OpenWifi::GWObjects {
 		std::string ErrorText;
 		uint64_t Submitted = time(nullptr);
 		uint64_t Executed = 0;
-		uint64_t Completed = 0;
-		uint64_t RunAt = 0;
-		uint64_t ErrorCode = 0;
-		uint64_t Custom = 0;
-		uint64_t WaitingForFile = 0;
-		uint64_t AttachDate = 0;
-		uint64_t AttachSize = 0;
+		uint64_t Completed = 0 ;
+		uint64_t RunAt = 0 ;
+		uint64_t ErrorCode = 0 ;
+		uint64_t Custom = 0 ;
+		uint64_t WaitingForFile = 0 ;
+		uint64_t AttachDate = 0 ;
+		uint64_t AttachSize = 0 ;
 		std::string AttachType;
-		double executionTime = 0.0;
-		std::uint64_t lastTry = 0;
-		bool deferred = false;
-
+		double 		executionTime = 0.0;
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct BlackListedDevice {
@@ -241,20 +162,20 @@ namespace OpenWifi::GWObjects {
 	struct RttySessionDetails {
 		std::string SerialNumber;
 		std::string Server;
-		uint64_t Port = 0;
+		uint64_t 	Port = 0 ;
 		std::string Token;
-		uint64_t TimeOut = 0;
+		uint64_t 	TimeOut = 0 ;
 		std::string ConnectionId;
-		uint64_t Started = 0;
+		uint64_t 	Started = 0 ;
 		std::string CommandUUID;
-		uint64_t ViewPort = 0;
+		uint64_t 	ViewPort = 0 ;
 		std::string DevicePassword;
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
 	struct Dashboard {
-		uint64_t snapshot = 0;
-		uint64_t numberOfDevices = 0;
+		uint64_t 		  snapshot = 0 ;
+		uint64_t 		  numberOfDevices = 0 ;
 		Types::CountedMap commands;
 		Types::CountedMap upTimes;
 		Types::CountedMap memoryUsed;
@@ -279,44 +200,13 @@ namespace OpenWifi::GWObjects {
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 
-	struct ScriptEntry {
-		std::string id;
-		std::string name;
-		std::string description;
-		std::string uri;
-		std::string content;
-		std::string version;
-		std::string type;
-		std::uint64_t created;
-		std::uint64_t modified;
-		std::string author;
-		Types::StringVec restricted;
-		bool deferred = false;
-		std::uint64_t timeout = 30;
-		std::string defaultUploadURI;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct ScriptEntryList {
-		std::vector<ScriptEntry> scripts;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
 	struct ScriptRequest {
+		uint64_t 	timeout=30;
 		std::string serialNumber;
-		uint64_t timeout = 30;
 		std::string type;
 		std::string script;
 		std::string scriptId;
-		std::uint64_t when;
-		std::string signature;
-		bool deferred;
-		std::string uri;
-
+		uint64_t 	when=0;
 		void to_json(Poco::JSON::Object &Obj) const;
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
@@ -324,191 +214,38 @@ namespace OpenWifi::GWObjects {
 	struct RadiusProxyServerEntry {
 		std::string name;
 		std::string ip;
-		uint16_t port = 0;
-		uint64_t weight = 0;
-		std::string secret;
-		std::string certificate;
-		bool radsec = false;
-		bool allowSelfSigned = false;
-		uint16_t radsecPort = 2083;
-		std::string radsecSecret;
-		std::string radsecKey;
-		std::string radsecCert;
-		std::vector<std::string> radsecCacerts;
-		std::vector<std::string> radsecRealms;
-		bool ignore = false;
+		uint16_t 	port=0;
+		uint64_t 	weight=0;
 
 		void to_json(Poco::JSON::Object &Obj) const;
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct RadiusProxyServerConfig {
-		std::string strategy;
-		bool monitor = false;
-		std::string monitorMethod;
-		std::vector<std::string> methodParameters;
-		std::vector<RadiusProxyServerEntry> servers;
+		std::string 	strategy;
+		bool 			monitor=false;
+		std::string 	monitorMethod;
+		std::vector<std::string>	methodParameters;
+		std::vector<RadiusProxyServerEntry>	servers;
 
 		void to_json(Poco::JSON::Object &Obj) const;
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
-	struct RadiusProxyPool {
+	struct 	RadiusProxyPool {
 		std::string name;
 		std::string description;
-		RadiusProxyServerConfig authConfig;
-		RadiusProxyServerConfig acctConfig;
-		RadiusProxyServerConfig coaConfig;
-		bool useByDefault = false;
-		std::string 	radsecPoolType;
-		std::string 	poolProxyIp;
-		std::uint64_t 	radsecKeepAlive=25;
-		bool			enabled=true;
+		RadiusProxyServerConfig	authConfig;
+		RadiusProxyServerConfig	acctConfig;
 
 		void to_json(Poco::JSON::Object &Obj) const;
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct RadiusProxyPoolList {
-		std::vector<RadiusProxyPool> pools;
+		std::vector<RadiusProxyPool>	pools;
 
 		void to_json(Poco::JSON::Object &Obj) const;
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
-
-	struct RangeOptions {
-		bool NO_IR=false;
-		bool AUTO_BW=false;
-		bool DFS=false;
-		bool NO_OUTDOOR=false;
-		bool wmmrule_ETSI=false;
-		bool NO_OFDM=false;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct FrequencyRange {
-		float from = 0.0;
-		float to = 0.0;
-		int channelWidth = 0;
-		int powerDb = 0;
-		RangeOptions    options;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct RegulatoryCountryInfo {
-		std::string country;
-		std::string domain;
-		std::vector<FrequencyRange>   ranges;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	using RegulatoryInfoCountryMap = std::map<std::string,RegulatoryCountryInfo>;
-
-	struct RADIUSSession {
-		std::uint64_t 			started=0,
-								lastTransaction=0;
-		std::string 			serialNumber,
-								destination,
-								userName,
-					 			accountingSessionId,
-								accountingMultiSessionId,
-					 			callingStationId,
-								chargeableUserIdentity,
-								secret,
-								interface,
-								nasId;
-		std::uint64_t 			inputPackets = 0,
-								outputPackets = 0,
-								inputOctets = 0,
-								outputOctets = 0,
-								inputGigaWords = 0,
-								outputGigaWords = 0;
-		std::uint32_t 			sessionTime = 0;
-		std::string 			calledStationId;
-
-#ifdef TIP_GATEWAY_SERVICE
-		RADIUS::RadiusPacket	accountingPacket;
-#endif
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct RADIUSSessionList {
-		std::vector<RADIUSSession>	sessions;
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	struct RadiusCoADMParameters {
-		std::string 			accountingSessionId,
-								accountingMultiSessionId,
-								callingStationId,
-								chargeableUserIdentity,
-								userName;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
-
-	enum class RadiusPoolStrategy {
-		round_robin, random, weighted, unknown
-	};
-
-	enum class RadiusEndpointType {
-		generic, radsec, globalreach, orion, unknown
-	};
-
-	static inline RadiusEndpointType RadiusEndpointType(const std::string &T) {
-		if(T=="generic") return RadiusEndpointType::generic;
-		if(T=="radsec") return RadiusEndpointType::radsec;
-		if(T=="globalreach") return RadiusEndpointType::globalreach;
-		if(T=="orion") return RadiusEndpointType::orion;
-		return RadiusEndpointType::unknown;
-	}
-
-	static inline RadiusPoolStrategy RadiusPoolStrategy(const std::string &T) {
-		if(T=="round_robin") return RadiusPoolStrategy::round_robin;
-		if(T=="random") return RadiusPoolStrategy::random;
-		if(T=="weighted") return RadiusPoolStrategy::weighted;
-		return RadiusPoolStrategy::unknown;
-	}
-
-	static inline std::string to_string(enum RadiusEndpointType T) {
-		switch(T) {
-		case RadiusEndpointType::generic: return "generic";
-		case RadiusEndpointType::radsec: return "radsec";
-		case RadiusEndpointType::globalreach: return "globalreach";
-		case RadiusEndpointType::orion: return "orion";
-		default:
-			return "unknown";
-		}
-	}
-
-	static inline std::string to_string(enum RadiusPoolStrategy T) {
-		switch(T) {
-		case RadiusPoolStrategy::round_robin: return "round_robin";
-		case RadiusPoolStrategy::random: return "random";
-		case RadiusPoolStrategy::weighted: return "weighted";
-		default:
-			return "unknown";
-		}
-	}
-
-	struct DeviceTransferRequest {
-		std::string 	serialNumber;
-		std::string 	server;
-		std::uint64_t 	port;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct DeviceCertificateUpdateRequest {
-		std::string 	serialNumber;
-		std::string 	encodedCertificate;
-
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-} // namespace OpenWifi::GWObjects
+}

src/RESTObjects/RESTAPI_OWLSobjects.cpp

@@ -1,103 +0,0 @@
-//
-// Created by stephane bourque on 2021-08-31.
-//
-
-#include "framework/RESTAPI_utils.h"
-
-using OpenWifi::RESTAPI_utils::EmbedDocument;
-using OpenWifi::RESTAPI_utils::field_from_json;
-using OpenWifi::RESTAPI_utils::field_to_json;
-
-#include "RESTAPI_OWLSobjects.h"
-
-// SIM -> 0x53/0x073, 0x49/0x69, 0x4d/0x6d
-
-namespace OpenWifi::OWLSObjects {
-
-	void SimulationDetails::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "name", name);
-		field_to_json(Obj, "gateway", gateway);
-		field_to_json(Obj, "certificate", certificate);
-		field_to_json(Obj, "key", key);
-		field_to_json(Obj, "macPrefix", macPrefix);
-		field_to_json(Obj, "deviceType", deviceType);
-		field_to_json(Obj, "devices", devices);
-		field_to_json(Obj, "healthCheckInterval", healthCheckInterval);
-		field_to_json(Obj, "stateInterval", stateInterval);
-		field_to_json(Obj, "minAssociations", minAssociations);
-		field_to_json(Obj, "maxAssociations", maxAssociations);
-		field_to_json(Obj, "minClients", minClients);
-		field_to_json(Obj, "maxClients", maxClients);
-		field_to_json(Obj, "simulationLength", simulationLength);
-		field_to_json(Obj, "threads", threads);
-		field_to_json(Obj, "clientInterval", clientInterval);
-		field_to_json(Obj, "keepAlive", keepAlive);
-		field_to_json(Obj, "reconnectInterval", reconnectInterval);
-		field_to_json(Obj, "concurrentDevices", concurrentDevices);
-	}
-
-	bool SimulationDetails::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "name", name);
-			field_from_json(Obj, "gateway", gateway);
-			field_from_json(Obj, "certificate", certificate);
-			field_from_json(Obj, "key", key);
-			field_from_json(Obj, "macPrefix", macPrefix);
-			field_from_json(Obj, "deviceType", deviceType);
-			field_from_json(Obj, "devices", devices);
-			field_from_json(Obj, "healthCheckInterval", healthCheckInterval);
-			field_from_json(Obj, "stateInterval", stateInterval);
-			field_from_json(Obj, "minAssociations", minAssociations);
-			field_from_json(Obj, "maxAssociations", maxAssociations);
-			field_from_json(Obj, "minClients", minClients);
-			field_from_json(Obj, "maxClients", maxClients);
-			field_from_json(Obj, "simulationLength", simulationLength);
-			field_from_json(Obj, "threads", threads);
-			field_from_json(Obj, "clientInterval", clientInterval);
-			field_from_json(Obj, "keepAlive", keepAlive);
-			field_from_json(Obj, "reconnectInterval", reconnectInterval);
-			field_from_json(Obj, "concurrentDevices", concurrentDevices);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void SimulationDetailsList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "list", list);
-	}
-
-	bool SimulationDetailsList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "list", list);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-    void SimulationStatus::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "id", id);
-        field_to_json(Obj, "simulationId", simulationId);
-        field_to_json(Obj, "state", state);
-        field_to_json(Obj, "tx", tx);
-        field_to_json(Obj, "rx", rx);
-        field_to_json(Obj, "msgsTx", msgsTx);
-        field_to_json(Obj, "msgsRx", msgsRx);
-        field_to_json(Obj, "liveDevices", liveDevices);
-        field_to_json(Obj, "timeToFullDevices", timeToFullDevices);
-        field_to_json(Obj, "startTime", startTime);
-        field_to_json(Obj, "endTime", endTime);
-        field_to_json(Obj, "errorDevices", errorDevices);
-        field_to_json(Obj, "owner", owner);
-        field_to_json(Obj, "expectedDevices", expectedDevices);
-    }
-
-	void Dashboard::to_json([[maybe_unused]] Poco::JSON::Object &Obj) const {}
-
-	bool Dashboard::from_json([[maybe_unused]] const Poco::JSON::Object::Ptr &Obj) { return true; }
-
-	void Dashboard::reset() {}
-} // namespace OpenWifi::OWLSObjects

src/RESTObjects/RESTAPI_OWLSobjects.h

@@ -1,75 +0,0 @@
-//
-// Created by stephane bourque on 2021-08-31.
-//
-
-#ifndef UCENTRALSIM_RESTAPI_OWLSOBJECTS_H
-#define UCENTRALSIM_RESTAPI_OWLSOBJECTS_H
-
-#include "Poco/JSON/Object.h"
-#include <vector>
-
-namespace OpenWifi::OWLSObjects {
-
-	struct SimulationDetails {
-		std::string id;
-		std::string name;
-		std::string gateway;
-		std::string certificate;
-		std::string key;
-		std::string macPrefix;
-		std::string deviceType;
-		uint64_t devices = 5;
-		uint64_t healthCheckInterval = 60;
-		uint64_t stateInterval = 60;
-		uint64_t minAssociations = 1;
-		uint64_t maxAssociations = 3;
-		uint64_t minClients = 1;
-		uint64_t maxClients = 3;
-		uint64_t simulationLength = 60 * 60;
-		uint64_t threads = 16;
-		uint64_t clientInterval = 1;
-		uint64_t keepAlive = 300;
-		uint64_t reconnectInterval = 30;
-		uint64_t concurrentDevices = 5;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct SimulationDetailsList {
-		std::vector<SimulationDetails> list;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-    struct SimulationStatus {
-        std::string id;
-        std::string simulationId;
-        std::string state;
-        uint64_t tx;
-        uint64_t rx;
-        uint64_t msgsTx;
-        uint64_t msgsRx;
-        uint64_t liveDevices;
-        uint64_t timeToFullDevices;
-        uint64_t startTime;
-        uint64_t endTime;
-        uint64_t errorDevices;
-        std::string owner;
-        uint64_t expectedDevices;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-    };
-
-	struct Dashboard {
-		int O;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		void reset();
-	};
-
-} // namespace OpenWifi::OWLSObjects
-
-#endif // UCENTRALSIM_RESTAPI_OWLSOBJECTS_H

src/RESTObjects/RESTAPI_SecurityObjects.h

@@ -8,372 +8,320 @@
 
 #pragma once
 
-#include "Poco/Data/LOB.h"
-#include "Poco/Data/LOBStream.h"
-#include "Poco/JSON/Object.h"
-#include "framework/OpenWifiTypes.h"
-#include "framework/utils.h"
 #include <string>
 #include <type_traits>
+#include "framework/OpenWifiTypes.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/Data/LOB.h"
+#include "Poco/Data/LOBStream.h"
 
 namespace OpenWifi {
-	uint64_t Now();
-	namespace SecurityObjects {
+    uint64_t Now();
+    namespace SecurityObjects {
+        
+        typedef std::string USER_ID_TYPE;
 
-		typedef std::string USER_ID_TYPE;
+        struct AclTemplate {
+            bool Read_ = true;
+            bool ReadWrite_ = true;
+            bool ReadWriteCreate_ = true;
+            bool Delete_ = true;
+            bool PortalLogin_ = true;
 
-		struct AclTemplate {
-			bool Read_ = true;
-			bool ReadWrite_ = true;
-			bool ReadWriteCreate_ = true;
-			bool Delete_ = true;
-			bool PortalLogin_ = true;
-
-			AclTemplate() noexcept = default;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		static_assert(std::is_nothrow_move_constructible_v<AclTemplate>);
-
-		struct WebToken {
-			std::string access_token_;
-			std::string refresh_token_;
-			std::string id_token_;
-			std::string token_type_;
-			std::string username_;
-			bool userMustChangePassword = false;
-			uint64_t errorCode = 0;
-			uint64_t expires_in_ = 0;
-			uint64_t idle_timeout_ = 0;
-			AclTemplate acl_template_;
-			uint64_t created_ = 0;
-			uint64_t lastRefresh_ = 0;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		enum USER_ROLE {
-			UNKNOWN,
-			ROOT,
-			ADMIN,
-			SUBSCRIBER,
-			CSR,
-			SYSTEM,
-			INSTALLER,
-			NOC,
-			ACCOUNTING,
-			PARTNER
-		};
-
-		USER_ROLE UserTypeFromString(const std::string &U);
-		std::string UserTypeToString(USER_ROLE U);
-
-		struct NoteInfo {
-			uint64_t created = 0; // = Utils::Now();
-			std::string createdBy;
-			std::string note;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-		typedef std::vector<NoteInfo> NoteInfoVec;
-
-		struct MobilePhoneNumber {
-			std::string number;
-			bool verified = false;
-			bool primary = false;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct MfaAuthInfo {
-			bool enabled = false;
-			std::string method;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct UserLoginLoginExtensions {
-			std::vector<MobilePhoneNumber> mobiles;
-			struct MfaAuthInfo mfa;
-			std::string authenticatorSecret;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct MFAChallengeRequest {
-			std::string uuid;
-			std::string question;
-			std::string method;
-			uint64_t created = Utils::Now();
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct MFAChallengeResponse {
-			std::string uuid;
-			std::string answer;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct UserInfo {
-			std::string id;
-			std::string name;
-			std::string description;
-			std::string avatar;
-			std::string email;
-			bool validated = false;
-			std::string validationEmail;
-			uint64_t validationDate = 0;
-			uint64_t creationDate = 0;
-			std::string validationURI;
-			bool changePassword = false;
-			uint64_t lastLogin = 0;
-			std::string currentLoginURI;
-			uint64_t lastPasswordChange = 0;
-			uint64_t lastEmailCheck = 0;
-			bool waitingForEmailCheck = false;
-			std::string locale;
-			NoteInfoVec notes;
-			std::string location;
-			std::string owner;
-			bool suspended = false;
-			bool blackListed = false;
-			USER_ROLE userRole;
-			UserLoginLoginExtensions userTypeProprietaryInfo;
-			std::string securityPolicy;
-			uint64_t securityPolicyChange = 0;
-			std::string currentPassword;
-			OpenWifi::Types::StringVec lastPasswords;
-			std::string oauthType;
-			std::string oauthUserInfo;
-			uint64_t modified;
-			std::string signingUp;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-		typedef std::vector<UserInfo> UserInfoVec;
-
-		struct UserInfoList {
-			std::vector<UserInfo> users;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		// bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec &
-		// Notes);
-		bool MergeNotes(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec &Notes);
-		bool MergeNotes(const NoteInfoVec &NewNotes, const UserInfo &UInfo,
-						NoteInfoVec &ExistingNotes);
-
-		struct InternalServiceInfo {
-			std::string privateURI;
-			std::string publicURI;
-			std::string token;
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-		typedef std::vector<InternalServiceInfo> InternalServiceInfoVec;
-
-		struct InternalSystemServices {
-			std::string key;
-			std::string version;
-			InternalServiceInfoVec services;
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct SystemEndpoint {
-			std::string type;
-			uint64_t id = 0;
-			std::string vendor{"OpenWiFi"};
-			std::string uri;
-			std::string authenticationType{"internal_v1"};
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-		typedef std::vector<SystemEndpoint> SystemEndpointVec;
-
-		struct SystemEndpointList {
-			SystemEndpointVec endpoints;
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct UserInfoAndPolicy {
-			WebToken webtoken;
-			UserInfo userinfo;
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-		typedef std::map<std::string, SecurityObjects::UserInfoAndPolicy> UserInfoCache;
-
-		enum ResourceAccessType { NONE, READ, MODIFY, DELETE, CREATE, TEST, MOVE };
-
-		ResourceAccessType ResourceAccessTypeFromString(const std::string &s);
-		std::string ResourceAccessTypeToString(const ResourceAccessType &T);
-
-		struct ProfileAction {
-			std::string resource;
-			ResourceAccessType access;
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-		typedef std::vector<ProfileAction> ProfileActionVec;
-
-		struct SecurityProfile {
-			uint64_t id = 0;
-			std::string name;
-			std::string description;
-			ProfileActionVec policy;
-			std::string role;
-			NoteInfoVec notes;
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-		typedef std::vector<SecurityProfile> SecurityProfileVec;
-
-		struct SecurityProfileList {
-			SecurityProfileVec profiles;
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		enum LinkActions {
-			FORGOT_PASSWORD = 1,
-			VERIFY_EMAIL,
-			SUB_FORGOT_PASSWORD,
-			SUB_VERIFY_EMAIL,
-			SUB_SIGNUP,
-			EMAIL_INVITATION
-		};
-
-		struct ActionLink {
-			std::string id;
-			uint64_t action;
-			std::string userId;
-			std::string actionTemplate;
-			Types::StringPairVec variables;
-			std::string locale;
-			std::string message;
-			uint64_t sent = 0;
-			uint64_t created = Utils::Now();
-			uint64_t expires = 0;
-			uint64_t completed = 0;
-			uint64_t canceled = 0;
-			bool userAction = true;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct Preferences {
-			std::string id;
-			uint64_t modified;
-			Types::StringPairVec data;
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct SubMfaConfig {
-			std::string id;
-			std::string type;
-			std::string sms;
-			std::string email;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct Token {
-			std::string token;
-			std::string refreshToken;
-			std::string tokenType;
-			std::string userName;
-			uint64_t created = 0;
-			uint64_t expires = 0;
-			uint64_t idleTimeout = 0;
-			uint64_t revocationDate = 0;
-			uint64_t lastRefresh = 0;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct Avatar {
-			std::string id;
-			std::string type;
-			uint64_t created = 0;
-			std::string name;
-			Poco::Data::BLOB avatar;
-		};
-
-		struct LoginRecordInfo {
-			std::string sessionId;
-			std::string userId;
-			std::string email;
-			uint64_t login = 0;
-			uint64_t logout = 0;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-		};
-
-		struct ApiKeyAccessRight {
-			std::string service;
-			std::string access;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct ApiKeyAccessRightList {
-			std::vector<ApiKeyAccessRight> acls;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct ApiKeyEntry {
-			Types::UUID_t id;
-			Types::UUID_t userUuid;
-			std::string name;
-			std::string description;
-			std::string apiKey;
-			std::string salt;
-			std::uint64_t created;
-			std::uint64_t expiresOn = 0;
-			ApiKeyAccessRightList rights;
-			std::uint64_t lastUse = 0;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		struct ApiKeyEntryList {
-			std::vector<ApiKeyEntry> apiKeys;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-        struct ExtraSystemConfiguration {
-            std::string     parameterName;
-            std::string     parameterValue;
+            AclTemplate()  noexcept = default;
 
             void to_json(Poco::JSON::Object &Obj) const;
             bool from_json(const Poco::JSON::Object::Ptr &Obj);
         };
 
-} // namespace SecurityObjects
-} // namespace OpenWifi
+        static_assert( std::is_nothrow_move_constructible_v<AclTemplate> );
+
+        struct WebToken {
+            std::string access_token_;
+            std::string refresh_token_;
+            std::string id_token_;
+            std::string token_type_;
+            std::string username_;
+            bool userMustChangePassword=false;
+            uint64_t errorCode=0;
+            uint64_t expires_in_=0;
+            uint64_t idle_timeout_=0;
+            AclTemplate acl_template_;
+            uint64_t created_=0;
+            uint64_t lastRefresh_=0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        enum USER_ROLE {
+            UNKNOWN, ROOT, ADMIN, SUBSCRIBER, CSR, SYSTEM, INSTALLER, NOC, ACCOUNTING, PARTNER
+        };
+
+        USER_ROLE UserTypeFromString(const std::string &U);
+        std::string UserTypeToString(USER_ROLE U);
+
+        struct NoteInfo {
+            uint64_t    created=0; // = OpenWifi::Now();
+            std::string createdBy;
+            std::string note;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+        typedef std::vector<NoteInfo>	NoteInfoVec;
+
+        struct MobilePhoneNumber {
+            std::string number;
+            bool verified = false;
+            bool primary = false;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct MfaAuthInfo {
+            bool enabled = false;
+            std::string method;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct UserLoginLoginExtensions {
+            std::vector<MobilePhoneNumber>  mobiles;
+            struct MfaAuthInfo              mfa;
+            std::string                     authenticatorSecret;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct MFAChallengeRequest {
+            std::string uuid;
+            std::string question;
+            std::string method;
+            uint64_t    created = OpenWifi::Now();
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct MFAChallengeResponse {
+            std::string uuid;
+            std::string answer;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct UserInfo {
+            std::string id;
+            std::string name;
+            std::string description;
+            std::string avatar;
+            std::string email;
+            bool        validated = false;
+            std::string validationEmail;
+            uint64_t    validationDate = 0;
+            uint64_t    creationDate = 0;
+            std::string validationURI;
+            bool        changePassword = false;
+            uint64_t    lastLogin = 0;
+            std::string currentLoginURI;
+            uint64_t    lastPasswordChange = 0;
+            uint64_t    lastEmailCheck = 0;
+            bool        waitingForEmailCheck = false;
+            std::string locale;
+            NoteInfoVec notes;
+            std::string location;
+            std::string owner;
+            bool        suspended = false;
+            bool        blackListed = false;
+            USER_ROLE   userRole;
+            UserLoginLoginExtensions userTypeProprietaryInfo;
+            std::string securityPolicy;
+            uint64_t    securityPolicyChange = 0 ;
+            std::string currentPassword;
+            OpenWifi::Types::StringVec lastPasswords;
+            std::string oauthType;
+            std::string oauthUserInfo;
+            uint64_t    modified;
+            std::string signingUp;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+        typedef std::vector<UserInfo>   UserInfoVec;
+
+        struct UserInfoList {
+            std::vector<UserInfo>   users;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        // bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
+        bool MergeNotes(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
+        bool MergeNotes(const NoteInfoVec & NewNotes, const UserInfo &UInfo, NoteInfoVec & ExistingNotes);
+
+        struct InternalServiceInfo {
+            std::string privateURI;
+            std::string publicURI;
+            std::string token;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+        typedef std::vector<InternalServiceInfo>	InternalServiceInfoVec;
+
+        struct InternalSystemServices {
+            std::string key;
+            std::string version;
+            InternalServiceInfoVec services;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct SystemEndpoint {
+            std::string type;
+            uint64_t 	id = 0;
+            std::string vendor{"OpenWiFi"};
+            std::string uri;
+            std::string authenticationType{"internal_v1"};
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+        typedef std::vector<SystemEndpoint> SystemEndpointVec;
+
+        struct SystemEndpointList {
+            SystemEndpointVec	endpoints;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct UserInfoAndPolicy {
+            WebToken	webtoken;
+            UserInfo	userinfo;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+        typedef std::map<std::string,SecurityObjects::UserInfoAndPolicy>	UserInfoCache;
+
+        enum ResourceAccessType {
+            NONE,
+            READ,
+            MODIFY,
+            DELETE,
+            CREATE,
+            TEST,
+            MOVE
+        };
+
+        ResourceAccessType ResourceAccessTypeFromString(const std::string &s);
+        std::string ResourceAccessTypeToString(const ResourceAccessType & T);
+
+        struct ProfileAction {
+            std::string resource;
+            ResourceAccessType access;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+        typedef std::vector<ProfileAction>	ProfileActionVec;
+
+        struct SecurityProfile {
+            uint64_t id=0;
+            std::string name;
+            std::string description;
+            ProfileActionVec policy;
+            std::string role;
+            NoteInfoVec notes;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+        typedef std::vector<SecurityProfile> SecurityProfileVec;
+
+        struct SecurityProfileList {
+            SecurityProfileVec profiles;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        enum LinkActions {
+            FORGOT_PASSWORD=1,
+            VERIFY_EMAIL,
+            SUB_FORGOT_PASSWORD,
+            SUB_VERIFY_EMAIL,
+            SUB_SIGNUP
+        };
+
+        struct ActionLink {
+            std::string         id;
+            uint64_t            action;
+            std::string         userId;
+            std::string         actionTemplate;
+            Types::StringPairVec variables;
+            std::string         locale;
+            std::string         message;
+            uint64_t            sent=0;
+            uint64_t            created=OpenWifi::Now();
+            uint64_t            expires=0;
+            uint64_t            completed=0;
+            uint64_t            canceled=0;
+            bool                userAction=true;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct Preferences {
+            std::string                         id;
+            uint64_t                            modified;
+            Types::StringPairVec                data;
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct SubMfaConfig {
+            std::string                         id;
+            std::string                         type;
+            std::string                         sms;
+            std::string                         email;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct Token {
+            std::string         token;
+            std::string         refreshToken;
+            std::string         tokenType;
+            std::string         userName;
+            uint64_t            created=0;
+            uint64_t            expires=0;
+            uint64_t            idleTimeout=0;
+            uint64_t            revocationDate=0;
+            uint64_t            lastRefresh=0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+            bool from_json(const Poco::JSON::Object::Ptr &Obj);
+        };
+
+        struct Avatar {
+            std::string             id;
+            std::string             type;
+            uint64_t                created=0;
+            std::string             name;
+            Poco::Data::BLOB        avatar;
+        };
+
+        struct LoginRecordInfo {
+            std::string sessionId;
+            std::string userId;
+            std::string email;
+            uint64_t    login=0;
+            uint64_t    logout=0;
+
+            void to_json(Poco::JSON::Object &Obj) const;
+        };
+    }
+}

src/RESTObjects/RESTAPI_SubObjects.h

@@ -11,312 +11,312 @@
 
 namespace OpenWifi::SubObjects {
 
-	struct HomeDeviceMode {
-		bool enableLEDS = true;
-		std::string type; // bridge, manual, automatic
-		std::string subnet;
-		std::string subnetMask;
-		std::string startIP;
-		std::string endIP;
-		uint64_t created = 0;
-		uint64_t modified = 0;
-		std::string subnetV6;
-		int subnetMaskV6 = 0;
-		std::string startIPV6;
-		std::string endIPV6;
-		std::string leaseTime;
+    struct HomeDeviceMode {
+        bool            enableLEDS = true;
+        std::string     type;       // bridge, manual, automatic
+        std::string     subnet;
+        std::string     subnetMask;
+        std::string     startIP;
+        std::string     endIP;
+        uint64_t        created = 0 ;
+        uint64_t        modified = 0 ;
+        std::string     subnetV6;
+        int             subnetMaskV6=0;
+        std::string     startIPV6;
+        std::string     endIPV6;
+        std::string     leaseTime;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct IPReservation {
-		std::string nickname;
-		std::string ipAddress;
-		std::string macAddress;
+    struct IPReservation  {
+        std::string     nickname;
+        std::string     ipAddress;
+        std::string     macAddress;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct IPReservationList {
-		std::string id;
-		std::vector<IPReservation> reservations;
-		uint64_t created = 0;
-		uint64_t modified = 0;
+    struct IPReservationList {
+        std::string                 id;
+        std::vector<IPReservation>  reservations;
+        uint64_t created = 0 ;
+        uint64_t modified = 0 ;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct DnsConfiguration {
-		bool ISP = false;
-		bool custom = false;
-		std::string primary;
-		std::string secondary;
-		std::string primaryV6;
-		std::string secondaryV6;
+    struct DnsConfiguration {
+        bool            ISP=false;
+        bool            custom=false;
+        std::string     primary;
+        std::string     secondary;
+        std::string     primaryV6;
+        std::string     secondaryV6;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct InternetConnection {
-		std::string type; // automatic, pppoe, manual
-		std::string username;
-		std::string password;
-		std::string ipAddress;
-		std::string subnetMask;
-		std::string defaultGateway;
-		bool sendHostname = true;
-		std::string primaryDns;
-		std::string secondaryDns;
-		uint64_t created = 0;
-		uint64_t modified = 0;
-		bool ipV6Support = false;
-		std::string ipAddressV6;
-		int subnetMaskV6 = 0;
-		std::string defaultGatewayV6;
-		std::string primaryDnsV6;
-		std::string secondaryDnsV6;
+    struct InternetConnection {
+        std::string     type; // automatic, pppoe, manual
+        std::string     username;
+        std::string     password;
+        std::string     ipAddress;
+        std::string     subnetMask;
+        std::string     defaultGateway;
+        bool            sendHostname = true;
+        std::string     primaryDns;
+        std::string     secondaryDns;
+        uint64_t        created=0;
+        uint64_t        modified=0;
+        bool            ipV6Support=false;
+        std::string     ipAddressV6;
+        int             subnetMaskV6=0;
+        std::string     defaultGatewayV6;
+        std::string     primaryDnsV6;
+        std::string     secondaryDnsV6;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct WifiNetwork {
-		std::string type; // main, guest
-		std::string name;
-		std::string password;
-		std::string encryption;
-		std::vector<std::string> bands;
+    struct WifiNetwork {
+        std::string     type;       // main, guest
+        std::string     name;
+        std::string     password;
+        std::string     encryption;
+        std::vector<std::string>    bands;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct WifiNetworkList {
-		std::vector<WifiNetwork> wifiNetworks;
-		uint64_t created = 0;
-		uint64_t modified = 0;
+    struct WifiNetworkList {
+        std::vector<WifiNetwork>    wifiNetworks;
+        uint64_t                    created=0;
+        uint64_t                    modified=0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct AccessTime {
-		std::string day;
-		std::vector<std::string> rangeList;
+    struct AccessTime {
+        std::string day;
+        std::vector<std::string>    rangeList;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct AccessTimes {
-		std::vector<AccessTime> schedule;
-		uint64_t created = 0;
-		uint64_t modified = 0;
+    struct AccessTimes {
+        std::vector<AccessTime> schedule;
+        uint64_t        created=0;
+        uint64_t        modified=0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct SubscriberDevice {
-		std::string name;
-		std::string description;
-		std::string macAddress;
-		std::string manufacturer;
-		uint64_t firstContact = 0;
-		uint64_t lastContact = 0;
-		std::string group;
-		std::string icon;
-		bool suspended = false;
-		std::string ip;
-		std::vector<AccessTimes> schedule;
+    struct SubscriberDevice {
+        std::string     name;
+        std::string     description;
+        std::string     macAddress;
+        std::string     manufacturer;
+        uint64_t        firstContact=0;
+        uint64_t        lastContact=0;
+        std::string     group;
+        std::string     icon;
+        bool            suspended=false;
+        std::string     ip;
+        std::vector<AccessTimes>    schedule;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct SubscriberDeviceList {
-		std::vector<SubscriberDevice> devices;
-		uint64_t created = 0;
-		uint64_t modified = 0;
+    struct SubscriberDeviceList {
+        std::vector<SubscriberDevice>   devices;
+        uint64_t        created=0;
+        uint64_t        modified=0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct Association {
-		std::string name;
-		std::string ssid;
-		std::string macAddress;
-		int rssi = 0;
-		int power = 0;
-		std::string ipv4;
-		std::string ipv6;
-		uint64_t tx = 0;
-		uint64_t rx = 0;
-		std::string manufacturer;
+    struct Association {
+        std::string     name;
+        std::string     ssid;
+        std::string     macAddress;
+        int             rssi=0;
+        int             power=0;
+        std::string     ipv4;
+        std::string     ipv6;
+        uint64_t        tx=0;
+        uint64_t        rx=0;
+        std::string     manufacturer;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct AssociationList {
-		std::vector<Association> associations;
-		uint64_t created = 0;
-		uint64_t modified = 0;
+    struct AssociationList {
+        std::vector<Association>    associations;
+        uint64_t        created=0;
+        uint64_t        modified=0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct Client {
-		std::string macAddress;
-		std::string speed;
-		std::string mode;
-		std::string ipv4;
-		std::string ipv6;
-		uint64_t tx = 0;
-		uint64_t rx = 0;
-		std::string manufacturer;
+    struct Client {
+        std::string     macAddress;
+        std::string     speed;
+        std::string     mode;
+        std::string     ipv4;
+        std::string     ipv6;
+        uint64_t        tx=0;
+        uint64_t        rx=0;
+        std::string     manufacturer;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct ClientList {
-		std::vector<Client> clients;
-		uint64_t created = 0;
-		uint64_t modified = 0;
+    struct ClientList {
+        std::vector<Client> clients;
+        uint64_t        created=0;
+        uint64_t        modified=0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct Location {
-		std::string buildingName;
-		std::vector<std::string> addressLines;
-		std::string city;
-		std::string state;
-		std::string postal;
-		std::string country;
-		std::vector<std::string> phones;
-		std::vector<std::string> mobiles;
+    struct Location {
+        std::string                 buildingName;
+        std::vector<std::string>    addressLines;
+        std::string                 city;
+        std::string                 state;
+        std::string                 postal;
+        std::string                 country;
+        std::vector<std::string>    phones;
+        std::vector<std::string>    mobiles;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct RadioHE {
-		bool multipleBSSID = false;
-		bool ema = false;
-		uint64_t bssColor = 64;
+    struct RadioHE {
+        bool                        multipleBSSID = false;
+        bool                        ema = false;
+        uint64_t                    bssColor = 64;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct RadioRates {
-		uint64_t beacon = 6000;
-		uint64_t multicast = 24000;
+    struct RadioRates {
+        uint64_t                    beacon = 6000;
+        uint64_t                    multicast = 24000;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct RadioInformation {
-		std::string band;
-		uint64_t bandwidth;
-		uint64_t channel = 0;
-		std::string country;
-		std::string channelMode{"HE"};
-		uint64_t channelWidth = 80;
-		std::string requireMode;
-		uint64_t txpower = 0;
-		bool legacyRates = false;
-		uint64_t beaconInterval = 100;
-		uint64_t dtimPeriod = 2;
-		uint64_t maximumClients = 64;
-		RadioRates rates;
-		RadioHE he;
-		bool allowDFS = false;
-		std::string mimo;
-		std::vector<std::string> rawInfo;
+    struct RadioInformation {
+        std::string             band;
+        uint64_t                bandwidth;
+        uint64_t                channel = 0 ;
+        std::string             country;
+        std::string             channelMode{"HE"};
+        uint64_t                channelWidth = 80;
+        std::string             requireMode;
+        uint64_t                txpower=0;
+        bool                    legacyRates = false;
+        uint64_t                beaconInterval = 100;
+        uint64_t                dtimPeriod = 2;
+        uint64_t                maximumClients = 64;
+        RadioRates              rates;
+        RadioHE                 he;
+        bool                    allowDFS=false;
+        std::string             mimo;
+        std::vector<std::string>    rawInfo;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct AccessPoint {
-		std::string id;
-		std::string macAddress;
-		std::string serialNumber;
-		std::string name;
-		std::string deviceType;
-		SubscriberDeviceList subscriberDevices;
-		IPReservationList ipReservations;
-		Location address;
-		WifiNetworkList wifiNetworks;
-		InternetConnection internetConnection;
-		HomeDeviceMode deviceMode;
-		DnsConfiguration dnsConfiguration;
-		std::vector<RadioInformation> radios;
-		bool automaticUpgrade = true;
-		std::string configurationUUID;
-		std::string currentFirmware;
-		uint64_t currentFirmwareDate;
-		std::string latestFirmware;
-		uint64_t latestFirmwareDate;
-		bool newFirmwareAvailable;
-		std::string latestFirmwareURI;
+    struct AccessPoint {
+        std::string                 id;
+        std::string                 macAddress;
+        std::string                 serialNumber;
+        std::string                 name;
+        std::string                 deviceType;
+        SubscriberDeviceList        subscriberDevices;
+        IPReservationList           ipReservations;
+        Location                    address;
+        WifiNetworkList             wifiNetworks;
+        InternetConnection          internetConnection;
+        HomeDeviceMode              deviceMode;
+        DnsConfiguration            dnsConfiguration;
+        std::vector<RadioInformation>   radios;
+        bool                        automaticUpgrade = true;
+        std::string                 configurationUUID;
+        std::string                 currentFirmware;
+        uint64_t                    currentFirmwareDate;
+        std::string                 latestFirmware;
+        uint64_t                    latestFirmwareDate;
+        bool                        newFirmwareAvailable;
+        std::string                 latestFirmwareURI;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct AccessPointList {
-		std::vector<AccessPoint> list;
+    struct AccessPointList {
+        std::vector<AccessPoint>   list;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct SubscriberInfo {
-		std::string id;
-		std::string userId;
-		std::string firstName;
-		std::string initials;
-		std::string lastName;
-		std::string phoneNumber;
-		std::string secondaryEmail;
-		AccessPointList accessPoints;
-		Location serviceAddress;
-		Location billingAddress;
-		uint64_t created = 0;
-		uint64_t modified = 0;
+    struct SubscriberInfo {
+        std::string                 id;
+        std::string                 userId;
+        std::string                 firstName;
+        std::string                 initials;
+        std::string                 lastName;
+        std::string                 phoneNumber;
+        std::string                 secondaryEmail;
+        AccessPointList             accessPoints;
+        Location                    serviceAddress;
+        Location                    billingAddress;
+        uint64_t                    created = 0;
+        uint64_t                    modified = 0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct StatsEntry {
-		uint64_t timestamp = 0;
-		uint64_t tx = 0;
-		uint64_t rx = 0;
+    struct StatsEntry {
+        uint64_t        timestamp=0;
+        uint64_t        tx=0;
+        uint64_t        rx=0;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
 
-	struct StatsBlock {
-		uint64_t modified = 0;
-		std::vector<StatsEntry> external, internal;
+    struct StatsBlock {
+        uint64_t                    modified=0;
+        std::vector<StatsEntry>     external, internal;
 
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-} // namespace OpenWifi::SubObjects
+        void to_json(Poco::JSON::Object &Obj) const;
+        bool from_json(const Poco::JSON::Object::Ptr &Obj);
+    };
+}
 
-#endif // OWSUB_RESTAPI_SUBOBJECTS_H
+#endif //OWSUB_RESTAPI_SUBOBJECTS_H

src/StatFunc.h

@@ -4,62 +4,74 @@
 
 #pragma once
 
-#include <ostream>
 #include <string>
+#include <ostream>
 
 namespace OpenWifi {
 
-	class RelativeCounter {
-	  public:
-		explicit RelativeCounter(uint64_t iv) {
-			inited = true;
-			LastValue = iv;
-		}
+    class RelativeCounter {
+    public:
+        explicit RelativeCounter(uint64_t iv) {
+            inited = true;
+            LastValue = iv;
+        }
 
-		RelativeCounter() = default;
+        RelativeCounter() = default;
 
-		RelativeCounter &operator=(uint64_t v) {
-			set(v);
-			return *this;
-		}
+        RelativeCounter & operator=(uint64_t v) {
+            set(v);
+            return *this;
+        }
 
-		bool operator==(uint64_t v) const { return v == Value; }
-		bool operator>=(uint64_t v) const { return v >= Value; }
-		bool operator>(uint64_t v) const { return v > Value; }
-		bool operator<=(uint64_t v) const { return v <= Value; }
-		bool operator<(uint64_t v) const { return v < Value; }
+        bool operator==(uint64_t v) const {
+            return v == Value;
+        }
+        bool operator>=(uint64_t v) const {
+            return v >= Value;
+        }
+        bool operator>(uint64_t v) const {
+            return v > Value;
+        }
+        bool operator<=(uint64_t v) const {
+            return v <= Value;
+        }
+        bool operator<(uint64_t v) const {
+            return v < Value;
+        }
 
-		inline uint64_t set(uint64_t v) {
-			if (!inited) {
-				inited = true;
-				LastValue = v;
-				return v;
-			}
+        inline uint64_t set(uint64_t v) {
+            if(!inited) {
+                inited=true;
+                LastValue=v;
+                return v;
+            }
 
-			if (v >= LastValue) {
-				Value = (v - LastValue);
-				LastValue = v;
-				return Value;
-			} else {
-				Value = v;
-				LastValue = v;
-				return Value;
-			}
-		}
+            if(v>=LastValue) {
+                Value = (v-LastValue);
+                LastValue = v;
+                return Value;
+            } else {
+                Value = v ;
+                LastValue = v;
+                return Value;
+            }
+        }
 
-		[[nodiscard]] inline uint64_t get() const { return Value; }
+        [[nodiscard]] inline uint64_t get() const {
+            return Value;
+        }
 
-		friend std::ostream &operator<<(std::ostream &os, const RelativeCounter &rc);
+        friend std::ostream& operator<<(std::ostream& os, const RelativeCounter& rc);
 
-	  private:
-		uint64_t Value = 0;
-		bool inited = false;
-		uint64_t LastValue = 0;
-	};
+    private:
+        uint64_t Value = 0 ;
+        bool inited = false;
+        uint64_t LastValue=0;
+    };
 
-	std::ostream &operator<<(std::ostream &os, const RelativeCounter &rc) {
-		os << rc.get();
-		return os;
-	}
+    std::ostream & operator<<(std::ostream &os, const RelativeCounter &rc) {
+        os << rc.get() ;
+        return os;
+    }
 
-} // namespace OpenWifi
+}

src/StateReceiver.cpp

@@ -5,89 +5,89 @@
 #include "StateReceiver.h"
 #include "VenueWatcher.h"
 #include "fmt/core.h"
-#include "framework/KafkaManager.h"
-#include "framework/KafkaTopics.h"
 
 namespace OpenWifi {
 
-	int StateReceiver::Start() {
-		Running_ = true;
-		Types::TopicNotifyFunction F = [this](const std::string &Key, const std::string &Payload) {
-			this->StateReceived(Key, Payload);
-		};
-		StateWatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::STATE, F);
-		Worker_.start(*this);
-		return 0;
-	};
+    int StateReceiver::Start() {
+        Running_ = true;
+        Types::TopicNotifyFunction F = [this](const std::string &Key, const std::string &Payload) { this->StateReceived(Key,Payload); };
+        StateWatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::STATE, F);
+        Worker_.start(*this);
+        return 0;
+    };
 
-	void StateReceiver::Stop() {
-		Running_ = false;
-		KafkaManager()->UnregisterTopicWatcher(KafkaTopics::STATE, StateWatcherId_);
-		Queue_.wakeUpAll();
-		Worker_.join();
-	};
+    void StateReceiver::Stop() {
+        Running_ = false;
+        KafkaManager()->UnregisterTopicWatcher(KafkaTopics::STATE, StateWatcherId_);
+        Queue_.wakeUpAll();
+        Worker_.join();
+    };
 
-	void StateReceiver::run() {
-		Poco::AutoPtr<Poco::Notification> Note(Queue_.waitDequeueNotification());
-		Utils::SetThreadName("dev-state");
-		while (Note && Running_) {
-			auto Msg = dynamic_cast<StateMessage *>(Note.get());
-			if (Msg != nullptr) {
-				try {
-					nlohmann::json msg = nlohmann::json::parse(Msg->Payload());
-					if (msg.contains(uCentralProtocol::PAYLOAD)) {
-						auto payload = msg[uCentralProtocol::PAYLOAD];
-						if (payload.contains("state") && payload.contains("serial")) {
-							auto serialNumber = payload["serial"].get<std::string>();
-							auto state = std::make_shared<nlohmann::json>(payload["state"]);
-							std::lock_guard G(Mutex_);
-							auto it = Notifiers_.find(Utils::SerialNumberToInt(serialNumber));
-							if (it != Notifiers_.end()) {
-								for (const auto &i : it->second) {
-									i->PostState(Utils::SerialNumberToInt(serialNumber), state);
-								}
-							}
-						}
-					}
-				} catch (const Poco::Exception &E) {
-					Logger().log(E);
-				} catch (...) {
-				}
-			} else {
-			}
-			Note = Queue_.waitDequeueNotification();
-		}
-	}
+    void StateReceiver::run() {
+        Poco::AutoPtr<Poco::Notification>	Note(Queue_.waitDequeueNotification());
+        Utils::SetThreadName("dev-state");
+        while(Note && Running_) {
+            auto Msg = dynamic_cast<StateMessage *>(Note.get());
+            if(Msg!= nullptr) {
+                try {
+                    nlohmann::json msg = nlohmann::json::parse(Msg->Payload());
+                    if (msg.contains(uCentralProtocol::PAYLOAD)) {
+                        auto payload = msg[uCentralProtocol::PAYLOAD];
+                        if (payload.contains("state") && payload.contains("serial")) {
+                            auto serialNumber = payload["serial"].get<std::string>();
+                            auto state = std::make_shared<nlohmann::json>(payload["state"]);
+                            std::lock_guard     G(Mutex_);
+                            auto it = Notifiers_.find(Utils::SerialNumberToInt(serialNumber));
+                            if(it!=Notifiers_.end()) {
+                                for(const auto &i:it->second) {
+                                    i->PostState(Utils::SerialNumberToInt(serialNumber), state);
+                                }
+                            }
+                        }
+                    }
+                } catch (const Poco::Exception &E) {
+                    Logger().log(E);
+                } catch (...) {
 
-	void StateReceiver::StateReceived(const std::string &Key, const std::string &Payload) {
-		std::lock_guard G(Mutex_);
-		poco_trace(Logger(), fmt::format("Device({}): State message.", Key));
-		Queue_.enqueueNotification(new StateMessage(Key, Payload));
-	}
+                }
+            } else {
 
-	void StateReceiver::Register(uint64_t SerialNumber, VenueWatcher *VW) {
-		std::lock_guard G(Mutex_);
-		auto it = Notifiers_.find(SerialNumber);
-		if (it == Notifiers_.end()) {
-			std::list<VenueWatcher *> L;
-			L.push_back(VW);
-			Notifiers_[SerialNumber] = L;
-		} else {
-			it->second.push_back(VW);
-		}
-	}
+            }
+            Note = Queue_.waitDequeueNotification();
+        }
+    }
 
-	void StateReceiver::DeRegister(uint64_t SerialNumber, VenueWatcher *VW) {
-		std::lock_guard G(Mutex_);
-		auto it = Notifiers_.find(SerialNumber);
-		if (it == Notifiers_.end())
-			return;
-		for (auto i = it->second.begin(); i != it->second.end(); i++) {
-			if (*i == VW) {
-				it->second.erase(i);
-				break;
-			}
-		}
-	}
+    void StateReceiver::StateReceived( const std::string & Key, const std::string & Payload) {
+        std::lock_guard G(Mutex_);
+        poco_debug(Logger(),fmt::format("Device({}): State message.", Key));
+        Queue_.enqueueNotification( new StateMessage(Key,Payload));
+    }
 
-} // namespace OpenWifi
+    void StateReceiver::Register(uint64_t SerialNumber, VenueWatcher *VW) {
+        std::lock_guard     G(Mutex_);
+        auto it = Notifiers_.find(SerialNumber);
+        if(it == Notifiers_.end()) {
+            std::list<VenueWatcher *> L;
+            L.push_back(VW);
+            Notifiers_[SerialNumber] = L;
+        } else {
+            it->second.push_back(VW);
+        }
+    }
+
+    void StateReceiver::DeRegister(uint64_t SerialNumber, VenueWatcher *VW) {
+        std::lock_guard     G(Mutex_);
+        auto it = Notifiers_.find(SerialNumber);
+        if(it==Notifiers_.end())
+            return;
+        for(auto i=it->second.begin();i!=it->second.end();i++) {
+            if(*i==VW) {
+                it->second.erase(i);
+                break;
+            }
+        }
+    }
+
+
+
+}

src/StateReceiver.h

@@ -3,51 +3,52 @@
 //
 
 #pragma once
-#include "Poco/Notification.h"
-#include "Poco/NotificationQueue.h"
-#include "framework/SubSystemServer.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
-	class StateMessage : public Poco::Notification {
-	  public:
-		explicit StateMessage(const std::string &Key, const std::string &Payload)
-			: Key_(Key), Payload_(Payload) {}
-		const std::string &Key() { return Key_; }
-		const std::string &Payload() { return Payload_; }
+    class StateMessage : public Poco::Notification {
+    public:
+        explicit StateMessage(const std::string &Key, const std::string &Payload ) :
+                Key_(Key),
+                Payload_(Payload) {}
+        const std::string & Key() { return Key_; }
+        const std::string & Payload() { return Payload_; }
+    private:
+        std::string     Key_;
+        std::string     Payload_;
+    };
 
-	  private:
-		std::string Key_;
-		std::string Payload_;
-	};
+    class VenueWatcher;
 
-	class VenueWatcher;
+    class StateReceiver : public SubSystemServer, Poco::Runnable {
+    public:
 
-	class StateReceiver : public SubSystemServer, Poco::Runnable {
-	  public:
-		static auto instance() {
-			static auto instance_ = new StateReceiver;
-			return instance_;
-		}
+        static auto instance() {
+            static auto instance_ = new StateReceiver;
+            return instance_;
+        }
 
-		int Start() override;
-		void Stop() override;
-		void StateReceived(const std::string &Key, const std::string &Payload);
-		void run() override;
-		void Register(uint64_t SerialNumber, VenueWatcher *VW);
-		void DeRegister(uint64_t SerialNumber, VenueWatcher *VW);
+        int Start() override;
+        void Stop() override;
+        void StateReceived( const std::string & Key, const std::string & Payload);
+        void run() override;
+        void Register(uint64_t SerialNumber, VenueWatcher *VW);
+        void DeRegister(uint64_t SerialNumber, VenueWatcher *VW);
 
-	  private:
-		// map of mac(as int), list of (id,func)
-		std::map<uint64_t, std::list<VenueWatcher *>> Notifiers_;
-		uint64_t StateWatcherId_ = 0;
-		Poco::NotificationQueue Queue_;
-		Poco::Thread Worker_;
-		std::atomic_bool Running_ = false;
+    private:
+        // map of mac(as int), list of (id,func)
+        std::map<uint64_t , std::list< VenueWatcher * >>   Notifiers_;
+        uint64_t                                StateWatcherId_=0;
+        Poco::NotificationQueue                 Queue_;
+        Poco::Thread                            Worker_;
+        std::atomic_bool                        Running_=false;
 
-		StateReceiver() noexcept
-			: SubSystemServer("StatsReceiver", "STATS-RECEIVER", "stats.receiver") {}
-	};
+        StateReceiver() noexcept:
+                SubSystemServer("StatsReceiver", "STATS-RECEIVER", "stats.receiver")
+                {
+                }
+    };
 
-	inline auto StateReceiver() { return StateReceiver::instance(); }
+    inline auto StateReceiver() { return StateReceiver::instance(); }
 
-} // namespace OpenWifi
+}

src/StorageService.cpp

@@ -8,97 +8,85 @@
 
 #include "StorageService.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
-#include "fmt/format.h"
-#include "framework/MicroServiceFuncs.h"
-#include "framework/utils.h"
 
 namespace OpenWifi {
 
-	int Storage::Start() {
-		poco_notice(Logger(), "Starting...");
-		std::lock_guard Guard(Mutex_);
+    int Storage::Start() {
+		std::lock_guard		Guard(Mutex_);
 
 		StorageClass::Start();
 
-		BoardsDB_ = std::make_unique<OpenWifi::BoardsDB>(dbType_, *Pool_, Logger());
-		TimePointsDB_ = std::make_unique<OpenWifi::TimePointDB>(dbType_, *Pool_, Logger());
-		WifiClientHistoryDB_ =
-			std::make_unique<OpenWifi::WifiClientHistoryDB>(dbType_, *Pool_, Logger());
+        BoardsDB_ = std::make_unique<OpenWifi::BoardsDB>(dbType_,*Pool_, Logger());
+        TimePointsDB_ = std::make_unique<OpenWifi::TimePointDB>(dbType_,*Pool_, Logger());
+        WifiClientHistoryDB_ = std::make_unique<OpenWifi::WifiClientHistoryDB>(dbType_,*Pool_, Logger());
 
-		TimePointsDB_->Create();
-		BoardsDB_->Create();
-		WifiClientHistoryDB_->Create();
+        TimePointsDB_->Create();
+        BoardsDB_->Create();
+        WifiClientHistoryDB_->Create();
 
-		PeriodicCleanup_ = MicroServiceConfigGetInt("storage.cleanup.interval", 6 * 60 * 60);
-		if (PeriodicCleanup_ < 1 * 60 * 60)
-			PeriodicCleanup_ = 1 * 60 * 60;
+        PeriodicCleanup_ = MicroService::instance().ConfigGetInt("storage.cleanup.interval", 6*60*60);
+        if(PeriodicCleanup_<1*60*60)
+            PeriodicCleanup_ = 1*60*60;
 
-		Updater_.start(*this);
+        Updater_.start(*this);
 
-		TimerCallback_ = std::make_unique<Poco::TimerCallback<Storage>>(*this, &Storage::onTimer);
-		Timer_.setStartInterval(60 * 1000);						   // first run in 20 seconds
-		Timer_.setPeriodicInterval((long)PeriodicCleanup_ * 1000); // 1 hours
-		Timer_.start(*TimerCallback_);
+        TimerCallback_ = std::make_unique<Poco::TimerCallback<Storage>>(*this,&Storage::onTimer);
+        Timer_.setStartInterval( 60 * 1000);  // first run in 20 seconds
+        Timer_.setPeriodicInterval((long)PeriodicCleanup_ * 1000); // 1 hours
+        Timer_.start(*TimerCallback_);
 
-		return 0;
+        return 0;
+    }
+
+    void Storage::onTimer([[maybe_unused]] Poco::Timer &timer) {
+        BoardsDB::RecordVec BoardList;
+        uint64_t start = 0 ;
+        bool done = false;
+        const uint64_t batch=100;
+        Logger().information("Starting cleanup of TimePoint Database");
+        while(!done) {
+            if(!BoardsDB().GetRecords(start,batch,BoardList)) {
+                for(const auto &board:BoardList) {
+                    for(const auto &venue:board.venueList) {
+                        auto now = OpenWifi::Now();
+                        auto lower_bound = now - venue.retention;
+                        Logger().information(fmt::format("Removing old records for board '{}'",board.info.name));
+                        BoardsDB().DeleteRecords(fmt::format(" boardId='{}' and timestamp<{}", board.info.id, lower_bound));
+                    }
+                }
+            }
+            done = (BoardList.size() < batch);
+        }
+
+        auto MaxDays = MicroService::instance().ConfigGetInt("wificlient.age.limit",14);
+        auto LowerDate = OpenWifi::Now() - (MaxDays*60*60*24);
+        Logger().information(fmt::format("Removing WiFi Clients history older than {} days.", MaxDays));
+        StorageService()->WifiClientHistoryDB().DeleteRecords(fmt::format(" timestamp<{} ", LowerDate));
+        Logger().information(fmt::format("Done cleanup of databases. Next run in {} seconds.", PeriodicCleanup_));
+    }
+
+    void Storage::run() {
+        Utils::SetThreadName("strg-updtr");
+	    Running_ = true ;
+	    bool FirstRun=true;
+	    long Retry = 2000;
+	    while(Running_) {
+	        if(!FirstRun)
+	            Poco::Thread::trySleep(Retry);
+	        if(!Running_)
+	            break;
+            FirstRun = false;
+            Retry = 2000;
+	    }
 	}
 
-	void Storage::onTimer([[maybe_unused]] Poco::Timer &timer) {
-		BoardsDB::RecordVec BoardList;
-		uint64_t start = 0;
-		bool done = false;
-		const uint64_t batch = 100;
-		poco_information(Logger(), "Starting cleanup of TimePoint Database");
-		while (!done) {
-			if (!BoardsDB().GetRecords(start, batch, BoardList)) {
-				for (const auto &board : BoardList) {
-					for (const auto &venue : board.venueList) {
-						auto now = Utils::Now();
-						auto lower_bound = now - venue.retention;
-						poco_information(
-							Logger(),
-							fmt::format("Removing old records for board '{}'", board.info.name));
-						BoardsDB().DeleteRecords(fmt::format(" boardId='{}' and timestamp<{}",
-															 board.info.id, lower_bound));
-					}
-				}
-			}
-			done = (BoardList.size() < batch);
-		}
-
-		auto MaxDays = MicroServiceConfigGetInt("wificlient.age.limit", 14);
-		auto LowerDate = Utils::Now() - (MaxDays * 60 * 60 * 24);
-		poco_information(Logger(),
-						 fmt::format("Removing WiFi Clients history older than {} days.", MaxDays));
-		StorageService()->WifiClientHistoryDB().DeleteRecords(
-			fmt::format(" timestamp<{} ", LowerDate));
-		poco_information(Logger(), fmt::format("Done cleanup of databases. Next run in {} seconds.",
-											   PeriodicCleanup_));
-	}
-
-	void Storage::run() {
-		Utils::SetThreadName("strg-updtr");
-		Running_ = true;
-		bool FirstRun = true;
-		long Retry = 2000;
-		while (Running_) {
-			if (!FirstRun)
-				Poco::Thread::trySleep(Retry);
-			if (!Running_)
-				break;
-			FirstRun = false;
-			Retry = 2000;
-		}
-	}
-
-	void Storage::Stop() {
-		poco_notice(Logger(), "Stopping...");
-		Running_ = false;
-		Timer_.stop();
-		Updater_.wakeUp();
-		Updater_.join();
-		poco_notice(Logger(), "Stopped...");
-	}
-} // namespace OpenWifi
+    void Storage::Stop() {
+	    Running_=false;
+        Timer_.stop();
+	    Updater_.wakeUp();
+	    Updater_.join();
+        Logger().notice("Stopping.");
+    }
+}
 
 // namespace

src/StorageService.h

@@ -8,37 +8,39 @@
 
 #pragma once
 
+#include "framework/MicroService.h"
 #include "framework/StorageClass.h"
 #include "storage/storage_boards.h"
 #include "storage/storage_timepoints.h"
 #include "storage/storage_wificlients.h"
 
 namespace OpenWifi {
-	class Storage : public StorageClass, Poco::Runnable {
-	  public:
-		static auto instance() {
-			static auto instance_ = new Storage;
-			return instance_;
-		}
+    class Storage : public StorageClass, Poco::Runnable {
+        public:
+            static auto instance() {
+                static auto instance_ = new Storage;
+                return instance_;
+            }
 
-		int Start() override;
-		void Stop() override;
+            int 	Start() override;
+            void 	Stop() override;
 
-		void run() final;
-		auto &BoardsDB() { return *BoardsDB_; };
-		auto &TimePointsDB() { return *TimePointsDB_; };
-		auto &WifiClientHistoryDB() { return *WifiClientHistoryDB_; };
-		void onTimer(Poco::Timer &timer);
+            void run() final;
+            auto & BoardsDB() { return *BoardsDB_; };
+            auto & TimePointsDB() { return *TimePointsDB_; };
+            auto & WifiClientHistoryDB() { return *WifiClientHistoryDB_; };
+            void onTimer(Poco::Timer & timer);
+
+          private:
+            std::unique_ptr<OpenWifi::BoardsDB>                 BoardsDB_;
+            std::unique_ptr<OpenWifi::TimePointDB>              TimePointsDB_;
+            std::unique_ptr<OpenWifi::WifiClientHistoryDB>      WifiClientHistoryDB_;
+            Poco::Thread                                        Updater_;
+            std::atomic_bool                                    Running_=false;
+            Poco::Timer                                         Timer_;
+            std::unique_ptr<Poco::TimerCallback<Storage>>       TimerCallback_;
+            uint64_t                                            PeriodicCleanup_=6*60*60;
+   };
+   inline auto StorageService() { return Storage::instance(); }
+}  // namespace
 
-	  private:
-		std::unique_ptr<OpenWifi::BoardsDB> BoardsDB_;
-		std::unique_ptr<OpenWifi::TimePointDB> TimePointsDB_;
-		std::unique_ptr<OpenWifi::WifiClientHistoryDB> WifiClientHistoryDB_;
-		Poco::Thread Updater_;
-		std::atomic_bool Running_ = false;
-		Poco::Timer Timer_;
-		std::unique_ptr<Poco::TimerCallback<Storage>> TimerCallback_;
-		uint64_t PeriodicCleanup_ = 6 * 60 * 60;
-	};
-	inline auto StorageService() { return Storage::instance(); }
-} // namespace OpenWifi

src/VenueCoordinator.cpp

@@ -3,207 +3,175 @@
 //
 
 #include "VenueCoordinator.h"
-#include "StorageService.h"
 #include "VenueWatcher.h"
-#include "fmt/core.h"
-#include "framework/MicroServiceFuncs.h"
+#include "StorageService.h"
 #include "sdks/SDK_prov.h"
+#include "fmt/core.h"
 
 namespace OpenWifi {
 
-	int VenueCoordinator::Start() {
-		poco_notice(Logger(), "Starting...");
-		GetBoardList();
-		Worker_.start(*this);
+    int VenueCoordinator::Start() {
+        GetBoardList();
+        Worker_.start(*this);
+        return 0;
+    }
 
-		ReconcileTimerCallback_ = std::make_unique<Poco::TimerCallback<VenueCoordinator>>(
-			*this, &VenueCoordinator::onReconcileTimer);
-		ReconcileTimerTimer_.setStartInterval(3 * 60 * 1000);
-		ReconcileTimerTimer_.setPeriodicInterval(3 * 60 * 1000); // 1 hours
-		ReconcileTimerTimer_.start(*ReconcileTimerCallback_, MicroServiceTimerPool());
+    void VenueCoordinator::GetBoardList() {
+        BoardsToWatch_.clear();
+        auto F = [&](const AnalyticsObjects::BoardInfo &B) ->bool {
+            BoardsToWatch_.insert(B);
+            // Logger().information(fmt::format("Starting watch for {}.", B.info.name));
+            return true;
+        };
+        StorageService()->BoardsDB().Iterate(F);
+    }
 
-		return 0;
-	}
+    void VenueCoordinator::Stop() {
+        Running_=false;
+        Worker_.wakeUp();
+        Worker_.wakeUp();
+        Worker_.join();
+    }
 
-	void VenueCoordinator::onReconcileTimer([[maybe_unused]] Poco::Timer &timer) {
-		std::lock_guard G(Mutex_);
-		Utils::SetThreadName("brd-refresh");
+    void VenueCoordinator::run() {
+        Utils::SetThreadName("venue-coord");
+        Running_=true;
+        while(Running_) {
+            Poco::Thread::trySleep(20000);
+            if(!Running_)
+                break;
 
-		poco_information(Logger(), "Starting to reconcile board information.");
-		for (const auto &[board_id, watcher] : Watchers_) {
-			poco_information(Logger(), fmt::format("Updating: {}", board_id));
-			UpdateBoard(board_id);
-		}
-		poco_information(Logger(), "Finished reconciling board information.");
-	}
+            std::lock_guard         G(Mutex_);
+            GetBoardList();
 
-	void VenueCoordinator::GetBoardList() {
-		BoardsToWatch_.clear();
-		auto F = [&](const AnalyticsObjects::BoardInfo &B) -> bool {
-			BoardsToWatch_.insert(B);
-			// poco_information(Logger(),fmt::format("Starting watch for {}.", B.info.name));
-			return true;
-		};
-		StorageService()->BoardsDB().Iterate(F);
-	}
+            if(!BoardsToWatch_.empty()) {
+                for(const auto &board_to_start:BoardsToWatch_) {
+                    bool VenueExists = true;
+                    if(!Watching(board_to_start.info.id)) {
+                        StartBoard(board_to_start);
+                    } else if(SDK::Prov::Venue::Exists(nullptr,board_to_start.venueList[0].id,VenueExists) && !VenueExists) {
+                        RetireBoard(board_to_start);
+                    }
+                }
+            }
+        }
+    }
 
-	void VenueCoordinator::Stop() {
-		poco_notice(Logger(), "Stopping...");
-		Running_ = false;
-		Worker_.wakeUp();
-		Worker_.wakeUp();
-		Worker_.join();
-		poco_notice(Logger(), "Stopped...");
-	}
+    void VenueCoordinator::RetireBoard(const AnalyticsObjects::BoardInfo &B) {
+        Logger().error(fmt::format("Venue board '{}' is no longer in the system. Retiring its associated board.", B.venueList[0].name));
+        StopBoard(B.info.id);
+        StorageService()->BoardsDB().DeleteRecord("id",B.info.id);
+        StorageService()->TimePointsDB().DeleteRecords(fmt::format(" boardId='{}' ", B.info.id));
+    }
 
-	void VenueCoordinator::run() {
-		Utils::SetThreadName("venue-coord");
-		Running_ = true;
-		while (Running_) {
-			Poco::Thread::trySleep(60000);
-			if (!Running_)
-				break;
+    bool VenueCoordinator::GetDevicesForBoard(const AnalyticsObjects::BoardInfo &B, std::vector<uint64_t> & Devices, bool & VenueExists) {
+        ProvObjects::VenueDeviceList    VDL;
 
-			std::lock_guard G(Mutex_);
-			GetBoardList();
+        if(SDK::Prov::Venue::GetDevices(nullptr,B.venueList[0].id,B.venueList[0].monitorSubVenues, VDL, VenueExists)) {
+            Devices.clear();
+            for (const auto &device: VDL.devices) {
+                Devices.push_back(Utils::SerialNumberToInt(device));
+            }
+            std::sort(Devices.begin(), Devices.end());
+            auto LastDevice = std::unique(Devices.begin(), Devices.end());
+            Devices.erase(LastDevice, Devices.end());
+            return true;
+        }
 
-			if (!BoardsToWatch_.empty()) {
-				for (const auto &board_to_start : BoardsToWatch_) {
-					bool VenueExists = true;
-					if (!Watching(board_to_start.info.id)) {
-						StartBoard(board_to_start);
-					} else if (SDK::Prov::Venue::Exists(nullptr, board_to_start.venueList[0].id,
-														VenueExists) &&
-							   !VenueExists) {
-						RetireBoard(board_to_start);
-					}
-				}
-			}
-		}
-	}
+        if(!VenueExists) {
+            RetireBoard(B);
+        }
 
-	void VenueCoordinator::RetireBoard(const AnalyticsObjects::BoardInfo &B) {
-		Logger().error(fmt::format(
-			"Venue board '{}' is no longer in the system. Retiring its associated board.",
-			B.venueList[0].name));
-		StopBoard(B.info.id);
-		StorageService()->BoardsDB().DeleteRecord("id", B.info.id);
-		StorageService()->TimePointsDB().DeleteRecords(fmt::format(" boardId='{}' ", B.info.id));
-	}
+        return false;
+    }
 
-	bool VenueCoordinator::GetDevicesForBoard(const AnalyticsObjects::BoardInfo &B,
-											  std::vector<uint64_t> &Devices, bool &VenueExists) {
-		ProvObjects::VenueDeviceList VDL;
+    bool VenueCoordinator::StartBoard(const AnalyticsObjects::BoardInfo &B) {
+        if(B.venueList.empty())
+            return true;
 
-		if (SDK::Prov::Venue::GetDevices(nullptr, B.venueList[0].id,
-										 B.venueList[0].monitorSubVenues, VDL, VenueExists)) {
-			Devices.clear();
-			for (const auto &device : VDL.devices) {
-				Devices.push_back(Utils::SerialNumberToInt(device));
-			}
-			std::sort(Devices.begin(), Devices.end());
-			auto LastDevice = std::unique(Devices.begin(), Devices.end());
-			Devices.erase(LastDevice, Devices.end());
-			return true;
-		}
+        bool VenueExists=true;
+        std::vector<uint64_t>   Devices;
+        if(GetDevicesForBoard(B,Devices,VenueExists)) {
+            std::lock_guard G(Mutex_);
+            ExistingBoards_[B.info.id] = Devices;
+            Watchers_[B.info.id] = std::make_shared<VenueWatcher>(B.info.id, B.venueList[0].id, Logger(), Devices);
+            Watchers_[B.info.id]->Start();
+            Logger().information(fmt::format("Started board {} for venue {}", B.info.name,B.venueList[0].id ));
+            return true;
+        }
 
-		if (!VenueExists) {
-			RetireBoard(B);
-		}
+        if(!VenueExists) {
+            RetireBoard(B);
+            return false;
+        }
 
-		return false;
-	}
+        Logger().information(fmt::format("Could not start board {}",B.info.name));
+        return false;
+    }
 
-	bool VenueCoordinator::StartBoard(const AnalyticsObjects::BoardInfo &B) {
-		if (B.venueList.empty())
-			return true;
+    void VenueCoordinator::StopBoard(const std::string &id) {
+        std::lock_guard     G(Mutex_);
 
-		bool VenueExists = true;
-		std::vector<uint64_t> Devices;
-		if (GetDevicesForBoard(B, Devices, VenueExists)) {
-			std::lock_guard G(Mutex_);
-			ExistingBoards_[B.info.id] = Devices;
-			Watchers_[B.info.id] =
-				std::make_shared<VenueWatcher>(B.info.id, B.venueList[0].id, Logger(), Devices);
-			Watchers_[B.info.id]->Start();
-			poco_information(Logger(), fmt::format("Started board {} for venue {}", B.info.name,
-												   B.venueList[0].id));
-			return true;
-		}
+        auto it = Watchers_.find(id);
+        if(it!=Watchers_.end()) {
+            it->second->Stop();
+            Watchers_.erase(it);
+        }
+    }
 
-		if (!VenueExists) {
-			RetireBoard(B);
-			return false;
-		}
+    void VenueCoordinator::ModifyBoard(const std::string &id) {
+        AnalyticsObjects::BoardInfo B;
+        if(StorageService()->BoardsDB().GetRecord("id",id,B)) {
+            std::vector<uint64_t>   Devices;
+            bool VenueExists=true;
+            if(GetDevicesForBoard(B,Devices,VenueExists)) {
+                std::lock_guard     G(Mutex_);
+                auto it = ExistingBoards_.find(id);
+                if(it!=ExistingBoards_.end()) {
+                    if(it->second!=Devices) {
+                        auto it2 = Watchers_.find(id);
+                        if(it2!=Watchers_.end())
+                            it2->second->ModifySerialNumbers(Devices);
+                        ExistingBoards_[id] = Devices;
+                        Logger().information(fmt::format("Modified board {}",B.info.name));
+                    } else {
+                        Logger().information(fmt::format("No device changes in board {}",B.info.name));
+                    }
+                }
+                Logger().information(fmt::format("Modified board {}",B.info.name));
+                return;
+            }
 
-		poco_information(Logger(), fmt::format("Could not start board {}", B.info.name));
-		return false;
-	}
+            if(!VenueExists) {
+                RetireBoard(B);
+                return;
+            }
 
-	void VenueCoordinator::StopBoard(const std::string &id) {
-		std::lock_guard G(Mutex_);
+            Logger().information(fmt::format("Could not modify board {}",B.info.name));
+        }
+    }
 
-		auto it = Watchers_.find(id);
-		if (it != Watchers_.end()) {
-			it->second->Stop();
-			Watchers_.erase(it);
-		}
-	}
+    bool VenueCoordinator::Watching(const std::string &id) {
+        std::lock_guard     G(Mutex_);
+        return (ExistingBoards_.find(id) != ExistingBoards_.end());
+    }
 
-	void VenueCoordinator::UpdateBoard(const std::string &id) {
-		AnalyticsObjects::BoardInfo B;
-		if (StorageService()->BoardsDB().GetRecord("id", id, B)) {
-			std::vector<uint64_t> Devices;
-			bool VenueExists = true;
-			if (GetDevicesForBoard(B, Devices, VenueExists)) {
-				std::lock_guard G(Mutex_);
-				auto it = ExistingBoards_.find(id);
-				if (it != ExistingBoards_.end()) {
-					if (it->second != Devices) {
-						auto it2 = Watchers_.find(id);
-						if (it2 != Watchers_.end()) {
-							it2->second->ModifySerialNumbers(Devices);
-						}
-						ExistingBoards_[id] = Devices;
-						poco_information(Logger(), fmt::format("Modified board {}", B.info.name));
-					} else {
-						poco_information(Logger(),
-										 fmt::format("No device changes in board {}", B.info.name));
-					}
-				}
-				return;
-			}
+    void VenueCoordinator::AddBoard(const std::string &id) {
+        std::lock_guard     G(Mutex_);
 
-			if (!VenueExists) {
-				RetireBoard(B);
-				return;
-			}
+        AnalyticsObjects::BoardInfo B;
+        if(StorageService()->BoardsDB().GetRecord("id",id,B))
+            BoardsToWatch_.insert(B);
+        else
+            Logger().information(fmt::format("Board {} does not seem to exist",id));
+    }
 
-			poco_information(Logger(), fmt::format("Could not modify board {}", B.info.name));
-		}
-	}
+    void VenueCoordinator::GetDevices(std::string &id, AnalyticsObjects::DeviceInfoList &DIL) {
+        std::lock_guard     G(Mutex_);
 
-	bool VenueCoordinator::Watching(const std::string &id) {
-		std::lock_guard G(Mutex_);
-		return (ExistingBoards_.find(id) != ExistingBoards_.end());
-	}
-
-	void VenueCoordinator::AddBoard(const std::string &id) {
-		std::lock_guard G(Mutex_);
-
-		AnalyticsObjects::BoardInfo B;
-		if (StorageService()->BoardsDB().GetRecord("id", id, B))
-			BoardsToWatch_.insert(B);
-		else
-			poco_information(Logger(), fmt::format("Board {} does not seem to exist", id));
-	}
-
-	void VenueCoordinator::GetDevices(std::string &id, AnalyticsObjects::DeviceInfoList &DIL) {
-		std::lock_guard G(Mutex_);
-
-		auto it = Watchers_.find(id);
-		if (it != end(Watchers_)) {
-			it->second->GetDevices(DIL.devices);
-		}
-	}
-} // namespace OpenWifi
+        auto it = Watchers_.find(id);
+        if(it!=end(Watchers_)) {
+            it->second->GetDevices(DIL.devices);
+        }
+    }
+}