[WIFI-10236] Fix: image building

Signed-off-by: Dmitry Dunaev <dmitry@opsfleet.com>

.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

@@ -13,7 +13,6 @@ on:
   pull_request:
     branches:
       - main
-      - 'release/*'
 
 defaults:
   run:
@@ -27,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
@@ -40,16 +39,6 @@ jobs:
         registry_user: ucentral
         registry_password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
 
-    - name: Notify on failure via Slack
-      if: failure() && github.ref == 'refs/heads/main'
-      uses: rtCamp/action-slack-notify@v2
-      env:
-        SLACK_USERNAME: GitHub Actions failure notifier
-        SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-        SLACK_COLOR: "${{ job.status }}"
-        SLACK_ICON: https://raw.githubusercontent.com/quintessence/slack-icons/master/images/github-logo-slack-icon.png
-        SLACK_TITLE: Docker build failed for OWFMS service
-
   trigger-testing:
     if: startsWith(github.ref, 'refs/pull/')
     runs-on: ubuntu-latest
@@ -58,11 +47,11 @@ jobs:
     - name: Get base branch name and set as output
       id: get_base_branch
       run: |
-        echo "branch=$(echo ${GITHUB_BASE_REF##*/})" >> $GITHUB_OUTPUT
+        echo ::set-output name=branch::$(echo ${GITHUB_BASE_REF##*/})
-        echo "owgw_branch=$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')" >> $GITHUB_OUTPUT
+        echo ::set-output name=owgw_branch::$(echo ${GITHUB_BASE_REF##*/} | sed 's/main/master/g')
 
     - name: Checkout actions repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         repository: Telecominfraproject/.github
         path: github
@@ -78,26 +67,4 @@ jobs:
         workflow: ow_docker-compose.yml
         token: ${{ secrets.WLAN_TESTING_PAT }}
         ref: master
-        inputs: '{"deployment_version": "${{ env.BASE_BRANCH }}", "owgw_version": "${{ env.OWGW_BASE_BRANCH }}", "owsec_version": "${{ env.BASE_BRANCH }}", "owfms_version": "${{ github.sha }}", "owprov_version": "${{ env.BASE_BRANCH }}", "owanalytics_version": "${{ env.BASE_BRANCH }}", "owsub_version": "${{ env.BASE_BRANCH }}", "microservice": "owfms"}'
+        inputs: '{"owgw_version": "${{ env.OWGW_BASE_BRANCH }}", "owgwui_version": "${{ env.BASE_BRANCH }}", "owsec_version": "${{ env.BASE_BRANCH }}", "owfms_version": "${{ github.sha }}", "owprov_version": "main", "owprovui_version": "main"}'
-
-  trigger-deploy-to-dev:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    needs:
-      - docker
-    steps:
-    - name: Checkout actions repo
-      uses: actions/checkout@v3
-      with:
-        repository: Telecominfraproject/.github
-        path: github
-
-    - name: Trigger deployment of the latest version to dev instance and wait for result
-      uses: ./github/composite-actions/trigger-workflow-and-wait
-      with:
-        owner: Telecominfraproject
-        repo: wlan-testing
-        workflow: ucentralgw-dev-deployment.yaml
-        token: ${{ secrets.WLAN_TESTING_PAT }}
-        ref: master
-        inputs: '{"force_latest": "true"}'

.github/workflows/cleanup.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - main
-      - 'release/*'
     types: [ closed ]
 
 defaults:
@@ -17,10 +16,4 @@ jobs:
     steps:
       - run: |
           export PR_BRANCH_TAG=$(echo ${GITHUB_HEAD_REF#refs/heads/} | tr '/' '-')
-
+          curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owfms/$PR_BRANCH_TAG"
-          if [[ ! $PR_BRANCH_TAG =~ (main|master|release-*) ]]; then
-            echo "PR branch is $PR_BRANCH_TAG, deleting Docker image"
-            curl -s -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/owfms/$PR_BRANCH_TAG"
-          else
-            echo "PR branch is $PR_BRANCH_TAG, not deleting Docker image"
-          fi

.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-ucentralfms/main/openapi/owfms.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

@@ -1,46 +0,0 @@
-name: Release chart package
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  helm-package:
-    runs-on: ubuntu-20.04
-    env:
-      HELM_REPO_URL: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
-      HELM_REPO_USERNAME: ucentral
-    steps:
-      - name: Checkout uCentral assembly chart repo
-        uses: actions/checkout@v2
-        with:
-          path: wlan-cloud-ucentralfms
-
-      - name: Build package
-        working-directory: wlan-cloud-ucentralfms/helm
-        run: |
-          helm plugin install https://github.com/aslafy-z/helm-git --version 0.10.0
-          helm repo add bitnami https://charts.bitnami.com/bitnami
-          helm repo update
-          helm dependency update
-          mkdir dist
-          helm package . -d dist
-
-      - name: Generate GitHub release body
-        working-directory: wlan-cloud-ucentralfms/helm
-        run: |
-          pip3 install yq -q
-          echo "Docker image - tip-tip-wlan-cloud-ucentral.jfrog.io/owfms:$GITHUB_REF_NAME" > release.txt
-          echo "Helm charted may be attached to this release" >> release.txt
-          echo "Deployment artifacts may be found in https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/$GITHUB_REF_NAME" >> release.txt
-
-      - name: Create GitHub release
-        uses: softprops/action-gh-release@v1
-        with:
-          body_path: wlan-cloud-ucentralfms/helm/release.txt
-          files: wlan-cloud-ucentralfms/helm/dist/*

BUILDING.md

@@ -1,122 +0,0 @@
-# Building from source
-In order to build the OWFMS, 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
-
-Building is a 2 part process. The first part is to build a local copy of the framework tailored to your environment. This
-framework is [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/stephb9959/poco). Building
-Poco may take several minutes depending on the platform you are building on.
-
-## Ubuntu
-These instructions have proven to work on Ubuntu 20.4.
-```bash
-sudo apt install git cmake g++ libssl-dev libmariabd-dev unixodbc-dev 
-sudo apt install libpq-dev libaprutil1-dev apache2-dev libboost-all-dev
-sudo apt install librdkafka-dev liblua5.3-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
-
-git clone https://github.com/stephb9959/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-ucentralgw
-cd wlan-cloud-ucentralgw
-mkdir cmake-build
-cd cmake-build
-cmake ..
-make
-```
-
-## Fedora
-The following instructions have proven to work on Fedora 33
-```bash
-sudo yum install cmake g++ openssl-devel unixODBC-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
-
-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
-
-git clone https://github.com/stephb9959/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-ucentralfms
-cd wlan-cloud-ucentralfms
-mkdir cmake-build
-cd cmake-build
-cmake ..
-make
-
-```
-
-## OSX Build
-The following instructions have proven to work on OSX 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
-brew install cmake
-brew install libpq
-brew install mysql-client
-brew install apr
-brew install apr-util
-brew install boost
-brew install yaml-cpp
-brew install postgresql
-brew install unixodbc
-brew install librdkafka
-
-git clone https://github.com/stephb9959/poco
-cd poco
-mkdir cmake-build 
-cd cmake-build
-cmake ..
-cmake --build . --config Release -j
-sudo cmake --build . --target install
-
-git clone https://github.com/stephb9959/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-ucentralfms
-cd wlan-cloud-ucentralfms
-mkdir cmake-build
-cd cmake-build
-cmake ..
-make -j
-```

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owfms VERSION 2.9.0)
+project(owfms VERSION 2.5.0)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -27,25 +27,29 @@ 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()
 
-# set(BUILD_SHARED_LIBS 1)
+add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
-# add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
 
+set(BUILD_SHARED_LIBS 1)
+add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
+
+set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_MULTITHREADED ON)
+set(Boost_USE_STATIC_RUNTIME OFF)
+
+find_package(Boost      REQUIRED system)
 find_package(OpenSSL    REQUIRED)
-find_package(fmt        REQUIRED)
-find_package(ZLIB       REQUIRED)
-find_package(Poco       REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
 find_package(AWSSDK     REQUIRED COMPONENTS s3)
-find_package(ZLIB       REQUIRED)
+find_package(Poco       REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
 
 if(SMALL_BUILD)
     find_package(Poco REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
@@ -60,14 +64,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_compile_options(-Wall -Wextra)
-add_definitions(-DPOCO_LOG_DEBUG="1")
-
-if(ASAN)
-    add_compile_options(-fsanitize=address)
-    add_link_options(-fsanitize=address)
-endif()
-
 add_executable( owfms
         build
         src/ow_version.h.in
@@ -76,55 +72,14 @@ add_executable( owfms
         src/framework/MicroService.h
         src/framework/OpenWifiTypes.h
         src/framework/orm.h
+        src/framework/RESTAPI_errors.h
+        src/framework/RESTAPI_protocol.h
         src/framework/StorageClass.h
-        src/framework/MicroServiceErrorHandler.h
+        src/framework/uCentral_Protocol.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/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_firmwaresHandler.cpp src/RESTAPI/RESTAPI_firmwaresHandler.h
         src/RESTAPI/RESTAPI_firmwareHandler.cpp src/RESTAPI/RESTAPI_firmwareHandler.h
         src/RESTAPI/RESTAPI_historyHandler.cpp src/RESTAPI/RESTAPI_historyHandler.h
@@ -137,6 +92,7 @@ add_executable( owfms
         src/Daemon.cpp src/Daemon.h
         src/StorageService.cpp src/StorageService.h
         src/ManifestCreator.cpp src/ManifestCreator.h
+        src/framework/MicroService.h
         src/NewConnectionHandler.cpp src/NewConnectionHandler.h
         src/LatestFirmwareCache.cpp src/LatestFirmwareCache.h
         src/DeviceCache.cpp src/DeviceCache.h
@@ -146,16 +102,11 @@ add_executable( owfms
         src/NewCommandHandler.cpp src/NewCommandHandler.h
         src/storage/orm_history.cpp src/storage/orm_history.h
         src/storage/orm_firmwares.cpp src/storage/orm_firmwares.h
-        src/storage/orm_deviceInfo.cpp src/storage/orm_deviceInfo.h
+        src/storage/orm_deviceInfo.cpp src/storage/orm_deviceInfo.h)
-        src/RESTAPI/RESTAPI_deviceInformation_handler.cpp
-        src/RESTAPI/RESTAPI_deviceInformation_handler.h)
 
 target_link_libraries(owfms PUBLIC
-        ${Poco_LIBRARIES}
+        ${Poco_LIBRARIES} ${MySQL_LIBRARIES}
-        ${MySQL_LIBRARIES}
+        ${Boost_LIBRARIES}
-        ${ZLIB_LIBRARIES}
+        ${ZLIB_LIBRARIES} ${AWSSDK_LINK_LIBRARIES}
-        ${AWSSDK_LINK_LIBRARIES}
+        CppKafka::cppkafka )
-        fmt::fmt
-        CppKafka::cppkafka
-    )
 

CONFIGURATION.md

@@ -1,241 +0,0 @@
-# OWFMS Configuration
-Here is the list of parameters you can configure in the `owfms.properties` file.
-
-## OWFMS Specific Parameters
-### OWFMS behaviour
-```properties
-firmwaredb.refresh = 86400
-firmwaredb.maxage = 90
-autoupdater.enabled = true
-```
-#### firmwaredb.refresh
-How often to refresh the FMS DB, in seconds. Should never be less than 6 hours. It does take 10-20 minutes to 
-create a refresh. The default is 24 hours. 
-
-#### firmwaredb.maxage
-The maximum age of firmware kept in the DB (in days). Do not go more than 6 months. The default is 3 months.
-
-#### autoupdater.enabled
-The determins if the FMS autoupdates its database. You should leave this to `true`.
-
-
-### S3 information
-The actual data for all the firmware is kept in a TIP bucket. The following parameters allow you to change the bucket.
-You should never need to do this unless you need to implement your own FMS server.
-
-```properties
-s3.bucketname = ucentral-ap-firmware
-s3.region = us-east-1
-s3.secret = *******************************************
-s3.key =  *******************************************
-s3.retry = 60
-s3.bucket.uri = ucentral-ap-firmware.s3.amazonaws.com
-```
-
-#### s3.bucketname
-The S3 bucket name.
-#### s3.region
-The region for this bucket.
-#### s3.secret
-The AWS secret for access to this S3 bucket
-#### s3.key
-The AWS key for access for this S3 bucket
-#### s3.retry = 60
-The AWS retry window in seconds.
-#### s3.bucket.uri = ucentral-ap-firmware.s3.amazonaws.com
-The URI to the S3 bucket
-
-## 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 = $OWFMS_ROOT/certs/restapi-ca.pem
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = 16004
-openwifi.restapi.host.0.cert = $OWFMS_ROOT/certs/restapi-cert.pem
-openwifi.restapi.host.0.key = $OWFMS_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 = $OWFMS_ROOT/certs/restapi-ca.pem
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = 17004
-openwifi.internal.restapi.host.0.cert = $OWFMS_ROOT/certs/restapi-cert.pem
-openwifi.internal.restapi.host.0.key = $OWFMS_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 = $OWFMS_ROOT/certs/restapi-key.pem
-openwifi.service.key.password = mypassword
-openwifi.system.data = $OWFMS_ROOT/data
-openwifi.system.uri.private = https://localhost:17004
-openwifi.system.uri.public = https://ucentral.dpaas.arilia.com:16002
-openwifi.system.uri.ui = https://ucentral-ui.arilia.com
-openwifi.security.restapi.disable = false
-openwifi.system.commandchannel = /tmp/app.ucentralfms
-openwifi.autoprovisioning = true
-```
-#### openwifi.service.key
-From time to time, the microservice must encrypt information. This is the key it should use. You may use the
-same keey as you RESTAPI or your server.
-#### openwifi.service.key.password
-The password for the `openwifi.service.key`
-#### openwifi.system.data
-The location of system data. This path must exist.
-#### openwifi.system.uri.private
-The URI to reach the controller on the internal port.
-#### openwifi.system.uri.public
-The URI to reach the controller from the outside world.
-#### openwifi.system.uri.ui
-The URI of the UI to manage this service
-#### openwifi.security.restapi.disable
-This allows to disable security for internal and external API calls. This should only be used if the controller
-sits behind an application load balancer that will actually do TLS. Setting this to `true` disables security.
-#### openwifi.system.commandchannel
-The UNIX socket command channel used by this service.
-#### openwifi.autoprovisioning
-Allow unknown devices to be provisioned by the system.
-
-### ALB Support
-In order to support an application load balancer health check verification, your need to provide the following parameters.
-```properties
-alb.enable = true
-alb.port = 16104
-```
-
-### Kafka
-The controller use Kafka, like all the other microservices. You must configure the kafka section in order for the
-system to work.
-```properties
-openwifi.kafka.group.id = firmware
-openwifi.kafka.client.id = firmware1
-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 `firmware`
-### 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 = firmware.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 = firmware
-storage.type.postgresql.password = firmware
-storage.type.postgresql.database = firmware
-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 = firmware
-storage.type.postgresql.password = firmware
-storage.type.postgresql.database = firmware
-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 = $OWFMS_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,21 +1,16 @@
-ARG DEBIAN_VERSION=11.5-slim
+FROM alpine:3.15 AS build-base
-ARG POCO_VERSION=poco-tip-v2
-ARG CPPKAFKA_VERSION=tip-v1
 
-FROM debian:$DEBIAN_VERSION AS build-base
+RUN apk add --update --no-cache \
-
+    make cmake g++ git \
-RUN apt-get update && apt-get install --no-install-recommends -y \
+    unixodbc-dev postgresql-dev mariadb-dev \
-    make cmake g++ git curl zip unzip pkg-config \
+    librdkafka-dev boost-dev openssl-dev \
-    libpq-dev libmariadb-dev libmariadbclient-dev-compat \
+    zlib-dev nlohmann-json \
-    librdkafka-dev libboost-all-dev libssl-dev \
+    curl-dev
-    zlib1g-dev ca-certificates libcurl4-openssl-dev libfmt-dev
 
 FROM build-base AS poco-build
 
-ARG POCO_VERSION
+ADD https://api.github.com/repos/stephb9959/poco/git/refs/heads/master version.json
-
+RUN git clone https://github.com/stephb9959/poco /poco
-ADD https://api.github.com/repos/AriliaWireless/poco/git/refs/tags/${POCO_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/poco --branch ${POCO_VERSION} /poco
 
 WORKDIR /poco
 RUN mkdir cmake-build
@@ -26,10 +21,8 @@ RUN cmake --build . --target install
 
 FROM build-base AS cppkafka-build
 
-ARG CPPKAFKA_VERSION
+ADD https://api.github.com/repos/stephb9959/cppkafka/git/refs/heads/master version.json
-
+RUN git clone https://github.com/stephb9959/cppkafka /cppkafka
-ADD https://api.github.com/repos/AriliaWireless/cppkafka/git/refs/tags/${CPPKAFKA_VERSION} version.json
-RUN git clone https://github.com/AriliaWireless/cppkafka --branch ${CPPKAFKA_VERSION} /cppkafka
 
 WORKDIR /cppkafka
 RUN mkdir cmake-build
@@ -38,47 +31,72 @@ RUN cmake ..
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install
 
+FROM build-base AS json-schema-validator-build
+
+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
+
+WORKDIR /json-schema-validator
+RUN mkdir cmake-build
+WORKDIR cmake-build
+RUN cmake ..
+RUN make
+RUN make install
+
+FROM build-base AS aws-sdk-cpp-build
+
+ADD https://api.github.com/repos/aws/aws-sdk-cpp/git/refs/heads/main version.json
+RUN git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp /aws-sdk-cpp
+
+WORKDIR /aws-sdk-cpp
+RUN mkdir cmake-build
+WORKDIR cmake-build
+RUN cmake .. -DBUILD_ONLY="sns;s3" \
+             -DCMAKE_BUILD_TYPE=Release \
+             -DCMAKE_CXX_FLAGS="-Wno-error=stringop-overflow -Wno-error=uninitialized" \
+             -DAUTORUN_UNIT_TESTS=OFF
+RUN cmake --build . --config Release -j8
+RUN cmake --build . --target install
+
 FROM build-base AS owfms-build
 
 ADD CMakeLists.txt build /owfms/
-ADD overlays /owfms/overlays
 ADD cmake /owfms/cmake
 ADD src /owfms/src
 ADD .git /owfms/.git
-ARG VCPKG_VERSION=2022.11.14
-RUN git clone --depth 1 --branch ${VCPKG_VERSION} https://github.com/microsoft/vcpkg && \
-    ./vcpkg/bootstrap-vcpkg.sh && \
-    mkdir /vcpkg/custom-triplets && \
-    cp /vcpkg/triplets/x64-linux.cmake /vcpkg/custom-triplets/x64-linux.cmake && \
-    sed -i 's/set(VCPKG_LIBRARY.*/set(VCPKG_LIBRARY_LINKAGE dynamic)/g' /vcpkg/custom-triplets/x64-linux.cmake && \
-    ./vcpkg/vcpkg install aws-sdk-cpp[s3]:x64-linux json-schema-validator:x64-linux --overlay-triplets=/vcpkg/custom-triplets --overlay-ports=/owfms/overlays
 
 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=json-schema-validator-build /usr/local/include /usr/local/include
+COPY --from=json-schema-validator-build /usr/local/lib /usr/local/lib
+COPY --from=aws-sdk-cpp-build /usr/local/include /usr/local/include
+COPY --from=aws-sdk-cpp-build /usr/local/lib /usr/local/lib
 
 WORKDIR /owfms
 RUN mkdir cmake-build
 WORKDIR /owfms/cmake-build
-RUN cmake -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake ..
+RUN cmake .. \
+          -Dcrypto_LIBRARY=/usr/lib/libcrypto.so \
+          -DBUILD_SHARED_LIBS=ON
 RUN cmake --build . --config Release -j8
 
-FROM debian:$DEBIAN_VERSION
+FROM alpine:3.15
 
 ENV OWFMS_USER=owfms \
     OWFMS_ROOT=/owfms-data \
     OWFMS_CONFIG=/owfms-data
 
-RUN useradd "$OWFMS_USER"
+RUN addgroup -S "$OWFMS_USER" && \
+    adduser -S -G "$OWFMS_USER" "$OWFMS_USER"
 
 RUN mkdir /openwifi
 RUN mkdir -p "$OWFMS_ROOT" "$OWFMS_CONFIG" && \
     chown "$OWFMS_USER": "$OWFMS_ROOT" "$OWFMS_CONFIG"
 
-RUN apt-get update && apt-get install --no-install-recommends -y \
+RUN apk add --update --no-cache librdkafka su-exec gettext ca-certificates bash jq curl \
-    librdkafka++1 gosu gettext ca-certificates bash jq curl wget \
+    mariadb-connector-c libpq unixodbc postgresql-client
-    libmariadb-dev-compat libpq5 postgresql-client libfmt7 sqlite3
 
 COPY readiness_check /readiness_check
 COPY test_scripts/curl/cli /cli
@@ -87,14 +105,14 @@ COPY owfms.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=owfms-build /owfms/cmake-build/owfms /openwifi/owfms
-COPY --from=owfms-build /vcpkg/installed/x64-linux/lib/ /usr/local/lib/
+COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/* /usr/local/lib
-COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib/ /usr/local/lib/
+COPY --from=poco-build /poco/cmake-build/lib/* /usr/local/lib
-COPY --from=poco-build /poco/cmake-build/lib/ /usr/local/lib/
+COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-core/libaws-cpp-sdk-core.so /usr/local/lib
-
+COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-s3/libaws-cpp-sdk-s3.so /usr/local/lib
-RUN ldconfig
+COPY --from=aws-sdk-cpp-build /aws-sdk-cpp/cmake-build/aws-cpp-sdk-sns/libaws-cpp-sdk-sns.so /usr/local/lib
 
 EXPOSE 16004 17004 16104
 

README.md

@@ -1,7 +1,3 @@
-<p align="center">
-    <img src="images/project/logo.svg" width="200"/>
-</p>
-
 # uCentralFMS
 
 ## What is this?
@@ -9,87 +5,215 @@ The uCentralFMS is a micro-service part of the OpenWiFi ecosystem. uCentralFMS i
 to facilitate the task of upgrade and maintaining the proper firmware for all the devices 
 used in your OpenWiFi solution. You may either [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-ucentralfms/).
-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-ucentralfms/main/openapi/owfms.yaml)) to get interactive docs page.
-
 ## Building
-To build the microservice from source, please follow the instructions in [here](./BUILDING.md)
+In order to build the uCentralFMS, 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
 
-## Docker
+Building is a 2 part process. The first part is to build a local copy of the framework tailored to your environment. This
-To use the CLoudSDK deployment please follow [here](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy)
+framework is [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/stephb9959/poco). Building
+Poco may take several minutes depending on the platform you are building on.
+
+### Ubuntu
+These instructions have proven to work on Ubuntu 20.4.
+```
+sudo apt install git cmake g++ libssl-dev libmariabd-dev unixodbc-dev 
+sudo apt install libpq-dev libaprutil1-dev apache2-dev libboost-all-dev
+sudo apt install librdkafka-dev liblua5.3-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
+
+git clone https://github.com/stephb9959/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-ucentralgw
+cd wlan-cloud-ucentralgw
+mkdir cmake-build
+cd cmake-build
+cmake ..
+make
+```
+
+### Fedora
+The following instructions have proven to work on Fedora 33
+```
+sudo yum install cmake g++ openssl-devel unixODBC-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
+
+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
+
+git clone https://github.com/stephb9959/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-ucentralfms
+cd wlan-cloud-ucentralfms
+mkdir cmake-build
+cd cmake-build
+cmake ..
+make
+
+```
+
+### OSX Build
+The following instructions have proven to work on OSX 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/).
+```
+brew install openssl
+brew install cmake
+brew install libpq
+brew install mysql-client
+brew install apr
+brew install apr-util
+brew install boost
+brew install yaml-cpp
+brew install postgresql
+brew install unixodbc
+brew install librdkafka
+
+git clone https://github.com/stephb9959/poco
+cd poco
+mkdir cmake-build 
+cd cmake-build
+cmake ..
+cmake --build . --config Release -j
+sudo cmake --build . --target install
+
+git clone https://github.com/stephb9959/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-ucentralfms
+cd wlan-cloud-ucentralfms
+mkdir cmake-build
+cd cmake-build
+cmake ..
+make -j
+```
+
+### After completing the build
+After completing the build, you can remove the Poco source as it is no longer needed.
 
 #### Expected directory layout
-From the directory where your cloned source is, you will need to create the `certs`, `logs`, and `uploads` directories.
+From the directory where your cloned source is, you will need to create the `certs`, `logs`, and `data`.
-```bash
+```shell
 mkdir certs
-mkdir certs/cas
 mkdir logs
-mkdir uploads
+mkdir data
-```
-You should now have the following:
-```text
---+-- certs
-  |   +--- cas
-  +-- cmake
-  +-- cmake-build
-  +-- logs
-  +-- src
-  +-- test_scripts
-  +-- openapi
-  +-- uploads
-  +-- owsec.properties
 ```
 
-### Certificate
+### Certificates
-The OWFMS uses a certificate to provide security for the REST API Certificate to secure the Northbound API.
+Love'em of hate'em, we gotta use'em. So we tried to make this as easy as possible for you.
 
 #### The `certs` directory
 For all deployments, you will need the following `certs` directory, populated with the proper files.
 
-```text
+```asm
-certs ---+--- restapi-ca.pem
+certs ---+--- 
+         +--- restapi-ca.pem
          +--- restapi-cert.pem
          +--- restapi-key.pem
 ```
 
-## Firewall Considerations
+### Configuration
-| Port  | Description                                   | Configurable |
+The configuration is kep in the file `owfms.properties`. This is a text file read by the service at startup time.
-|:------|:----------------------------------------------|:------------:|
-| 16003 | Default port for REST API Access to the OWFMS |     yes      |
 
-### Environment variables
+#### Basic configuration
-The following environment variables should be set from the root directory of the service. They tell the OWGW process where to find
+You must set the environment variables:
-the configuration and the root directory.
+- OWFMS_ROOT: represents where the root of the installation is for this service.
-```bash
+- OWFMS_CONFIG: represents the path where the configuration is kept.
-export OWGW_ROOT=`pwd`
+
-export OWGW_CONFIG=`pwd`
+#### The file section
+#### RESTAPI
+```json
+openwifi.restapi.host.0.backlog = 100
+openwifi.restapi.host.0.security = relaxed
+openwifi.restapi.host.0.rootca = $OWFMS_ROOT/certs/restapi-ca.pem
+openwifi.restapi.host.0.address = *
+openwifi.restapi.host.0.port = 16004
+openwifi.restapi.host.0.cert = $OWFMS_ROOT/certs/restapi-cert.pem
+openwifi.restapi.host.0.key = $OWFMS_ROOT/certs/restapi-key.pem
+openwifi.restapi.host.0.key.password = mypassword
 ```
-You can run the shell script `set_env.sh` from the microservice root.
+Of importance are the `.port` which should point to the port used.
 
-### OWFMS Service Configuration
+#### Internal microservice interface
-The configuration is kept in a file called `owfms.properties`. To understand the content of this file,
+```json
-please look [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralfms/blob/main/CONFIGURATION.md)
+openwifi.internal.restapi.host.0.backlog = 100
+openwifi.internal.restapi.host.0.security = relaxed
+openwifi.internal.restapi.host.0.rootca = $OWFMS_ROOT/certs/restapi-ca.pem
+openwifi.internal.restapi.host.0.address = *
+openwifi.internal.restapi.host.0.port = 17004
+openwifi.internal.restapi.host.0.cert = $OWFMS_ROOT/certs/restapi-cert.pem
+openwifi.internal.restapi.host.0.key = $OWFMS_ROOT/certs/restapi-key.pem
+openwifi.internal.restapi.host.0.key.password = mypassword
+```
+You can leave all the default values for this one. 
 
-## Kafka topics
+#### System values
-Toe read more about Kafka, follow the [document](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/KAFKA.md)
+In the following values, you need to change `.uri.public` and `uri.ui`. The `.uri.public` must point to an externally available FQDN to access the service. The `.uri.ui` must point to web server running 
+the UI for the service. `firmwaredb.refresh` tells the service how often to refresh the firmware database in seconds. `firmwaredb.maxage` tells the service how old you
+want to accept release for. This value is in days.
 
-## Contributions
+```json
-We need more contributors. Should you wish to contribute,
+openwifi.service.key = $OWFMS_ROOT/certs/restapi-key.pem
-please follow the [contributions](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/CONTRIBUTING.md) document.
+openwifi.service.key.password = mypassword
+openwifi.system.data = $OWFMS_ROOT/data
+openwifi.system.debug = false
+openwifi.system.uri.private = https://localhost:17004
+openwifi.system.uri.public = https://ucentral.dpaas.arilia.com:16004
+openwifi.system.commandchannel = /tmp/app.owfms
+openwifi.system.uri.ui = ucentral-ui.arilia.com
+firmwaredb.refresh = 1800
+firmwaredb.maxage = 90
+```
 
-## Pull Requests
+#### S3 configuration
-Please create a branch with the Jira addressing the issue you are fixing or the feature you are implementing.
+The service mua read the information about firmware from an Amazon S3 Bucket. You need to replace `s3.secret` and `s3.key` with your own. 
-Create a pull-request from the branch into master.
 
-## Additional OWSDK Microservices
+```json
-Here is a list of additional OWSDK microservices
+s3.bucketname = ucentral-ap-firmware
-| Name | Description | Link | OpenAPI |
+s3.region = us-east-1
-| :--- | :--- | :---: | :---: |
+s3.secret = *******************************************
-| OWSEC | Security Service | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralsec) | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml) |
+s3.key =  *******************************************
-| OWGW | Controller Service | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw) | [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/openapi/owgw.yaml) |
+s3.retry = 60
-| 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) |
+s3.bucket.uri = ucentral-ap-firmware.s3.amazonaws.com
-| 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) |
 
+```

build

@@ -1 +1 @@
-13
+36

docker-entrypoint.sh

@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 if [ "$SELFSIGNED_CERTS" = 'true' ]; then
     update-ca-certificates
 fi
 
-if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
+if [[ "$TEMPLATE_CONFIG" = 'true' && ! -f "$OWFMS_CONFIG"/owfms.properties ]]; then
   RESTAPI_HOST_ROOTCA=${RESTAPI_HOST_ROOTCA:-"\$OWFMS_ROOT/certs/restapi-ca.pem"} \
   RESTAPI_HOST_PORT=${RESTAPI_HOST_PORT:-"16004"} \
   RESTAPI_HOST_CERT=${RESTAPI_HOST_CERT:-"\$OWFMS_ROOT/certs/restapi-cert.pem"} \
@@ -22,9 +22,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   SYSTEM_URI_PRIVATE=${SYSTEM_URI_PRIVATE:-"https://localhost:17004"} \
   SYSTEM_URI_PUBLIC=${SYSTEM_URI_PUBLIC:-"https://localhost:16004"} \
   SYSTEM_URI_UI=${SYSTEM_URI_UI:-"http://localhost"} \
-  SECURITY_RESTAPI_DISABLE=${SECURITY_RESTAPI_DISABLE:-"false"} \
-  FIRMWAREDB_REFRESH=${FIRMWAREDB_REFRESH:-"86400"} \
-  FIRMWAREDB_MAXAGE=${FIRMWAREDB_MAXAGE:-"90"} \
   S3_BUCKETNAME=${S3_BUCKETNAME:-"ucentral-ap-firmware"} \
   S3_REGION=${S3_REGION:-"us-east-1"} \
   S3_SECRET=${S3_SECRET:-"*******************************************"} \
@@ -32,10 +29,6 @@ if [[ "$TEMPLATE_CONFIG" = 'true' ]]; then
   S3_BUCKET_URI=${S3_BUCKET_URI:-"ucentral-ap-firmware.s3.amazonaws.com"} \
   KAFKA_ENABLE=${KAFKA_ENABLE:-"true"} \
   KAFKA_BROKERLIST=${KAFKA_BROKERLIST:-"localhost:9092"} \
-  KAFKA_SSL_CA_LOCATION=${KAFKA_SSL_CA_LOCATION:-""} \
-  KAFKA_SSL_CERTIFICATE_LOCATION=${KAFKA_SSL_CERTIFICATE_LOCATION:-""} \
-  KAFKA_SSL_KEY_LOCATION=${KAFKA_SSL_KEY_LOCATION:-""} \
-  KAFKA_SSL_KEY_PASSWORD=${KAFKA_SSL_KEY_PASSWORD:-""} \
   STORAGE_TYPE=${STORAGE_TYPE:-"sqlite"} \
   STORAGE_TYPE_POSTGRESQL_HOST=${STORAGE_TYPE_POSTGRESQL_HOST:-"localhost"} \
   STORAGE_TYPE_POSTGRESQL_USERNAME=${STORAGE_TYPE_POSTGRESQL_USERNAME:-"owfms"} \
@@ -54,7 +47,7 @@ if [ "$1" = '/openwifi/owfms' -a "$(id -u)" = '0' ]; then
     if [ "$RUN_CHOWN" = 'true' ]; then
       chown -R "$OWFMS_USER": "$OWFMS_ROOT" "$OWFMS_CONFIG"
     fi
-    exec gosu "$OWFMS_USER" "$@"
+    exec su-exec "$OWFMS_USER" "$@"
 fi
 
 exec "$@"

helm/.gitignore

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

helm/README.md

@@ -70,8 +70,7 @@ 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 Firmware | |
 | configProperties | hash | Configuration properties that should be passed to the application in `owfms.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 Firmware (PEM format is adviced to be used) (see `volumes.owfms` on where it is mounted) |  |
-| certs | hash | Defines files (keys and certificates) that should be passed to the Gateway (PEM format is adviced to be used) (see `volumes.owfms` on where it is mounted). If `existingCertsSecret` is set, certificates passed this way will not be used. |  |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

helm/templates/deployment.yaml

@@ -1,5 +1,4 @@
 {{- $root := . -}}
-{{- $storageType := index .Values.configProperties "storage.type" -}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -47,39 +46,6 @@ spec:
             - -timeout
             - 600s
 
-{{- if eq $storageType "postgresql" }}
-        - name: wait-postgres
-          image: "{{ .Values.images.owfms.repository }}:{{ .Values.images.owfms.tag }}"
-          imagePullPolicy: {{ .Values.images.owfms.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 "owfms.fullname" $root }}-env
-                  key: {{ $key }}
-          {{- end }}
-          volumeMounts:
-          {{- range .Values.volumes.owfms }}
-          - name: {{ .name }}
-            mountPath: {{ .mountPath }}
-            {{- if .subPath }}
-            subPath: {{ .subPath }}
-            {{- end }}
-          {{- end }}
-{{- end }}
-
       containers:
 
         - name: owfms
@@ -131,10 +97,8 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
 
-      {{- with .Values.securityContext }}
       securityContext:
-        {{- toYaml . | nindent 8 }}
+        fsGroup: 101
-      {{- end }}
 
       imagePullSecrets:
       {{- range $image, $imageValue := .Values.images }}

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owfms:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owfms
-    tag: v2.9.0-RC2
+    tag: v2.5.2
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
@@ -71,7 +71,7 @@ volumes:
       mountPath: /owfms-data/certs
       volumeDefinition: |
         secret:
-          secretName: {{ if .Values.existingCertsSecret }}{{ .Values.existingCertsSecret }}{{ else }}{{ include "owfms.fullname" . }}-certs{{ end }}
+          secretName: {{ include "owfms.fullname" . }}-certs
     # Change this if you want to use another volume type
     - name: persist
       mountPath: /owfms-data/persist
@@ -91,9 +91,6 @@ resources: {}
   #  cpu: 100m
   #  memory: 128Mi
 
-securityContext:
-  fsGroup: 1000
-
 nodeSelector: {}
 
 tolerations: []
@@ -147,7 +144,7 @@ configProperties:
   s3.region: us-east-1
   s3.retry: 60
   s3.bucket.uri: ucentral-ap-firmware.s3.amazonaws.com
-  firmwaredb.refresh: 86400
+  firmwaredb.refresh: 1800
   # ALB
   alb.enable: "true"
   alb.port: 16104
@@ -158,10 +155,6 @@ configProperties:
   openwifi.kafka.brokerlist: localhost:9092
   openwifi.kafka.auto.commit: false
   openwifi.kafka.queue.buffering.max.ms: 50
-  openwifi.kafka.ssl.ca.location: ""
-  openwifi.kafka.ssl.certificate.location: ""
-  openwifi.kafka.ssl.key.location: ""
-  openwifi.kafka.ssl.key.password: ""
   # Storage
   storage.type: sqlite # (sqlite|postgresql|mysql|odbc)
   ## SQLite
@@ -210,9 +203,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/owfms.yaml

@@ -30,13 +30,58 @@ 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.
-    BadRequest:
+      content:
-      $ref: 'https://github.com/Telecominfraproject/wlan-cloud-ucentralsec/blob/main/openpapi/owsec.yaml#/components/responses/BadRequest'
+        application/json:
+          schema:
+            properties:
+              Operation:
+                type: string
+              Details:
+                type: string
+              Code:
+                type: integer
 
   schemas:
     FirmwareDetails:
@@ -95,25 +140,6 @@ components:
           items:
             $ref: '#/components/schemas/FirmwareDetails'
 
-    DeviceCurrentInfo:
-      type: object
-      properties:
-        serialNumber:
-          type: string
-        revision:
-          type: string
-        upgraded:
-          type: integer
-          format: int64
-
-    DeviceCurrentInfoList:
-      type: object
-      properties:
-        devices:
-          type: array
-          items:
-            $ref: '#/components/schemas/DeviceCurrentInfo'
-
     RevisionHistoryEntry:
       type: object
       properties:
@@ -231,37 +257,6 @@ components:
         totalSecondsOld:
           $ref: '#/components/schemas/TagIntPairList'
 
-    DeviceInformation:
-      type: object
-      properties:
-        serialNumber:
-          type: string
-        history:
-          $ref: '#/components/schemas/RevisionHistoryEntryList'
-        currentFirmware:
-          type: string
-        currentFirmwareDate:
-          type: integer
-          format: int64
-        latestFirmware:
-          type: string
-        latestFirmwareDate:
-          type: integer
-          format: int64
-        latestFirmwareAvailable:
-          type: boolean
-
-    ExtraSystemConfiguration:
-      type: array
-      items:
-        type: object
-        properties:
-          parameterName:
-            type: string
-          parameterValue:
-            type: string
-
-
     #########################################################################################
     ##
     ## These are endpoints that all services in the uCentral stack must provide
@@ -460,10 +455,9 @@ paths:
           required: false
         - in: query
           name: latestOnly
-          description: Return only the latest firmware
+          description: Return only the latest firwares
           schema:
             type: boolean
-            default: false
           required: false
         - in: query
           name: deviceType
@@ -474,61 +468,19 @@ paths:
           name: revisionSet
           schema:
             type: boolean
-            default: false
           required: false
         - in: query
           name: deviceSet
           schema:
             type: boolean
           required: false
-        - in: query
-          name: rcOnly
-          schema:
-            type: boolean
-            default: false
-          required: false
-        - in: query
-          name: updateTimeOnly
-          schema:
-            type: boolean
-          required: false
       responses:
         200:
           description: List firmwares
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/FirmwareDetailsList'
-                  - type: object
-                    properties:
-                      lastUpdateTime:
-                        type: integer
-                        format: int64
-                  - $ref: '#/components/schemas/FirmwareDetailsList'
-                  - $ref: '#/components/schemas/FirmwareDetails'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    put:
-      tags:
-        - Firmware
-      summary: Force a DB refresh.
-      description: Force a DB refresh.
-      operationId: updateFirmwareList
-      parameters:
-        - in: query
-          description: Force the firmware DB update
-          name: update
-          schema:
-            type: boolean
-          required: false
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
-        400:
-          $ref: '#/components/responses/BadRequest'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
@@ -675,31 +627,13 @@ paths:
           schema:
             type: string
           required: false
-        - in: query
-          description: Return current device list and current firmware
-          name: currentList
-          schema:
-            type: boolean
-            default: false
-          required: false
-          example: You must set {serialNumber} to 000000000000
-        - in: query
-          description: Return current device list and current firmware
-          name: unknownList
-          schema:
-            type: boolean
-            default: false
-          required: false
-          example: You must set {serialNumber} to 000000000000
       responses:
         200:
           description: List of device history upgrade.
           content:
             application/json:
               schema:
-                oneOf:
+                $ref: '#/components/schemas/RevisionHistoryEntryList'
-                  - $ref: '#/components/schemas/RevisionHistoryEntryList'
-                  - $ref: '#/components/schemas/DeviceCurrentInfoList'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
@@ -854,28 +788,6 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
-  /deviceInformation/{serialNumber}:
-    get:
-      tags:
-        - Device Information
-      summary: receive a repor on a single decide
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-            example:
-              aabbccdd1234
-          required: true
-      responses:
-        200:
-          $ref: '#/components/schemas/DeviceInformation'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-
   #########################################################################################
   ##
   ## These are endpoints that all services in the uCentral stack must provide
@@ -939,66 +851,3 @@ paths:
           $ref: '#/components/responses/Unauthorized'
         404:
           $ref: '#/components/responses/NotFound'
-
-  /systemConfiguration:
-    get:
-      tags:
-        - SystemConfiguration
-      summary: Retrieve system configuration items
-      operationId: getSystemConfiguration
-      parameters:
-        - in: query
-          description: Which parameters you want to retrieve
-          name: entries
-          schema:
-            type: string
-            example:
-              - element1
-              - element1,element2,element3
-          required: false
-      responses:
-        200:
-          description: List of configuration elements
-          content:
-            application/json:
-              schema:
-                type: array
-                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'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'

overlays/curl/portfile.cmake

@@ -1 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

overlays/curl/vcpkg.json

@@ -1,4 +0,0 @@
-{
-    "name": "curl",
-    "version-string": "7.74.0-1.3+deb11u3"
-}

overlays/openssl/portfile.cmake

@@ -1 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

overlays/openssl/vcpkg.json

@@ -1,4 +0,0 @@
-{
-    "name": "openssl",
-    "version-string": "1.1.1n-0+deb11u3"
-}

overlays/zlib/portfile.cmake

@@ -1 +0,0 @@
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

overlays/zlib/vcpkg.json

@@ -1,4 +0,0 @@
-{
-    "name": "zlib",
-    "version-string": "1:1.2.11.dfsg-2+deb11u2"
-}

owfms.properties

@@ -35,7 +35,6 @@ openwifi.system.uri.private = https://localhost:17004
 openwifi.system.uri.public = https://ucentral.dpaas.arilia.com:16004
 openwifi.system.commandchannel = /tmp/app.owfms
 openwifi.system.uri.ui = ucentral-ui.arilia.com
-openwifi.security.restapi.disable = false
 
 firmwaredb.refresh = 1800
 firmwaredb.maxage = 90
@@ -70,10 +69,6 @@ openwifi.kafka.enable = true
 openwifi.kafka.brokerlist = a1.arilia.com:9092
 openwifi.kafka.auto.commit = false
 openwifi.kafka.queue.buffering.max.ms = 50
-openwifi.kafka.ssl.ca.location =
-openwifi.kafka.ssl.certificate.location =
-openwifi.kafka.ssl.key.location =
-openwifi.kafka.ssl.key.password =
 
 #
 # This section select which form of persistence you need

owfms.properties.tmpl

@@ -36,10 +36,8 @@ openwifi.system.uri.private = ${SYSTEM_URI_PRIVATE}
 openwifi.system.uri.public = ${SYSTEM_URI_PUBLIC}
 openwifi.system.commandchannel = /tmp/app.ucentralfms
 openwifi.system.uri.ui = ${SYSTEM_URI_UI}
-openwifi.security.restapi.disable = ${SECURITY_RESTAPI_DISABLE}
+firmwaredb.refresh = 1800
-
+firmwaredb.maxage = 90
-firmwaredb.refresh = ${FIRMWAREDB_REFRESH}
-firmwaredb.maxage = ${FIRMWAREDB_MAXAGE}
 
 #
 # Firmware Microservice Specific Section
@@ -69,10 +67,6 @@ openwifi.kafka.enable = ${KAFKA_ENABLE}
 openwifi.kafka.brokerlist = ${KAFKA_BROKERLIST}
 openwifi.kafka.auto.commit = false
 openwifi.kafka.queue.buffering.max.ms = 50
-openwifi.kafka.ssl.ca.location = ${KAFKA_SSL_CA_LOCATION}
-openwifi.kafka.ssl.certificate.location = ${KAFKA_SSL_CERTIFICATE_LOCATION}
-openwifi.kafka.ssl.key.location = ${KAFKA_SSL_KEY_LOCATION}
-openwifi.kafka.ssl.key.password = ${KAFKA_SSL_KEY_PASSWORD}
 
 #
 # This section select which form of persistence you need

src/AutoUpdater.cpp

@@ -3,26 +3,19 @@
 //
 
 #include "AutoUpdater.h"
-#include "LatestFirmwareCache.h"
-#include "SDK/GW_SDK.h"
 #include "SDK/Prov_SDK.h"
+#include "SDK/GW_SDK.h"
+#include "LatestFirmwareCache.h"
 #include "StorageService.h"
 
-#include "framework/MicroServiceFuncs.h"
-#include "framework/utils.h"
-
-#include "fmt/format.h"
-
 namespace OpenWifi {
 
     int AutoUpdater::Start() {
-		poco_information(Logger(), "Starting...");
+        AutoUpdaterEnabled_ = MicroService::instance().ConfigGetBool("autoupdater.enabled", false);
-		AutoUpdaterEnabled_ = MicroServiceConfigGetBool("autoupdater.enabled", false);
         if(AutoUpdaterEnabled_) {
             Running_ = false;
-			AutoUpdaterFrequency_ = MicroServiceConfigGetInt("autoupdater.frequency", 600);
+            AutoUpdaterFrequency_ = MicroService::instance().ConfigGetInt("autoupdater.frequency",600);
-			AutoUpdaterCallBack_ =
+            AutoUpdaterCallBack_ = std::make_unique<Poco::TimerCallback<AutoUpdater>>(*this, &AutoUpdater::onTimer);
-				std::make_unique<Poco::TimerCallback<AutoUpdater>>(*this, &AutoUpdater::onTimer);
             Timer_.setStartInterval(5 * 60 * 1000);  // first run in 5 minutes
             Timer_.setPeriodicInterval(AutoUpdaterFrequency_ * 1000);
             Timer_.start(*AutoUpdaterCallBack_);
@@ -31,12 +24,10 @@ namespace OpenWifi {
     }
 
     void AutoUpdater::Stop() {
-		poco_information(Logger(), "Stopping...");
         Running_ = false;
         if(AutoUpdaterEnabled_) {
             Timer_.stop();
         }
-		poco_information(Logger(), "Stopped...");
     }
 
     void AutoUpdater::ToBeUpgraded(std::string serialNumber, std::string DeviceType) {
@@ -46,44 +37,38 @@ namespace OpenWifi {
         Queue_.emplace_back(std::make_pair(std::move(serialNumber),std::move(DeviceType)));
     }
 
-	void AutoUpdater::onTimer([[maybe_unused]] Poco::Timer &timer) {
+    void AutoUpdater::onTimer(Poco::Timer & timer) {
-		Utils::SetThreadName("auto-updater");
         Running_ = true;
         std::unique_lock    L(Mutex_);
         while(!Queue_.empty() && Running_) {
             auto Entry = Queue_.front();
             Queue_.pop_front();
             try {
-				poco_debug(Logger(), fmt::format("Preparing to upgrade {}", Entry.first));
+                Logger().debug(Poco::format("Preparing to upgrade %s",Entry.first));
                 auto CacheEntry = Cache_.find(Entry.first);
-				uint64_t now = Utils::Now();
+                uint64_t Now = std::time(nullptr);
                 std::string firmwareUpgrade;
-				if (CacheEntry == Cache_.end() || (CacheEntry->second.LastCheck - now) > 300) {
+                if(CacheEntry == Cache_.end() || (CacheEntry->second.LastCheck-Now)>300) {
                     //  get the firmware settings for that device.
                     SerialCache     C;
-					C.LastCheck = now;
+                    C.LastCheck = Now;
                     bool        firmwareRCOnly;
-					if (OpenWifi::SDK::Prov::GetFirmwareOptions(Entry.first, firmwareUpgrade,
+                    if(OpenWifi::SDK::Prov::GetFirmwareOptions(Entry.first, firmwareUpgrade, firmwareRCOnly)) {
-																firmwareRCOnly)) {
+                        Logger().debug(Poco::format("Found firmware options for %s",Entry.first));
-						poco_debug(Logger(),
-								   fmt::format("Found firmware options for {}", Entry.first));
                         C.firmwareRCOnly = firmwareRCOnly;
                         C.firmwareUpgrade = firmwareUpgrade;
                     } else {
-						poco_debug(Logger(),
+                        Logger().debug(Poco::format("Found no firmware options for %s",Entry.first));
-								   fmt::format("Found no firmware options for {}", Entry.first));
                         C.firmwareRCOnly = firmwareRCOnly;
                         C.firmwareUpgrade = firmwareUpgrade;
                     }
                     Cache_[Entry.first] = C;
                 } else {
+
                 }
 
                 if(firmwareUpgrade=="no") {
-					poco_information(
+                    Logger().information(Poco::format("Device %s not upgradable. Provisioning service settings.",Entry.first));
-						Logger(),
-						fmt::format("Device {} not upgradable. Provisioning service settings.",
-									Entry.first));
                     continue;
                 }
 
@@ -93,37 +78,26 @@ namespace OpenWifi {
                 if(LF) {
                     if(StorageService()->FirmwaresDB().GetFirmware(fwEntry.Id,fwDetails)) {
                         //  send the command to upgrade this device...
-						poco_information(Logger(), fmt::format("Upgrading {} to version {}",
+                        Logger().information(Poco::format("Upgrading %s to version %s", Entry.first, fwEntry.Revision));
-															   Entry.first, fwEntry.Revision));
+                        if(OpenWifi::SDK::GW::SendFirmwareUpgradeCommand(Entry.first,fwDetails.uri)) {
-						if (OpenWifi::SDK::GW::SendFirmwareUpgradeCommand(Entry.first,
+                            Logger().information(Poco::format("Upgrade command sent for %s",Entry.first));
-																		  fwDetails.uri)) {
-							poco_information(
-								Logger(), fmt::format("Upgrade command sent for {}", Entry.first));
                         } else {
-							poco_information(
+                            Logger().information(Poco::format("Upgrade command not sent for %s",Entry.first));
-								Logger(),
-								fmt::format("Upgrade command not sent for {}", Entry.first));
                         }
                     } else {
-						poco_information(Logger(),
+                        Logger().information(Poco::format("Firmware for device %s (%s) cannot be found.", Entry.first, Entry.second ));
-										 fmt::format("Firmware for device {} ({}) cannot be found.",
-													 Entry.first, Entry.second));
                     }
                 } else {
-					poco_information(Logger(),
+                    Logger().information(Poco::format("Firmware for device %s (%s) cannot be found.", Entry.first, Entry.second ));
-									 fmt::format("Firmware for device {} ({}) cannot be found.",
-												 Entry.first, Entry.second));
                 }
             } catch (...) {
-				poco_information(
+                Logger().information(Poco::format("Exception during auto update for device %s.", Entry.first ));
-					Logger(),
-					fmt::format("Exception during auto update for device {}.", Entry.first));
             }
         }
     }
 
-	void AutoUpdater::reinitialize([[maybe_unused]] Poco::Util::Application &self) {
+    void AutoUpdater::reinitialize(Poco::Util::Application &self) {
-		poco_information(Logger(), "Reinitializing.");
+        Logger().information("Reinitializing.");
         Reset();
     }
-} // namespace OpenWifi
+}

src/AutoUpdater.h

@@ -2,18 +2,19 @@
 // Created by stephane bourque on 2021-10-04.
 //
 
-#pragma once
+#ifndef OWFMS_AUTOUPDATER_H
+#define OWFMS_AUTOUPDATER_H
 
+#include "framework/MicroService.h"
 #include <deque>
-
-#include "Poco/Timer.h"
 #include "Poco/Util/Application.h"
-#include "framework/SubSystemServer.h"
+#include "Poco/Timer.h"
 
 namespace OpenWifi {
 
     class AutoUpdater : public SubSystemServer { // };, Poco::Runnable {
     public:
+
     struct SerialCache {
             uint64_t        LastCheck=0;
             std::string     firmwareUpgrade;
@@ -45,9 +46,13 @@ namespace OpenWifi {
         Poco::Timer                                         Timer_;
         std::unique_ptr<Poco::TimerCallback<AutoUpdater>>   AutoUpdaterCallBack_;
 
-		explicit AutoUpdater() noexcept
+        explicit AutoUpdater() noexcept:
-			: SubSystemServer("AutoUpdater", "AUTO-UPDATER", "autoupdater") {}
+        SubSystemServer("AutoUpdater", "AUTO-UPDATER", "autoupdater")
+            {
+            }
     };
 
     inline auto AutoUpdater() { return AutoUpdater::instance(); }
-} // namespace OpenWifi
+}
+
+#endif //OWFMS_AUTOUPDATER_H

src/Daemon.cpp

@@ -3,46 +3,54 @@
 //
 
 #include <aws/core/Aws.h>
-#include <aws/s3/model/AccessControlPolicy.h>
 #include <aws/s3/model/CreateBucketRequest.h>
-#include <aws/s3/model/GetBucketAclRequest.h>
-#include <aws/s3/model/PutBucketAclRequest.h>
 #include <aws/s3/model/PutObjectRequest.h>
+#include <aws/s3/model/AccessControlPolicy.h>
+#include <aws/s3/model/PutBucketAclRequest.h>
+#include <aws/s3/model/GetBucketAclRequest.h>
 
-#include "AutoUpdater.h"
 #include "Daemon.h"
+#include "StorageService.h"
+#include "ManifestCreator.h"
+#include "NewConnectionHandler.h"
+#include "LatestFirmwareCache.h"
 #include "DeviceCache.h"
 #include "FirmwareCache.h"
-#include "LatestFirmwareCache.h"
+#include "AutoUpdater.h"
-#include "ManifestCreator.h"
 #include "NewCommandHandler.h"
-#include "NewConnectionHandler.h"
-#include "StorageService.h"
-
-#include "framework/UI_WebSocketClientServer.h"
 
 namespace OpenWifi {
     class Daemon *Daemon::instance_ = nullptr;
 
     class Daemon *Daemon::instance() {
         if (instance_ == nullptr) {
-			instance_ = new Daemon(
+            instance_ = new Daemon(vDAEMON_PROPERTIES_FILENAME,
-				vDAEMON_PROPERTIES_FILENAME, vDAEMON_ROOT_ENV_VAR, vDAEMON_CONFIG_ENV_VAR,
+                                   vDAEMON_ROOT_ENV_VAR,
-				vDAEMON_APP_NAME, vDAEMON_BUS_TIMER,
+                                   vDAEMON_CONFIG_ENV_VAR,
-				SubSystemVec{StorageService(), FirmwareCache(), LatestFirmwareCache(),
+                                   vDAEMON_APP_NAME,
-							 DeviceCache(), NewConnectionHandler(), ManifestCreator(),
+                                   vDAEMON_BUS_TIMER,
-							 AutoUpdater(), NewCommandHandler(), UI_WebSocketClientServer()});
+                                   SubSystemVec{
+                                            StorageService(),
+                                            FirmwareCache(),
+                                            LatestFirmwareCache(),
+                                            DeviceCache(),
+                                            NewConnectionHandler(),
+                                            ManifestCreator(),
+                                            AutoUpdater(),
+                                            NewCommandHandler()
+                                   });
         }
         return instance_;
     }
 
-	void Daemon::PostInitialization([[maybe_unused]] Poco::Util::Application &self) {}
+    void Daemon::initialize(Poco::Util::Application &self) {
-
+        MicroService::initialize(*this);
-	void DaemonPostInitialization(Poco::Util::Application &self) {
-		Daemon()->PostInitialization(self);
     }
 
-} // namespace OpenWifi
+    void MicroServicePostInitialization() {
+
+    }
+}
 
 int main(int argc, char **argv) {
     SSL_library_init();

src/Daemon.h

@@ -6,30 +6,33 @@
 #define UCENTRALFWS_DAEMON_H
 
 #include "framework/MicroService.h"
-#include "framework/MicroServiceNames.h"
 #include "framework/OpenWifiTypes.h"
-
-#include "Dashboard.h"
 #include "RESTObjects/RESTAPI_FMSObjects.h"
+#include "Dashboard.h"
 
 namespace OpenWifi {
 
-	[[maybe_unused]] static const char *vDAEMON_PROPERTIES_FILENAME = "owfms.properties";
+    static const char * vDAEMON_PROPERTIES_FILENAME = "owfms.properties";
-	[[maybe_unused]] static const char *vDAEMON_ROOT_ENV_VAR = "OWFMS_ROOT";
+    static const char * vDAEMON_ROOT_ENV_VAR = "OWFMS_ROOT";
-	[[maybe_unused]] static const char *vDAEMON_CONFIG_ENV_VAR = "OWFMS_CONFIG";
+    static const char * vDAEMON_CONFIG_ENV_VAR = "OWFMS_CONFIG";
-	[[maybe_unused]] static const char *vDAEMON_APP_NAME = uSERVICE_FIRMWARE.c_str();
+    static const char * vDAEMON_APP_NAME = uSERVICE_FIRMWARE.c_str();
-	[[maybe_unused]] static const uint64_t vDAEMON_BUS_TIMER = 10000;
+    static const uint64_t vDAEMON_BUS_TIMER = 10000;
 
     class Daemon : public MicroService {
     public:
-		explicit Daemon(const std::string &PropFile, const std::string &RootEnv,
+        explicit Daemon(const std::string & PropFile,
-						const std::string &ConfigEnv, const std::string &AppName, uint64_t BusTimer,
+                        const std::string & RootEnv,
-						const SubSystemVec &SubSystems)
+                        const std::string & ConfigEnv,
-			: MicroService(PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems){};
+                        const std::string & AppName,
+                        uint64_t 	BusTimer,
+                        const SubSystemVec & SubSystems) :
+                MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};
 
-		void PostInitialization(Poco::Util::Application &self);
+        void initialize(Poco::Util::Application &self);
         static Daemon *instance();
-		inline DeviceDashboard &GetDashboard() { return DB_; }
+        inline void ResetDashboard() { DB_.Reset(); }
+        inline void CreateDashboard() { DB_.Create(); }
+        inline const FMSObjects::DeviceReport & GetDashboard() { return DB_.Report(); }
 
     private:
         static Daemon 				*instance_;
@@ -37,6 +40,6 @@ namespace OpenWifi {
     };
 
     inline Daemon * Daemon() { return Daemon::instance(); }
-} // namespace OpenWifi
+}
 
 #endif //UCENTRALFWS_DAEMON_H

src/Dashboard.cpp

@@ -4,47 +4,15 @@
 
 #include "Dashboard.h"
 #include "StorageService.h"
-#include "framework/utils.h"
 
 namespace OpenWifi {
+	void DeviceDashboard::Create() {
+		uint64_t Now = std::time(nullptr);
 
-	bool DeviceDashboard::Get(FMSObjects::DeviceReport &D, Poco::Logger &Logger) {
+		if(LastRun_==0 || (Now-LastRun_)>120) {
-		uint64_t Now = Utils::Now();
+			DB_.reset();
-		if (!ValidDashboard_ || LastRun_ == 0 || (Now - LastRun_) > 120) {
+			StorageService()->DevicesDB().GenerateDeviceReport(DB_);
-			Generate(D, Logger);
+			LastRun_ = Now;
-		} else {
+		}
-			std::lock_guard G(DataMutex_);
-			D = DB_;
-		}
-		return ValidDashboard_;
-	};
-
-	void DeviceDashboard::Generate(FMSObjects::DeviceReport &D, Poco::Logger &Logger) {
-		if (GeneratingDashboard_.load()) {
-			// std::cout << "Trying to generate dashboard but already being generated" << std::endl;
-			while (GeneratingDashboard_.load()) {
-				Poco::Thread::trySleep(100);
-			}
-			std::lock_guard G(DataMutex_);
-			D = DB_;
-		} else {
-			GeneratingDashboard_ = true;
-			ValidDashboard_ = false;
-			try {
-				// std::cout << "Generating dashboard." << std::endl;
-				poco_information(Logger, "DASHBOARD: Generating a new dashboard.");
-				FMSObjects::DeviceReport NewData;
-				StorageService()->DevicesDB().GenerateDeviceReport(NewData);
-				LastRun_ = Utils::Now();
-				NewData.snapshot = LastRun_;
-				D = NewData;
-				std::lock_guard G(DataMutex_);
-				DB_ = NewData;
-				ValidDashboard_ = true;
-			} catch (...) {
-			}
-			GeneratingDashboard_ = false;
 	}
 }
-
-} // namespace OpenWifi

src/Dashboard.h

@@ -2,26 +2,22 @@
 // Created by stephane bourque on 2021-07-21.
 //
 
-#pragma once
+#ifndef UCENTRALGW_DASHBOARD_H
+#define UCENTRALGW_DASHBOARD_H
 
-#include <mutex>
-
-#include "Poco/Logger.h"
-#include "RESTObjects/RESTAPI_FMSObjects.h"
 #include "framework/OpenWifiTypes.h"
+#include "RESTObjects/RESTAPI_FMSObjects.h"
 
 namespace OpenWifi {
 	class DeviceDashboard {
 	  public:
-		bool Get(FMSObjects::DeviceReport &D, Poco::Logger &Logger);
+			void Create();
-
+			const FMSObjects::DeviceReport & Report() const { return DB_;}
+			inline void Reset() { LastRun_=0; DB_.reset(); }
 	  private:
-		std::mutex DataMutex_;
-		volatile std::atomic_bool GeneratingDashboard_ = false;
-		volatile bool ValidDashboard_ = false;
             FMSObjects::DeviceReport  	DB_;
 			uint64_t 				LastRun_=0;
-
-		void Generate(FMSObjects::DeviceReport &D, Poco::Logger &Logger);
 	};
-} // namespace OpenWifi
+}
+
+#endif // UCENTRALGW_DASHBOARD_H

src/DeviceCache.cpp

@@ -7,23 +7,23 @@
 namespace OpenWifi {
 
     int DeviceCache::Start() {
-		poco_information(Logger(), "Starting...");
         return 0;
     }
 
     void DeviceCache::Stop() {
-		poco_information(Logger(), "Stopping...");
-		poco_information(Logger(), "Stopped...");
     }
 
-	void DeviceCache::AddToCache(const std::string &SerialNumber, const std::string &DeviceType,
+    void DeviceCache::AddToCache(
+                        const std::string &SerialNumber, const std::string & DeviceType,
                         const std::string &Host, const std::string &Revision) {
         std::lock_guard G(Mutex_);
         auto Device = DeviceCache_.find(SerialNumber);
 
         if(Device==DeviceCache_.end()) {
-			DeviceCache_[SerialNumber] =
+            DeviceCache_[SerialNumber]=DeviceCacheEntry{
-				DeviceCacheEntry{.deviceType = DeviceType, .host = Host, .revision = Revision};
+                                                .deviceType=DeviceType,
+                                                .host=Host,
+                                                .revision=Revision};
         } else {
             Device->second.revision=Revision;
             Device->second.host=Host;
@@ -40,5 +40,8 @@ namespace OpenWifi {
         return true;
     }
 
-	void DeviceCache::DumpCache() {}
+
-} // namespace OpenWifi
+    void DeviceCache::DumpCache() {
+
+    }
+}

src/DeviceCache.h

@@ -2,10 +2,11 @@
 // Created by stephane bourque on 2021-07-13.
 //
 
-#pragma once
+#ifndef UCENTRALFMS_DEVICECACHE_H
+#define UCENTRALFMS_DEVICECACHE_H
 
-#include "framework/SubSystemServer.h"
 #include <string>
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -33,9 +34,15 @@ namespace OpenWifi {
     private:
         std::atomic_bool    Running_=false;
         DeviceCacheMap      DeviceCache_;
-		explicit DeviceCache() noexcept
+        explicit DeviceCache() noexcept:
-			: SubSystemServer("DeviceCache", "DEVICE-CACHE", "devicecache") {}
+                SubSystemServer("DeviceCache", "DEVICE-CACHE", "devicecache")
+        {
+        }
     };
 
     inline auto DeviceCache() { return DeviceCache::instance(); }
-} // namespace OpenWifi
+}
+
+
+
+#endif //UCENTRALFMS_DEVICECACHE_H

src/FirmwareCache.cpp

@@ -7,24 +7,19 @@
 namespace OpenWifi {
 
     int FirmwareCache::Start() {
-		poco_information(Logger(), "Starting...");
         return 0;
     }
 
     void FirmwareCache::Stop() {
-		poco_information(Logger(), "Stopping...");
+
-		poco_information(Logger(), "Stopped...");
     }
 
-	std::shared_ptr<FMSObjects::Firmware>
+    std::shared_ptr<FMSObjects::Firmware> GetFirmware(const std::string & DeviceType, const std::string & Revision) {
-	GetFirmware([[maybe_unused]] const std::string &DeviceType,
-				[[maybe_unused]] const std::string &Revision) {
         return nullptr;
     }
 
-	std::shared_ptr<FMSObjects::Firmware>
+    std::shared_ptr<FMSObjects::Firmware> AddFirmware(const FMSObjects::Firmware &F) {
-	AddFirmware([[maybe_unused]] const FMSObjects::Firmware &F) {
         return nullptr;
     }
 
-} // namespace OpenWifi
+}

src/FirmwareCache.h

@@ -2,13 +2,14 @@
 // Created by stephane bourque on 2021-07-26.
 //
 
-#pragma once
+#ifndef UCENTRALFMS_FIRMWARECACHE_H
+#define UCENTRALFMS_FIRMWARECACHE_H
 
 #include <map>
 #include <memory>
 
 #include "RESTObjects/RESTAPI_FMSObjects.h"
-#include "framework/SubSystemServer.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -24,17 +25,22 @@ namespace OpenWifi {
         int Start() override;
         void Stop() override;
 
-		std::shared_ptr<FMSObjects::Firmware> GetFirmware(const std::string &DeviceType,
+        std::shared_ptr<FMSObjects::Firmware> GetFirmware(const std::string & DeviceType, const std::string & Revision);
-														  const std::string &Revision);
         std::shared_ptr<FMSObjects::Firmware> AddFirmware(const FMSObjects::Firmware &F);
 
+
     private:
         std::atomic_bool        Running_=false;
         FirmwareCacheMap        Cache_;
-		explicit FirmwareCache() noexcept
+        explicit FirmwareCache() noexcept:
-			: SubSystemServer("FirmwareCache", "FIRMWARE-CACHE", "firmwarecache") {}
+                SubSystemServer("FirmwareCache", "FIRMWARE-CACHE", "firmwarecache")
+        {
+        }
     };
 
     inline auto FirmwareCache() { return FirmwareCache::instance(); }
 
-} // namespace OpenWifi
+}
+
+
+#endif //UCENTRALFMS_FIRMWARECACHE_H

src/LatestFirmwareCache.cpp

@@ -8,42 +8,29 @@
 namespace OpenWifi {
 
     int LatestFirmwareCache::Start() {
-		poco_information(Logger(), "Starting...");
         StorageService()->FirmwaresDB().PopulateLatestFirmwareCache();
         return 0;
     }
 
     void LatestFirmwareCache::Stop() {
-		poco_information(Logger(), "Stopping...");
-		poco_information(Logger(), "Stopped...");
     }
 
-	bool LatestFirmwareCache::AddToCache(const std::string &DeviceType, const std::string &Revision,
+    bool LatestFirmwareCache::AddToCache(const std::string & DeviceType, const std::string &Revision, const std::string &Id, uint64_t TimeStamp) {
-										 const std::string &Id, uint64_t TimeStamp) {
         std::lock_guard G(Mutex_);
 
         RevisionSet_.insert(Revision);
         DeviceSet_.insert(DeviceType);
-
         auto E = Cache_.find(DeviceType);
         if((E==Cache_.end()) || (TimeStamp >= E->second.TimeStamp)) {
-			Cache_[DeviceType] =
+            Cache_[DeviceType] = LatestFirmwareCacheEntry{  .Id=Id,
-				LatestFirmwareCacheEntry{.Id = Id, .TimeStamp = TimeStamp, .Revision = Revision};
+                                                            .TimeStamp=TimeStamp,
-		}
+                                                            .Revision=Revision};
-
-		if (!IsRC(Revision))
-			return true;
-
-		auto rcE = rcCache_.find(DeviceType);
-		if ((rcE == rcCache_.end()) || (TimeStamp >= rcE->second.TimeStamp)) {
-			rcCache_[DeviceType] =
-				LatestFirmwareCacheEntry{.Id = Id, .TimeStamp = TimeStamp, .Revision = Revision};
-		}
             return true;
         }
+        return false;
+    }
 
-	bool LatestFirmwareCache::FindLatestFirmware(const std::string &DeviceType,
+    bool LatestFirmwareCache::FindLatestFirmware(const std::string &DeviceType, LatestFirmwareCacheEntry &Entry )  {
-												 LatestFirmwareCacheEntry &Entry) {
         std::lock_guard G(Mutex_);
 
         auto E=Cache_.find(DeviceType);
@@ -51,18 +38,7 @@ namespace OpenWifi {
             Entry = E->second;
             return true;
         }
-		return false;
-	}
 
-	bool LatestFirmwareCache::FindLatestRCOnlyFirmware(const std::string &DeviceType,
-													   LatestFirmwareCacheEntry &Entry) {
-		std::lock_guard G(Mutex_);
-
-		auto E = rcCache_.find(DeviceType);
-		if (E != rcCache_.end()) {
-			Entry = E->second;
-			return true;
-		}
         return false;
     }
 
@@ -76,16 +52,6 @@ namespace OpenWifi {
         return false;
     }
 
-	bool LatestFirmwareCache::IsLatestRCOnly(const std::string &DeviceType,
-											 const std::string &Revision) {
-		std::lock_guard G(Mutex_);
-
-		auto E = rcCache_.find(DeviceType);
-		if (E != rcCache_.end()) {
-			return E->second.Revision == Revision;
-		}
-		return false;
-	}
 
     void LatestFirmwareCache::DumpCache() {
         std::lock_guard G(Mutex_);
@@ -93,5 +59,6 @@ namespace OpenWifi {
         for( auto &[Id,E]:Cache_) {
             std::cout << "Device: " << Id << "    ID:" << E.Id << std::endl;
         }
+
+    }
 }
-} // namespace OpenWifi

src/LatestFirmwareCache.h

@@ -2,17 +2,16 @@
 // Created by stephane bourque on 2021-07-13.
 //
 
-#pragma once
+#ifndef UCENTRALFMS_LATESTFIRMWARECACHE_H
+#define UCENTRALFMS_LATESTFIRMWARECACHE_H
 
 #include "Poco/JSON/Object.h"
-#include "Poco/JWT/Signer.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/JWT/Signer.h"
 #include "Poco/SHA2Engine.h"
-#include "Poco/StringTokenizer.h"
-
 #include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "framework/SubSystemServer.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
 
@@ -22,7 +21,6 @@ namespace OpenWifi {
         std::string     Revision;
     };
     typedef std::map<std::string, LatestFirmwareCacheEntry> LatestFirmwareCacheMap;
-	typedef std::map<std::string, LatestFirmwareCacheEntry> rcOnlyLatestFirmwareCacheMap;
 
     class LatestFirmwareCache : public SubSystemServer {
     public:
@@ -33,42 +31,26 @@ namespace OpenWifi {
 
         int Start() override;
         void Stop() override;
-		bool AddToCache(const std::string &DeviceType, const std::string &Revision,
+        bool AddToCache(const std::string & DeviceType, const std::string & Revision, const std::string &Id, uint64_t TimeStamp);
-						const std::string &Id, uint64_t TimeStamp);
         // void AddRevision(const std::string &Revision);
         bool FindLatestFirmware(const std::string &DeviceType, LatestFirmwareCacheEntry &Entry );
-		bool FindLatestRCOnlyFirmware(const std::string &DeviceType,
-									  LatestFirmwareCacheEntry &Entry);
-
-		inline static bool IsRC(const std::string &Revision) {
-			// OpenWrt 21.02-SNAPSHOT r16399+120-c67509efd7 / TIP-v2.5.0-36b5478
-			auto Tokens = Poco::StringTokenizer(Revision, "/", Poco::StringTokenizer::TOK_TRIM);
-			if (Tokens.count() != 2)
-				return false;
-			return (Tokens[1].substr(0, 5) == "TIP-v");
-		}
-
         void DumpCache();
-		inline Types::StringSet GetRevisions() {
+        inline Types::StringSet GetRevisions() { std::lock_guard G(Mutex_); return RevisionSet_; };
-			std::lock_guard G(Mutex_);
+        inline Types::StringSet GetDevices() { std::lock_guard G(Mutex_); return DeviceSet_; };
-			return RevisionSet_;
-		};
-		inline Types::StringSet GetDevices() {
-			std::lock_guard G(Mutex_);
-			return DeviceSet_;
-		};
         bool IsLatest(const std::string &DeviceType, const std::string &Revision);
-		bool IsLatestRCOnly(const std::string &DeviceType, const std::string &Revision);
 
     private:
         LatestFirmwareCacheMap      Cache_;
-		rcOnlyLatestFirmwareCacheMap rcCache_;
         Types::StringSet            RevisionSet_;
         Types::StringSet            DeviceSet_;
-		explicit LatestFirmwareCache() noexcept
+        explicit LatestFirmwareCache() noexcept:
-			: SubSystemServer("LatestFirmwareCache", "LATEST-FIRMWARE-CACHE",
+                SubSystemServer("FirmwareCache", "FIRMWARE-CACHE", "FirmwareCache")
-							  "LatestFirmwareCache") {}
+        {
+        }
     };
 
     inline auto LatestFirmwareCache() { return LatestFirmwareCache::instance(); }
-} // namespace OpenWifi
+}
+
+
+#endif //UCENTRALFMS_LATESTFIRMWARECACHE_H

src/ManifestCreator.cpp

@@ -6,61 +6,41 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"
 
-#include <aws/s3/model/GetObjectRequest.h>
 #include <aws/s3/model/ListObjectsRequest.h>
 #include <aws/s3/model/ListObjectsV2Request.h>
+#include <aws/s3/model/GetObjectRequest.h>
 
-#include "LatestFirmwareCache.h"
 #include "ManifestCreator.h"
 #include "StorageService.h"
-
+#include "LatestFirmwareCache.h"
-#include "fmt/format.h"
-#include "framework/utils.h"
 
 namespace OpenWifi {
 
-	void ManifestCreator::onTimer([[maybe_unused]] Poco::Timer &timer) {
+    void ManifestCreator::onTimer(Poco::Timer &timer) {
-		Utils::SetThreadName("manifest");
+        Logger().information("Performing DB refresh");
-		RunUpdateTask();
-	}
-
-	bool ManifestCreator::RunUpdateTask() {
-		if (!UpdateRunning_.test_and_set(std::memory_order_acquire)) {
-			poco_information(Logger(), "Performing DB refresh");
-			RunnerThread_.start(*this);
-			return true;
-		} else {
-			poco_information(Logger(), "DB refresh already in progress");
-			return false;
-		}
-	}
-
-	void ManifestCreator::run() {
         S3BucketContent BucketList;
         StorageService()->FirmwaresDB().RemoveOldFirmware();
         ReadBucket(BucketList);
-		poco_information(Logger(), fmt::format("Found {} firmware entries in S3 repository.",
+        Logger().information(Poco::format("Found %Lu firmware entries in S3 repository.",(uint64_t)BucketList.size()));
-											   BucketList.size()));
         ComputeManifest(BucketList);
         AddManifestToDB(BucketList);
-		LastUpdate_ = Utils::Now();
-		UpdateRunning_.clear(std::memory_order_release);
     }
 
     bool ManifestCreator::ComputeManifest(S3BucketContent &BucketContent) {
 
-		uint64_t Limit = Utils::Now() - MaxAge_, Rejected = 0, Accepted = 0, BadFormat = 0,
+        uint64_t Limit = std::time(nullptr) - MaxAge_, Rejected=0, Accepted=0, BadFormat=0, MissingJson=0;
-				 MissingJson = 0;
         for(auto &[Name,Entry]:BucketContent) {
             std::string C = Entry.S3ContentManifest;
 
             try {
                 Poco::JSON::Parser  P;
-				auto ParsedContent =
+                auto ParsedContent = P.parse(Entry.S3ContentManifest).extract<Poco::JSON::Object::Ptr>();
-					P.parse(Entry.S3ContentManifest).extract<Poco::JSON::Object::Ptr>();
 
-				if (ParsedContent->has("image") && ParsedContent->has("compatible") &&
+                if( ParsedContent->has("image") &&
-					ParsedContent->has("revision") && ParsedContent->has("timestamp")) {
+                    ParsedContent->has("compatible") &&
+                    ParsedContent->has("revision") &&
+                    ParsedContent->has("timestamp"))
+                {
                     Entry.Timestamp = ParsedContent->get("timestamp");
                     if(Entry.Timestamp>Limit) {
                         Entry.Compatible = ParsedContent->get("compatible").toString();
@@ -68,11 +48,7 @@ namespace OpenWifi {
                         Entry.Image = ParsedContent->get("image").toString();
                         auto FullNme = Name + "-upgrade.bin";
                         if(FullNme!=Entry.Image) {
-							poco_error(
+                            Logger().error(Poco::format("MANIFEST(%s): Image name does not match manifest name (%s).",Name,Entry.Image));
-								Logger(),
-								fmt::format(
-									"MANIFEST({}): Image name does not match manifest name ({}).",
-									Name, Entry.Image));
                             Entry.Valid = false;
                             BadFormat++;
                             continue;
@@ -84,10 +60,7 @@ namespace OpenWifi {
                         Entry.Valid = false;
                     }
                 } else {
-					poco_error(
+                    Logger().error(Poco::format("MANIFEST(%s): Entry does not have a valid JSON manifest.",Name));
-						Logger(),
-						fmt::format("MANIFEST({}): Entry does not have a valid JSON manifest.",
-									Name));
                     MissingJson++;
                     Entry.Valid = false;
                 }
@@ -96,49 +69,36 @@ namespace OpenWifi {
             }
         }
 
-		poco_information(Logger(), fmt::format("Accepted {} firmwares.", Accepted));
+        Logger().information(Poco::format("Accepted %Lu firmwares.", Accepted));
-		poco_information(Logger(), fmt::format("Rejected {} too old firmwares.", Rejected));
+        Logger().information(Poco::format("Rejected %Lu too old firmwares.", Rejected));
-		poco_information(Logger(), fmt::format("Rejected {} bad JSON.", BadFormat));
+        Logger().information(Poco::format("Rejected %Lu bad JSON.", BadFormat));
-		poco_information(Logger(), fmt::format("Rejected {} missing JSON.", MissingJson));
+        Logger().information(Poco::format("Rejected %Lu missing JSON.", MissingJson));
 
         return true;
     }
 
     bool ManifestCreator::AddManifestToDB(S3BucketContent & BucketContent) {
 
-		//  remove all staging names
-		for (auto it = BucketContent.begin(); it != end(BucketContent);) {
-			if (it->second.URI.find("-staging-") != std::string::npos) {
-				it = BucketContent.erase(it);
-			} else {
-				++it;
-			}
-		}
-
-		//  Now remove all DB entries that do not appear in the Latest manifest
-		auto RemovedEntries =
-			StorageService()->FirmwaresDB().RemoveOldDBEntriesNotInManifest(BucketContent);
-		poco_information(Logger(), fmt::format("Removed {} DB entries that no longer are relevant.",
-											   RemovedEntries));
-
         for(auto &[Release,BucketEntry]:BucketContent) {
             FMSObjects::Firmware    F;
             auto R = Release;
 
-			if (BucketEntry.Valid &&
+            // skip staging releases.
-				!StorageService()->FirmwaresDB().GetFirmwareByName(R, BucketEntry.Compatible, F)) {
+            if(BucketEntry.URI.find("-staging-")!=std::string::npos)
-				F.id = MicroServiceCreateUUID();
+                continue;
+
+            if(BucketEntry.Valid && !StorageService()->FirmwaresDB().GetFirmwareByName(R,BucketEntry.Compatible,F)) {
+                F.id = MicroService::instance().CreateUUID();
                 F.release = Release;
                 F.size = BucketEntry.S3Size;
-				F.created = Utils::Now();
+                F.created = std::time(nullptr);
                 F.imageDate = BucketEntry.S3TimeStamp;
-				F.image = BucketEntry.Image;
+                F.image = BucketEntry.S3Name;
                 F.uri = BucketEntry.URI;
                 F.revision = BucketEntry.Revision;
                 F.deviceType = BucketEntry.Compatible;
                 if(StorageService()->FirmwaresDB().AddFirmware(F)) {
-					poco_information(Logger(),
+                    Logger().information(Poco::format("Adding firmware '%s'",Release));
-									 fmt::format("Adding firmware '{}', size={}", Release, F.size));
                 } else {
                 }
             }
@@ -148,14 +108,14 @@ namespace OpenWifi {
 
     int ManifestCreator::Start() {
         Running_ = true;
-		S3BucketName_ = MicroServiceConfigGetString("s3.bucketname", "");
+        S3BucketName_ = MicroService::instance().ConfigGetString("s3.bucketname");
-		S3Region_ = MicroServiceConfigGetString("s3.region", "");
+        S3Region_ = MicroService::instance().ConfigGetString("s3.region");
-		S3Secret_ = MicroServiceConfigGetString("s3.secret", "");
+        S3Secret_ = MicroService::instance().ConfigGetString("s3.secret");
-		S3Key_ = MicroServiceConfigGetString("s3.key", "");
+        S3Key_ = MicroService::instance().ConfigGetString("s3.key");
-		S3Retry_ = MicroServiceConfigGetInt("s3.retry", 60);
+        S3Retry_ = MicroService::instance().ConfigGetInt("s3.retry",60);
 
-		DBRefresh_ = MicroServiceConfigGetInt("firmwaredb.refresh", 24 * 60 * 60);
+        DBRefresh_ = MicroService::instance().ConfigGetInt("firmwaredb.refresh",30*60);
-		MaxAge_ = MicroServiceConfigGetInt("firmwaredb.maxage", 90) * 24 * 60 * 60;
+        MaxAge_ = MicroService::instance().ConfigGetInt("firmwaredb.maxage",90) * 24 * 60 * 60;
 
         AwsConfig_.enableTcpKeepAlive = true;
         AwsConfig_.enableEndpointDiscovery = true;
@@ -165,10 +125,9 @@ namespace OpenWifi {
         AwsCreds_.SetAWSAccessKeyId(S3Key_);
         AwsCreds_.SetAWSSecretKey(S3Secret_);
 
-		ManifestCreatorCallBack_ = std::make_unique<Poco::TimerCallback<ManifestCreator>>(
+        ManifestCreatorCallBack_ = std::make_unique<Poco::TimerCallback<ManifestCreator>>(*this, &ManifestCreator::onTimer);
-			*this, &ManifestCreator::onTimer);
+        Timer_.setStartInterval(5 * 60 * 1000);  // first run in 5 minutes
-		Timer_.setStartInterval(1 * 60 * 1000); // first run in 1 hour
+        Timer_.setPeriodicInterval(DBRefresh_ * 1000);
-		Timer_.setPeriodicInterval((long)(DBRefresh_ * 1000));
         Timer_.start(*ManifestCreatorCallBack_);
 
         return 0;
@@ -181,10 +140,10 @@ namespace OpenWifi {
         }
     }
 
-	void ManifestCreator::CloseBucket() {}
+    void ManifestCreator::CloseBucket() {
+    }
 
-	bool ManifestCreator::GetBucketObjectContent(Aws::S3::S3Client &S3Client,
+    bool ManifestCreator::GetBucketObjectContent(Aws::S3::S3Client &S3Client, const std::string &ObjectName,
-												 const std::string &ObjectName,
                                                  std::string &ObjectContent) {
         Aws::S3::Model::GetObjectRequest Request;
         Request.SetBucket(S3BucketName_.c_str());
@@ -192,7 +151,8 @@ namespace OpenWifi {
 
         Aws::S3::Model::GetObjectOutcome get_object_outcome = S3Client.GetObject(Request);
 
-		if (get_object_outcome.IsSuccess()) {
+        if (get_object_outcome.IsSuccess())
+        {
             auto & FileData = get_object_outcome.GetResultWithOwnership().GetBody();
             std::string O;
             std::ostringstream OS(O);
@@ -208,7 +168,7 @@ namespace OpenWifi {
         static const std::string UPGRADE("-upgrade.bin");
 
         std::string     URIBase = "https://";
-		URIBase += MicroServiceConfigGetString("s3.bucket.uri", "");
+        URIBase += MicroService::instance().ConfigGetString("s3.bucket.uri");
 
         Bucket.clear();
 
@@ -224,7 +184,7 @@ namespace OpenWifi {
         while(!isDone) {
             Outcome = S3Client.ListObjectsV2(Request);
             if(!Outcome.IsSuccess()) {
-				poco_error(Logger(), fmt::format("Error while doing ListObjectsV2: {}, {}",
+                Logger().error(Poco::format("Error while doing ListObjectsV2: %s, %s",
                                            std::string{Outcome.GetError().GetExceptionName()},
                                            std::string{Outcome.GetError().GetMessage()}));
                 return false;
@@ -246,8 +206,10 @@ namespace OpenWifi {
                         // std::cout << "Content: " << Content << std::endl;
                         Poco::JSON::Parser P;
                         auto ParsedContent = P.parse(Content).extract<Poco::JSON::Object::Ptr>();
-						if (ParsedContent->has("image") && ParsedContent->has("compatible") &&
+                        if (ParsedContent->has("image") &&
-							ParsedContent->has("revision") && ParsedContent->has("timestamp")) {
+                            ParsedContent->has("compatible") &&
+                            ParsedContent->has("revision") &&
+                            ParsedContent->has("timestamp")) {
                             auto It = Bucket.find(Release);
                             uint64_t TimeStamp = ParsedContent->get("timestamp");
                             auto Compatible = ParsedContent->get("compatible").toString();
@@ -261,23 +223,18 @@ namespace OpenWifi {
                                 It->second.Image = Image;
                                 It->second.S3ContentManifest = Content;
                             } else {
-								Bucket.emplace(Release, S3BucketEntry{.Valid = false,
+                                Bucket.emplace(Release, S3BucketEntry{
-																	  .S3Name = "",
                                         .S3ContentManifest = Content,
-																	  .S3TimeStamp = 0,
-																	  .S3Size = 0,
                                         .Revision = Revision,
                                         .Image = Image,
                                         .Compatible = Compatible,
-																	  .Timestamp = TimeStamp,
+                                        .Timestamp = TimeStamp});
-																	  .URI = ""});
                             }
                         }
                     }
                 } else if (FileName.getExtension() == "bin") {
                     //  we must remove -upgrade, so
-					const auto &ReleaseName =
+                    const auto &ReleaseName = FileName.getBaseName().substr(0, FileName.getBaseName().size() - 8);
-						FileName.getBaseName().substr(0, FileName.getBaseName().size() - 8);
                     auto It = Bucket.find(ReleaseName);
                     auto S3TimeStamp = (uint64_t) (Object.GetLastModified().Millis() / 1000);
                     uint64_t S3Size = Object.GetSize();
@@ -288,16 +245,10 @@ namespace OpenWifi {
                         It->second.S3Name = ReleaseName;
                         It->second.URI = URI;
                     } else {
-
+                        Bucket.emplace(ReleaseName, S3BucketEntry{
-						Bucket.emplace(ReleaseName, S3BucketEntry{.Valid = false,
+                                .S3Name = ReleaseName,
-																  .S3Name = "",
-																  .S3ContentManifest = "",
                                 .S3TimeStamp = S3TimeStamp,
                                 .S3Size = S3Size,
-																  .Revision = "",
-																  .Image = "",
-																  .Compatible = "",
-																  .Timestamp = 0,
                                 .URI = URI});
                     }
                 } else {
@@ -317,7 +268,7 @@ namespace OpenWifi {
 
         // std::cout << "Count:" << Count << "  Runs:" << Runs << std::endl;
         if(!Outcome.IsSuccess()) {
-			poco_error(Logger(), fmt::format("Error while doing ListObjectsV2: {}, {}",
+            Logger().error(Poco::format("Error while doing ListObjectsV2: %s, %s",
                                        std::string{Outcome.GetError().GetExceptionName()},
                                        std::string{Outcome.GetError().GetMessage()}));
             return false;
@@ -337,6 +288,7 @@ namespace OpenWifi {
             std::cout << "  Timestamp: " << Timestamp << std::endl;
             std::cout << "  URI: " << URI << std::endl;
         } else {
+
         }
     }
 
@@ -347,4 +299,4 @@ namespace OpenWifi {
         }
     }
 
-} // namespace OpenWifi
+}

src/ManifestCreator.h

@@ -2,14 +2,15 @@
 // Created by stephane bourque on 2021-06-02.
 //
 
-#pragma once
+#ifndef UCENTRALFWS_MANIFESTCREATOR_H
+#define UCENTRALFWS_MANIFESTCREATOR_H
 
 #include <aws/core/Aws.h>
-#include <aws/core/auth/AWSCredentials.h>
 #include <aws/s3/S3Client.h>
+#include <aws/core/auth/AWSCredentials.h>
 
+#include "framework/MicroService.h"
 #include "Poco/Timer.h"
-#include "framework/SubSystemServer.h"
 
 namespace OpenWifi {
 
@@ -28,7 +29,7 @@ namespace OpenWifi {
     };
     typedef std::map<const std::string, S3BucketEntry>    S3BucketContent;
 
-	class ManifestCreator : public SubSystemServer, Poco::Runnable {
+    class ManifestCreator : public SubSystemServer {
     public:
         static auto instance() {
             static auto instance_ = new ManifestCreator;
@@ -42,15 +43,11 @@ namespace OpenWifi {
         bool AddManifestToDB(S3BucketContent & BucketContent);
         bool InitBucket();
         bool ReadBucket(S3BucketContent & Bucket);
-		bool GetBucketObjectContent(Aws::S3::S3Client &S3Client, const std::string &ObjectName,
+        bool GetBucketObjectContent(Aws::S3::S3Client &S3Client, const std::string &ObjectName, std::string & ObjectContent);
-									std::string &ObjectContent);
         void CloseBucket();
         void Print(const S3BucketContent &B);
         uint64_t MaxAge() const { return MaxAge_; }
         void onTimer(Poco::Timer & timer);
-		bool RunUpdateTask();
-		void run() override;
-		std::uint64_t LastUpdate() const { return LastUpdate_; }
 
     private:
         std::atomic_bool            Running_ = false;
@@ -65,14 +62,14 @@ namespace OpenWifi {
         uint64_t                    MaxAge_ = 0 ;
         Poco::Timer                                             Timer_;
         std::unique_ptr<Poco::TimerCallback<ManifestCreator>>   ManifestCreatorCallBack_;
-		std::atomic_flag UpdateRunning_ = ATOMIC_FLAG_INIT;
-		Poco::Thread RunnerThread_;
-		std::uint64_t LastUpdate_ = 0;
 
-		ManifestCreator() noexcept
+        ManifestCreator() noexcept:
-			: SubSystemServer("ManifestCreator", "MANIFEST-MGR", "manifestcreator") {}
+                SubSystemServer("ManifestCreator", "MANIFEST-MGR", "manifestcreator") {
+        }
     };
 
     inline auto ManifestCreator() { return ManifestCreator::instance(); };
 
-} // namespace OpenWifi
+}
+
+#endif //UCENTRALFWS_MANIFESTCREATOR_H

src/NewCommandHandler.cpp

@@ -5,15 +5,10 @@
 #include "NewCommandHandler.h"
 #include "StorageService.h"
 
-#include "fmt/format.h"
-#include "framework/KafkaManager.h"
-#include "nlohmann/json.hpp"
-
 namespace OpenWifi {
 
     void NewCommandHandler::run() {
         Running_ = true ;
-		Utils::SetThreadName("cmd-handler");
         while(Running_) {
             Poco::Thread::trySleep(2000);
 
@@ -50,15 +45,9 @@ namespace OpenWifi {
                             if(Command=="delete_device") {
                                 auto pSerialNumber = PayloadSection["payload"]["serialNumber"];
                                 if(pSerialNumber==SerialNumber) {
-									poco_debug(
+                                    Logger().debug(Poco::format("Removing device '%s' from upgrade history.",SerialNumber));
-										Logger(),
-										fmt::format("Removing device '{}' from upgrade history.",
-													SerialNumber));
                                     StorageService()->HistoryDB().DeleteHistory(SerialNumber);
-									poco_debug(
+                                    Logger().debug(Poco::format("Removing device '%s' from device table.",SerialNumber));
-										Logger(),
-										fmt::format("Removing device '{}' from device table.",
-													SerialNumber));
                                     StorageService()->DevicesDB().DeleteDevice(SerialNumber);
                                 }
                             }
@@ -72,9 +61,7 @@ namespace OpenWifi {
     };
 
     int NewCommandHandler::Start() {
-		Types::TopicNotifyFunction F = [this](std::string s1, std::string s2) {
+        Types::TopicNotifyFunction F = [this](std::string s1,std::string s2) { this->CommandReceived(s1,s2); };
-			this->CommandReceived(s1, s2);
-		};
         WatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::COMMAND, F);
         Worker_.start(*this);
         return 0;
@@ -96,4 +83,4 @@ namespace OpenWifi {
         std::lock_guard G(Mutex_);
         NewCommands_.push(std::make_pair(Key,Message));
     }
-} // namespace OpenWifi
+}

src/NewCommandHandler.h

@@ -2,10 +2,11 @@
 // Created by stephane bourque on 2021-11-21.
 //
 
-#pragma once
+#ifndef OWFMS_NEWCOMMANDHANDLER_H
+#define OWFMS_NEWCOMMANDHANDLER_H
 
+#include "framework/MicroService.h"
 #include "framework/OpenWifiTypes.h"
-#include "framework/SubSystemServer.h"
 
 namespace OpenWifi {
 
@@ -28,9 +29,13 @@ namespace OpenWifi {
         int                         WatcherId_=0;
         Types::StringPairQueue      NewCommands_;
 
-		NewCommandHandler() noexcept
+        NewCommandHandler() noexcept:
-			: SubSystemServer("NewCommandHandler", "NEWCOM-MGR", "commanmdhandler") {}
+            SubSystemServer("NewCommandHandler", "NEWCOM-MGR", "commanmdhandler") {
+        }
+
     };
     inline auto NewCommandHandler() { return NewCommandHandler::instance(); };
 
-} // namespace OpenWifi
+}
+
+#endif //OWFMS_NEWCOMMANDHANDLER_H

src/NewConnectionHandler.cpp

@@ -3,33 +3,25 @@
 //
 
 #include "NewConnectionHandler.h"
-#include "AutoUpdater.h"
+#include "framework/KafkaTopics.h"
-#include "DeviceCache.h"
+#include "framework/OpenWifiTypes.h"
-#include "LatestFirmwareCache.h"
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Parser.h"
 #include "StorageService.h"
-#include "framework/KafkaTopics.h"
+#include "LatestFirmwareCache.h"
-#include "framework/OpenWifiTypes.h"
+#include "framework/uCentral_Protocol.h"
-#include "framework/ow_constants.h"
+#include "DeviceCache.h"
-
+#include "AutoUpdater.h"
-#include "fmt/format.h"
-#include "framework/KafkaManager.h"
 
 /*
 { "system" : { "id" : 6715803232063 , "host" : "https://localhost:17002" } ,
- "payload" : "{"capabilities":{"compatible":"linksys_ea8300","model":"Linksys EA8300
+ "payload" : "{"capabilities":{"compatible":"linksys_ea8300","model":"Linksys EA8300 (Dallas)","network":{"lan":["eth0"],"wan":["eth1"]},"platform":"ap","switch":{"switch0":{"enable":true,"ports":[{"device":"eth0","need_tag":false,"num":0,"want_untag":true},{"num":1,"role":"lan"},{"num":2,"role":"lan"},{"num":3,"role":"lan"},{"num":4,"role":"lan"}],"reset":true,"roles":[{"device":"eth0","ports":"1 2 3 4 0","role":"lan"}]}},"wifi":{"platform/soc/a000000.wifi":{"band":["2G"],"channels":[1,2,3,4,5,6,7,8,9,10,11],"frequencies":[2412,2417,2422,2427,2432,2437,2442,2447,2452,2457,2462],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865687986},"platform/soc/a800000.wifi":{"band":["5G"],"channels":[36,40,44,48,52,56,60,64],"frequencies":[5180,5200,5220,5240,5260,5280,5300,5320],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865687986},"soc/40000000.pci/pci0000:00/0000:00:00.0/0000:01:00.0":{"band":["5G"],"channels":[100,104,108,112,116,120,124,128,132,136,140,144,149,153,157,161,165],"frequencies":[5500,5520,5540,5560,5580,5600,5620,5640,5660,5680,5700,5720,5745,5765,5785,5805,5825],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865696178}}},"firmware":"OpenWrt 21.02-SNAPSHOT r16011+53-6fd65c6573 / TIP-devel-0825cb93","serial":"24f5a207a130","uuid":1623866223}}
-(Dallas)","network":{"lan":["eth0"],"wan":["eth1"]},"platform":"ap","switch":{"switch0":{"enable":true,"ports":[{"device":"eth0","need_tag":false,"num":0,"want_untag":true},{"num":1,"role":"lan"},{"num":2,"role":"lan"},{"num":3,"role":"lan"},{"num":4,"role":"lan"}],"reset":true,"roles":[{"device":"eth0","ports":"1
-2 3 4
-0","role":"lan"}]}},"wifi":{"platform/soc/a000000.wifi":{"band":["2G"],"channels":[1,2,3,4,5,6,7,8,9,10,11],"frequencies":[2412,2417,2422,2427,2432,2437,2442,2447,2452,2457,2462],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865687986},"platform/soc/a800000.wifi":{"band":["5G"],"channels":[36,40,44,48,52,56,60,64],"frequencies":[5180,5200,5220,5240,5260,5280,5300,5320],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865687986},"soc/40000000.pci/pci0000:00/0000:00:00.0/0000:01:00.0":{"band":["5G"],"channels":[100,104,108,112,116,120,124,128,132,136,140,144,149,153,157,161,165],"frequencies":[5500,5520,5540,5560,5580,5600,5620,5640,5660,5680,5700,5720,5745,5765,5785,5805,5825],"ht_capa":6639,"htmode":["HT20","HT40","VHT20","VHT40","VHT80"],"rx_ant":3,"tx_ant":3,"vht_capa":865696178}}},"firmware":"OpenWrt
-21.02-SNAPSHOT r16011+53-6fd65c6573 /
-TIP-devel-0825cb93","serial":"24f5a207a130","uuid":1623866223}}
  */
 
+
 namespace OpenWifi {
 
     void NewConnectionHandler::run() {
-		Utils::SetThreadName("conn-handler");
         Running_ = true ;
         while(Running_) {
             Poco::Thread::trySleep(2000);
@@ -67,54 +59,33 @@ namespace OpenWifi {
                             // std::cout << "CAPABILITIES:" << SerialNumber << std::endl;
                             auto CapObj = PayloadObj->getObject(uCentralProtocol::CAPABILITIES);
                             if(CapObj->has(uCentralProtocol::COMPATIBLE)) {
-								auto DeviceType =
+                                auto DeviceType = CapObj->get(uCentralProtocol::COMPATIBLE).toString();
-									CapObj->get(uCentralProtocol::COMPATIBLE).toString();
                                 auto Serial = PayloadObj->get(uCentralProtocol::SERIAL).toString();
-								auto Revision = Storage::TrimRevision(
+                                auto Revision = Storage::TrimRevision(PayloadObj->get(uCentralProtocol::FIRMWARE).toString());
-									PayloadObj->get(uCentralProtocol::FIRMWARE).toString());
+                                // std::cout << "ConnectionEvent: SerialNumber: " << SerialNumber << " DeviceType: " << DeviceType << " Revision:" << Revision << std::endl;
-								// std::cout << "ConnectionEvent: SerialNumber: " << SerialNumber <<
-								// " DeviceType: " << DeviceType << " Revision:" << Revision <<
-								// std::endl;
                                 FMSObjects::FirmwareAgeDetails  FA;
-								if (StorageService()->FirmwaresDB().ComputeFirmwareAge(
+                                if(StorageService()->FirmwaresDB().ComputeFirmwareAge(DeviceType, Revision, FA)) {
-										DeviceType, Revision, FA)) {
+                                    StorageService()->DevicesDB().SetDeviceRevision(SerialNumber, Revision, DeviceType, EndPoint);
-									StorageService()->DevicesDB().SetDeviceRevision(
-										SerialNumber, Revision, DeviceType, EndPoint);
                                     if(FA.age)
-										poco_information(
+                                        Logger().information(Poco::format("Device %s connection. Firmware is %s older than latest.",SerialNumber, Utils::SecondsToNiceText(FA.age)));
-											Logger(),
-											fmt::format("Device {} connection. Firmware is {} "
-														"older than latest.",
-														SerialNumber,
-														Utils::SecondsToNiceText(FA.age)));
                                     else
-										poco_information(Logger(),
+                                        Logger().information(Poco::format("Device %s connection. Device firmware is up to date.",SerialNumber));
-														 fmt::format("Device {} connection. Device "
+                                }
-																	 "firmware is up to date.",
+                                else {
-																	 SerialNumber));
+                                    Logger().information(Poco::format("Device %s connection. Firmware age cannot be determined",SerialNumber));
-								} else {
-									poco_information(Logger(),
-													 fmt::format("Device {} connection. Firmware "
-																 "age cannot be determined.",
-																 SerialNumber));
                                 }
 
                                 if(!LatestFirmwareCache()->IsLatest(DeviceType, Revision)) {
-									// std::cout << "Device (connection): " << SerialNumber << " to
+                                    // std::cout << "Device (connection): " << SerialNumber << " to be upgraded ... " << std::endl;
-									// be upgraded ... " << std::endl;
                                     AutoUpdater()->ToBeUpgraded(SerialNumber, DeviceType);
                                 }
                                 DeviceCache()->AddToCache(Serial, DeviceType, EndPoint, Revision);
                             }
                         } else if(PayloadObj->has(uCentralProtocol::DISCONNECTION)) {
-							auto DisconnectMessage =
+                            auto DisconnectMessage = PayloadObj->getObject(uCentralProtocol::DISCONNECTION);
-								PayloadObj->getObject(uCentralProtocol::DISCONNECTION);
+                            if(DisconnectMessage->has(uCentralProtocol::SERIALNUMBER) && DisconnectMessage->has(uCentralProtocol::TIMESTAMP)) {
-							if (DisconnectMessage->has(uCentralProtocol::SERIALNUMBER) &&
+                                auto SNum = DisconnectMessage->get(uCentralProtocol::SERIALNUMBER).toString();
-								DisconnectMessage->has(uCentralProtocol::TIMESTAMP)) {
+                                auto Timestamp = DisconnectMessage->get(uCentralProtocol::TIMESTAMP);
-								auto SNum = DisconnectMessage->get(uCentralProtocol::SERIALNUMBER)
-												.toString();
-								auto Timestamp =
-									DisconnectMessage->get(uCentralProtocol::TIMESTAMP);
                                 StorageService()->DevicesDB().SetDeviceDisconnected(SNum,EndPoint);
                                 // std::cout << "DISCONNECTION:" << SerialNumber << std::endl;
                             }
@@ -124,18 +95,13 @@ namespace OpenWifi {
                             if( PingMessage->has(uCentralProtocol::FIRMWARE) &&
                             PingMessage->has(uCentralProtocol::SERIALNUMBER) &&
                             PingMessage->has(uCentralProtocol::COMPATIBLE)) {
-								auto Revision = Storage::TrimRevision(
+                                auto Revision = Storage::TrimRevision(PingMessage->get(uCentralProtocol::FIRMWARE).toString());
-									PingMessage->get(uCentralProtocol::FIRMWARE).toString());
+                                auto Serial = PingMessage->get( uCentralProtocol::SERIALNUMBER).toString();
-								auto Serial =
+                                auto DeviceType = PingMessage->get( uCentralProtocol::COMPATIBLE).toString();
-									PingMessage->get(uCentralProtocol::SERIALNUMBER).toString();
+                                StorageService()->DevicesDB().SetDeviceRevision(Serial, Revision, DeviceType, EndPoint);
-								auto DeviceType =
-									PingMessage->get(uCentralProtocol::COMPATIBLE).toString();
-								StorageService()->DevicesDB().SetDeviceRevision(
-									Serial, Revision, DeviceType, EndPoint);
                                 DeviceCache()->AddToCache(Serial, DeviceType, EndPoint, Revision);
                                 if(!LatestFirmwareCache()->IsLatest(DeviceType, Revision)) {
-									// std::cout << "Device(ping): " << SerialNumber << " to be
+                                    // std::cout << "Device(ping): " << SerialNumber << " to be upgraded ... " << std::endl;
-									// upgraded ... " << std::endl;
                                     AutoUpdater()->ToBeUpgraded(SerialNumber, DeviceType);
                                 }
                             }
@@ -149,22 +115,17 @@ namespace OpenWifi {
     };
 
     int NewConnectionHandler::Start() {
-		poco_information(Logger(), "Starting...");
+        Types::TopicNotifyFunction F = [this](std::string s1,std::string s2) { this->ConnectionReceived(s1,s2); };
-		Types::TopicNotifyFunction F = [this](std::string s1, std::string s2) {
-			this->ConnectionReceived(s1, s2);
-		};
         ConnectionWatcherId_ = KafkaManager()->RegisterTopicWatcher(KafkaTopics::CONNECTION, F);
         Worker_.start(*this);
         return 0;
     };
 
     void NewConnectionHandler::Stop() {
-		poco_information(Logger(), "Stopping...");
         KafkaManager()->UnregisterTopicWatcher(KafkaTopics::CONNECTION, ConnectionWatcherId_);
         Running_ = false;
         Worker_.wakeUp();
         Worker_.join();
-		poco_information(Logger(), "Stopped...");
     };
 
     bool NewConnectionHandler::Update() {
@@ -172,9 +133,8 @@ namespace OpenWifi {
         return true;
     }
 
-	void NewConnectionHandler::ConnectionReceived(const std::string &Key,
+    void NewConnectionHandler::ConnectionReceived( const std::string & Key, const std::string & Message) {
-												  const std::string &Message) {
         std::lock_guard G(Mutex_);
         NewConnections_.push(std::make_pair(Key,Message));
     }
-} // namespace OpenWifi
+}

src/NewConnectionHandler.h

@@ -2,15 +2,18 @@
 // Created by stephane bourque on 2021-07-13.
 //
 
-#pragma once
+#ifndef UCENTRALFMS_NEWCONNECTIONHANDLER_H
+#define UCENTRALFMS_NEWCONNECTIONHANDLER_H
 
+
+#include "framework/MicroService.h"
 #include "framework/OpenWifiTypes.h"
-#include "framework/SubSystemServer.h"
 
 namespace OpenWifi {
 
     class NewConnectionHandler : public SubSystemServer, Poco::Runnable {
     public:
+
         static auto instance() {
             static auto instance_ = new NewConnectionHandler;
             return instance_;
@@ -26,11 +29,16 @@ namespace OpenWifi {
     private:
         Poco::Thread                Worker_;
         std::atomic_bool            Running_ = false;
-		uint64_t ConnectionWatcherId_ = 0;
+        int                         ConnectionWatcherId_=0;
+        int                         HealthcheckWatcherId_=0;
         Types::StringPairQueue      NewConnections_;
 
-		NewConnectionHandler() noexcept
+        NewConnectionHandler() noexcept:
-			: SubSystemServer("ConnectionHandler", "NEWCONN-MGR", "connectionhandler") {}
+                SubSystemServer("ConnectionHandler", "NEWCONN-MGR", "connectionhandler") {
+        }
+
     };
     inline auto NewConnectionHandler() { return NewConnectionHandler::instance(); };
-} // namespace OpenWifi
+}
+
+#endif //UCENTRALFMS_NEWCONNECTIONHANDLER_H

src/RESTAPI/RESTAPI_Routers.cpp

@@ -2,40 +2,40 @@
 // Created by stephane bourque on 2021-10-23.
 //
 
-#include "RESTAPI/RESTAPI_connectedDeviceHandler.h"
+#include "framework/MicroService.h"
-#include "RESTAPI/RESTAPI_connectedDevicesHandler.h"
+
-#include "RESTAPI/RESTAPI_deviceInformation_handler.h"
-#include "RESTAPI/RESTAPI_deviceReportHandler.h"
-#include "RESTAPI/RESTAPI_firmwareAgeHandler.h"
 #include "RESTAPI/RESTAPI_firmwareHandler.h"
 #include "RESTAPI/RESTAPI_firmwaresHandler.h"
+#include "RESTAPI/RESTAPI_firmwareAgeHandler.h"
+#include "RESTAPI/RESTAPI_connectedDeviceHandler.h"
+#include "RESTAPI/RESTAPI_connectedDevicesHandler.h"
 #include "RESTAPI/RESTAPI_historyHandler.h"
-#include "framework/RESTAPI_Handler.h"
+#include "RESTAPI/RESTAPI_deviceReportHandler.h"
-#include "framework/RESTAPI_SystemCommand.h"
-#include "framework/RESTAPI_SystemConfiguration.h"
-#include "framework/RESTAPI_WebSocketServer.h"
 
 namespace OpenWifi {
 
-	Poco::Net::HTTPRequestHandler *
+    Poco::Net::HTTPRequestHandler * RESTAPI_ExtRouter(const char *Path, RESTAPIHandler::BindingMap &Bindings,
-	RESTAPI_ExtRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
+                                                            Poco::Logger & L, RESTAPI_GenericServer & S, uint64_t TransactionId) {
-					  Poco::Logger &L, RESTAPI_GenericServerAccounting &S, uint64_t TransactionId) {
+        return  RESTAPI_Router<
-		return RESTAPI_Router<RESTAPI_firmwaresHandler, RESTAPI_system_configuration, RESTAPI_firmwareHandler,
+            RESTAPI_firmwaresHandler,
-							  RESTAPI_system_command, RESTAPI_firmwareAgeHandler,
+            RESTAPI_firmwareHandler,
-							  RESTAPI_connectedDevicesHandler, RESTAPI_connectedDeviceHandler,
+            RESTAPI_system_command,
-							  RESTAPI_historyHandler, RESTAPI_deviceReportHandler,
+            RESTAPI_firmwareAgeHandler,
-							  RESTAPI_deviceInformation_handler, RESTAPI_webSocketServer>(
+            RESTAPI_connectedDevicesHandler,
-			Path, Bindings, L, S, TransactionId);
+            RESTAPI_connectedDeviceHandler,
+            RESTAPI_historyHandler,
+            RESTAPI_deviceReportHandler
+            >(Path,Bindings,L, S, TransactionId);
     }
 
-	Poco::Net::HTTPRequestHandler *
+    Poco::Net::HTTPRequestHandler * RESTAPI_IntRouter(const char *Path, RESTAPIHandler::BindingMap &Bindings,
-	RESTAPI_IntRouter(const std::string &Path, RESTAPIHandler::BindingMap &Bindings,
+                                                            Poco::Logger & L, RESTAPI_GenericServer & S, uint64_t TransactionId) {
-					  Poco::Logger &L, RESTAPI_GenericServerAccounting &S, uint64_t TransactionId) {
+        return RESTAPI_Router_I<
-		return RESTAPI_Router_I<RESTAPI_firmwaresHandler, RESTAPI_system_configuration, RESTAPI_firmwareHandler,
+            RESTAPI_firmwaresHandler,
-								RESTAPI_system_command, RESTAPI_firmwareAgeHandler,
+            RESTAPI_firmwareHandler,
-								RESTAPI_connectedDevicesHandler, RESTAPI_connectedDeviceHandler,
+            RESTAPI_system_command,
-								RESTAPI_historyHandler, RESTAPI_deviceReportHandler,
+            RESTAPI_connectedDevicesHandler,
-								RESTAPI_deviceInformation_handler>(Path, Bindings, L, S,
+            RESTAPI_connectedDeviceHandler
-																   TransactionId);
+            >(Path, Bindings, L, S, TransactionId);
+    }
 }
-} // namespace OpenWifi

src/RESTAPI/RESTAPI_connectedDeviceHandler.cpp

@@ -5,7 +5,8 @@
 #include "RESTAPI_connectedDeviceHandler.h"
 #include "RESTObjects/RESTAPI_FMSObjects.h"
 #include "StorageService.h"
-#include "framework/ow_constants.h"
+#include "framework/RESTAPI_protocol.h"
+#include "framework/RESTAPI_errors.h"
 
 namespace OpenWifi {
 
@@ -24,4 +25,4 @@ namespace OpenWifi {
         }
         NotFound();
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_connectedDeviceHandler.h

@@ -5,27 +5,26 @@
 #ifndef UCENTRALFMS_RESTAPI_CONNECTEDDEVICEHANDLER_H
 #define UCENTRALFMS_RESTAPI_CONNECTEDDEVICEHANDLER_H
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_connectedDeviceHandler : public RESTAPIHandler {
     public:
-		RESTAPI_connectedDeviceHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_connectedDeviceHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-									   RESTAPI_GenericServerAccounting &Server,
-									   uint64_t TransactionId, bool Internal)
                 : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                                 std::vector<std::string>
+                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+                                          Server,
-		static auto PathName() {
+                                          TransactionId,
-			return std::list<std::string>{"/api/v1/connectedDevice/{serialNumber}"};
+                                          Internal) {}
-		}
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/connectedDevice/{serialNumber}"};}
 
         void DoGet() final;
         void DoDelete() final {};
         void DoPost() final {};
         void DoPut() final {};
     };
-} // namespace OpenWifi
+}
 
 #endif //UCENTRALFMS_RESTAPI_CONNECTEDDEVICEHANDLER_H

src/RESTAPI/RESTAPI_connectedDevicesHandler.cpp

@@ -2,13 +2,13 @@
 // Created by stephane bourque on 2021-07-18.
 //
 
-#include "Poco/JSON/Array.h"
 #include "Poco/JSON/Object.h"
+#include "Poco/JSON/Array.h"
 
 #include "RESTAPI_connectedDevicesHandler.h"
 #include "RESTObjects/RESTAPI_FMSObjects.h"
 #include "StorageService.h"
-#include "framework/ow_constants.h"
+#include "framework/RESTAPI_protocol.h"
 
 namespace OpenWifi {
     void RESTAPI_connectedDevicesHandler::DoGet() {
@@ -27,4 +27,4 @@ namespace OpenWifi {
         AnswerObj.set(RESTAPI::Protocol::DEVICES, AnswerArr);
         ReturnObject(AnswerObj);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_connectedDevicesHandler.h

@@ -5,24 +5,27 @@
 #ifndef UCENTRALFMS_RESTAPI_CONNECTEDDEVICESHANDLER_H
 #define UCENTRALFMS_RESTAPI_CONNECTEDDEVICESHANDLER_H
 
-#include "framework/RESTAPI_Handler.h"
+
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_connectedDevicesHandler : public RESTAPIHandler {
     public:
-		RESTAPI_connectedDevicesHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_connectedDevicesHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-										RESTAPI_GenericServerAccounting &Server,
-										uint64_t TransactionId, bool Internal)
                 : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                                 std::vector<std::string>
+                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+                                          Server,
-		static auto PathName() { return std::list<std::string>{"/api/v1/connectedDevices"}; }
+                                          TransactionId,
+                                          Internal) {}
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/connectedDevices"};}
         void DoGet()  final;
         void DoDelete() final {};
         void DoPost() final {};
         void DoPut() final {};
+
     };
-} // namespace OpenWifi
+}
 
 #endif //UCENTRALFMS_RESTAPI_CONNECTEDDEVICESHANDLER_H

src/RESTAPI/RESTAPI_deviceInformation_handler.cpp

@@ -1,47 +0,0 @@
-//
-// Created by stephane bourque on 2022-03-04.
-//
-
-#include "RESTAPI_deviceInformation_handler.h"
-#include "LatestFirmwareCache.h"
-#include "StorageService.h"
-
-namespace OpenWifi {
-	void RESTAPI_deviceInformation_handler::DoGet() {
-		auto SerialNumber = GetBinding("serialNumber", "");
-
-		if (SerialNumber.empty() || !Utils::ValidSerialNumber(SerialNumber)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		FMSObjects::DeviceInformation DI;
-
-		//  Let's get the history
-		StorageService()->HistoryDB().GetHistory(SerialNumber, 0, 100, DI.history.history);
-
-		// Let's get the DeviceConnectionInformation
-		FMSObjects::DeviceConnectionInformation DCI;
-		StorageService()->DevicesDB().GetDevice(SerialNumber, DCI);
-
-		LatestFirmwareCacheEntry LFE;
-		LatestFirmwareCache()->FindLatestFirmware(DCI.deviceType, LFE);
-
-		FMSObjects::Firmware Latest;
-		StorageService()->FirmwaresDB().GetFirmware(LFE.Id, Latest);
-
-		DI.serialNumber = SerialNumber;
-		DI.currentFirmware = DCI.revision;
-		DI.latestFirmware = LFE.Revision;
-		DI.latestFirmwareDate = LFE.TimeStamp;
-		DI.latestFirmwareURI = Latest.uri;
-		FirmwaresDB::RecordName FI;
-		StorageService()->FirmwaresDB().GetFirmwareByRevision(DCI.revision, DCI.deviceType, FI);
-		DI.currentFirmwareDate = FI.imageDate;
-
-		DI.latestFirmwareAvailable = (LFE.Revision != DCI.revision);
-
-		Poco::JSON::Object Answer;
-		DI.to_json(Answer);
-		return ReturnObject(Answer);
-	}
-} // namespace OpenWifi

src/RESTAPI/RESTAPI_deviceInformation_handler.h

@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2022-03-04.
-//
-
-#pragma once
-
-#include "framework/RESTAPI_Handler.h"
-
-namespace OpenWifi {
-	class RESTAPI_deviceInformation_handler : public RESTAPIHandler {
-	  public:
-		RESTAPI_deviceInformation_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) {}
-		static auto PathName() {
-			return std::list<std::string>{"/api/v1/deviceInformation/{serialNumber}"};
-		}
-		void DoGet() final;
-		void DoDelete() final{};
-		void DoPost() final{};
-		void DoPut() final{};
-	};
-} // namespace OpenWifi

src/RESTAPI/RESTAPI_deviceReportHandler.cpp

@@ -3,19 +3,16 @@
 //
 
 #include "RESTAPI_deviceReportHandler.h"
-#include "Daemon.h"
+#include "StorageService.h"
-#include "Poco/JSON/Object.h"
 #include "RESTObjects/RESTAPI_FMSObjects.h"
+#include "Poco/JSON/Object.h"
+#include "Daemon.h"
 
 namespace OpenWifi {
     void RESTAPI_deviceReportHandler::DoGet() {
-		poco_information(Logger(), fmt::format("GET-DASHBOARD: {}", Requester()));
+        Daemon()->CreateDashboard();
-		FMSObjects::DeviceReport Data;
+        Poco::JSON::Object  O;
-		if (Daemon()->GetDashboard().Get(Data, Logger())) {
+        Daemon()->GetDashboard().to_json(O);
-			Poco::JSON::Object Answer;
+        ReturnObject(O);
-			Data.to_json(Answer);
-			return ReturnObject(Answer);
     }
-		return BadRequest(RESTAPI::Errors::InternalError);
 }
-} // namespace OpenWifi

src/RESTAPI/RESTAPI_deviceReportHandler.h

@@ -2,24 +2,29 @@
 // Created by stephane bourque on 2021-07-19.
 //
 
-#pragma once
+#ifndef UCENTRALFMS_RESTAPI_DEVICEREPORTHANDLER_H
+#define UCENTRALFMS_RESTAPI_DEVICEREPORTHANDLER_H
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_deviceReportHandler : public RESTAPIHandler {
     public:
-		RESTAPI_deviceReportHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_deviceReportHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-									RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-									bool Internal)
                 : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                                 std::vector<std::string>
+                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+                                          Server,
-		static auto PathName() { return std::list<std::string>{"/api/v1/deviceReport"}; }
+                                          TransactionId,
+                                 Internal) {}
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/deviceReport"};}
         void DoGet()  final;
         void DoDelete() final {};
         void DoPost() final {};
         void DoPut() final {};
     };
-} // namespace OpenWifi
+}
+
+
+#endif //UCENTRALFMS_RESTAPI_DEVICEREPORTHANDLER_H

src/RESTAPI/RESTAPI_firmwareAgeHandler.cpp

@@ -4,10 +4,13 @@
 
 #include "RESTAPI_firmwareAgeHandler.h"
 
-#include "DeviceCache.h"
-#include "Poco/JSON/Parser.h"
 #include "StorageService.h"
-#include "framework/ow_constants.h"
+#include "Poco/JSON/Parser.h"
+#include "DeviceCache.h"
+#include "framework/uCentral_Protocol.h"
+#include "framework/RESTAPI_protocol.h"
+#include "framework/RESTAPI_errors.h"
+
 
 namespace OpenWifi {
     void RESTAPI_firmwareAgeHandler::DoGet() {
@@ -17,8 +20,7 @@ namespace OpenWifi {
                 DeviceCacheEntry E;
                 if (DeviceCache()->GetDevice(i, E)) {
                     FMSObjects::FirmwareAgeDetails FA;
-					if (StorageService()->FirmwaresDB().ComputeFirmwareAge(E.deviceType, E.revision,
+                    if(StorageService()->FirmwaresDB().ComputeFirmwareAge(E.deviceType,E.revision,FA)) {
-																		   FA)) {
                         Poco::JSON::Object  O;
                         FA.to_json(O);
                         O.set(uCentralProtocol::SERIALNUMBER,i);
@@ -38,8 +40,8 @@ namespace OpenWifi {
             Answer.set(RESTAPI::Protocol::AGES, Objects);
             return ReturnObject(Answer);
         } else {
-			auto DeviceType = ORM::Escape(GetParameter(RESTAPI::Protocol::DEVICETYPE, ""));
+            auto DeviceType = GetParameter(RESTAPI::Protocol::DEVICETYPE, "");
-			auto Revision = ORM::Escape(GetParameter(RESTAPI::Protocol::REVISION, ""));
+            auto Revision = GetParameter(RESTAPI::Protocol::REVISION, "");
 
             if (DeviceType.empty() || Revision.empty()) {
                 return BadRequest(RESTAPI::Errors::BothDeviceTypeRevision);
@@ -57,4 +59,4 @@ namespace OpenWifi {
             NotFound();
         }
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_firmwareAgeHandler.h

@@ -5,24 +5,25 @@
 #ifndef UCENTRALFMS_RESTAPI_FIRMWAREAGEHANDLER_H
 #define UCENTRALFMS_RESTAPI_FIRMWAREAGEHANDLER_H
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_firmwareAgeHandler : public RESTAPIHandler {
     public:
-		RESTAPI_firmwareAgeHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_firmwareAgeHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-								   RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-								   bool Internal)
                 : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                                 std::vector<std::string>
+                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+                                          Server,
-		static auto PathName() { return std::list<std::string>{"/api/v1/firmwareAge"}; }
+                                          TransactionId,
+                                          Internal) {}
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/firmwareAge"};}
         void DoGet()  final;
         void DoDelete() final {};
         void DoPost() final {};
         void DoPut() final {};
     };
-} // namespace OpenWifi
+}
 
 #endif //UCENTRALFMS_RESTAPI_FIRMWAREAGEHANDLER_H

src/RESTAPI/RESTAPI_firmwareHandler.cpp

@@ -4,20 +4,21 @@
 
 #include "Poco/JSON/Parser.h"
 
-#include "RESTAPI/RESTAPI_firmwareHandler.h"
+#include "RESTAPI_firmwareHandler.h"
 #include "StorageService.h"
-#include "framework/MicroServiceFuncs.h"
+#include "framework/uCentral_Protocol.h"
-#include "framework/ow_constants.h"
+#include "framework/RESTAPI_protocol.h"
-#include "framework/utils.h"
+#include "framework/RESTAPI_errors.h"
 
 namespace OpenWifi {
-	void RESTAPI_firmwareHandler::DoPost() {
+    void
-		const auto &Obj = ParsedBody_;
+    RESTAPI_firmwareHandler::DoPost() {
+        auto Obj = ParseStream();
         FMSObjects::Firmware F;
         if (!F.from_json(Obj)) {
             return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
         }
-		F.id = MicroServiceCreateUUID();
+        F.id = MicroService::instance().CreateUUID();
         if(StorageService()->FirmwaresDB().AddFirmware(F)) {
             Poco::JSON::Object  Answer;
             F.to_json(Answer);
@@ -26,7 +27,8 @@ namespace OpenWifi {
         BadRequest(RESTAPI::Errors::RecordNotCreated);
     }
 
-	void RESTAPI_firmwareHandler::DoGet() {
+    void
+    RESTAPI_firmwareHandler::DoGet() {
         auto UUID = GetBinding(uCentralProtocol::ID, "");
 
         if(UUID.empty()) {
@@ -42,7 +44,8 @@ namespace OpenWifi {
         NotFound();
     }
 
-	void RESTAPI_firmwareHandler::DoDelete() {
+    void
+    RESTAPI_firmwareHandler::DoDelete() {
         auto UUID = GetBinding(uCentralProtocol::ID, "");
         if(UUID.empty()) {
             return BadRequest(RESTAPI::Errors::MissingUUID);
@@ -65,7 +68,7 @@ namespace OpenWifi {
             return NotFound();
         }
 
-		const auto &Obj = ParsedBody_;
+        auto Obj = ParseStream();
         FMSObjects::Firmware    NewFirmware;
         if(!NewFirmware.from_json(Obj)) {
             return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
@@ -75,12 +78,9 @@ namespace OpenWifi {
             F.description = Obj->get(RESTAPI::Protocol::DESCRIPTION).toString();
         if(Obj->has(RESTAPI::Protocol::NOTES)) {
             SecurityObjects::NoteInfoVec NIV;
-			NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(
+            NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(Obj->get(RESTAPI::Protocol::NOTES).toString());
-				Obj->get(RESTAPI::Protocol::NOTES).toString());
             for(auto const &i:NIV) {
-				SecurityObjects::NoteInfo ii{.created = (uint64_t)Utils::Now(),
+                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UserInfo_.userinfo.email, .note=i.note};
-											 .createdBy = UserInfo_.userinfo.email,
-											 .note = i.note};
                 F.notes.push_back(ii);
             }
         }
@@ -92,4 +92,4 @@ namespace OpenWifi {
         }
         BadRequest(RESTAPI::Errors::RecordNotUpdated);
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_firmwareHandler.h

@@ -5,27 +5,28 @@
 #ifndef UCENTRALFWS_RESTAPI_FIRMWAREHANDLER_H
 #define UCENTRALFWS_RESTAPI_FIRMWAREHANDLER_H
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_firmwareHandler : public RESTAPIHandler {
     public:
-		RESTAPI_firmwareHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_firmwareHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-								RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-								bool Internal)
                 : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                                 std::vector<std::string>
+                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                           Poco::Net::HTTPRequest::HTTP_POST,
                                           Poco::Net::HTTPRequest::HTTP_PUT,
                                           Poco::Net::HTTPRequest::HTTP_DELETE,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+                                          Server,
-		static auto PathName() { return std::list<std::string>{"/api/v1/firmware/{id}"}; }
+                                          TransactionId,
+                                          Internal) {}
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/firmware/{id}"};}
         void DoGet()  final;
         void DoDelete() final;
         void DoPost() final;
         void DoPut() final;
     };
-} // namespace OpenWifi
+}
 
 #endif //UCENTRALFWS_RESTAPI_FIRMWAREHANDLER_H

src/RESTAPI/RESTAPI_firmwaresHandler.cpp

@@ -3,24 +3,20 @@
 //
 
 #include "RESTAPI_firmwaresHandler.h"
-#include "LatestFirmwareCache.h"
 #include "StorageService.h"
-#include "framework/ow_constants.h"
+#include "LatestFirmwareCache.h"
+#include "framework/RESTAPI_protocol.h"
 
 namespace OpenWifi {
-	void RESTAPI_firmwaresHandler::DoGet() {
+    void
-		std::string DeviceType = ORM::Escape(GetParameter(RESTAPI::Protocol::DEVICETYPE, ""));
+    RESTAPI_firmwaresHandler::DoGet() {
-		bool IdOnly = GetBoolParameter(RESTAPI::Protocol::IDONLY);
+        std::string DeviceType = GetParameter(RESTAPI::Protocol::DEVICETYPE, "");
-		bool LatestOnly = GetBoolParameter(RESTAPI::Protocol::LATESTONLY);
+        bool IdOnly = GetBoolParameter(RESTAPI::Protocol::IDONLY, false);
-		bool rcOnly = GetBoolParameter("rcOnly");
+        bool RevisionSet = GetBoolParameter(RESTAPI::Protocol::REVISIONSET, false);
+        bool LatestOnly = GetBoolParameter(RESTAPI::Protocol::LATESTONLY, false);
+        bool DeviceSet = GetBoolParameter(RESTAPI::Protocol::DEVICESET, false);
 
-		if (GetBoolParameter("updateTimeOnly")) {
+        if(DeviceSet) {
-			Poco::JSON::Object Answer;
-			Answer.set("lastUpdateTime", ManifestCreator()->LastUpdate());
-			return ReturnObject(Answer);
-		}
-
-		if (GetBoolParameter(RESTAPI::Protocol::DEVICESET)) {
             auto Revisions = LatestFirmwareCache()->GetDevices();
             Poco::JSON::Array ObjectArray;
             for (const auto &i:Revisions) {
@@ -31,7 +27,7 @@ namespace OpenWifi {
             return ReturnObject(RetObj);
         }
 
-		if (GetBoolParameter(RESTAPI::Protocol::REVISIONSET)) {
+        if(RevisionSet) {
             auto Revisions = LatestFirmwareCache()->GetRevisions();
             Poco::JSON::Array ObjectArray;
             for (const auto &i:Revisions) {
@@ -46,15 +42,9 @@ namespace OpenWifi {
         if(!DeviceType.empty()) {
             if(LatestOnly) {
                 LatestFirmwareCacheEntry    Entry;
-				if (rcOnly) {
-					if (!LatestFirmwareCache()->FindLatestRCOnlyFirmware(DeviceType, Entry)) {
-						return NotFound();
-					}
-				} else {
                 if(!LatestFirmwareCache()->FindLatestFirmware(DeviceType,Entry)) {
                     return NotFound();
                 }
-				}
 
                 FMSObjects::Firmware    F;
                 if(StorageService()->FirmwaresDB().GetFirmware(Entry.Id,F)) {
@@ -65,12 +55,9 @@ namespace OpenWifi {
                 return NotFound();
             } else {
                 std::vector<FMSObjects::Firmware> List;
-				if (StorageService()->FirmwaresDB().GetFirmwares(QB_.Offset, QB_.Limit, DeviceType,
+                if (StorageService()->FirmwaresDB().GetFirmwares(QB_.Offset, QB_.Limit, DeviceType, List)) {
-																 List)) {
                     Poco::JSON::Array ObjectArray;
                     for (const auto &i:List) {
-						if (rcOnly && !LatestFirmwareCache::IsRC(i.revision))
-							continue;
                         if(IdOnly) {
                             ObjectArray.add(i.id);
                         } else {
@@ -93,8 +80,6 @@ namespace OpenWifi {
         Poco::JSON::Object Answer;
         if (StorageService()->FirmwaresDB().GetFirmwares(QB_.Offset, QB_.Limit, DeviceType, List)) {
             for (const auto &i:List) {
-				if (rcOnly && !LatestFirmwareCache::IsRC(i.revision))
-					continue;
                 if(IdOnly) {
                     ObjectArray.add(i.id);
                 } else {
@@ -107,20 +92,4 @@ namespace OpenWifi {
         Answer.set(RESTAPI::Protocol::FIRMWARES, ObjectArray);
         ReturnObject(Answer);
     }
-
-	void RESTAPI_firmwaresHandler::DoPut() {
-		if (UserInfo_.userinfo.userRole != SecurityObjects::ROOT &&
-			UserInfo_.userinfo.userRole != SecurityObjects::ADMIN) {
-			return UnAuthorized(RESTAPI::Errors::ACCESS_DENIED);
 }
-
-		if (GetBoolParameter("update")) {
-			if (ManifestCreator()->RunUpdateTask()) {
-				return OK();
-			}
-			return BadRequest(RESTAPI::Errors::FirmwareBDInProgress);
-		}
-
-		return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-	}
-} // namespace OpenWifi

src/RESTAPI/RESTAPI_firmwaresHandler.h

@@ -5,26 +5,26 @@
 #ifndef UCENTRALFWS_RESTAPI_FIRMWARESHANDLER_H
 #define UCENTRALFWS_RESTAPI_FIRMWARESHANDLER_H
 
-#include "framework/RESTAPI_Handler.h"
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_firmwaresHandler : public RESTAPIHandler {
     public:
-		RESTAPI_firmwaresHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_firmwaresHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-								 RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-								 bool Internal)
                 : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                                 std::vector<std::string>
-													  Poco::Net::HTTPRequest::HTTP_PUT,
+                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+                                          Server,
+                                          TransactionId,
+                                          Internal) {}
 
-		static auto PathName() { return std::list<std::string>{"/api/v1/firmwares"}; }
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/firmwares"};}
         void DoGet()  final;
         void DoDelete() final {};
         void DoPost() final {};
-		void DoPut() final;
+        void DoPut() final {};
     };
-} // namespace OpenWifi
+}
 
 #endif //UCENTRALFWS_RESTAPI_FIRMWARESHANDLER_H

src/RESTAPI/RESTAPI_historyHandler.cpp

@@ -4,37 +4,18 @@
 
 #include "RESTAPI_historyHandler.h"
 #include "StorageService.h"
-#include "framework/ow_constants.h"
+#include "framework/RESTAPI_protocol.h"
+#include "framework/RESTAPI_errors.h"
 
 namespace OpenWifi {
-	void RESTAPI_historyHandler::DoGet() {
+    void
-		auto SerialNumber = ORM::Escape(GetBinding(RESTAPI::Protocol::SERIALNUMBER, ""));
+    RESTAPI_historyHandler::DoGet() {
+        auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
 
         if(SerialNumber.empty()) {
             return BadRequest(RESTAPI::Errors::MissingSerialNumber);
         }
 
-		auto unknownList = GetBoolParameter("unknownList");
-		if (SerialNumber == "000000000000" && unknownList) {
-			// so let's get all the devices, filter the latest record
-			FMSObjects::DeviceCurrentInfoList L;
-			StorageService()->HistoryDB().GetUnknownDeviceFirmwares(QB_.Offset, QB_.Limit,
-																	L.devices);
-			Poco::JSON::Object Answer;
-			L.to_json(Answer);
-			return ReturnObject(Answer);
-		}
-
-		auto currentList = GetBoolParameter("currentList");
-		if (SerialNumber == "000000000000" && currentList) {
-			// so let's get all the devices, filter the latest record
-			FMSObjects::DeviceCurrentInfoList L;
-			StorageService()->HistoryDB().GetDeviceFirmwares(QB_.Offset, QB_.Limit, L.devices);
-			Poco::JSON::Object Answer;
-			L.to_json(Answer);
-			return ReturnObject(Answer);
-		}
-
         FMSObjects::RevisionHistoryEntryVec H;
         if (StorageService()->HistoryDB().GetHistory(SerialNumber, QB_.Offset, QB_.Limit, H)) {
             Poco::JSON::Array A;
@@ -62,4 +43,4 @@ namespace OpenWifi {
         }
         NotFound();
     }
-} // namespace OpenWifi
+}

src/RESTAPI/RESTAPI_historyHandler.h

@@ -2,27 +2,31 @@
 // Created by stephane bourque on 2021-07-13.
 //
 
-#pragma once
+#ifndef UCENTRALFMS_RESTAPI_HISTORYHANDLER_H
+#define UCENTRALFMS_RESTAPI_HISTORYHANDLER_H
 
-#include "framework/RESTAPI_Handler.h"
+
+#include "framework/MicroService.h"
 
 namespace OpenWifi {
     class RESTAPI_historyHandler : public RESTAPIHandler {
     public:
-		RESTAPI_historyHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L,
+        RESTAPI_historyHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, uint64_t TransactionId, bool Internal)
-							   RESTAPI_GenericServerAccounting &Server, uint64_t TransactionId,
-							   bool Internal)
                 : RESTAPIHandler(bindings, L,
-							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
+                                 std::vector<std::string>
+                                         {Poco::Net::HTTPRequest::HTTP_GET,
                                           Poco::Net::HTTPRequest::HTTP_DELETE,
                                           Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 Server, TransactionId, Internal) {}
+                                          Server,
-		static auto PathName() {
+                                          TransactionId,
-			return std::list<std::string>{"/api/v1/revisionHistory/{serialNumber}"};
+                                          Internal) {}
-		}
+        static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/revisionHistory/{serialNumber}"};}
         void DoGet()  final;
         void DoDelete() final;
         void DoPost() final {};
         void DoPut() final {};
     };
-} // namespace OpenWifi
+}
+
+
+#endif //UCENTRALFMS_RESTAPI_HISTORYHANDLER_H

src/RESTObjects/RESTAPI_AnalyticsObjects.cpp

@@ -1,605 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-10.
-//
-
-#include "RESTAPI_AnalyticsObjects.h"
-#include "RESTAPI_ProvObjects.h"
-#include "framework/RESTAPI_utils.h"
-
-using OpenWifi::RESTAPI_utils::field_from_json;
-using OpenWifi::RESTAPI_utils::field_to_json;
-
-namespace OpenWifi::AnalyticsObjects {
-
-	void Report::reset() {}
-
-	void Report::to_json([[maybe_unused]] Poco::JSON::Object &Obj) const {}
-
-	void VenueInfo::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, "retention", retention);
-		field_to_json(Obj, "interval", interval);
-		field_to_json(Obj, "monitorSubVenues", monitorSubVenues);
-	}
-
-	bool VenueInfo::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, "retention", retention);
-			field_from_json(Obj, "interval", interval);
-			field_from_json(Obj, "monitorSubVenues", monitorSubVenues);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void BoardInfo::to_json(Poco::JSON::Object &Obj) const {
-		info.to_json(Obj);
-		field_to_json(Obj, "venueList", venueList);
-	}
-
-	bool BoardInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			info.from_json(Obj);
-			field_from_json(Obj, "venueList", venueList);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void DeviceInfo::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "boardId", boardId);
-		field_to_json(Obj, "type", type);
-		field_to_json(Obj, "serialNumber", serialNumber);
-		field_to_json(Obj, "deviceType", deviceType);
-		field_to_json(Obj, "lastContact", lastContact);
-		field_to_json(Obj, "lastPing", lastPing);
-		field_to_json(Obj, "lastState", lastState);
-		field_to_json(Obj, "lastFirmware", lastFirmware);
-		field_to_json(Obj, "lastFirmwareUpdate", lastFirmwareUpdate);
-		field_to_json(Obj, "lastConnection", lastConnection);
-		field_to_json(Obj, "lastDisconnection", lastDisconnection);
-		field_to_json(Obj, "pings", pings);
-		field_to_json(Obj, "states", states);
-		field_to_json(Obj, "connected", connected);
-		field_to_json(Obj, "connectionIp", connectionIp);
-		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, "health", health);
-		field_to_json(Obj, "lastHealth", lastHealth);
-		field_to_json(Obj, "locale", locale);
-		field_to_json(Obj, "uptime", uptime);
-		field_to_json(Obj, "memory", memory);
-	}
-
-	bool DeviceInfo::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "boardId", boardId);
-			field_from_json(Obj, "type", type);
-			field_from_json(Obj, "serialNumber", serialNumber);
-			field_from_json(Obj, "deviceType", deviceType);
-			field_from_json(Obj, "lastContact", lastContact);
-			field_from_json(Obj, "lastPing", lastPing);
-			field_from_json(Obj, "lastState", lastState);
-			field_from_json(Obj, "lastFirmware", lastFirmware);
-			field_from_json(Obj, "lastFirmwareUpdate", lastFirmwareUpdate);
-			field_from_json(Obj, "lastConnection", lastConnection);
-			field_from_json(Obj, "lastDisconnection", lastDisconnection);
-			field_from_json(Obj, "pings", pings);
-			field_from_json(Obj, "states", states);
-			field_from_json(Obj, "connected", connected);
-			field_from_json(Obj, "connectionIp", connectionIp);
-			field_from_json(Obj, "associations_2g", associations_2g);
-			field_from_json(Obj, "associations_5g", associations_5g);
-			field_from_json(Obj, "associations_6g", associations_6g);
-			field_from_json(Obj, "health", health);
-			field_from_json(Obj, "lastHealth", lastHealth);
-			field_from_json(Obj, "locale", locale);
-			field_from_json(Obj, "uptime", uptime);
-			field_from_json(Obj, "memory", memory);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void DeviceInfoList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "devices", devices);
-	}
-
-	bool DeviceInfoList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "devices", devices);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void UE_rate::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "bitrate", bitrate);
-		field_to_json(Obj, "mcs", mcs);
-		field_to_json(Obj, "nss", nss);
-		field_to_json(Obj, "ht", ht);
-		field_to_json(Obj, "sgi", sgi);
-		field_to_json(Obj, "chwidth", chwidth);
-	}
-
-	bool UE_rate::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "bitrate", bitrate);
-			field_from_json(Obj, "mcs", mcs);
-			field_from_json(Obj, "nss", nss);
-			field_from_json(Obj, "ht", ht);
-			field_from_json(Obj, "sgi", sgi);
-			field_from_json(Obj, "chwidth", chwidth);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void UETimePoint::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "station", station);
-		field_to_json(Obj, "rssi", rssi);
-		field_to_json(Obj, "tx_bytes", tx_bytes);
-		field_to_json(Obj, "rx_bytes", rx_bytes);
-		field_to_json(Obj, "tx_duration", tx_duration);
-		field_to_json(Obj, "rx_packets", rx_packets);
-		field_to_json(Obj, "tx_packets", tx_packets);
-		field_to_json(Obj, "tx_retries", tx_retries);
-		field_to_json(Obj, "tx_failed", tx_failed);
-		field_to_json(Obj, "connected", connected);
-		field_to_json(Obj, "inactive", inactive);
-		field_to_json(Obj, "tx_rate", tx_rate);
-		field_to_json(Obj, "rx_rate", rx_rate);
-		//      field_to_json(Obj, "tidstats", tidstats);
-
-		field_to_json(Obj, "tx_bytes_bw", tx_bytes_bw);
-		field_to_json(Obj, "rx_bytes_bw", rx_bytes_bw);
-		field_to_json(Obj, "tx_packets_bw", tx_packets_bw);
-		field_to_json(Obj, "rx_packets_bw", rx_packets_bw);
-		field_to_json(Obj, "tx_failed_pct", tx_failed_pct);
-		field_to_json(Obj, "tx_retries_pct", tx_retries_pct);
-		field_to_json(Obj, "tx_duration_pct", tx_duration_pct);
-
-		field_to_json(Obj, "tx_bytes_delta", tx_bytes_delta);
-		field_to_json(Obj, "rx_bytes_delta", rx_bytes_delta);
-		field_to_json(Obj, "tx_packets_delta", tx_packets_delta);
-		field_to_json(Obj, "rx_packets_delta", rx_packets_delta);
-		field_to_json(Obj, "tx_failed_delta", tx_failed_delta);
-		field_to_json(Obj, "tx_retries_delta", tx_retries_delta);
-		field_to_json(Obj, "tx_duration_delta", tx_duration_delta);
-	}
-
-	bool UETimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "station", station);
-			field_from_json(Obj, "rssi", rssi);
-			field_from_json(Obj, "tx_bytes", tx_bytes);
-			field_from_json(Obj, "rx_bytes", rx_bytes);
-			field_from_json(Obj, "tx_duration", tx_duration);
-			field_from_json(Obj, "rx_packets", rx_packets);
-			field_from_json(Obj, "tx_packets", tx_packets);
-			field_from_json(Obj, "tx_retries", tx_retries);
-			field_from_json(Obj, "tx_failed", tx_failed);
-			field_from_json(Obj, "connected", connected);
-			field_from_json(Obj, "inactive", inactive);
-			field_from_json(Obj, "tx_rate", tx_rate);
-			field_from_json(Obj, "rx_rate", rx_rate);
-			//          field_from_json(Obj,"tidstats",tidstats);
-			field_from_json(Obj, "tx_bytes_bw", tx_bytes_bw);
-			field_from_json(Obj, "rx_bytes_bw", rx_bytes_bw);
-			field_from_json(Obj, "tx_packets_bw", tx_packets_bw);
-			field_from_json(Obj, "rx_packets_bw", rx_packets_bw);
-			field_from_json(Obj, "tx_failed_pct", tx_failed_pct);
-			field_from_json(Obj, "tx_retries_pct", tx_retries_pct);
-			field_from_json(Obj, "tx_duration_pct", tx_duration_pct);
-			field_from_json(Obj, "tx_bytes_delta", tx_bytes_delta);
-			field_from_json(Obj, "rx_bytes_delta", rx_bytes_delta);
-			field_from_json(Obj, "tx_packets_delta", tx_packets_delta);
-			field_from_json(Obj, "rx_packets_delta", rx_packets_delta);
-			field_from_json(Obj, "tx_failed_delta", tx_failed_delta);
-			field_from_json(Obj, "tx_retries_delta", tx_retries_delta);
-			field_from_json(Obj, "tx_duration_delta", tx_duration_delta);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void APTimePoint::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "collisions", collisions);
-		field_to_json(Obj, "multicast", multicast);
-		field_to_json(Obj, "rx_bytes", rx_bytes);
-		field_to_json(Obj, "rx_dropped", rx_dropped);
-		field_to_json(Obj, "rx_errors", rx_errors);
-		field_to_json(Obj, "rx_packets", rx_packets);
-		field_to_json(Obj, "tx_bytes", tx_bytes);
-		field_to_json(Obj, "tx_packets", tx_packets);
-		field_to_json(Obj, "tx_dropped", tx_dropped);
-		field_to_json(Obj, "tx_errors", tx_errors);
-		field_to_json(Obj, "tx_packets", tx_packets);
-
-		field_to_json(Obj, "tx_bytes_bw", tx_bytes_bw);
-		field_to_json(Obj, "rx_bytes_bw", rx_bytes_bw);
-		field_to_json(Obj, "rx_dropped_pct", rx_dropped_pct);
-		field_to_json(Obj, "tx_dropped_pct", tx_dropped_pct);
-		field_to_json(Obj, "rx_packets_bw", rx_packets_bw);
-		field_to_json(Obj, "tx_packets_bw", tx_packets_bw);
-		field_to_json(Obj, "rx_errors_pct", rx_errors_pct);
-		field_to_json(Obj, "tx_errors_pct", tx_errors_pct);
-
-		field_to_json(Obj, "tx_bytes_delta", tx_bytes_delta);
-		field_to_json(Obj, "rx_bytes_delta", rx_bytes_delta);
-		field_to_json(Obj, "rx_dropped_delta", rx_dropped_delta);
-		field_to_json(Obj, "tx_dropped_delta", tx_dropped_delta);
-		field_to_json(Obj, "rx_packets_delta", rx_packets_delta);
-		field_to_json(Obj, "tx_packets_delta", tx_packets_delta);
-		field_to_json(Obj, "rx_errors_delta", rx_errors_delta);
-		field_to_json(Obj, "tx_errors_delta", tx_errors_delta);
-	}
-
-	bool APTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "collisions", collisions);
-			field_from_json(Obj, "multicast", multicast);
-			field_from_json(Obj, "rx_bytes", rx_bytes);
-			field_from_json(Obj, "rx_dropped", rx_dropped);
-			field_from_json(Obj, "rx_errors", rx_errors);
-			field_from_json(Obj, "rx_packets", rx_packets);
-			field_from_json(Obj, "tx_bytes", tx_bytes);
-			field_from_json(Obj, "tx_packets", tx_packets);
-			field_from_json(Obj, "tx_dropped", tx_dropped);
-			field_from_json(Obj, "tx_errors", tx_errors);
-			field_from_json(Obj, "tx_packets", tx_packets);
-
-			field_from_json(Obj, "tx_bytes_bw", tx_bytes_bw);
-			field_from_json(Obj, "rx_bytes_bw", rx_bytes_bw);
-			field_from_json(Obj, "rx_dropped_pct", rx_dropped_pct);
-			field_from_json(Obj, "tx_dropped_pct", tx_dropped_pct);
-			field_from_json(Obj, "rx_packets_bw", rx_packets_bw);
-			field_from_json(Obj, "tx_packets_bw", tx_packets_bw);
-			field_from_json(Obj, "rx_errors_pct", rx_errors_pct);
-			field_from_json(Obj, "tx_errors_pct", tx_errors_pct);
-
-			field_from_json(Obj, "tx_bytes_delta", tx_bytes_delta);
-			field_from_json(Obj, "rx_bytes_delta", rx_bytes_delta);
-			field_from_json(Obj, "rx_dropped_delta", rx_dropped_delta);
-			field_from_json(Obj, "tx_dropped_delta", tx_dropped_delta);
-			field_from_json(Obj, "rx_packets_delta", rx_packets_delta);
-			field_from_json(Obj, "tx_packets_delta", tx_packets_delta);
-			field_from_json(Obj, "rx_errors_delta", rx_errors_delta);
-			field_from_json(Obj, "tx_errors_delta", tx_errors_delta);
-
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void TIDstat_entry::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "rx_msdu", rx_msdu);
-		field_to_json(Obj, "tx_msdu", tx_msdu);
-		field_to_json(Obj, "tx_msdu_failed", tx_msdu_failed);
-		field_to_json(Obj, "tx_msdu_retries", tx_msdu_retries);
-	}
-
-	bool TIDstat_entry::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "rx_msdu", rx_msdu);
-			field_from_json(Obj, "tx_msdu", tx_msdu);
-			field_from_json(Obj, "tx_msdu_failed", tx_msdu_failed);
-			field_from_json(Obj, "tx_msdu_retries", tx_msdu_retries);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void RadioTimePoint::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "band", band);
-		field_to_json(Obj, "channel_width", channel_width);
-		field_to_json(Obj, "active_ms", active_ms);
-		field_to_json(Obj, "busy_ms", busy_ms);
-		field_to_json(Obj, "receive_ms", receive_ms);
-		field_to_json(Obj, "transmit_ms", transmit_ms);
-		field_to_json(Obj, "tx_power", tx_power);
-		field_to_json(Obj, "channel", channel);
-		field_to_json(Obj, "temperature", temperature);
-		field_to_json(Obj, "noise", noise);
-		field_to_json(Obj, "active_pct", active_pct);
-		field_to_json(Obj, "busy_pct", busy_pct);
-		field_to_json(Obj, "receive_pct", receive_pct);
-		field_to_json(Obj, "transmit_pct", transmit_pct);
-	}
-
-	bool RadioTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "band", band);
-			field_from_json(Obj, "channel_width", channel_width);
-			field_from_json(Obj, "active_ms", active_ms);
-			field_from_json(Obj, "busy_ms", busy_ms);
-			field_from_json(Obj, "receive_ms", receive_ms);
-			field_from_json(Obj, "transmit_ms", transmit_ms);
-			field_from_json(Obj, "tx_power", tx_power);
-			field_from_json(Obj, "channel", channel);
-			field_from_json(Obj, "temperature", temperature);
-			field_from_json(Obj, "noise", noise);
-			field_from_json(Obj, "active_pct", active_pct);
-			field_from_json(Obj, "busy_pct", busy_pct);
-			field_from_json(Obj, "receive_pct", receive_pct);
-			field_from_json(Obj, "transmit_pct", transmit_pct);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void AveragePoint::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "min", min);
-		field_to_json(Obj, "max", max);
-		field_to_json(Obj, "avg", avg);
-	}
-
-	bool AveragePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "min", min);
-			field_from_json(Obj, "max", max);
-			field_from_json(Obj, "avg", avg);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void SSIDTimePoint::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "bssid", bssid);
-		field_to_json(Obj, "mode", mode);
-		field_to_json(Obj, "ssid", ssid);
-		field_to_json(Obj, "band", band);
-		field_to_json(Obj, "channel", channel);
-		field_to_json(Obj, "associations", associations);
-		field_to_json(Obj, "tx_bytes_bw", tx_bytes_bw);
-		field_to_json(Obj, "rx_bytes_bw", rx_bytes_bw);
-		field_to_json(Obj, "tx_packets_bw", tx_packets_bw);
-		field_to_json(Obj, "rx_packets_bw", rx_packets_bw);
-		field_to_json(Obj, "tx_failed_pct", tx_failed_pct);
-		field_to_json(Obj, "tx_retries_pct", tx_retries_pct);
-		field_to_json(Obj, "tx_duration_pct", tx_duration_pct);
-	}
-
-	bool SSIDTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "bssid", bssid);
-			field_from_json(Obj, "mode", mode);
-			field_from_json(Obj, "ssid", ssid);
-			field_from_json(Obj, "band", band);
-			field_from_json(Obj, "channel", channel);
-			field_from_json(Obj, "associations", associations);
-			field_from_json(Obj, "tx_bytes_bw", tx_bytes_bw);
-			field_from_json(Obj, "rx_bytes_bw", rx_bytes_bw);
-			field_from_json(Obj, "tx_packets_bw", tx_packets_bw);
-			field_from_json(Obj, "rx_packets_bw", rx_packets_bw);
-			field_from_json(Obj, "tx_failed_pct", tx_failed_pct);
-			field_from_json(Obj, "tx_retries_pct", tx_retries_pct);
-			field_from_json(Obj, "tx_duration_pct", tx_duration_pct);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void DeviceTimePoint::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "id", id);
-		field_to_json(Obj, "boardId", boardId);
-		field_to_json(Obj, "timestamp", timestamp);
-		field_to_json(Obj, "ap_data", ap_data);
-		field_to_json(Obj, "ssid_data", ssid_data);
-		field_to_json(Obj, "radio_data", radio_data);
-		field_to_json(Obj, "device_info", device_info);
-		field_to_json(Obj, "serialNumber", serialNumber);
-	}
-
-	bool DeviceTimePoint::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "id", id);
-			field_from_json(Obj, "boardId", boardId);
-			field_from_json(Obj, "timestamp", timestamp);
-			field_from_json(Obj, "ap_data", ap_data);
-			field_from_json(Obj, "ssid_data", ssid_data);
-			field_from_json(Obj, "radio_data", radio_data);
-			field_from_json(Obj, "device_info", device_info);
-			field_from_json(Obj, "serialNumber", serialNumber);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void DeviceTimePointAnalysis::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "noise", noise);
-		field_to_json(Obj, "temperature", temperature);
-		field_to_json(Obj, "active_pct", active_pct);
-		field_to_json(Obj, "busy_pct", busy_pct);
-		field_to_json(Obj, "receive_pct", receive_pct);
-		field_to_json(Obj, "transmit_pct", transmit_pct);
-		field_to_json(Obj, "tx_power", tx_power);
-		field_to_json(Obj, "tx_bytes_bw", tx_bytes_bw);
-		field_to_json(Obj, "rx_bytes_bw", rx_bytes_bw);
-		field_to_json(Obj, "rx_dropped_pct", rx_dropped_pct);
-		field_to_json(Obj, "tx_dropped_pct", tx_dropped_pct);
-		field_to_json(Obj, "rx_packets_bw", rx_packets_bw);
-		field_to_json(Obj, "tx_packets_bw", tx_packets_bw);
-		field_to_json(Obj, "rx_errors_pct", rx_errors_pct);
-		field_to_json(Obj, "tx_errors_pct", tx_errors_pct);
-	}
-
-	bool DeviceTimePointAnalysis::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "noise", noise);
-			field_from_json(Obj, "temperature", temperature);
-			field_from_json(Obj, "active_pct", active_pct);
-			field_from_json(Obj, "busy_pct", busy_pct);
-			field_from_json(Obj, "receive_pct", receive_pct);
-			field_from_json(Obj, "transmit_pct", transmit_pct);
-			field_from_json(Obj, "tx_power", tx_power);
-			field_from_json(Obj, "tx_bytes_bw", tx_bytes_bw);
-			field_from_json(Obj, "rx_bytes_bw", rx_bytes_bw);
-			field_from_json(Obj, "rx_dropped_pct", rx_dropped_pct);
-			field_from_json(Obj, "tx_dropped_pct", tx_dropped_pct);
-			field_from_json(Obj, "rx_packets_bw", rx_packets_bw);
-			field_from_json(Obj, "tx_packets_bw", tx_packets_bw);
-			field_from_json(Obj, "rx_errors_pct", rx_errors_pct);
-			field_from_json(Obj, "tx_errors_pct", tx_errors_pct);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void DeviceTimePointList::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "points", points);
-		field_to_json(Obj, "stats", stats);
-	}
-
-	bool DeviceTimePointList::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "points", points);
-			field_from_json(Obj, "stats", stats);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void DeviceTimePointStats::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "firstPoint", firstPoint);
-		field_to_json(Obj, "lastPoint", lastPoint);
-		field_to_json(Obj, "count", count);
-	}
-
-	bool DeviceTimePointStats::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "firstPoint", firstPoint);
-			field_from_json(Obj, "lastPoint", lastPoint);
-			field_from_json(Obj, "count", count);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void WifiClientRate::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "bitrate", bitrate);
-		field_to_json(Obj, "chwidth", chwidth);
-		field_to_json(Obj, "mcs", mcs);
-		field_to_json(Obj, "nss", nss);
-		field_to_json(Obj, "vht", vht);
-	}
-
-	bool WifiClientRate::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "bitrate", bitrate);
-			field_from_json(Obj, "chwidth", chwidth);
-			field_from_json(Obj, "mcs", mcs);
-			field_from_json(Obj, "nss", nss);
-			field_from_json(Obj, "vht", vht);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-
-	void WifiClientHistory::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj, "timestamp", timestamp);
-		field_to_json(Obj, "station_id", station_id);
-		field_to_json(Obj, "bssid", bssid);
-		field_to_json(Obj, "ssid", ssid);
-		field_to_json(Obj, "rssi", rssi);
-		field_to_json(Obj, "rx_bitrate", rx_bitrate);
-		field_to_json(Obj, "rx_chwidth", rx_chwidth);
-		field_to_json(Obj, "rx_mcs", rx_mcs);
-		field_to_json(Obj, "rx_nss", rx_nss);
-		field_to_json(Obj, "rx_vht", rx_vht);
-		field_to_json(Obj, "tx_bitrate", tx_bitrate);
-		field_to_json(Obj, "tx_chwidth", tx_chwidth);
-		field_to_json(Obj, "tx_mcs", tx_mcs);
-		field_to_json(Obj, "tx_nss", tx_nss);
-		field_to_json(Obj, "tx_vht", tx_vht);
-		field_to_json(Obj, "rx_bytes", rx_bytes);
-		field_to_json(Obj, "tx_bytes", tx_bytes);
-		field_to_json(Obj, "rx_duration", rx_duration);
-		field_to_json(Obj, "tx_duration", tx_duration);
-		field_to_json(Obj, "rx_packets", rx_packets);
-		field_to_json(Obj, "tx_packets", tx_packets);
-		field_to_json(Obj, "ipv4", ipv4);
-		field_to_json(Obj, "ipv6", ipv6);
-		field_to_json(Obj, "channel_width", channel_width);
-		field_to_json(Obj, "noise", noise);
-		field_to_json(Obj, "tx_power", tx_power);
-		field_to_json(Obj, "channel", channel);
-		field_to_json(Obj, "active_ms", active_ms);
-		field_to_json(Obj, "busy_ms", busy_ms);
-		field_to_json(Obj, "receive_ms", receive_ms);
-		field_to_json(Obj, "mode", mode);
-		field_to_json(Obj, "ack_signal", ack_signal);
-		field_to_json(Obj, "ack_signal_avg", ack_signal_avg);
-		field_to_json(Obj, "connected", connected);
-		field_to_json(Obj, "inactive", inactive);
-		field_to_json(Obj, "tx_retries", tx_retries);
-		field_to_json(Obj, "venue_id", venue_id);
-	}
-
-	bool WifiClientHistory::from_json(const Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj, "timestamp", timestamp);
-			field_from_json(Obj, "station_id", station_id);
-			field_from_json(Obj, "bssid", bssid);
-			field_from_json(Obj, "ssid", ssid);
-			field_from_json(Obj, "rssi", rssi);
-			field_from_json(Obj, "rx_bitrate", rx_bitrate);
-			field_from_json(Obj, "rx_chwidth", rx_chwidth);
-			field_from_json(Obj, "rx_mcs", rx_mcs);
-			field_from_json(Obj, "rx_nss", rx_nss);
-			field_from_json(Obj, "rx_vht", rx_vht);
-			field_from_json(Obj, "tx_bitrate", tx_bitrate);
-			field_from_json(Obj, "tx_chwidth", tx_chwidth);
-			field_from_json(Obj, "tx_mcs", tx_mcs);
-			field_from_json(Obj, "tx_nss", tx_nss);
-			field_from_json(Obj, "tx_vht", tx_vht);
-			field_from_json(Obj, "rx_bytes", rx_bytes);
-			field_from_json(Obj, "tx_bytes", tx_bytes);
-			field_from_json(Obj, "rx_duration", rx_duration);
-			field_from_json(Obj, "tx_duration", tx_duration);
-			field_from_json(Obj, "rx_packets", rx_packets);
-			field_from_json(Obj, "tx_packets", tx_packets);
-			field_from_json(Obj, "ipv4", ipv4);
-			field_from_json(Obj, "ipv6", ipv6);
-			field_from_json(Obj, "channel_width", channel_width);
-			field_from_json(Obj, "noise", noise);
-			field_from_json(Obj, "tx_power", tx_power);
-			field_from_json(Obj, "channel", channel);
-			field_from_json(Obj, "active_ms", active_ms);
-			field_from_json(Obj, "busy_ms", busy_ms);
-			field_from_json(Obj, "receive_ms", receive_ms);
-			field_from_json(Obj, "mode", mode);
-			field_from_json(Obj, "ack_signal", ack_signal);
-			field_from_json(Obj, "ack_signal_avg", ack_signal_avg);
-			field_from_json(Obj, "connected", connected);
-			field_from_json(Obj, "inactive", inactive);
-			field_from_json(Obj, "tx_retries", tx_retries);
-			field_from_json(Obj, "venue_id", venue_id);
-			return true;
-		} catch (...) {
-		}
-		return false;
-	}
-} // namespace OpenWifi::AnalyticsObjects

src/RESTObjects/RESTAPI_AnalyticsObjects.h

@@ -1,343 +0,0 @@
-//
-// Created by stephane bourque on 2022-01-10.
-//
-
-#pragma once
-
-#include "RESTAPI_ProvObjects.h"
-#include "framework/utils.h"
-#include <vector>
-
-namespace OpenWifi {
-
-	namespace AnalyticsObjects {
-
-		struct Report {
-			uint64_t snapShot = 0;
-
-			void reset();
-
-			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;
-
-			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;
-
-			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; }
-		};
-
-		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);
-		};
-
-		struct DeviceInfoList {
-			std::vector<DeviceInfo> devices;
-
-			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 };
-
-		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);
-		};
-
-		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);
-		};
-
-		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;
-
-			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;
-
-			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);
-		};
-
-		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;
-		}
-
-		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;
-
-			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;
-
-			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;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		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;
-
-			double active_pct = 0.0, busy_pct = 0.0, receive_pct = 0.0, transmit_pct = 0.0;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-		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);
-
-			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 {
-				return timestamp == rhs.timestamp &&
-					   device_info.serialNumber == rhs.device_info.serialNumber;
-			}
-
-			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;
-
-			AveragePoint noise;
-			AveragePoint temperature;
-			AveragePoint active_pct;
-			AveragePoint busy_pct;
-			AveragePoint receive_pct;
-			AveragePoint transmit_pct;
-			AveragePoint tx_power;
-
-			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 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 BandwidthAnalysisEntry {
-			uint64_t timestamp = 0;
-		};
-
-		struct BandwidthAnalysis {};
-
-		struct AverageValueSigned {
-			int64_t peak = 0, avg = 0, low = 0;
-		};
-
-		struct AverageValueUnsigned {
-			uint64_t peak = 0, avg = 0, low = 0;
-		};
-
-		struct RadioAnalysis {
-			uint64_t timestamp = 0;
-			AverageValueSigned noise, temperature;
-			AverageValueUnsigned active_ms, busy_ms, transmit_ms, receive_ms;
-		};
-
-		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 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 = 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;
-
-			void to_json(Poco::JSON::Object &Obj) const;
-			bool from_json(const Poco::JSON::Object::Ptr &Obj);
-		};
-
-	} // namespace AnalyticsObjects
-
-} // namespace OpenWifi

src/RESTObjects/RESTAPI_CertObjects.cpp

@@ -3,12 +3,12 @@
 //
 
 #include "RESTAPI_CertObjects.h"
-#include "framework/RESTAPI_utils.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 {
+namespace OpenWifi {
+    namespace  CertObjects {
         void CertificateEntry::to_json(Poco::JSON::Object &Obj) const {
             field_to_json(Obj,"id", id);
             field_to_json(Obj,"entity", entity);
@@ -29,8 +29,6 @@ namespace OpenWifi::CertObjects {
             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);
         }
 
         bool CertificateEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -54,8 +52,6 @@ namespace OpenWifi::CertObjects {
                 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 (...) {
             }
@@ -156,7 +152,6 @@ namespace OpenWifi::CertObjects {
             field_to_json(Obj,"submitted", submitted);
             field_to_json(Obj,"started", started);
             field_to_json(Obj,"completed", completed);
-		field_to_json(Obj, "requesterUsername", requesterUsername);
         }
 
         bool JobEntry::from_json(const Poco::JSON::Object::Ptr &Obj) {
@@ -174,39 +169,10 @@ namespace OpenWifi::CertObjects {
                 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;
         }
-
-	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::reset() {
-		snapshot = 0;
-		numberOfRevokedCerts = numberOfIssuedCerts = 0;
-		activeCertsPerOrganization.clear();
-		revokedCertsPerOrganization.clear();
-		numberOfRedirectors.clear();
-		deviceTypes.clear();
-		monthlyNumberOfCerts.clear();
-		monthlyNumberOfCertsPerOrgPerYear.clear();
-	}
-} // namespace OpenWifi::CertObjects

src/RESTObjects/RESTAPI_CertObjects.h

@@ -4,11 +4,14 @@
 
 #pragma once
 
-#include "RESTObjects/RESTAPI_SecurityObjects.h"
-#include "framework/OpenWifiTypes.h"
 #include <string>
+#include "framework/MicroService.h"
+#include "framework/OpenWifiTypes.h"
+#include "RESTObjects/RESTAPI_SecurityObjects.h"
 
-namespace OpenWifi::CertObjects {
+namespace OpenWifi {
+
+    namespace CertObjects {
 
         struct CertificateEntry {
             OpenWifi::Types::UUID_t         id;
@@ -30,8 +33,6 @@ namespace OpenWifi::CertObjects {
             uint64_t                        modified = 0;
             uint64_t                        revoked = 0;
             uint64_t                        revokeCount = 0;
-		uint64_t synched = 0;
-		uint64_t expiryDate = 0;
 
             void to_json(Poco::JSON::Object &Obj) const;
             bool from_json(const Poco::JSON::Object::Ptr &Obj);
@@ -92,33 +93,9 @@ namespace OpenWifi::CertObjects {
             uint64_t                        submitted=0;
             uint64_t                        started=0;
             uint64_t                        completed=0;
-		std::string requesterUsername;
 
             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;
-
-		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;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		void reset();
-	};
-
-} // namespace OpenWifi::CertObjects

src/RESTObjects/RESTAPI_FMSObjects.cpp

@@ -3,11 +3,10 @@
 //
 
 #include "RESTAPI_FMSObjects.h"
-#include "framework/RESTAPI_utils.h"
+#include "framework/MicroService.h"
-#include "framework/utils.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 {
 
@@ -54,6 +53,7 @@ namespace OpenWifi::FMSObjects {
             field_from_json(Obj, "created", created);
             return true;
         } catch (...) {
+
         }
         return true;
     }
@@ -67,6 +67,7 @@ namespace OpenWifi::FMSObjects {
             field_from_json(Obj, "firmwares", firmwares);
             return true;
         } catch (...) {
+
         }
         return false;
     }
@@ -100,6 +101,7 @@ namespace OpenWifi::FMSObjects {
             field_from_json(Obj, "id", id);
             return true;
         } catch (...) {
+
         }
         return false;
     }
@@ -113,6 +115,7 @@ namespace OpenWifi::FMSObjects {
             field_from_json(Obj,"deviceTypes", deviceTypes);
             return true;
         } catch(...) {
+
         }
         return false;
     }
@@ -138,6 +141,7 @@ namespace OpenWifi::FMSObjects {
             field_from_json(Obj, "upgraded", upgraded);
             return true;
         } catch(...) {
+
         }
         return false;
     }
@@ -151,6 +155,7 @@ namespace OpenWifi::FMSObjects {
             field_from_json(Obj,"deviceTypes", history);
             return true;
         } catch(...) {
+
         }
         return false;
     }
@@ -176,6 +181,7 @@ namespace OpenWifi::FMSObjects {
             field_from_json(Obj,"latest", latest);
             return true;
         } catch(...) {
+
         }
         return false;
     }
@@ -199,6 +205,7 @@ namespace OpenWifi::FMSObjects {
             field_from_json(Obj, "status", status);
             return true;
         } catch(...) {
+
         }
         return false;
     }
@@ -226,73 +233,16 @@ namespace OpenWifi::FMSObjects {
         UnknownFirmwares_.clear();
         totalSecondsOld_.clear();
         numberOfDevices = 0 ;
-		snapshot = Utils::Now();
+        snapshot = std::time(nullptr);
     }
 
-	bool DeviceReport::from_json([[maybe_unused]] const Poco::JSON::Object::Ptr &Obj) {
+    bool DeviceReport::from_json(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;
-	}
-
-} // namespace OpenWifi::FMSObjects

src/RESTObjects/RESTAPI_FMSObjects.h

@@ -4,7 +4,9 @@
 
 #include <string>
 
-#pragma once
+#ifndef UCENTRALFMS_RESTAPI_FMSOBJECTS_H
+#define UCENTRALFMS_RESTAPI_FMSOBJECTS_H
+
 
 #include "RESTAPI_SecurityObjects.h"
 #include "framework/OpenWifiTypes.h"
@@ -27,7 +29,7 @@ namespace OpenWifi::FMSObjects {
         std::string     location;
         std::string     uploader;
         std::string     digest;
-		bool latest = false;
+        bool            latest=0;
         SecurityObjects::NoteInfoVec    notes;
         uint64_t        created=0;
 
@@ -125,35 +127,7 @@ namespace OpenWifi::FMSObjects {
         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;
 
-		void to_json(Poco::JSON::Object &Obj) const;
+#endif //UCENTRALFMS_RESTAPI_FMSOBJECTS_H
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-	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);
-	};
-
-	struct DeviceCurrentInfoList {
-		std::vector<DeviceCurrentInfo> devices;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(const Poco::JSON::Object::Ptr &Obj);
-	};
-
-} // namespace OpenWifi::FMSObjects