Chg: release candidate version fix for helm

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Build Docker image
-      run: docker build -t wlan-cloud-owgw:${{ github.sha }} .
+      run: docker build -t wlan-cloud-ucentralgw:${{ github.sha }} .
 
     - name: Tag Docker image
       run: |
@@ -52,7 +52,7 @@ jobs:
         echo "Result tags: $TAGS"
 
         for tag in $TAGS; do
-          docker tag wlan-cloud-owgw:${{ github.sha }} ${{ env.DOCKER_REGISTRY_URL }}/owgw:$tag
+          docker tag wlan-cloud-ucentralgw:${{ github.sha }} ${{ env.DOCKER_REGISTRY_URL }}/ucentralgw:$tag
         done
 
     - name: Log into Docker registry
@@ -66,7 +66,7 @@ jobs:
     - name: Push Docker images
       if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/master'
       run: |
-        docker images | grep ${{ env.DOCKER_REGISTRY_URL }}/owgw | awk -F ' ' '{print $1":"$2}' | xargs -I {} docker push {}
+        docker images | grep ${{ env.DOCKER_REGISTRY_URL }}/ucentralgw | awk -F ' ' '{print $1":"$2}' | xargs -I {} docker push {}
 
   docker-compose:
     if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/pull/') || github.ref == 'refs/heads/master'
@@ -82,11 +82,11 @@ jobs:
     - name: Instantiate Docker Compose deployment
       working-directory: ./wlan-cloud-ucentral-deploy/docker-compose
       env:
-        OWGW_TAG: ${{ github.sha }}
+        UCENTRALGW_TAG: ${{ github.sha }}
       run: |
         docker-compose up -d
 
-    - name: Wait for OWSec to be alive and kicking
+    - name: Wait for uCentralSec to be alive and kicking
       run: |
         n=0
         until [ "$n" -ge 3 ]
@@ -100,6 +100,11 @@ jobs:
           fi
         done
 
+    - name: Add self-signed certificates to system trust store of containers
+      working-directory: ./wlan-cloud-ucentral-deploy/docker-compose
+      run: |
+        ./add-ca-cert.sh
+
     - name: Check out wlan-cloud-ucentralgw repository
       uses: actions/checkout@v2
       with:
@@ -107,8 +112,8 @@ jobs:
 
     - name: Check functionality of microservices
       env:
-        OWSEC: "openwifi.wlan.local:16001"
-        FLAGS: "-s --cacert ./wlan-cloud-ucentral-deploy/docker-compose/certs/restapi-ca.pem --resolve openwifi.wlan.local:16001:127.0.0.1"
+        UCENTRALSEC: "ucentral.wlan.local:16001"
+        FLAGS: "-s --cacert ./wlan-cloud-ucentral-deploy/docker-compose/certs/restapi-ca.pem --resolve ucentral.wlan.local:16001:127.0.0.1"
       run: |
         ./wlan-cloud-ucentralgw/test_scripts/curl/cli listdevices
 

.github/workflows/cleanup.yml

@@ -17,4 +17,4 @@ jobs:
     - name: Cleanup Docker image with PR branch tag 
       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/owgw/$PR_BRANCH_TAG"
+        curl -uucentral:${{ secrets.DOCKER_REGISTRY_PASSWORD }} -X DELETE "https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral/ucentralgw/$PR_BRANCH_TAG"

.gitignore

@@ -25,6 +25,3 @@ _deps
 test_scripts/curl/token.json
 .vscode/c_cpp_properties.json
 test_scripts/curl/result.json
-*.swp
-helm/charts/*
-!helm/charts/.gitkeep

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owgw VERSION 2.4.0)
+project(ucentralgw VERSION 2.0.0)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -29,20 +29,7 @@ else()
     set(BUILD_NUM 1)
     file(WRITE build ${BUILD_NUM})
 endif()
-
-find_package(Git QUIET)
-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-    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 describe --always --tags failed with ${GIT_RESULT}")
-    endif()
-    string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}")
-endif()
-add_definitions(-DAWS_CUSTOM_MEMORY_MANAGEMENT)
-
+add_definitions(-DAPP_VERSION="${CMAKE_PROJECT_VERSION}" -DBUILD_NUMBER="${BUILD_NUM}")
 add_definitions(-DTIP_GATEWAY_SERVICE="1")
 
 set(Boost_USE_STATIC_LIBS OFF)
@@ -51,8 +38,6 @@ set(Boost_USE_STATIC_RUNTIME OFF)
 find_package(Boost REQUIRED system)
 find_package(OpenSSL REQUIRED)
 find_package(ZLIB REQUIRED)
-find_package(nlohmann_json  REQUIRED)
-find_package(nlohmann_json_schema_validator REQUIRED)
 
 if(SMALL_BUILD)
     find_package(Poco REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
@@ -65,80 +50,61 @@ endif()
 
 include_directories(/usr/local/include  /usr/local/opt/openssl/include src include/kafka /usr/local/opt/mysql-client/include)
 
-configure_file(src/ow_version.h.in ${PROJECT_SOURCE_DIR}/src/ow_version.h @ONLY)
-
-add_executable( owgw
-        build
-        src/ow_version.h.in
-        src/framework/CountryCodes.h
-        src/framework/KafkaTopics.h
-        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/uCentral_Protocol.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/RESTAPI/RESTAPI_devices_handler.cpp src/RESTAPI/RESTAPI_devices_handler.h
-        src/RESTAPI/RESTAPI_device_handler.cpp src/RESTAPI/RESTAPI_device_handler.h
-        src/RESTAPI/RESTAPI_device_commandHandler.cpp src/RESTAPI/RESTAPI_device_commandHandler.h
-        src/RESTAPI/RESTAPI_default_configuration.cpp
-        src/RESTAPI/RESTAPI_default_configuration.h src/RESTAPI/RESTAPI_default_configurations.cpp src/RESTAPI/RESTAPI_default_configurations.h
-        src/RESTAPI/RESTAPI_commands.cpp src/RESTAPI/RESTAPI_commands.h
-        src/RESTAPI/RESTAPI_command.cpp src/RESTAPI/RESTAPI_command.h
-        src/RESTAPI/RESTAPI_file.cpp src/RESTAPI/RESTAPI_file.h
-        src/RESTAPI/RESTAPI_blacklist.cpp src/RESTAPI/RESTAPI_blacklist.h
-        src/RESTAPI/RESTAPI_ouis.cpp src/RESTAPI/RESTAPI_ouis.h
-        src/RESTAPI/RESTAPI_blacklist_list.cpp src/RESTAPI/RESTAPI_blacklist_list.h
-        src/RESTAPI/RESTAPI_capabilities_handler.cpp src/RESTAPI/RESTAPI_capabilities_handler.h
-        src/RESTAPI/RESTAPI_RPC.cpp src/RESTAPI/RESTAPI_RPC.h
-        src/RESTAPI/RESTAPI_deviceDashboardHandler.cpp src/RESTAPI/RESTAPI_deviceDashboardHandler.h
-        src/RESTAPI/RESTAPI_TelemetryWebSocket.cpp src/RESTAPI/RESTAPI_TelemetryWebSocket.h
-        src/RESTAPI/RESTAPI_webSocketServer.cpp src/RESTAPI/RESTAPI_webSocketServer.h
-        src/storage/storage_blacklist.cpp src/storage/storage_tables.cpp src/storage/storage_logs.cpp
-        src/storage/storage_command.cpp src/storage/storage_healthcheck.cpp src/storage/storage_statistics.cpp
-        src/storage/storage_device.cpp src/storage/storage_capabilities.cpp src/storage/storage_defconfig.cpp
-        src/storage/storage_tables.cpp
-        src/APIServers.cpp
-        src/Daemon.cpp src/Daemon.h
-        src/StateProcessor.cpp src/StateProcessor.h
-        src/storage/storage_lifetime_stats.cpp
-        src/WebSocketServer.cpp src/WebSocketServer.h
-        src/StorageService.cpp src/StorageService.h
-        src/DeviceRegistry.cpp src/DeviceRegistry.h
-        src/CommandManager.cpp src/CommandManager.h
-        src/CentralConfig.cpp src/CentralConfig.h
-        src/FileUploader.cpp src/FileUploader.h
-        src/OUIServer.cpp src/OUIServer.h
-        src/StorageArchiver.cpp src/StorageArchiver.h
-        src/Dashboard.cpp src/Dashboard.h
-        src/SerialNumberCache.cpp src/SerialNumberCache.h
-        src/TelemetryStream.cpp src/TelemetryStream.h
-        src/framework/ConfigurationValidator.cpp src/framework/ConfigurationValidator.h
-        src/ConfigurationCache.cpp src/ConfigurationCache.h
-        )
+add_executable( ucentralgw
+                build
+                src/Daemon.cpp src/Daemon.h
+                src/RESTAPI_server.cpp src/RESTAPI_server.h
+                src/WebSocketServer.cpp src/WebSocketServer.h
+                src/SubSystemServer.cpp src/SubSystemServer.h
+                src/StorageService.cpp src/StorageService.h
+                src/RESTAPI_SecurityObjects.cpp src/RESTAPI_SecurityObjects.h
+                src/DeviceRegistry.cpp src/DeviceRegistry.h
+                src/RESTAPI_devices_handler.cpp src/RESTAPI_devices_handler.h
+                src/RESTAPI_device_handler.cpp src/RESTAPI_device_handler.h
+                src/RESTAPI_handler.cpp src/RESTAPI_handler.h
+                src/RESTAPI_device_commandHandler.cpp src/RESTAPI_device_commandHandler.h
+                src/RESTAPI_GWobjects.h src/RESTAPI_GWobjects.cpp
+                src/CentralConfig.cpp src/CentralConfig.h
+                src/RESTAPI_default_configuration.cpp
+                src/RESTAPI_InternalServer.cpp src/RESTAPI_InternalServer.h
+                src/RESTAPI_default_configuration.h src/RESTAPI_default_configurations.cpp src/RESTAPI_default_configurations.h
+                src/RESTAPI_commands.cpp src/RESTAPI_commands.h
+                src/CommandManager.cpp src/CommandManager.h
+                src/RESTAPI_command.cpp src/RESTAPI_command.h
+                src/FileUploader.cpp src/FileUploader.h
+                src/RESTAPI_file.cpp src/RESTAPI_file.h
+                src/CommandChannel.cpp src/CommandChannel.h
+                src/RESTAPI_system_command.cpp src/RESTAPI_system_command.h
+                src/RESTAPI_BlackList.cpp src/RESTAPI_BlackList.h
+                src/Utils.h src/Utils.cpp src/storage_blacklist.cpp
+                src/storage_command.cpp src/storage_healthcheck.cpp src/storage_statistics.cpp src/storage_logs.cpp
+                src/storage_device.cpp src/storage_capabilities.cpp src/storage_defconfig.cpp src/storage_sqlite.cpp
+                src/storage_mysql.cpp src/storage_pgql.cpp src/storage_tables.cpp
+                src/StateProcessor.cpp src/StateProcessor.h
+                src/storage_lifetime_stats.cpp src/uCentralProtocol.h src/RESTAPI_protocol.h
+                src/ALBHealthCheckServer.h src/Kafka_topics.h src/uCentralTypes.h
+                src/OUIServer.cpp src/OUIServer.h
+                src/RESTAPI_ouis.cpp src/RESTAPI_ouis.h
+                src/MicroService.cpp src/MicroService.h
+                src/RESTAPI_RPC.cpp src/RESTAPI_RPC.h src/AuthClient.cpp src/AuthClient.h src/OpenAPIRequest.cpp src/OpenAPIRequest.h
+                src/RESTAPI_utils.h src/RESTAPI_utils.cpp src/StorageArchiver.cpp src/StorageArchiver.h src/Dashboard.cpp src/Dashboard.h src/RESTAPI_deviceDashboardHandler.cpp src/RESTAPI_deviceDashboardHandler.h)
 
 if(NOT SMALL_BUILD)
-
+    target_sources(ucentralgw PUBLIC src/KafkaManager.cpp src/KafkaManager.h)
 endif()
 
-INSTALL(TARGETS owgw
+INSTALL(TARGETS ucentralgw
         RUNTIME DESTINATION /usr/bin
 )
 
-target_link_libraries(owgw PUBLIC
+target_link_libraries(ucentralgw PUBLIC
                         ${Poco_LIBRARIES} ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
 if(NOT SMALL_BUILD)
-    target_link_libraries(owgw PUBLIC
+    target_link_libraries(ucentralgw PUBLIC
             ${MySQL_LIBRARIES} ${ZLIB_LIBRARIES}
-                CppKafka::cppkafka
-                nlohmann_json_schema_validator
+            CppKafka::cppkafka
              )
     if(UNIX AND NOT APPLE)
-        target_link_libraries(owgw PUBLIC PocoJSON)
+        target_link_libraries(ucentralgw PUBLIC PocoJSON)
     endif()
 endif()

Dockerfile

@@ -7,12 +7,10 @@ RUN apk add --update --no-cache \
     make cmake gcc g++ libstdc++ libgcc git zlib-dev yaml-cpp-dev \
     openssl-dev boost-dev unixodbc-dev postgresql-dev mariadb-dev \
     apache2-utils yaml-dev apr-util-dev \
-    lua-dev librdkafka-dev \
-    nlohmann-json
+    lua-dev librdkafka-dev
 
 RUN git clone https://github.com/stephb9959/poco /poco
 RUN git clone https://github.com/stephb9959/cppkafka /cppkafka
-RUN git clone https://github.com/pboettch/json-schema-validator /json-schema-validator
 
 WORKDIR /cppkafka
 RUN mkdir cmake-build
@@ -28,51 +26,35 @@ RUN cmake ..
 RUN cmake --build . --config Release -j8
 RUN cmake --build . --target install
 
-WORKDIR /json-schema-validator
-RUN mkdir cmake-build
-WORKDIR cmake-build
-RUN cmake ..
-RUN make
-RUN make install
+ADD CMakeLists.txt build /ucentralgw/
+ADD cmake /ucentralgw/cmake
+ADD src /ucentralgw/src
 
-ADD CMakeLists.txt build /owgw/
-ADD cmake /owgw/cmake
-ADD src /owgw/src
-ADD .git /owgw/.git
-
-WORKDIR /owgw
+WORKDIR /ucentralgw
 RUN mkdir cmake-build
-WORKDIR /owgw/cmake-build
+WORKDIR /ucentralgw/cmake-build
 RUN cmake ..
 RUN cmake --build . --config Release -j8
 
 FROM alpine
 
-ENV OWGW_USER=owgw \
-    OWGW_ROOT=/owgw-data \
-    OWGW_CONFIG=/owgw-data
+ENV UCENTRALGW_USER=ucentralgw \
+    UCENTRALGW_ROOT=/ucentralgw-data \
+    UCENTRALGW_CONFIG=/ucentralgw-data
 
-RUN addgroup -S "$OWGW_USER" && \
-    adduser -S -G "$OWGW_USER" "$OWGW_USER"
+RUN addgroup -S "$UCENTRALGW_USER" && \
+    adduser -S -G "$UCENTRALGW_USER" "$UCENTRALGW_USER"
 
-RUN mkdir /openwifi
-RUN mkdir -p "$OWGW_ROOT" "$OWGW_CONFIG" && \
-    chown "$OWGW_USER": "$OWGW_ROOT" "$OWGW_CONFIG"
-RUN apk add --update --no-cache librdkafka mariadb-connector-c libpq unixodbc su-exec gettext ca-certificates bash jq curl postgresql-client
+RUN mkdir /ucentral
+RUN mkdir -p "$UCENTRALGW_ROOT" "$UCENTRALGW_CONFIG"
+RUN apk add --update --no-cache librdkafka mariadb-connector-c libpq unixodbc su-exec
 
-COPY --from=builder /owgw/cmake-build/owgw /openwifi/owgw
+COPY --from=builder /ucentralgw/cmake-build/ucentralgw /ucentral/ucentralgw
 COPY --from=builder /cppkafka/cmake-build/src/lib/* /lib/
 COPY --from=builder /poco/cmake-build/lib/* /lib/
-
-COPY owgw.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.pem
-
-COPY readiness_check /readiness_check
 
 EXPOSE 15002 16002 16003 17002 16102
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/openwifi/owgw"]
+CMD ["/ucentral/ucentralgw"]

OPENAPI.md

@@ -2,7 +2,7 @@
 This document will describe how the API is built and how to use it. 
 
 ## Where is the OpenAPI.
-This uses OpenAPI definition 3.0 and can be found [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/openapi/ucentral/owgw.yaml).
+This uses OpenAPI definition 3.0 and can be found [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/openapi/ucentral/ucentral.yaml).
 All endpoints begin with `/api/v1`.
 
 ## The flow

PROTOCOL.md

@@ -155,22 +155,6 @@ which version it is running. The Controller may decide to send the device a newe
 }
 ```
 
-#### Recovery Event
-Device may decide it has to do into recovery mode. This event should be used.
-```
-{   "jsonrpc" : "2.0" , 
-    "method" : "recovery" , 
-    "params" : {
-        "serial" : <serial number> ,
-        "uuid"   : <the UUID of the configuration that generated the crash log>,
-        "firmware: <the string describing the current firmware>,
-        "reboot" : true/false    (shoudld the device be instructed to reboot after loggin the information),
-        "loglines" : [ an array of strings representing the logs from the log file ]
-      }
-}
-```
-
-
 ### Controller commands
 Most controller commands include a `when` member. This is a UTC clock time asking the AP
 to perform the command at that time. This is a suggestion only. The AP may ignore this
@@ -534,48 +518,6 @@ The device should answer:
 }
 ```
 
-#### Controller requesting telemetry stream information
-Controller sends this command when it needs the device to telemetry streaming.
-```
-{    "jsonrpc" : "2.0" , 
-     "method" : "telemetry" , 
-     "params" : {
-	        "serial" : <serial number> ,
-	        "interval" : 0-60, # number of seconds for polling information. 0 means to shutdown the stream 
-	        "types" : [ "dhcp", "rrm"], <this must be an array: array of 1 or 2 elements, right now only "rrm" and "dhcp" are supported
-        },
-     "id" : <some number>
-}
-```
-
-The device should answer:
-```
-{   "jsonrpc" : "2.0" , 
-    "result" : {
-          "serial" : <serial number> ,
-          "status" : {
-            "error" : 0 or an error number,
-            "text" : <description of the error or success>
-  	        }
-        },
-    "id" : <same number>
-}
-```
-
-When the interval is greater than 0, the gateway will start to receive messages
-```
-{   "jsonrpc" : "2.0" , 
-    "method" : "telemetry" , 
-    "params" : {
-        "serial" : <serial number> ,
-        "data" : <A JSON document describing the information coming from the device>
-      }
-}
-```
-
-The device will stop sending data after 30 minutes or if it receives a `telemetry` command with an interval of 0.
-
-
 #### Controller requesting an `rtty` session
 Controller sends this command an administrator requests to start an `rtty` session with the AP. 
 ```

README.md

@@ -26,9 +26,9 @@ 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 libmariadb-dev 
+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 libmysqlclient-dev default-libmysqlclient-dev
+sudo apt install librdkafka-dev liblua5.3-dev
 
 git clone https://github.com/stephb9959/poco
 cd poco
@@ -153,8 +153,8 @@ cmake -DSMALL_BUILD=1 ..
 make
 ```
 
-### After completing the build
-After completing the build, you can remove the Poco source as it is no longer needed. 
+### After the build step is completed
+Once your build is done. 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.
@@ -179,7 +179,7 @@ You should now have the following:
   +-- test_scripts
   +-- openapi
   +-- uploads
-  +-- owgw.properties
+  +-- ucentralgw.properties
 ```
 
 ### Certificates
@@ -218,15 +218,15 @@ document. Once you have these files, you need to renamed them `restapi-key.pem`,
 in your browner 
 
 #### Configuration
-The configuration for this service is kept in a properties file. This file is called `owgw.properties` and you can 
-see the latest version [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/owgw.properties). The file will be loaded from
-the directory set by the environment variable `UCENTRALGW_CONFIG`. To use environment variables in the configuration,
+The configuration for this service is kept in a properties file. This file is called `ucentralgw.properties` and you can 
+see the latest version [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/ucentralgw.properties). The file will be loaded from
+the directory set by the environment variable `UCENTRAL_CONFIG`. To use environment variables in the configuration,
 you must use `$<varname>`. Only `path names` support the use of environment variables. The sample configuration requires very 
 little changes if you keep the suggested directory structure. For the sample configuration to work, you need to define 2 
 environment variables. 
 ```
-export OWGW_ROOT=`pwd`
-export UCENTRALGW_CONFIG=`pwd`
+export UCENTRAL_ROOT=`pwd`
+export UCENTRAL_CONFIG=`pwd`
 ```
 If you current working directory is the root of the project, this will set the variables properly. Otherwise, you can set the variables 
 to point to wherever is necessary.
@@ -234,7 +234,7 @@ to point to wherever is necessary.
 ##### Important config entries
 ###### This is the logging directory
 ```
-logging.channels.c2.path = $OWGW_ROOT/logs/sample.log
+logging.channels.c2.path = $UCENTRAL_ROOT/logs/sample.log
 ```
 
 ###### This is the type of storage in use
@@ -244,23 +244,23 @@ storage.type = sqlite
 
 ###### Autoprovisioning settings
 ```asm
-openwifi.autoprovisioning = true
-openwifi.devicetypes.0 = AP:linksys_ea8300,edgecore_eap101,linksys_e8450-ubi
-openwifi.devicetypes.1 = SWITCH:edgecore_ecs4100-12ph
-openwifi.devicetypes.2 = IOT:esp32
+ucentral.autoprovisioning = true
+ucentral.devicetypes.0 = AP:linksys_ea8300,edgecore_eap101,linksys_e8450-ubi
+ucentral.devicetypes.1 = SWITCH:edgecore_ecs4100-12ph
+ucentral.devicetypes.2 = IOT:esp32
 ```
 
 ###### This is the RESTAPI endpoint
 
 ```asm
-openwifi.restapi.host.0.backlog = 100
-openwifi.restapi.host.0.security = relaxed
-openwifi.restapi.host.0.rootca = $OWGW_ROOT/certs/restapi-ca.pem
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = 16002
-openwifi.restapi.host.0.cert = $OWGW_ROOT/certs/restapi-cert.pem
-openwifi.restapi.host.0.key = $OWGW_ROOT/certs/restapi-key.pem
-openwifi.restapi.host.0.key.password = mypassword
+ucentral.restapi.host.0.backlog = 100
+ucentral.restapi.host.0.security = relaxed
+ucentral.restapi.host.0.rootca = $UCENTRAL_ROOT/certs/restapi-ca.pem
+ucentral.restapi.host.0.address = *
+ucentral.restapi.host.0.port = 16002
+ucentral.restapi.host.0.cert = $UCENTRAL_ROOT/certs/restapi-cert.pem
+ucentral.restapi.host.0.key = $UCENTRAL_ROOT/certs/restapi-key.pem
+ucentral.restapi.host.0.key.password = mypassword
 ```
 
 ##### This is the end point for the devices to connect with
@@ -309,12 +309,12 @@ You will need to get the `cert.pem` and `key.pem` from Digicert. The rest is her
 
 ```asm
 ucentral.websocket.host.0.backlog = 500
-ucentral.websocket.host.0.rootca = $OWGW_ROOT/certs/root.pem
-ucentral.websocket.host.0.issuer = $OWGW_ROOT/certs/issuer.pem
-ucentral.websocket.host.0.cert = $OWGW_ROOT/certs/websocket-cert.pem
-ucentral.websocket.host.0.key = $OWGW_ROOT/certs/websocket-key.pem
-ucentral.websocket.host.0.clientcas = $OWGW_ROOT/certs/clientcas.pem
-ucentral.websocket.host.0.cas = $OWGW_ROOT/certs/cas
+ucentral.websocket.host.0.rootca = $UCENTRAL_ROOT/certs/root.pem
+ucentral.websocket.host.0.issuer = $UCENTRAL_ROOT/certs/issuer.pem
+ucentral.websocket.host.0.cert = $UCENTRAL_ROOT/certs/websocket-cert.pem
+ucentral.websocket.host.0.key = $UCENTRAL_ROOT/certs/websocket-key.pem
+ucentral.websocket.host.0.clientcas = $UCENTRAL_ROOT/certs/clientcas.pem
+ucentral.websocket.host.0.cas = $UCENTRAL_ROOT/certs/cas
 ucentral.websocket.host.0.address = *
 ucentral.websocket.host.0.port = 15002
 ucentral.websocket.host.0.security = strict
@@ -324,17 +324,17 @@ ucentral.websocket.maxreactors = 20
 
 ###### This is the end point for the devices when uploading files
 ```asm
-openwifi.fileuploader.host.0.backlog = 100
-openwifi.fileuploader.host.0.rootca = $OWGW_ROOT/certs/restapi-ca.pem
-openwifi.fileuploader.host.0.security = relaxed
-openwifi.fileuploader.host.0.address = *
-openwifi.fileuploader.host.0.name = 192.168.1.176
-openwifi.fileuploader.host.0.port = 16003
-openwifi.fileuploader.host.0.cert = $OWGW_ROOT/certs/restapi-cert.pem
-openwifi.fileuploader.host.0.key = $OWGW_ROOT/certs/restapi-key.pem
-openwifi.fileuploader.host.0.key.password = mypassword
-openwifi.fileuploader.path = $OWGW_ROOT/uploads
-openwifi.fileuploader.maxsize = 10000
+ucentral.fileuploader.host.0.backlog = 100
+ucentral.fileuploader.host.0.rootca = $UCENTRAL_ROOT/certs/restapi-ca.pem
+ucentral.fileuploader.host.0.security = relaxed
+ucentral.fileuploader.host.0.address = *
+ucentral.fileuploader.host.0.name = 192.168.1.176
+ucentral.fileuploader.host.0.port = 16003
+ucentral.fileuploader.host.0.cert = $UCENTRAL_ROOT/certs/restapi-cert.pem
+ucentral.fileuploader.host.0.key = $UCENTRAL_ROOT/certs/restapi-key.pem
+ucentral.fileuploader.host.0.key.password = mypassword
+ucentral.fileuploader.path = $UCENTRAL_ROOT/uploads
+ucentral.fileuploader.maxsize = 10000
 ```
 
 ###### host.0.address entries
@@ -343,7 +343,7 @@ the `*`. Using the `*` means all interfaces will be able to accept connections.
 by changing the `0` to another index. You need to repeat the whole configuration block for each index. Indexes must be sequential
 start at `0`.
 
-###### openwifi.fileuploader.host.0.name
+###### ucentral.fileuploader.host.0.name
 This must point to the IP or FQDN of your uCentralGW.
 
 #### Running the gateway
@@ -369,7 +369,7 @@ can be any of the keys you are already using. You must keep that keep secret and
 this is the entry
 
 ```asm
-openwifi.service.key = $OWGW_ROOT/certs/websocket-key.pem
+ucentral.service.key = $UCENTRAL_ROOT/certs/websocket-key.pem
 ```
  
 #### Command line options
@@ -391,7 +391,7 @@ A uCentral gateway implementation for TIP.
 ```
 
 ##### file
-This allows you to point to another file without specifying the UCENTRALGW_CONFIG variable. The file name must end in `.properties`.
+This allows you to point to another file without specifying the UCENTRAL_CONFIG variable. The file name must end in `.properties`.
 ##### daemon
 Run this as a UNIX service
 ##### pidfile
@@ -440,9 +440,9 @@ then
   exit 1
 fi
 
-if [[ ! -f owgw.properties ]]
+if [[ ! -f ucentralgw.properties ]]
 then
-  echo "Configuration file owgw.properties is missing in the current directory"
+  echo "Configuration file ucentralgw.properties is missing in the current directory"
   exit 2
 fi
 
@@ -452,15 +452,15 @@ docker run -d -p 15002:15002 \
               --init \
               --volume="$PWD:/ucentral-data" \
               -e UCENTRAL_ROOT="/ucentral-data" \
-              -e UCENTRALGW_CONFIG="/ucentral-data" \
+              -e UCENTRAL_CONFIG="/ucentral-data" \
               --name="ucentralgw" $DOCKER_NAME
 
 ```
 
 Create yourself a directory and copy that script which you can also get from [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/docker_run.sh).
-You must have the basic configuration file copied in the directory. This file must be called `owgw.properties`. You can bring your own or
-copy it from [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/owgw.properties). Please look at [this](#certificates-with-docker) to have the right 
-certificates. You need to make sure that the names match the content of the `owgw.properties`
+You must have the basic configuration file copied in the directory. This file must be called `ucentralgw.properties`. You can bring your own or
+copy it from [here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/ucentralgw.properties). Please look at [this](#certificates-with-docker) to have the right 
+certificates. You need to make sure that the names match the content of the `ucentralgw.properties`
 file. Once all this is done, you can simply run `docker_run.sh`.
 
 #### Docker installation directory layout
@@ -472,15 +472,15 @@ Run-time root
     ----- certs (same as above)
     +---- logs  (dir)
     +---- uploads  (dir)
-    +---- owgw.properties (file)
+    +---- ucentralgw.properties (file)
 ```
 
-#### `owgw.properties` for Docker
+#### `ucentralgw.properties` for Docker
 If you use the pre-made configuration file, and you follow the directory layout, the only line you must change 
 is the following line:
 
 ```asm
-openwifi.fileuploader.host.0.name = 192.168.1.176
+ucentral.fileuploader.host.0.name = 192.168.1.176
 ```
 
 This line should reflect the IP of your gateway or its FQDN. You must make sure that this name or IP is accessible
@@ -491,9 +491,9 @@ Please refer to the `certs` directory from the sections above.
 
 #### Configuration with Docker
 The configuration for this service is kept in a properties file. Currently, this configuration file must be kept in the 
-current directory of uCentral or one level up. This file is called `owgw.properties` and you can see the latest version
-[here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/owgw.properties). The file will be loaded from 
-the directory set by the environment variable `UCENTRALGW_CONFIG`. To use environment variables in the configuration,
+current directory of uCentral or one level up. This file is called `ucentralgw.properties` and you can see the latest version
+[here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/ucentralgw.properties). The file will be loaded from 
+the directory set by the environment variable `UCENTRAL_CONFIG`. To use environment variables in the configuration,
 you must use `$<varname>`. The path for the logs for the service must exist prior to starting the 
 service. The path is defined under `logging.channels.c2.path`. Only `path names` support the use of 
 environment variables. Here is a sample configuration:
@@ -502,34 +502,34 @@ environment variables. Here is a sample configuration:
 The communication protocol between the device and the controller is detailed in this [document](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/PROTOCOL.md).
 
 ## OpenAPI
-The service supports an OpenAPI REST based interface for management. You can find the [definition here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/openapi/ucentral/owgw.yaml).
+The service supports an OpenAPI REST based interface for management. You can find the [definition here](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/openapi/ucentral/ucentral.yaml).
 And here is [how to use it](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/OPENAPI.md)
 
 ## Using the API
 In the `test_scripts` directory, you will find a series of scripts that will show you how to use the API 
-with [curl](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/CLI.md) 
+with [curl](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/TEST_CURL.md) 
 or [python](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/main/TEST_PYTHON.md). 
 More scripts will be added in the future.
 
 ## Firewall Considerations
 - The protocol uses TCP port 15002 between the devices and the gateway. This port must be opened.
-- Devices use the TCP port 16003 to upload files. This port is configurable in the `owgw.properties` file. Look for `openwifi.fileuploader.host.0.port`.
-- The RESTAPI is accessed through TCP port 16002 by default. This port is configurable in the `owgw.properties` file. Look for the entry `openwifi.restapi.host.0.port`.
+- Devices use the TCP port 16003 to upload files. This port is configurable in the `ucentralgw.properties` file. Look for `ucentral.fileuploader.host.0.port`.
+- The RESTAPI is accessed through TCP port 16002 by default. This port is configurable in the `ucentralgw.properties` file. Look for the entry `ucentral.restapi.host.0.port`.
 
 ## Kafka integration
 So what about Kafka? Well, the gateway has basic integration with Kafka. It is turned off by default, to turn it on, in the configuration:
 
 ```asm
-openwifi.kafka.enable = false
-openwifi.kafka.brokerlist = 127.0.0.1:9092
-openwifi.kafka.commit = false
-openwifi.kafka.queue.buffering.max.ms = 50
+ucentral.kafka.enable = false
+ucentral.kafka.brokerlist = 127.0.0.1:9092
+ucentral.kafka.commit = false
+ucentral.kafka.queue.buffering.max.ms = 50
 ```
 
-#### `openwifi.kafka.enable`
+#### `ucentral.kafka.enable`
 Kind of obvious but hey, set `true` or `false`. Default is `false`
 
-#### `openwifi.kafka.brokerlist`
+#### `ucentral.kafka.brokerlist`
 This is a comma separator list of the brokers in your `kafka` deployment. 
 
 #### Kafka topics

TEST_CURL.md

@@ -82,9 +82,6 @@ Do wifiscan for a device.
 - `serial`: device serial number
 - `verbose`: verbose=true/false
 
-### telemetry <serial>
-Start `telemetry` stream for a device.
-
 ### trace <serial> <duration> <network>            
 Launch a remote trace for a device.
 - `serial`: device serial number
@@ -164,23 +161,12 @@ Get a list of devices based on a list.
 ### deviceswithstatus                 
 Get devices with their status.
 
-### setloglevel <subsystem> <loglevel>
-Set the log level for s specific subsystem.
+### setloglevel <sys> <level>         
+Set the logging system level for individual subsystems.
+- `sys`: ufileuploader/websocket/storage/restapi/commandmanager/auth/deviceregistry/all
+- `level`: level:none/fatal/critical/error/warning/notice/information/debug/trace
 
-### getloglevels
-Get the current log levels for all subsystems.
-
-### getloglevelnames
-Get the log level names available.
-
-### getsubsystemnames
-Get the list of subsystems.
-
-### systeminfo
-Get basic system information.
-
-### reloadsubsystem <subsystem name>
-Reload the configuration for a subsystem.### getfile <uuid>					  
+### getfile <uuid>					  
 Get the file associated with trace command <uuid>.
 - `uuid`: UUID of file to retrieve
 

build

@@ -1 +1 @@
-44
+1

docker-entrypoint.sh

@@ -1,71 +1,11 @@
 #!/bin/sh
 set -e
 
-if [ "$SELFSIGNED_CERTS" = 'true' ]; then
-    update-ca-certificates
-fi
-
-if [[ "$TEMPLATE_CONFIG" = 'true' && ! -f "$OWGW_CONFIG"/owgw.properties ]]; then
-  WEBSOCKET_HOST_ROOTCA=${WEBSOCKET_HOST_ROOTCA:-"\$OWGW_ROOT/certs/root.pem"} \
-  WEBSOCKET_HOST_ISSUER=${WEBSOCKET_HOST_ISSUER:-"\$OWGW_ROOT/certs/issuer.pem"} \
-  WEBSOCKET_HOST_CERT=${WEBSOCKET_HOST_CERT:-"\$OWGW_ROOT/certs/websocket-cert.pem"} \
-  WEBSOCKET_HOST_KEY=${WEBSOCKET_HOST_KEY:-"\$OWGW_ROOT/certs/websocket-key.pem"} \
-  WEBSOCKET_HOST_CLIENTCAS=${WEBSOCKET_HOST_CLIENTCAS:-"\$OWGW_ROOT/certs/clientcas.pem"} \
-  WEBSOCKET_HOST_CAS=${WEBSOCKET_HOST_CAS:-"\$OWGW_ROOT/certs/cas"} \
-  WEBSOCKET_HOST_PORT=${WEBSOCKET_HOST_PORT:-"15002"} \
-  WEBSOCKET_HOST_KEY_PASSWORD=${WEBSOCKET_HOST_KEY_PASSWORD:-"mypassword"} \
-  RESTAPI_HOST_ROOTCA=${RESTAPI_HOST_ROOTCA:-"\$OWGW_ROOT/certs/restapi-ca.pem"} \
-  RESTAPI_HOST_PORT=${RESTAPI_HOST_PORT:-"16002"} \
-  RESTAPI_HOST_CERT=${RESTAPI_HOST_CERT:-"\$OWGW_ROOT/certs/restapi-cert.pem"} \
-  RESTAPI_HOST_KEY=${RESTAPI_HOST_KEY:-"\$OWGW_ROOT/certs/restapi-key.pem"} \
-  RESTAPI_HOST_KEY_PASSWORD=${RESTAPI_HOST_KEY_PASSWORD:-"mypassword"} \
-  INTERNAL_RESTAPI_HOST_ROOTCA=${INTERNAL_RESTAPI_HOST_ROOTCA:-"\$OWGW_ROOT/certs/restapi-ca.pem"} \
-  INTERNAL_RESTAPI_HOST_PORT=${INTERNAL_RESTAPI_HOST_PORT:-"17002"} \
-  INTERNAL_RESTAPI_HOST_CERT=${INTERNAL_RESTAPI_HOST_CERT:-"\$OWGW_ROOT/certs/restapi-cert.pem"} \
-  INTERNAL_RESTAPI_HOST_KEY=${INTERNAL_RESTAPI_HOST_KEY:-"\$OWGW_ROOT/certs/restapi-key.pem"} \
-  INTERNAL_RESTAPI_HOST_KEY_PASSWORD=${INTERNAL_RESTAPI_HOST_KEY_PASSWORD:-"mypassword"} \
-  FILEUPLOADER_HOST_ROOTCA=${FILEUPLOADER_HOST_ROOTCA:-"\$OWGW_ROOT/certs/restapi-ca.pem"} \
-  FILEUPLOADER_HOST_NAME=${FILEUPLOADER_HOST_NAME:-"localhost"} \
-  FILEUPLOADER_HOST_PORT=${FILEUPLOADER_HOST_PORT:-"16003"} \
-  FILEUPLOADER_HOST_CERT=${FILEUPLOADER_HOST_CERT:-"\$OWGW_ROOT/certs/restapi-cert.pem"} \
-  FILEUPLOADER_HOST_KEY=${FILEUPLOADER_HOST_KEY:-"\$OWGW_ROOT/certs/restapi-key.pem"} \
-  FILEUPLOADER_HOST_KEY_PASSWORD=${FILEUPLOADER_HOST_KEY_PASSWORD:-"mypassword"} \
-  FILEUPLOADER_PATH=${FILEUPLOADER_PATH:-"\$OWGW_ROOT/uploads"} \
-  FILEUPLOADER_URI=${FILEUPLOADER_URI:-"https://localhost:16003"} \
-  SERVICE_KEY=${SERVICE_KEY:-"\$OWGW_ROOT/certs/restapi-key.pem"} \
-  SERVICE_KEY_PASSWORD=${SERVICE_KEY_PASSWORD:-"mypassword"} \
-  SYSTEM_DATA=${SYSTEM_DATA:-"\$OWGW_ROOT/data"} \
-  SYSTEM_URI_PRIVATE=${SYSTEM_URI_PRIVATE:-"https://localhost:17002"} \
-  SYSTEM_URI_PUBLIC=${SYSTEM_URI_PUBLIC:-"https://localhost:16002"} \
-  SYSTEM_URI_UI=${SYSTEM_URI_UI:-"http://localhost"} \
-  SIMULATORID=${SIMULATORID:-""} \
-  RTTY_ENABLED=${RTTY_ENABLED:-"false"} \
-  RTTY_SERVER=${RTTY_SERVER:-"localhost"} \
-  RTTY_PORT=${RTTY_PORT:-"5912"} \
-  RTTY_TOKEN=${RTTY_TOKEN:-"96181c567b4d0d98c50f127230068fa8"} \
-  RTTY_TIMEOUT=${RTTY_TIMEOUT:-"60"} \
-  RTTY_VIEWPORT=${RTTY_VIEWPORT:-"5913"} \
-  KAFKA_ENABLE=${KAFKA_ENABLE:-"true"} \
-  KAFKA_BROKERLIST=${KAFKA_BROKERLIST:-"localhost:9092"} \
-  STORAGE_TYPE=${STORAGE_TYPE:-"sqlite"} \
-  STORAGE_TYPE_POSTGRESQL_HOST=${STORAGE_TYPE_POSTGRESQL_HOST:-"localhost"} \
-  STORAGE_TYPE_POSTGRESQL_USERNAME=${STORAGE_TYPE_POSTGRESQL_USERNAME:-"owgw"} \
-  STORAGE_TYPE_POSTGRESQL_PASSWORD=${STORAGE_TYPE_POSTGRESQL_PASSWORD:-"owgw"} \
-  STORAGE_TYPE_POSTGRESQL_DATABASE=${STORAGE_TYPE_POSTGRESQL_DATABASE:-"owgw"} \
-  STORAGE_TYPE_POSTGRESQL_PORT=${STORAGE_TYPE_POSTGRESQL_PORT:-"5432"} \
-  STORAGE_TYPE_MYSQL_HOST=${STORAGE_TYPE_MYSQL_HOST:-"localhost"} \
-  STORAGE_TYPE_MYSQL_USERNAME=${STORAGE_TYPE_MYSQL_USERNAME:-"owgw"} \
-  STORAGE_TYPE_MYSQL_PASSWORD=${STORAGE_TYPE_MYSQL_PASSWORD:-"owgw"} \
-  STORAGE_TYPE_MYSQL_DATABASE=${STORAGE_TYPE_MYSQL_DATABASE:-"owgw"} \
-  STORAGE_TYPE_MYSQL_PORT=${STORAGE_TYPE_MYSQL_PORT:-"3306"} \
-  envsubst < /owgw.properties.tmpl > $OWGW_CONFIG/owgw.properties
-fi
-
-if [ "$1" = '/openwifi/owgw' -a "$(id -u)" = '0' ]; then
+if [ "$1" = '/ucentral/ucentralgw' -a "$(id -u)" = '0' ]; then
     if [ "$RUN_CHOWN" = 'true' ]; then
-      chown -R "$OWGW_USER": "$OWGW_ROOT" "$OWGW_CONFIG"
+      chown -R "$UCENTRALGW_USER": "$UCENTRALGW_ROOT" "$UCENTRALGW_CONFIG"
     fi
-    exec su-exec "$OWGW_USER" "$@"
+    exec su-exec "$UCENTRALGW_USER" "$@"
 fi
 
 exec "$@"

docker_run.sh

@@ -26,7 +26,7 @@ then
   exit 1
 fi
 
-if [[ ! -f owgw.properties ]]
+if [[ ! -f ucentral.properties ]]
 then
   echo "Configuration file ucentral.properties is missing in the current directory"
   exit 2
@@ -37,7 +37,7 @@ docker run -d -p 15002:15002 \
               -p 16003:16003 \
               --init \
               --volume="$PWD:/ucentral-data" \
-              -e UCENTRALGW_ROOT="/ucentral-data" \
-              -e UCENTRALGW_CONFIG="/ucentral-data" \
+              -e UCENTRAL_ROOT="/ucentral-data" \
+              -e UCENTRAL_CONFIG="/ucentral-data" \
               --name="ucentralgw" $DOCKER_NAME
 

helm/Chart.yaml

@@ -1,18 +1,5 @@
-apiVersion: v2
+apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-name: owgw
+name: ucentralgw
 version: 0.1.0
-dependencies:
-- name: postgresql
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
-  version: 10.9.2
-  condition: postgresql.enabled
-- name: mysql
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
-  version: 8.8.3
-  condition: mysql.enabled
-- name: mariadb
-  repository: https://tip.jfrog.io/artifactory/tip-wlan-cloud-ucentral-helm/
-  version: 9.4.2
-  condition: mariadb.enabled

helm/README.md

@@ -1,6 +1,6 @@
-# owgw
+# ucentralgw
 
-This Helm chart helps to deploy OpenWIFI Gateway (further on refered as __Gateway__) to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) as Gateway requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment.
+This Helm chart helps to deploy uCentralGW to the Kubernetes clusters. It is mainly used in [assembly chart](https://github.com/Telecominfraproject/wlan-cloud-ucentral-deploy/tree/main/chart) as uCentralGW requires other services as dependencies that are considered in that Helm chart. This chart is purposed to define deployment logic close to the application code itself and define default values that could be overriden during deployment.
 
 
 ## TL;DR;
@@ -11,7 +11,7 @@ $ helm install .
 
 ## Introduction
 
-This chart bootstraps the Gateway on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+This chart bootstraps an ucentralgw on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
 ## Installing the Chart
 
@@ -20,10 +20,10 @@ Currently this chart is not assembled in charts archives, so [helm-git](https://
 To install the chart with the release name `my-release`:
 
 ```bash
-$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm/owgw-0.1.0.tgz?ref=master
+$ helm install --name my-release git+https://github.com/Telecominfraproject/wlan-cloud-ucentralgw@helm?ref=master
 ```
 
-The command deploys the Gateway on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+The command deploys ucentralgw on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
 
 > **Tip**: List all releases using `helm list`
 
@@ -47,40 +47,40 @@ The following table lists the configurable parameters of the chart and their def
 | strategyType | string | Application deployment strategy | `'Recreate'` |
 | nameOverride | string | Override to be used for application deployment |  |
 | fullnameOverride | string | Override to be used for application deployment (has priority over nameOverride) |  |
-| images.owgw.repository | string | Docker image repository |  |
-| images.owgw.tag | string | Docker image tag | `'master'` |
-| images.owgw.pullPolicy | string | Docker image pull policy | `'Always'` |
-| services.owgw.type | string | OpenWIFI Gateway service type | `'LoadBalancer'` |
-| services.owgw.ports.websocket.servicePort | number | Websocket endpoint port to be exposed on service | `15002` |
-| services.owgw.ports.websocket.targetPort | number | Websocket endpoint port to be targeted by service | `15002` |
-| services.owgw.ports.websocket.protocol | string | Websocket endpoint protocol | `'TCP'` |
-| services.owgw.ports.restapi.servicePort | number | REST API endpoint port to be exposed on service | `16002` |
-| services.owgw.ports.restapi.targetPort | number | REST API endpoint port to be targeted by service | `16002` |
-| services.owgw.ports.restapi.protocol | string | REST API endpoint protocol | `'TCP'` |
-| services.owgw.ports.restapiinternal.servicePort | string | Internal REST API endpoint port to be exposed on service | `17002` |
-| services.owgw.ports.restapiinternal.targetPort | number | Internal REST API endpoint port to be targeted by service | `17002` |
-| services.owgw.ports.restapiinternal.protocol | string | Internal REST API endpoint protocol | `'TCP'` |
-| services.owgw.ports.fileuploader.servicePort | string | Fileuploader endpoint port to be exposed on service | `16003` |
-| services.owgw.ports.fileuploader.targetPort | number | Fileuploader endpoint port to be targeted by service | `16003` |
-| services.owgw.ports.fileuploader.protocol | string | Fileuploader endpoint protocol | `'TCP'` |
-| checks.owgw.liveness.httpGet.path | string | Liveness check path to be used | `'/'` |
-| checks.owgw.liveness.httpGet.port | number | Liveness check port to be used (should be pointint to ALB endpoint) | `16102` |
-| checks.owgw.readiness.httpGet.path | string | Readiness check path to be used | `'/'` |
-| checks.owgw.readiness.httpGet.port | number | Readiness check port to be used (should be pointint to ALB endpoint) | `16102` |
+| images.ucentralgw.repository | string | Docker image repository |  |
+| images.ucentralgw.tag | string | Docker image tag | `'master'` |
+| images.ucentralgw.pullPolicy | string | Docker image pull policy | `'Always'` |
+| services.ucentralgw.type | string | uCentralGW service type | `'LoadBalancer'` |
+| services.ucentralgw.ports.websocket.servicePort | number | Websocket endpoint port to be exposed on service | `15002` |
+| services.ucentralgw.ports.websocket.targetPort | number | Websocket endpoint port to be targeted by service | `15002` |
+| services.ucentralgw.ports.websocket.protocol | string | Websocket endpoint protocol | `'TCP'` |
+| services.ucentralgw.ports.restapi.servicePort | number | REST API endpoint port to be exposed on service | `16002` |
+| services.ucentralgw.ports.restapi.targetPort | number | REST API endpoint port to be targeted by service | `16002` |
+| services.ucentralgw.ports.restapi.protocol | string | REST API endpoint protocol | `'TCP'` |
+| services.ucentralgw.ports.restapiinternal.servicePort | string | Internal REST API endpoint port to be exposed on service | `17002` |
+| services.ucentralgw.ports.restapiinternal.targetPort | number | Internal REST API endpoint port to be targeted by service | `17002` |
+| services.ucentralgw.ports.restapiinternal.protocol | string | Internal REST API endpoint protocol | `'TCP'` |
+| services.ucentralgw.ports.fileuploader.servicePort | string | Fileuploader endpoint port to be exposed on service | `16003` |
+| services.ucentralgw.ports.fileuploader.targetPort | number | Fileuploader endpoint port to be targeted by service | `16003` |
+| services.ucentralgw.ports.fileuploader.protocol | string | Fileuploader endpoint protocol | `'TCP'` |
+| checks.ucentralgw.liveness.httpGet.path | string | Liveness check path to be used | `'/'` |
+| checks.ucentralgw.liveness.httpGet.port | number | Liveness check port to be used (should be pointint to ALB endpoint) | `16102` |
+| checks.ucentralgw.readiness.httpGet.path | string | Readiness check path to be used | `'/'` |
+| checks.ucentralgw.readiness.httpGet.port | number | Readiness check port to be used (should be pointint to ALB endpoint) | `16102` |
 | ingresses.restapi.enabled | boolean | Defines if REST API endpoint should be exposed via Ingress controller | `False` |
 | ingresses.restapi.hosts | array | List of hosts for exposed REST API |  |
 | ingresses.restapi.paths | array | List of paths to be exposed for REST API |  |
 | ingresses.fileuploader.enabled | boolean | Defines if Fileuploader endpoint should be exposed via Ingress controller | `False` |
 | ingresses.fileuploader.hosts | array | List of hosts for exposed Fileuploader |  |
 | ingresses.fileuploader.paths | array | List of paths for exposed Fileuploader |  |
-| volumes.owgw | array | Defines list of volumes to be attached to the Gateway |  |
-| persistence.enabled | boolean | Defines if the Gateway requires Persistent Volume (required for permanent files storage and SQLite DB if enabled) | `True` |
+| volumes.ucentralgw | array | Defines list of volumes to be attached to uCentralGW |  |
+| persistence.enabled | boolean | Defines if uCentralGW requires Persistent Volume (required for permanent files storage and SQLite DB if enabled) | `True` |
 | persistence.accessModes | array | Defines PV access modes |  |
 | persistence.size | string | Defines PV size | `'10Gi'` |
-| public_env_variables | hash | Defines list of environment variables to be passed to the Gateway | |
-| configProperties | hash | Configuration properties that should be passed to the application in `owgw.properties`. May be passed by key in set (i.e. `configProperties."rtty\.token"`) | |
-| certs | hash | Defines files (keys and certificates) that should be passed to the Gateway (PEM format is adviced to be used) (see `volumes.owgw` on where it is mounted) |  |
-| certsCAs | hash | Defines files with CAs that should be passed to the Gateway (see `volumes.owgw` on where it is mounted) |  |
+| public_env_variables | hash | Defines list of environment variables to be passed to uCentralGW | |
+| configProperties | hash | Configuration properties that should be passed to the application in `ucentralgw.properties`. May be passed by key in set (i.e. `configProperties."rtty\.token"`) | |
+| certs | hash | Defines files (keys and certificates) that should be passed to uCentralGW (PEM format is adviced to be used) (see `volumes.ucentralgw` on where it is mounted) |  |
+| certsCAs | hash | Defines files with CAs that should be passed to uCentralGW (see `volumes.ucentralgw` on where it is mounted) |  |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
@@ -100,3 +100,5 @@ $ helm install --name my-release -f values.yaml .
 ```
 
 > **Tip**: You can use the default [values.yaml](values.yaml) as a base for customization.
+
+

helm/templates/_config.tpl

@@ -1,4 +1,4 @@
-{{- define "owgw.config" -}}
+{{- define "ucentralgw.config" -}}
 {{- range $key, $value := .Values.configProperties }}
 {{ $key }} = {{ $value }}
 {{- end }}

helm/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "owgw.name" -}}
+{{- define "ucentralgw.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "owgw.fullname" -}}
+{{- define "ucentralgw.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,6 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "owgw.chart" -}}
+{{- define "ucentralgw.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{- define "owgw.ingress.apiVersion" -}}
-  {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
-      {{- print "networking.k8s.io/v1" -}}
-  {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
-    {{- print "networking.k8s.io/v1beta1" -}}
-  {{- else -}}
-    {{- print "extensions/v1beta1" -}}
-  {{- end -}}
-{{- end -}}

helm/templates/deployment.yaml

@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "owgw.fullname" . }}
+  name: {{ include "ucentralgw.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "owgw.name" . }}
-    helm.sh/chart: {{ include "owgw.chart" . }}
+    app.kubernetes.io/name: {{ include "ucentralgw.name" . }}
+    helm.sh/chart: {{ include "ucentralgw.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,34 +15,28 @@ spec:
     type: {{ .Values.strategyType }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "owgw.name" . }}
+      app.kubernetes.io/name: {{ include "ucentralgw.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- with .Values.services.owgw.labels }}
+      {{- with .Values.services.ucentralgw.labels }}
       {{- toYaml . | nindent 6 }}
       {{- end }}
   template:
     metadata:
       annotations:
-        checksum/config: {{ include "owgw.config" . | sha256sum }}
-        {{- if .Values.podSecurityPolicy.enabled }}
-        kubernetes.io/psp: {{ include "owgw.fullname" . }}-{{ .Release.Namespace }}-owgw-unsafe-sysctl
-        {{- end }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
+        checksum/config: {{ include "ucentralgw.config" . | sha256sum }}
       labels:
-        app.kubernetes.io/name: {{ include "owgw.name" . }}
+        app.kubernetes.io/name: {{ include "ucentralgw.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-        {{- with .Values.services.owgw.labels }}
+        {{- with .Values.services.ucentralgw.labels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
 
       containers:
 
-        - name: owgw
-          image: "{{ .Values.images.owgw.repository }}:{{ .Values.images.owgw.tag }}"
-          imagePullPolicy: {{ .Values.images.owgw.pullPolicy }}
+        - name: ucentralgw
+          image: "{{ .Values.images.ucentralgw.repository }}:{{ .Values.images.ucentralgw.tag }}"
+          imagePullPolicy: {{ .Values.images.ucentralgw.pullPolicy }}
 
           env:
             - name: KUBERNETES_DEPLOYED
@@ -55,19 +49,19 @@ spec:
             - name: {{ $key }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "owgw.fullname" $root }}-env
+                  name: {{ include "ucentralgw.fullname" $root }}-env
                   key: {{ $key }}
           {{- end }}
 
           ports:
-          {{- range $port, $portValue := .Values.services.owgw.ports }}
+          {{- range $port, $portValue := .Values.services.ucentralgw.ports }}
             - name: {{ $port }}
               containerPort: {{ $portValue.targetPort }}
               protocol: {{ $portValue.protocol }}
           {{- end }}
 
           volumeMounts:
-          {{- range .Values.volumes.owgw }}
+          {{- range .Values.volumes.ucentralgw }}
           - name: {{ .name }}
             mountPath: {{ .mountPath }}
             {{- if .subPath }}
@@ -75,13 +69,13 @@ spec:
             {{- end }}
           {{- end }}
 
-          {{- if .Values.checks.owgw.liveness }}
+          {{- if .Values.checks.ucentralgw.liveness }}
           livenessProbe:
-            {{- toYaml .Values.checks.owgw.liveness | nindent 12 }}
+            {{- toYaml .Values.checks.ucentralgw.liveness | nindent 12 }}
           {{- end }}
-          {{- if .Values.checks.owgw.readiness }}
+          {{- if .Values.checks.ucentralgw.readiness }}
           readinessProbe:
-            {{- toYaml .Values.checks.owgw.readiness | nindent 12 }}
+            {{- toYaml .Values.checks.ucentralgw.readiness | nindent 12 }}
           {{- end }}
 
           {{- with .Values.resources }}
@@ -89,15 +83,10 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
 
-      {{- with .Values.securityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-
       imagePullSecrets:
       {{- range $image, $imageValue := .Values.images }}
         {{- if $imageValue.regcred }}
-      - name: {{ include "owgw.fullname" $root }}-{{ $image }}-regcred
+      - name: {{ include "ucentralgw.fullname" $root }}-{{ $image }}-regcred
         {{- end }}
       {{- end }}
 

helm/templates/ingress.yaml

@@ -2,13 +2,13 @@
 {{- range $ingress, $ingressValue := .Values.ingresses }}
 {{- if $ingressValue.enabled }}
 ---
-apiVersion: {{ include "owgw.ingress.apiVersion" $root }}
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: {{ include "owgw.fullname" $root }}-{{ $ingress }}
+  name: {{ include "ucentralgw.fullname" $root }}-{{ $ingress }}
   labels:
-    app.kubernetes.io/name: {{ include "owgw.name" $root }}
-    helm.sh/chart: {{ include "owgw.chart" $root }}
+    app.kubernetes.io/name: {{ include "ucentralgw.name" $root }}
+    helm.sh/chart: {{ include "ucentralgw.chart" $root }}
     app.kubernetes.io/instance: {{ $root.Release.Name }}
     app.kubernetes.io/managed-by: {{ $root.Release.Service }}
   {{- with $ingressValue.annotations }}
@@ -36,23 +36,9 @@ spec:
       paths:
       {{- range $ingressValue.paths }}
         - path: {{ .path }}
-          {{- if $root.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-          pathType: {{ .pathType | default "ImplementationSpecific" }}
-          {{- end }}
           backend:
-            {{- if $root.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-            service:
-              name: {{ include "owgw.fullname" $root }}-{{ .serviceName }}
-              port:
-              {{- if kindIs "string" .servicePort }}
-                name: {{ .servicePort }}
-              {{- else }}
-                number: {{ .servicePort }}
-              {{- end }}
-            {{- else }}
-            serviceName: {{ include "owgw.fullname" $root }}-{{ .serviceName }}
+            serviceName: {{ include "ucentralgw.fullname" $root }}-{{ .serviceName }}
             servicePort: {{ .servicePort }}
-            {{- end }}
       {{- end }}
   {{- end }}
 

helm/templates/psp.yaml

@@ -1,28 +0,0 @@
-{{- if .Values.podSecurityPolicy.enabled }}
----
-apiVersion: policy/v1beta1
-kind: PodSecurityPolicy
-metadata:
-  name: {{ include "owgw.fullname" . }}-{{ .Release.Namespace }}-owgw-unsafe-sysctl
-  labels:
-    app.kubernetes.io/name: {{ include "owgw.name" . }}
-    helm.sh/chart: {{ include "owgw.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  allowedUnsafeSysctls:
-  {{- range $unsafeSysctl := .Values.securityContext.sysctls }}
-  - {{ $unsafeSysctl.name }}
-  {{- end }}
-  privileged: false
-  seLinux:
-    rule: RunAsAny
-  supplementalGroups:
-    rule: RunAsAny
-  runAsUser:
-    rule: RunAsAny
-  fsGroup:
-    rule: RunAsAny
-  volumes:
-  - '*'
-{{- end }}

helm/templates/pvc.yaml

@@ -3,10 +3,10 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ template "owgw.fullname" . }}-pvc
+  name: {{ template "ucentralgw.fullname" . }}-pvc
   labels:
-    app.kubernetes.io/name: {{ include "owgw.name" . }}
-    helm.sh/chart: {{ include "owgw.chart" . }}
+    app.kubernetes.io/name: {{ include "ucentralgw.name" . }}
+    helm.sh/chart: {{ include "ucentralgw.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   {{- with .Values.persistence.annotations  }}

helm/templates/role.yaml

@@ -1,16 +0,0 @@
-{{- if .Values.podSecurityPolicy.enabled }}
----
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ include "owgw.fullname" . }}-owgw-use-unsafe-sysctl
-rules:
-- apiGroups:
-  - policy
-  resources:
-  - podsecuritypolicies
-  verbs:
-  - use
-  resourceNames:
-  - {{ include "owgw.fullname" . }}-{{ .Release.Namespace }}-owgw-unsafe-sysctl
-{{- end }}

helm/templates/rolebinding.yaml

@@ -1,15 +0,0 @@
-{{- if .Values.podSecurityPolicy.enabled }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "owgw.fullname" . }}-owgw-use-unsafe-sysctl-to-default
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "owgw.fullname" . }}-owgw-use-unsafe-sysctl
-subjects:
-- kind: ServiceAccount
-  name: default
-  namespace: {{ .Release.Namespace }}
-{{- end }}

helm/templates/secret-certs-cas.yaml

@@ -2,11 +2,11 @@
 apiVersion: v1
 metadata:
   labels:
-    app.kuberentes.io/name: {{ include "owgw.name" . }}
-    helm.sh/chart: {{ include "owgw.chart" . }}
+    app.kuberentes.io/name: {{ include "ucentralgw.name" . }}
+    helm.sh/chart: {{ include "ucentralgw.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "owgw.fullname" . }}-certs-cas
+  name: {{ include "ucentralgw.fullname" . }}-certs-cas
 kind: Secret
 type: Opaque
 data:

helm/templates/secret-certs.yaml

@@ -2,11 +2,11 @@
 apiVersion: v1
 metadata:
   labels:
-    app.kuberentes.io/name: {{ include "owgw.name" . }}
-    helm.sh/chart: {{ include "owgw.chart" . }}
+    app.kuberentes.io/name: {{ include "ucentralgw.name" . }}
+    helm.sh/chart: {{ include "ucentralgw.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "owgw.fullname" . }}-certs
+  name: {{ include "ucentralgw.fullname" . }}-certs
 kind: Secret
 type: Opaque
 data:

helm/templates/secret-config.yaml

@@ -2,12 +2,12 @@
 apiVersion: v1
 metadata:
   labels:
-    app.kuberentes.io/name: {{ include "owgw.name" . }}
-    helm.sh/chart: {{ include "owgw.chart" . }}
+    app.kuberentes.io/name: {{ include "ucentralgw.name" . }}
+    helm.sh/chart: {{ include "ucentralgw.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "owgw.fullname" . }}-config
+  name: {{ include "ucentralgw.fullname" . }}-config
 kind: Secret
 type: Opaque
 data:
-  owgw.properties: {{ include "owgw.config" . | b64enc }}
+  ucentralgw.properties: {{ include "ucentralgw.config" . | b64enc }}

helm/templates/secret-env.yaml

@@ -2,11 +2,11 @@
 apiVersion: v1
 metadata:
   labels:
-    app.kuberentes.io/name: {{ include "owgw.name" . }}
-    helm.sh/chart: {{ include "owgw.chart" . }}
+    app.kuberentes.io/name: {{ include "ucentralgw.name" . }}
+    helm.sh/chart: {{ include "ucentralgw.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  name: {{ include "owgw.fullname" . }}-env
+  name: {{ include "ucentralgw.fullname" . }}-env
 kind: Secret
 type: Opaque
 data:

helm/templates/secret-regcred.yaml

@@ -10,11 +10,11 @@ kind: Secret
 type: kubernetes.io/dockerconfigjson
 metadata:
   labels:
-    app.kuberentes.io/name: {{ include "owgw.name" $root }}
-    helm.sh/chart: {{ include "owgw.chart" $root }}
+    app.kuberentes.io/name: {{ include "ucentralgw.name" $root }}
+    helm.sh/chart: {{ include "ucentralgw.chart" $root }}
     app.kubernetes.io/instance: {{ $root.Release.Name }}
     app.kubernetes.io/managed-by: {{ $root.Release.Service }}
-  name: {{ include "owgw.fullname" $root }}-{{ $image }}-regcred
+  name: {{ include "ucentralgw.fullname" $root }}-{{ $image }}-regcred
 data:
   .dockerconfigjson: {{ template "imagePullSecret" $imageValue.regcred }}
 {{- end }}

helm/templates/service.yaml

@@ -4,14 +4,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "owgw.fullname" $root }}-{{ $service }}
+  name: {{ include "ucentralgw.fullname" $root }}-{{ $service }}
   {{- with $serviceValue.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ include "owgw.name" $root }}
-    helm.sh/chart: {{ include "owgw.chart" $root }}
+    app.kubernetes.io/name: {{ include "ucentralgw.name" $root }}
+    helm.sh/chart: {{ include "ucentralgw.chart" $root }}
     app.kubernetes.io/instance: {{ $root.Release.Name }}
     app.kubernetes.io/managed-by: {{ $root.Release.Service }}
 
@@ -39,7 +39,7 @@ spec:
       {{- end }}
   {{- end }}
   selector:
-    app.kubernetes.io/name: {{ include "owgw.name" $root }}
+    app.kubernetes.io/name: {{ include "ucentralgw.name" $root }}
     app.kubernetes.io/instance: {{ $root.Release.Name }}
     {{- with $serviceValue.labels }}
     {{- toYaml . | nindent 4 }}

helm/values.yaml

@@ -6,9 +6,9 @@ nameOverride: ""
 fullnameOverride: ""
 
 images:
-  owgw:
-    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owgw
-    tag: v2.4.2
+  ucentralgw:
+    repository: tip-tip-wlan-cloud-ucentral.jfrog.io/ucentralgw
+    tag: v2.0.0-RC1
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io
@@ -16,7 +16,7 @@ images:
 #      password: password
 
 services:
-  owgw:
+  ucentralgw:
     type: LoadBalancer
     ports:
       websocket:
@@ -37,16 +37,15 @@ services:
         protocol: TCP
 
 checks:
-  owgw:
+  ucentralgw:
     liveness:
       httpGet:
         path: /
         port: 16102
     readiness:
-      exec:
-        command:
-          - /readiness_check
-      failureThreshold: 1
+      httpGet:
+        path: /
+        port: 16102
 
 ingresses:
   restapi:
@@ -58,8 +57,7 @@ ingresses:
     - restapi.chart-example.local
     paths:
     - path: /
-      pathType: ImplementationSpecific
-      serviceName: owgw
+      serviceName: ucentralgw
       servicePort: restapi
   fileuploader:
     enabled: false
@@ -70,35 +68,34 @@ ingresses:
     - fileuploader.chart-example.local
     paths:
     - path: /
-      pathType: ImplementationSpecific
-      serviceName: owgw
+      serviceName: ucentralgw
       servicePort: fileuploader
 
 volumes:
-  owgw:
+  ucentralgw:
     - name: config
-      mountPath: /owgw-data/owgw.properties
-      subPath: owgw.properties
+      mountPath: /ucentralgw-data/ucentralgw.properties
+      subPath: ucentralgw.properties
       # Template below will be rendered in template
       volumeDefinition: |
         secret:
-          secretName: {{ include "owgw.fullname" . }}-config
+          secretName: {{ include "ucentralgw.fullname" . }}-config
     - name: certs
-      mountPath: /owgw-data/certs
+      mountPath: /ucentralgw-data/certs
       volumeDefinition: |
         secret:
-          secretName: {{ include "owgw.fullname" . }}-certs
+          secretName: {{ include "ucentralgw.fullname" . }}-certs
     - name: certs-cas
-      mountPath: /owgw-data/certs/cas
+      mountPath: /ucentralgw-data/certs/cas
       volumeDefinition: |
         secret:
-          secretName: {{ include "owgw.fullname" . }}-certs-cas
+          secretName: {{ include "ucentralgw.fullname" . }}-certs-cas
     # Change this if you want to use another volume type
     - name: persist
-      mountPath: /owgw-data/persist
+      mountPath: /ucentralgw-data/persist
       volumeDefinition: |
         persistentVolumeClaim:
-          claimName: {{ template "owgw.fullname" . }}-pvc
+          claimName: {{ template "ucentralgw.fullname" . }}-pvc
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
@@ -112,31 +109,12 @@ resources: {}
   #  cpu: 100m
   #  memory: 128Mi
 
-securityContext:
-  fsGroup: 101
-  # Usage of unsafe sysctls requires multiple things:
-  # - allow these unsafe sysctls on kubelet level (by adding --allowed-unsafe-sysctls flag)
-  # - enabling addition of PodSecurityContext setting podSecurityPolicy.enabled to "true" below
-  # - uncommenting parameters below
-  #sysctls:
-  #- name: net.ipv4.tcp_keepalive_intvl
-  #  value: "5"
-  #- name: net.ipv4.tcp_keepalive_probes
-  #  value: "2"
-  #- name: net.ipv4.tcp_keepalive_time
-  #  value: "45"
-
 nodeSelector: {}
 
 tolerations: []
 
 affinity: {}
 
-podAnnotations: {}
-
-podSecurityPolicy:
-  enabled: false
-
 persistence:
   enabled: true
   # storageClassName: "-"
@@ -147,71 +125,63 @@ persistence:
 
 # Application
 public_env_variables:
-  OWGW_ROOT: /owgw-data
-  OWGW_CONFIG: /owgw-data
-  # Environment variables required for the readiness checks using script
-  FLAGS: "-s --connect-timeout 3"
-  # NOTE in order for readiness check to use system info you need to set READINESS_METHOD to "systeminfo" and set OWSEC to the OWSEC's REST API endpoint
-  #READINESS_METHOD: systeminfo
-  #OWSEC: gw-qa01.cicd.lab.wlan.tip.build:16001
+  UCENTRALGW_ROOT: /ucentralgw-data
+  UCENTRALGW_CONFIG: /ucentralgw-data
 
-secret_env_variables:
-  # NOTE in order for readiness check to use system info method you need to override these values to the real OWSEC credentials
-  OWSEC_USERNAME: tip@ucentral.com
-  OWSEC_PASSWORD: openwifi
+secret_env_variables: {}
 
 configProperties:
   # -> Public part
   # Websocket
   ucentral.websocket.host.0.backlog: 500
-  ucentral.websocket.host.0.rootca: $OWGW_ROOT/certs/root.pem
-  ucentral.websocket.host.0.issuer: $OWGW_ROOT/certs/issuer.pem
-  ucentral.websocket.host.0.cert: $OWGW_ROOT/certs/websocket-cert.pem
-  ucentral.websocket.host.0.key: $OWGW_ROOT/certs/websocket-key.pem
-  ucentral.websocket.host.0.clientcas: $OWGW_ROOT/certs/clientcas.pem
-  ucentral.websocket.host.0.cas: $OWGW_ROOT/certs/cas
+  ucentral.websocket.host.0.rootca: $UCENTRALGW_ROOT/certs/root.pem
+  ucentral.websocket.host.0.issuer: $UCENTRALGW_ROOT/certs/issuer.pem
+  ucentral.websocket.host.0.cert: $UCENTRALGW_ROOT/certs/websocket-cert.pem
+  ucentral.websocket.host.0.key: $UCENTRALGW_ROOT/certs/websocket-key.pem
+  ucentral.websocket.host.0.clientcas: $UCENTRALGW_ROOT/certs/clientcas.pem
+  ucentral.websocket.host.0.cas: $UCENTRALGW_ROOT/certs/cas
   ucentral.websocket.host.0.address: "*"
   ucentral.websocket.host.0.port: 15002
   ucentral.websocket.host.0.security: strict
   ucentral.websocket.maxreactors: 20
   # REST API
-  openwifi.restapi.host.0.backlog: 100
-  openwifi.restapi.host.0.security: relaxed
-  openwifi.restapi.host.0.rootca: $OWGW_ROOT/certs/restapi-ca.pem
-  openwifi.restapi.host.0.address: "*"
-  openwifi.restapi.host.0.port: 16002
-  openwifi.restapi.host.0.cert: $OWGW_ROOT/certs/restapi-cert.pem
-  openwifi.restapi.host.0.key: $OWGW_ROOT/certs/restapi-key.pem
-  openwifi.internal.restapi.host.0.backlog: 100
-  openwifi.internal.restapi.host.0.security: relaxed
-  openwifi.internal.restapi.host.0.rootca: $OWGW_ROOT/certs/restapi-ca.pem
-  openwifi.internal.restapi.host.0.address: "*"
-  openwifi.internal.restapi.host.0.port: 17002
-  openwifi.internal.restapi.host.0.cert: $OWGW_ROOT/certs/restapi-cert.pem
-  openwifi.internal.restapi.host.0.key: $OWGW_ROOT/certs/restapi-key.pem
+  ucentral.restapi.host.0.backlog: 100
+  ucentral.restapi.host.0.security: relaxed
+  ucentral.restapi.host.0.rootca: $UCENTRALGW_ROOT/certs/restapi-ca.pem
+  ucentral.restapi.host.0.address: "*"
+  ucentral.restapi.host.0.port: 16002
+  ucentral.restapi.host.0.cert: $UCENTRALGW_ROOT/certs/restapi-cert.pem
+  ucentral.restapi.host.0.key: $UCENTRALGW_ROOT/certs/restapi-key.pem
+  ucentral.internal.restapi.host.0.backlog: 100
+  ucentral.internal.restapi.host.0.security: relaxed
+  ucentral.internal.restapi.host.0.rootca: $UCENTRALGW_ROOT/certs/restapi-ca.pem
+  ucentral.internal.restapi.host.0.address: "*"
+  ucentral.internal.restapi.host.0.port: 17002
+  ucentral.internal.restapi.host.0.cert: $UCENTRALGW_ROOT/certs/restapi-cert.pem
+  ucentral.internal.restapi.host.0.key: $UCENTRALGW_ROOT/certs/restapi-key.pem
   # File uploader
-  openwifi.fileuploader.host.0.backlog: 100
-  openwifi.fileuploader.host.0.rootca: $OWGW_ROOT/certs/restapi-ca.pem
-  openwifi.fileuploader.host.0.security: relaxed
-  openwifi.fileuploader.host.0.address: "*"
-  openwifi.fileuploader.host.0.name: localhost
-  openwifi.fileuploader.host.0.port: 16003
-  openwifi.fileuploader.host.0.cert: $OWGW_ROOT/certs/restapi-cert.pem
-  openwifi.fileuploader.host.0.key: $OWGW_ROOT/certs/restapi-key.pem
-  openwifi.fileuploader.path: $OWGW_ROOT/uploads
-  openwifi.fileuploader.maxsize: 10000
+  ucentral.fileuploader.host.0.backlog: 100
+  ucentral.fileuploader.host.0.rootca: $UCENTRALGW_ROOT/certs/restapi-ca.pem
+  ucentral.fileuploader.host.0.security: relaxed
+  ucentral.fileuploader.host.0.address: "*"
+  ucentral.fileuploader.host.0.name: localhost
+  ucentral.fileuploader.host.0.port: 16003
+  ucentral.fileuploader.host.0.cert: $UCENTRALGW_ROOT/certs/restapi-cert.pem
+  ucentral.fileuploader.host.0.key: $UCENTRALGW_ROOT/certs/restapi-key.pem
+  ucentral.fileuploader.path: $UCENTRALGW_ROOT/uploads
+  ucentral.fileuploader.maxsize: 10000
   # Auto provisioning
-  openwifi.autoprovisioning: "true"
-  openwifi.devicetypes.0: AP:linksys_ea8300,edgecore_eap101,linksys_e8450-ubi
-  openwifi.devicetypes.1: SWITCH:edgecore_ecs4100-12ph
-  openwifi.devicetypes.2: IOT:esp32
+  ucentral.autoprovisioning: "true"
+  ucentral.devicetypes.0: AP:linksys_ea8300,edgecore_eap101,linksys_e8450-ubi
+  ucentral.devicetypes.1: SWITCH:edgecore_ecs4100-12ph
+  ucentral.devicetypes.2: IOT:esp32
   oui.download.uri: https://linuxnet.ca/ieee/oui.txt
   firmware.autoupdate.policy.default: auto
   # Callback
-  openwifi.callback.enable: "false"
-  openwifi.callback.0.local: localhost:16001
-  openwifi.callback.0.remote: localhost:15055
-  openwifi.callback.0.topics: owfws
+  ucentral.callback.enable: "false"
+  ucentral.callback.0.local: localhost:16001
+  ucentral.callback.0.remote: localhost:15055
+  ucentral.callback.0.topics: ucentralfws
   # rtty
   rtty.enabled: "true"
   rtty.server: localhost
@@ -222,12 +192,12 @@ configProperties:
   alb.enable: "true"
   alb.port: 16102
   # Kafka
-  openwifi.kafka.enable: "false"
-  openwifi.kafka.group.id: gateway
-  openwifi.kafka.client.id: gateway1
-  openwifi.kafka.brokerlist: localhost:9092
-  openwifi.kafka.auto.commit: false
-  openwifi.kafka.queue.buffering.max.ms: 50
+  ucentral.kafka.enable: "false"
+  ucentral.kafka.group.id: gateway
+  ucentral.kafka.client.id: gateway1
+  ucentral.kafka.brokerlist: localhost:9092
+  ucentral.kafka.auto.commit: false
+  ucentral.kafka.queue.buffering.max.ms: 50
   # Storage
   storage.type: sqlite # (sqlite|postgresql|mysql|odbc)
   ## SQLite
@@ -238,31 +208,31 @@ configProperties:
   storage.type.postgresql.maxsessions: 64
   storage.type.postgresql.idletime: 60
   storage.type.postgresql.host: localhost
-  storage.type.postgresql.database: owgw
+  storage.type.postgresql.database: ucentral
   storage.type.postgresql.port: 5432
   storage.type.postgresql.connectiontimeout: 60
   ## MySQL
   storage.type.mysql.maxsessions: 64
   storage.type.mysql.idletime: 60
   storage.type.mysql.host: localhost
-  storage.type.mysql.database: owgw
+  storage.type.mysql.database: ucentral
   storage.type.mysql.port: 3306
   storage.type.mysql.connectiontimeout: 60
   # System
-  openwifi.service.key: $OWGW_ROOT/certs/restapi-key.pem
-  openwifi.system.data: $OWGW_ROOT/persist
-  openwifi.system.debug: "true"
-  openwifi.system.uri.private: https://localhost:17002
-  openwifi.system.uri.public: https://localhost:16002
-  openwifi.system.commandchannel: /tmp/app_owgw
+  ucentral.service.key: $UCENTRALGW_ROOT/certs/restapi-key.pem
+  ucentral.system.data: $UCENTRALGW_ROOT/persist
+  ucentral.system.debug: "true"
+  ucentral.system.uri.private: https://localhost:17002
+  ucentral.system.uri.public: https://localhost:16002
+  ucentral.system.commandchannel: /tmp/app_ucentralgw
   # Logging
   logging.formatters.f1.class: PatternFormatter
-  logging.formatters.f1.pattern: "%Y-%m-%d %H:%M:%S %s: [%p] %t"
+  logging.formatters.f1.pattern: "%s: [%p] %t"
   logging.formatters.f1.times: UTC
   logging.channels.c1.class: ConsoleChannel
   logging.channels.c1.formatter: f1
   logging.channels.c2.class: FileChannel
-  logging.channels.c2.path: /tmp/log_owgw
+  logging.channels.c2.path: /tmp/log_ucentralgw
   logging.channels.c2.formatter.class: PatternFormatter
   logging.channels.c2.formatter.pattern: "%Y-%m-%d %H:%M:%S %s: [%p] %t"
   logging.channels.c2.rotation: "20 M"
@@ -270,21 +240,21 @@ configProperties:
   logging.channels.c2.purgeCount: 20
   logging.channels.c3.class: ConsoleChannel
   logging.channels.c3.pattern: "%s: [%p] %t"
-  logging.loggers.root.channel: c1
+  logging.loggers.root.channel: c2
   logging.loggers.root.level: debug
 
   # -> Secret part
   # Websocket
   ucentral.websocket.host.0.key.password: mypassword
   # REST API
-  openwifi.restapi.host.0.key.password: mypassword
-  openwifi.internal.restapi.host.0.key.password: mypassword
+  ucentral.restapi.host.0.key.password: mypassword
+  ucentral.internal.restapi.host.0.key.password: mypassword
   # File uploader
-  openwifi.fileuploader.host.0.key.password: mypassword
+  ucentral.fileuploader.host.0.key.password: mypassword
   # Callback
-  openwifi.callback.id: qblat6dfDHxQAZ6yMe6MrypBpgRDhQrhUtTOovOXAKAWU8qOvjjKKiUai4t9hGjA
-  openwifi.callback.0.localkey: t2dEOc88OIxVDb94mw7SLcLocgnCzZzzFoQ4JJv3OCU9UO6Ou5ds5Dh4CfBnHgrk
-  openwifi.callback.0.remotekey: t2dEOc88OIxVDb94mw7SLcLocgnCzZzzFoQ4JJv3OCU9UO6Ou5ds5Dh4CfBnHgrk
+  ucentral.callback.id: qblat6dfDHxQAZ6yMe6MrypBpgRDhQrhUtTOovOXAKAWU8qOvjjKKiUai4t9hGjA
+  ucentral.callback.0.localkey: t2dEOc88OIxVDb94mw7SLcLocgnCzZzzFoQ4JJv3OCU9UO6Ou5ds5Dh4CfBnHgrk
+  ucentral.callback.0.remotekey: t2dEOc88OIxVDb94mw7SLcLocgnCzZzzFoQ4JJv3OCU9UO6Ou5ds5Dh4CfBnHgrk
   # rtty
   rtty.token: 96181c567b4d0d98c50f127230068fa8
   # Storage
@@ -455,64 +425,3 @@ certsCAs:
     L+/DtiR5fDVMNdBSGU89UNTi0wHY9+RFuNlIuvZC+x/swF0V9R5mN+ywquTPtDLA
     5IOM7ItsRmen6u3qu+JXros54e4juQ==
     -----END CERTIFICATE-----
-
-# PostgreSQL (https://github.com/bitnami/charts/tree/master/bitnami/postgresql)
-postgresql:
-  enabled: false
-
-  image:
-    registry: docker.io
-    repository: bitnami/postgresql
-    tag: 11.13.0-debian-10-r0
-
-  postgresqlPostgresPassword: "rootPassword"
-  postgresqlUsername: stephb
-  postgresqlPassword: snoopy99
-  postgresqlDatabase: owgw
-
-  persistence:
-    enabled: true
-    storageClass: ""
-    size: 8Gi
-
-# MySQL (https://github.com/bitnami/charts/tree/master/bitnami/mysql)
-mysql:
-  enabled: false
-
-  image:
-    registry: docker.io
-    repository: bitnami/mysql
-    tag: 8.0.26-debian-10-r10
-
-  auth:
-    rootPassword: rootPassword
-    database: owgw
-    username: stephb
-    password: snoopy99
-
-  primary:
-    persistence:
-      enabled: true
-      storageClass: ""
-      size: 8Gi
-
-# MariaDB (https://github.com/bitnami/charts/tree/master/bitnami/mariadb)
-mariadb:
-  enabled: false
-
-  image:
-    registry: docker.io
-    repository: bitnami/mariadb
-    tag: 10.5.12-debian-10-r0
-
-  auth:
-    rootPassword: rootPassword
-    database: owgw
-    username: stephb
-    password: snoopy99
-
-  primary:
-    persistence:
-      enabled: true
-      storageClass: ""
-      size: 8Gi

openapi/ucentral/ucentral.yaml

@@ -51,16 +51,6 @@ components:
             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
               ErrorDetails:
                 type: string
               ErrorDescription:
@@ -101,9 +91,6 @@ components:
         location:
           type: string
           format: uuid
-        venue:
-          type: string
-          format: uuid
         serialNumber:
           type: string
         deviceType:
@@ -193,12 +180,6 @@ components:
         rxBytes:
           type: integer
           format: int64
-        associations_2G:
-          type: integer
-          format: int64
-        associations_5G:
-          type: integer
-          format: int64
         devicePassword:
           type: string
         lastContact:
@@ -267,12 +248,6 @@ components:
           format: int64
         firmware:
           type: string
-        associations_2G:
-          type: integer
-          format: int64
-        associations_5G:
-          type: integer
-          format: int64
         verifiedCertificate:
           type: string
           enum:
@@ -609,12 +584,6 @@ components:
     DeviceDashboard:
       type: object
       properties:
-        snapshot:
-          type: integer
-          format: int64
-        numberOfDevices:
-          type: integer
-          format: int64
         commands:
           $ref: '#/components/schemas/TagIntPairList'
         upTimes:
@@ -641,44 +610,6 @@ components:
           $ref: '#/components/schemas/TagIntPairList'
         lastContact:
           $ref: '#/components/schemas/TagIntPairList'
-        associations:
-          $ref: '#/components/schemas/TagIntPairList'
-
-    TelemetryStreamRequest:
-      type: object
-      properties:
-        serialNumber:
-          type: string
-        interval:
-          type: integer
-          example:
-            0 - means to stop streaming, values 1-120 in seconds.
-        types:
-          type: array
-          items:
-            type: string
-            enum:
-              - dhcp-snooping
-              - wire-frames
-              - state
-        uuid:
-          type: string
-          example:
-            only valid when terminating a stream
-
-    TelemetryStreamResponse:
-      type: object
-      properties:
-        serialNumber:
-          type: string
-        uuid:
-          type: string
-          format: uuid
-        uri:
-          type: string
-          format: uri
-          example:
-            wss://host.domain:port/endpoint
 
     #########################################################################################
     ##
@@ -765,107 +696,6 @@ components:
         note:
           type: string
 
-    SystemInfoResults:
-      type: object
-      properties:
-        version:
-          type: string
-        uptime:
-          type: integer
-          format: integer64
-        start:
-          type: integer
-          format: integer64
-        os:
-          type: string
-        processors:
-          type: integer
-        hostname:
-          type: string
-        certificates:
-          type: array
-          items:
-            type: object
-            properties:
-              filename:
-                type: string
-              expires:
-                type: integer
-                format: int64
-
-    SystemCommandSetLogLevel:
-      type: object
-      properties:
-        command:
-          type: string
-          enum:
-            - setloglevel
-        subsystems:
-          type: array
-          items:
-            $ref: '#/components/schemas/TagValuePair'
-
-    SystemCommandReload:
-      type: object
-      properties:
-        command:
-          type: string
-          enum:
-            - reload
-        subsystems:
-          type: array
-          items:
-            type: string
-            example: these are the SubSystems names retrieve with the GetSubSystemsNamesResult.
-
-    SystemCommandGetLogLevels:
-      type: object
-      properties:
-        command:
-          type: string
-          enum:
-            - getloglevels
-
-    SystemGetLogLevelsResult:
-      type: object
-      properties:
-        taglist:
-          type: array
-          items:
-            $ref: '#/components/schemas/TagValuePair'
-
-    SystemCommandGetLogLevelNames:
-      type: object
-      properties:
-        command:
-          type: string
-          enum:
-            - getloglevelnames
-
-    SystemCommandGetSubsystemNames:
-      type: object
-      properties:
-        command:
-          type: string
-          enum:
-            - getsubsystemnames
-
-    SystemCommandGetLogLevelNamesResult:
-      type: object
-      properties:
-        list:
-          type: array
-          items:
-            type: string
-
-    SystemGetSubSystemNamesResult:
-      type: object
-      properties:
-        taglist:
-          type: array
-          items:
-            $ref: '#/components/schemas/TagValuePair'
-
     #########################################################################################
     ##
     ## End of uCentral system wide values
@@ -979,22 +809,6 @@ components:
         password:
           type: string
 
-    CapabilitiesModel:
-      type: object
-      properties:
-        deviceType:
-          type: string
-        capabilities:
-          type: string
-
-    CapabilitiesModelList:
-      type: object
-      properties:
-        devices:
-          type: array
-          items:
-            $ref: '#/components/schemas/CapabilitiesModel'
-
 paths:
   /devices:
     get:
@@ -1038,7 +852,6 @@ paths:
           name: countOnly
           schema:
             type: boolean
-            example: countOnly=true
         - in: query
           description: Return extra information with the device information
           name: deviceWithStatus
@@ -1137,7 +950,7 @@ paths:
             format: int64
 
       responses:
-        204:
+        200:
           description: Successfully deleted commands for the device.
           content:
             application/json:
@@ -1152,7 +965,7 @@ paths:
     get:
       tags:
         - Commands
-      summary: Returns a specific command.
+      summary: Returns a specific command
       description: Returns a specific command
       operationId: getACommandDetails
       parameters:
@@ -1177,7 +990,7 @@ paths:
     delete:
       tags:
         - Commands
-      summary: Delete a specific command.
+      summary: Delete a specific command
       description: Delete a specific command
       operationId: deleteACommand
       parameters:
@@ -1188,7 +1001,7 @@ paths:
             format: uuid
           required: true
       responses:
-        204:
+        200:
           description: Delete command success
           content:
             application/json:
@@ -1203,8 +1016,8 @@ paths:
     get:
       tags:
         - Configurations
-      summary: Retrieve the lists of all default configurations.
-      description: Retrieve the lists of all default configurations.
+      summary: Retrieve the lists of all default configurations
+      description: Retrieve the lists of all default configurations
       operationId: getDefaultConfigurations
 
       responses:
@@ -1223,8 +1036,8 @@ paths:
     get:
       tags:
         - Configurations
-      summary: Retrieve a default configuration.
-      description: Retrieve a default configuration.
+      summary: Retrieve a default configuration
+      description: Retrieve a default configuration
       operationId: getDefaultConfiguration
       parameters:
         - in: path
@@ -1247,8 +1060,8 @@ paths:
     post:
       tags:
         - Configurations
-      summary: Create a default configuration.
-      description: Create a default configuration.
+      summary: Create a default configuration
+      description: Create a default configuration
       operationId: createDefaultConfiguration
       parameters:
         - in: path
@@ -1283,7 +1096,7 @@ paths:
             type: string
           required: true
       responses:
-        204:
+        200:
           $ref: '#/components/responses/Success'
         403:
           $ref: '#/components/responses/Unauthorized'
@@ -1320,7 +1133,7 @@ paths:
     get:
       tags:
         - Devices
-      summary: Retrieve information for a single device.
+      summary: Retrieve information for a single device
       description: Retrieve all the inforamtion about a single device
       operationId: getDeviceInformation
       parameters:
@@ -1344,7 +1157,7 @@ paths:
     post:
       tags:
         - Devices
-      summary: Create a new device.
+      summary: Creating a new device
       operationId: createNewDevice
       parameters:
         - in: path
@@ -1352,11 +1165,6 @@ paths:
           schema:
             type: string
           required: true
-        - in: query
-          name: validateOnly
-          schema:
-            type: boolean
-          required: false
       requestBody:
         description: Information used to create the new device
         content:
@@ -1378,7 +1186,7 @@ paths:
     put:
       tags:
         - Devices
-      summary: Update a device.
+      summary: Updating a new device
       operationId: updateNewDevice
       parameters:
         - in: path
@@ -1407,7 +1215,7 @@ paths:
     delete:
       tags:
         - Devices
-      summary: Delete a single device.
+      summary: Deleting a single device
       operationId: deleteDevice
       parameters:
         - in: path
@@ -1416,7 +1224,7 @@ paths:
             type: string
           required: true
       responses:
-        204:
+        200:
           $ref: '#/components/responses/Success'
         403:
           $ref: '#/components/responses/Unauthorized'
@@ -1484,7 +1292,7 @@ paths:
     delete:
       tags:
         - Commands
-      summary: Delete some device logs.
+      summary: Delete some device logs
       operationId: deleteDeviceLogs
       parameters:
         - in: path
@@ -1511,7 +1319,7 @@ paths:
             format: int64
 
       responses:
-        204:
+        200:
           description: Successfully deleted logs for the device.
           content:
             application/json:
@@ -1526,7 +1334,7 @@ paths:
     get:
       tags:
         - Commands
-      summary: Get the latest health checks for a given device.
+      summary: Get the latest health checks for a given device
       operationId: getDeviceHealthChecks
       parameters:
         - in: path
@@ -1573,7 +1381,7 @@ paths:
 
       responses:
         200:
-          description: Array of device health checks for this device
+          description: Array of device health checks  for this device
           content:
             application/json:
               schema:
@@ -1586,7 +1394,7 @@ paths:
     delete:
       tags:
         - Commands
-      summary: Delete some device health checks.
+      summary: Delete some device health checks
       operationId: deleteDeviceHealthChecks
       parameters:
         - in: path
@@ -1608,7 +1416,7 @@ paths:
           required: false
 
       responses:
-        204:
+        200:
           description: Successfully deleted health checks for the device.
           content:
             application/json:
@@ -1623,7 +1431,7 @@ paths:
     get:
       tags:
         - Commands
-      summary: Get the latest capabilities for a given device.
+      summary: Get the latest capabilities for a given device
       operationId: getDeviceCapabilities
       parameters:
         - in: path
@@ -1646,7 +1454,7 @@ paths:
     delete:
       tags:
         - Commands
-      summary: Delete the capabilities for a given device.
+      summary: Delete the capabilities for a given device
       operationId: deleteDeviceCapabilities
       parameters:
         - in: path
@@ -1655,7 +1463,7 @@ paths:
             type: string
           required: true
       responses:
-        204:
+        200:
           description: List of logs for this device
           content:
             application/json:
@@ -1670,7 +1478,7 @@ paths:
     get:
       tags:
         - Commands
-      summary: Get the latest statistics for a given device.
+      summary: Get the latest statistics for a given device
       operationId: getDeviceStats
       parameters:
         - in: path
@@ -1738,7 +1546,7 @@ paths:
     delete:
       tags:
         - Commands
-      summary: Get the latest statistics for a given device.
+      summary: Get the latest statistics for a given device
       operationId: deleteDeviceStats
       parameters:
         - in: path
@@ -1760,7 +1568,7 @@ paths:
           required: false
 
       responses:
-        204:
+        200:
           description: Array of statistics for this device
           content:
             application/json:
@@ -1775,7 +1583,7 @@ paths:
     get:
       tags:
         - Commands
-      summary: Get the latest status for a given device.
+      summary: Get the latest status for a given device
       operationId: getDeviceStatus
       parameters:
         - in: path
@@ -1825,7 +1633,7 @@ paths:
     post:
       tags:
         - Commands
-      summary: Configure a device.
+      summary: Configura a device
       operationId: updateConfigurationForADevice
       parameters:
         - in: path
@@ -1851,7 +1659,7 @@ paths:
     post:
       tags:
         - Commands
-      summary: Upgrade a device.
+      summary: Upgrade a device
       operationId: UpgradeDeviceFirmware
       parameters:
         - in: path
@@ -1877,7 +1685,7 @@ paths:
     post:
       tags:
         - Commands
-      summary: Reboot a device.
+      summary: Upgrade a device
       operationId: rebootDevice
       parameters:
         - in: path
@@ -1903,7 +1711,7 @@ paths:
     post:
       tags:
         - Commands
-      summary: Factory reset a device.
+      summary: Factory reset a device a device
       operationId: factoryReset
       parameters:
         - in: path
@@ -1929,7 +1737,7 @@ paths:
     post:
       tags:
         - Commands
-      summary: Blink the LEDs on a device.
+      summary: Blink the LEDs on a device
       operationId: ledsRequest
       parameters:
         - in: path
@@ -1955,7 +1763,7 @@ paths:
     post:
       tags:
         - Commands
-      summary: Launch a trace for a device.
+      summary: Launch a trace for a device
       operationId: traceRequest
       parameters:
         - in: path
@@ -1981,7 +1789,7 @@ paths:
     post:
       tags:
         - Commands
-      summary: Launch a wifi scan for a device.
+      summary: Launch a wifi scan for a device
       operationId: wifiscanRequest
       parameters:
         - in: path
@@ -2029,11 +1837,11 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
-  /device/{serialNumber}/eventqueue:
+  /device/{serialNumber}/eventrequest:
     post:
       tags:
         - Commands
-      summary: Request a list of queued events.
+      summary: Request a list of queued events
       operationId: eventQueueRequest
       parameters:
         - in: path
@@ -2055,38 +1863,12 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
-  /device/{serialNumber}/telemetry:
-    post:
-      tags:
-        - Commands
-      summary: Request a telemetry stream.
-      operationId: eventTelemetryStreamRequest
-      parameters:
-        - in: path
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-      requestBody:
-        description: Message request details
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TelemetryStreamRequest'
-      responses:
-        200:
-          $ref: '#/components/schemas/TelemetryStreamResponse'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
   /ouis:
     get:
       tags:
         - OUIs
       operationId: getOUIs
-      summary: Get a list of OUIs.
+      summary: Get a list of OUIs
       parameters:
         - in: query
           name: macList
@@ -2105,7 +1887,7 @@ paths:
     get:
       tags:
         - Commands
-      summary: Get the rtty parameters to initiate a session.
+      summary: Get the rtty parameters to initiate a session
       operationId: getRttySessionInfo
       parameters:
         - in: path
@@ -2129,7 +1911,7 @@ paths:
     get:
       tags:
         - Files
-      summary: Get a file from the upload directory.
+      summary: Get a file from the upload directory
       operationId: getUploadFile
       parameters:
         - in: path
@@ -2159,7 +1941,7 @@ paths:
     delete:
       tags:
         - Files
-      summary: Delete a file from the upload directory.
+      summary: Delete a file from the upload directory
       operationId: deleteUploadFidelete
       parameters:
         - in: path
@@ -2174,7 +1956,7 @@ paths:
             type: string
           required: true
       responses:
-        204:
+        200:
           $ref: '#/components/responses/Success'
         403:
           $ref: '#/components/responses/Unauthorized'
@@ -2186,7 +1968,7 @@ paths:
       tags:
         - Blacklist
       summary: Returns a list blacklisted devices.
-      description: Get a list of blacklisted devices.
+      description: Get a list of blacklisteddevices.
       operationId: getBlacklistDeviceList
       parameters:
         - in: query
@@ -2219,76 +2001,17 @@ paths:
         404:
           $ref: '#/components/responses/NotFound'
 
-  /blacklist/{serialNumber}:
-    get:
-      tags:
-        - Blacklist
-      summary: Returns a blacklist entry.
-      description: Get a list of blacklisted devices.
-      operationId: getBlacklistDevice
-      parameters:
-        - in: path
-          description: Pagination start (starts at 1. If not specified, 1 is assumed)
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-      responses:
-        200:
-          description: List blacklisted devices
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/BlackDeviceInfo'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
     post:
       tags:
         - Blacklist
-      summary: Create to the blacklist.
-      operationId: createBlackListDevice
-      parameters:
-        - in: path
-          description: Pagination start (starts at 1. If not specified, 1 is assumed)
-          name: serialNumber
-          schema:
-            type: string
-          required: true
-      requestBody:
-        description: Add blacklisted device
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/BlackDeviceInfo'
-      responses:
-        200:
-          $ref: '#/components/responses/Success'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-    put:
-      tags:
-        - Blacklist
-      summary: Modify to the blacklist.
-      operationId: modifyBlackList
-      parameters:
-        - in: path
-          description: Pagination start (starts at 1. If not specified, 1 is assumed)
-          name: serialNumber
-          schema:
-            type: string
-          required: true
+      summary: Adds to the blacklist
+      operationId: addToBlackList
       requestBody:
         description: Add blacklisted devices
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/BlackDeviceInfo'
+              $ref: '#/components/schemas/BlackDeviceList'
       responses:
         200:
           $ref: '#/components/responses/Success'
@@ -2300,35 +2023,18 @@ paths:
     delete:
       tags:
         - Blacklist
-      summary: Delete from the blacklist.
+      summary: Delete from the blacklist
       operationId: deleteFromBlackList
       parameters:
-        - in: path
+        - in: query
+          description: Serial Number
           name: serialNumber
           schema:
             type: string
           required: true
-      responses:
-        204:
-          $ref: '#/components/responses/Success'
-        403:
-          $ref: '#/components/responses/Unauthorized'
-        404:
-          $ref: '#/components/responses/NotFound'
-
-  /capabilities:
-    get:
-      tags:
-        - Devices
-      summary: Get the list of device types and capabilities.
-      operationId: getCapabilitiesList
       responses:
         200:
-          description: Successful command execution
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/CapabilitiesModelList'
+          $ref: '#/components/responses/Success'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
@@ -2338,7 +2044,7 @@ paths:
     get:
       tags:
         - Dashboards
-      summary: Get the last version of the dashboard.
+      summary: Get the last version of the dashboard
       operationId: getDeviceDashboard
       responses:
         200:
@@ -2353,33 +2059,26 @@ paths:
   ## These are endpoints that all services in the uCentral stack must provide
   ##
   #########################################################################################
+
   /system:
     post:
       tags:
         - System Commands
-      summary: Perform some system wide commands.
+      summary: Perform some systeme wide commands
       operationId: systemCommand
       requestBody:
         description: Command details
         content:
           application/json:
             schema:
-              oneOf:
-                - $ref: '#/components/schemas/SystemCommandSetLogLevel'
-                - $ref: '#/components/schemas/SystemCommandReload'
-                - $ref: '#/components/schemas/SystemCommandGetLogLevels'
-                - $ref: '#/components/schemas/SystemCommandGetLogLevelNames'
-                - $ref: '#/components/schemas/SystemCommandGetSubsystemNames'
+              $ref: '#/components/schemas/SystemCommandDetails'
       responses:
         200:
-          description: Successful command execution
+          description: Successfull command execution
           content:
             application/json:
               schema:
-                oneOf:
-                  - $ref: '#/components/schemas/SystemGetLogLevelsResult'
-                  - $ref: '#/components/schemas/SystemCommandGetLogLevelNamesResult'
-                  - $ref: '#/components/schemas/SystemGetSubSystemNamesResult'
+                $ref: '#/components/schemas/SystemCommandResults'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
@@ -2396,18 +2095,18 @@ paths:
           schema:
             type: string
             enum:
-              - info
+              - version
+              - times
           required: true
 
       responses:
         200:
-          description: Successful command execution
+          description: Successfull command execution
           content:
             application/json:
               schema:
-                oneOf:
-                  - $ref: '#/components/schemas/SystemInfoResults'
+                $ref: '#/components/schemas/TagValuePair'
         403:
           $ref: '#/components/responses/Unauthorized'
         404:
-          $ref: '#/components/responses/NotFound'
+          $ref: '#/components/responses/NotFound'

owgw.properties.tmpl

@@ -1,190 +0,0 @@
-#
-# uCentral protocol server for devices. This is where you point
-# all your devices. You can replace the * for address by the specific
-# address of one of your interfaces
-#
-ucentral.websocket.host.0.backlog = 500
-ucentral.websocket.host.0.rootca = ${WEBSOCKET_HOST_ROOTCA}
-ucentral.websocket.host.0.issuer = ${WEBSOCKET_HOST_ISSUER}
-ucentral.websocket.host.0.cert = ${WEBSOCKET_HOST_CERT}
-ucentral.websocket.host.0.key = ${WEBSOCKET_HOST_KEY}
-ucentral.websocket.host.0.clientcas = ${WEBSOCKET_HOST_CLIENTCAS}
-ucentral.websocket.host.0.cas = ${WEBSOCKET_HOST_CAS}
-ucentral.websocket.host.0.address = *
-ucentral.websocket.host.0.port = ${WEBSOCKET_HOST_PORT}
-ucentral.websocket.host.0.security = strict
-ucentral.websocket.host.0.key.password = ${WEBSOCKET_HOST_KEY_PASSWORD}
-ucentral.websocket.maxreactors = 20
-
-#
-# REST API access
-#
-openwifi.restapi.host.0.backlog = 100
-openwifi.restapi.host.0.security = relaxed
-openwifi.restapi.host.0.rootca = ${RESTAPI_HOST_ROOTCA}
-openwifi.restapi.host.0.address = *
-openwifi.restapi.host.0.port = ${RESTAPI_HOST_PORT}
-openwifi.restapi.host.0.cert = ${RESTAPI_HOST_CERT}
-openwifi.restapi.host.0.key = ${RESTAPI_HOST_KEY}
-openwifi.restapi.host.0.key.password = ${RESTAPI_HOST_KEY_PASSWORD}
-
-openwifi.internal.restapi.host.0.backlog = 100
-openwifi.internal.restapi.host.0.security = relaxed
-openwifi.internal.restapi.host.0.rootca = ${INTERNAL_RESTAPI_HOST_ROOTCA}
-openwifi.internal.restapi.host.0.address = *
-openwifi.internal.restapi.host.0.port = ${INTERNAL_RESTAPI_HOST_PORT}
-openwifi.internal.restapi.host.0.cert = ${INTERNAL_RESTAPI_HOST_CERT}
-openwifi.internal.restapi.host.0.key = ${INTERNAL_RESTAPI_HOST_KEY}
-openwifi.internal.restapi.host.0.key.password = ${INTERNAL_RESTAPI_HOST_KEY_PASSWORD}
-
-#
-# Used to upload files to the service.
-# You should replace the 'name' vaalue with the IP address of your gateway or an FQDN
-# that your devices can reach
-#
-openwifi.fileuploader.host.0.backlog = 100
-openwifi.fileuploader.host.0.rootca = ${FILEUPLOADER_HOST_ROOTCA}
-openwifi.fileuploader.host.0.security = relaxed
-openwifi.fileuploader.host.0.address = *
-openwifi.fileuploader.host.0.name = ${FILEUPLOADER_HOST_NAME}
-openwifi.fileuploader.host.0.port = ${FILEUPLOADER_HOST_PORT}
-openwifi.fileuploader.host.0.cert = ${FILEUPLOADER_HOST_CERT}
-openwifi.fileuploader.host.0.key = ${FILEUPLOADER_HOST_KEY}
-openwifi.fileuploader.host.0.key.password = ${FILEUPLOADER_HOST_KEY_PASSWORD}
-openwifi.fileuploader.path = ${FILEUPLOADER_PATH}
-openwifi.fileuploader.uri = ${FILEUPLOADER_URI}
-openwifi.fileuploader.maxsize = 10000
-
-#
-# Generic section that all microservices must have
-#
-openwifi.service.key = ${SERVICE_KEY}
-openwifi.service.key.password = ${SERVICE_KEY_PASSWORD}
-openwifi.system.data = ${SYSTEM_DATA}
-openwifi.system.debug = true
-openwifi.system.uri.private = ${SYSTEM_URI_PRIVATE}
-openwifi.system.uri.public = ${SYSTEM_URI_PUBLIC}
-openwifi.system.uri.ui = ${SYSTEM_URI_UI}
-openwifi.system.commandchannel = /tmp/app.ucentralgw
-
-#
-# Gateway Microservice Specific Section
-#
-openwifi.autoprovisioning = true
-openwifi.devicetypes.0 = AP:linksys_ea8300,edgecore_eap101,linksys_e8450-ubi
-openwifi.devicetypes.1 = SWITCH:edgecore_ecs4100-12ph
-openwifi.devicetypes.2 = IOT:esp32
-oui.download.uri = https://linuxnet.ca/ieee/oui.txt
-firmware.autoupdate.policy.default = auto
-simulatorid = ${SIMULATORID}
-
-#
-# rtty
-#
-rtty.enabled = ${RTTY_ENABLED}
-rtty.server = ${RTTY_SERVER}
-rtty.port = ${RTTY_PORT}
-rtty.token = ${RTTY_TOKEN}
-rtty.timeout = ${RTTY_TIMEOUT}
-rtty.viewport = ${RTTY_VIEWPORT}
-
-#############################
-# Generic information for all micro services
-#############################
-#
-# NLB Support
-#
-alb.enable = true
-alb.port = 16102
-
-#
-# Kafka
-#
-openwifi.kafka.group.id = gateway
-openwifi.kafka.client.id = gateway1
-openwifi.kafka.enable = ${KAFKA_ENABLE}
-openwifi.kafka.brokerlist = ${KAFKA_BROKERLIST}
-openwifi.kafka.auto.commit = false
-openwifi.kafka.queue.buffering.max.ms = 50
-
-#
-# This section select which form of persistence you need
-# Only one selected at a time. If you select multiple, this service will die if a horrible
-# death and might make your beer flat.
-#
-storage.type = ${STORAGE_TYPE}
-
-storage.type.sqlite.db = devices.db
-storage.type.sqlite.idletime = 120
-storage.type.sqlite.maxsessions = 128
-
-storage.type.postgresql.maxsessions = 64
-storage.type.postgresql.idletime = 60
-storage.type.postgresql.host = ${STORAGE_TYPE_POSTGRESQL_HOST}
-storage.type.postgresql.username = ${STORAGE_TYPE_POSTGRESQL_USERNAME}
-storage.type.postgresql.password = ${STORAGE_TYPE_POSTGRESQL_PASSWORD}
-storage.type.postgresql.database = ${STORAGE_TYPE_POSTGRESQL_DATABASE}
-storage.type.postgresql.port = ${STORAGE_TYPE_POSTGRESQL_PORT}
-storage.type.postgresql.connectiontimeout = 60
-
-storage.type.mysql.maxsessions = 64
-storage.type.mysql.idletime = 60
-storage.type.mysql.host = ${STORAGE_TYPE_MYSQL_HOST}
-storage.type.mysql.username = ${STORAGE_TYPE_MYSQL_USERNAME}
-storage.type.mysql.password = ${STORAGE_TYPE_MYSQL_PASSWORD}
-storage.type.mysql.database = ${STORAGE_TYPE_MYSQL_DATABASE}
-storage.type.mysql.port = ${STORAGE_TYPE_MYSQL_PORT}
-storage.type.mysql.connectiontimeout = 60
-
-archiver.enabled = true
-archiver.schedule = 03:00
-archiver.db.0.name = healthchecks
-archiver.db.0.keep = 7
-archiver.db.1.name = statistics
-archiver.db.1.keep = 7
-archiver.db.2.name = devicelogs
-archiver.db.2.keep = 7
-archiver.db.3.name = commandlist
-archiver.db.3.keep = 7
-
-########################################################################
-########################################################################
-#
-# Logging: please leave as is for now.
-#
-########################################################################
-
-logging.formatters.f1.class = PatternFormatter
-logging.formatters.f1.pattern = %Y-%m-%d %H:%M:%S %s: [%p] %t
-logging.formatters.f1.times = UTC
-logging.channels.c1.class = ConsoleChannel
-logging.channels.c1.formatter = f1
-
-# This is where the logs will be written. This path MUST exist
-logging.channels.c2.class = FileChannel
-logging.channels.c2.path = $OWGW_ROOT/logs/log
-logging.channels.c2.formatter.class = PatternFormatter
-logging.channels.c2.formatter.pattern = %Y-%m-%d %H:%M:%S %s: [%p] %t
-logging.channels.c2.rotation = 20 M
-logging.channels.c2.archive = timestamp
-logging.channels.c2.purgeCount = 20
-logging.channels.c3.class = ConsoleChannel
-logging.channels.c3.pattern = %s: [%p] %t
-
-# External Channel
-logging.loggers.root.channel = c1
-logging.loggers.root.level = debug
-
-# Inline Channel with PatternFormatter
-# logging.loggers.l1.name = logger1
-# logging.loggers.l1.channel.class = ConsoleChannel
-# logging.loggers.l1.channel.pattern = %s: [%p] %t
-# logging.loggers.l1.level = information
-# SplitterChannel
-# logging.channels.splitter.class = SplitterChannel
-# logging.channels.splitter.channels = l1,l2
-# logging.loggers.l2.name = logger2
-# logging.loggers.l2.channel = splitter
-
-
-

owgw.service

@@ -1,22 +0,0 @@
-[Unit]
-Description=OpenWiFi Gateway Service
-After=network-online.target docker.service
-Wants=network-online.target
-
-[Service]
-Type=simple
-Environment="OWGW_ROOT=/home/admin/dev/wlan-cloud-ucentralgw"
-ExecStart=/home/admin/dev/wlan-cloud-ucentralgw/cmake-build/owgw
-WorkingDirectory=/home/admin/dev/wlan-cloud-ucentralgw
-# ExecReload=/bin/kill -s HUP $MAINPID
-User=admin
-# TimeoutSec=0
-RestartSec=2
-Restart=always
-StartLimitBurst=3
-# KillMode=process
-LimitNOFILE=500000
-LimitNPROC=500000
-
-[Install]
-WantedBy=multi-user.target

readiness_check

@@ -1,65 +0,0 @@
-#!/bin/bash
-set -e
-
-if [[ "$(which jq)" == "" ]]
-then
-  echo "You need the package jq installed to use this script."
-  exit 1
-fi
-
-if [[ "$(which curl)" == "" ]]
-then
-  echo "You need the package curl installed to use this script."
-  exit 1
-fi
-
-if [[ "${OWSEC}" == "" ]]
-then
-  echo "You must set the variable OWSEC in order to use this script. Something like"
-  echo "OWSEC=security.isp.com:16001"
-  exit 1
-fi
-
-if [[ "${OWSEC_USERNAME}" == "" ]]
-then
-  echo "You must set the variable OWSEC_USERNAME in order to use this script. Something like"
-  echo "OWSEC_USERNAME=tip@ucentral.com"
-  exit 1
-fi
-
-if [[ "${OWSEC_PASSWORD}" == "" ]]
-then
-  echo "You must set the variable OWSEC_PASSWORD in order to use this script. Something like"
-  echo "OWSEC_PASSWORD=openwifi"
-  exit 1
-fi
-
-if [[ "${READINESS_METHOD}" == "systeminfo" ]]
-then
-  # Get OAuth token from OWSEC and cache it or use cached one
-  payload="{ \"userId\" : \"$OWSEC_USERNAME\" , \"password\" : \"$OWSEC_PASSWORD\" }"
-  if [[ -f "/tmp/token" ]]
-  then
-    token=$(cat /tmp/token)
-  else
-    token=$(curl ${FLAGS} -X POST -H "Content-Type: application/json" -d "$payload" "https://${OWSEC}/api/v1/oauth2" | jq -r '.access_token')
-  fi
-  if [[ "${token}" == "" ]]
-  then
-    echo "Could not login. Please verify the host and username/password."
-    exit 13
-  fi
-  echo -n $token > /tmp/token
-
-  # Make systeminfo request to the local owgw instance
-  export RESTAPI_PORT=$(grep 'openwifi.restapi.host.0.port' $OWGW_CONFIG/owgw.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-  curl ${FLAGS} -k -X GET "https://localhost:$RESTAPI_PORT/api/v1/system?command=info" \
-    -H "accept: application/json" \
-    -H "Authorization: Bearer ${token}" > /tmp/result.json
-  exit_code=$?
-  jq < /tmp/result.json
-  exit $exit_code
-else
-  export ALB_PORT=$(grep 'alb.port' $OWGW_CONFIG/owgw.properties | awk -F '=' '{print $2}' | xargs | envsubst)
-  curl localhost:$ALB_PORT
-fi

set_env.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-export OWGW_CONFIG=`pwd`
-export OWGW_ROOT=`pwd`
+export UCENTRALGW_CONFIG=`pwd`
+export UCENTRALGW_ROOT=`pwd`

src/ALBHealthCheckServer.h

@@ -0,0 +1,114 @@
+//
+// Created by stephane bourque on 2021-06-04.
+//
+
+#ifndef UCENTRALGW_ALBHEALTHCHECKSERVER_H
+#define UCENTRALGW_ALBHEALTHCHECKSERVER_H
+
+#include <memory>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include "Poco/Thread.h"
+#include "Poco/Net/HTTPServer.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Logger.h"
+
+#include "Daemon.h"
+#include "SubSystemServer.h"
+
+namespace uCentral {
+
+	class ALBRequestHandler: public Poco::Net::HTTPRequestHandler
+			/// Return a HTML document with the current date and time.
+		{
+		  public:
+			ALBRequestHandler(Poco::Logger & L)
+				: Logger_(L)
+			{
+			}
+
+			void handleRequest(Poco::Net::HTTPServerRequest& Request, Poco::Net::HTTPServerResponse& Response)
+			{
+				Logger_.information(Poco::format("ALB-REQUEST(%s): New ALB request.",Request.clientAddress().toString()));
+				Response.setChunkedTransferEncoding(true);
+				Response.setContentType("text/html");
+				Response.setDate(Poco::Timestamp());
+				Response.setStatus(Poco::Net::HTTPResponse::HTTP_OK);
+				Response.setKeepAlive(true);
+				Response.set("Connection","keep-alive");
+				Response.setVersion(Poco::Net::HTTPMessage::HTTP_1_1);
+				std::ostream &Answer = Response.send();
+				Answer << "uCentralGW Alive and kicking!" ;
+			}
+
+	  private:
+		Poco::Logger 	& Logger_;
+	};
+
+	class ALBRequestHandlerFactory: public Poco::Net::HTTPRequestHandlerFactory
+		{
+		  public:
+			explicit ALBRequestHandlerFactory(Poco::Logger & L):
+				Logger_(L)
+			{
+			}
+
+			ALBRequestHandler* createRequestHandler(const Poco::Net::HTTPServerRequest& request) override
+			{
+				if (request.getURI() == "/")
+					return new ALBRequestHandler(Logger_);
+				else
+					return nullptr;
+			}
+
+		  private:
+			Poco::Logger	&Logger_;
+		};
+
+    class ALBHealthCheckServer : public SubSystemServer {
+        public:
+            ALBHealthCheckServer() noexcept:
+                    SubSystemServer("ALBHealthCheckServer", "ALB-SVR", "alb")
+            {
+            }
+
+            static ALBHealthCheckServer *instance() {
+                if (instance_ == nullptr) {
+                    instance_ = new ALBHealthCheckServer;
+                }
+                return instance_;
+            }
+
+            int Start() {
+                if(Daemon()->ConfigGetBool("alb.enable",false)) {
+                    Port_ = (int)Daemon()->ConfigGetInt("alb.port",15015);
+                    Socket_ = std::make_unique<Poco::Net::ServerSocket>(Port_);
+                    auto Params = new Poco::Net::HTTPServerParams;
+                    Server_ = std::make_unique<Poco::Net::HTTPServer>(new ALBRequestHandlerFactory(Logger_), *Socket_, Params);
+                    Server_->start();
+                }
+
+                return 0;
+            }
+
+            void Stop() {
+                if(Server_)
+                    Server_->stop();
+            }
+
+          private:
+            static ALBHealthCheckServer *instance_;
+            std::unique_ptr<Poco::Net::HTTPServer>   	Server_;
+            std::unique_ptr<Poco::Net::ServerSocket> 	Socket_;
+            int                                     	Port_ = 0;
+        };
+
+    inline ALBHealthCheckServer * ALBHealthCheckServer() { return ALBHealthCheckServer::instance(); }
+    inline class ALBHealthCheckServer * ALBHealthCheckServer::instance_ = nullptr;
+}
+
+#endif // UCENTRALGW_ALBHEALTHCHECKSERVER_H

src/APIServers.cpp

@@ -1,61 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-23.
-//
-
-#include "framework/MicroService.h"
-
-#include "RESTAPI/RESTAPI_blacklist.h"
-#include "RESTAPI/RESTAPI_blacklist_list.h"
-#include "RESTAPI/RESTAPI_command.h"
-#include "RESTAPI/RESTAPI_commands.h"
-#include "RESTAPI/RESTAPI_default_configuration.h"
-#include "RESTAPI/RESTAPI_default_configurations.h"
-#include "RESTAPI/RESTAPI_deviceDashboardHandler.h"
-#include "RESTAPI/RESTAPI_device_commandHandler.h"
-#include "RESTAPI/RESTAPI_device_handler.h"
-#include "RESTAPI/RESTAPI_devices_handler.h"
-#include "RESTAPI/RESTAPI_file.h"
-#include "RESTAPI/RESTAPI_ouis.h"
-
-#include "RESTAPI/RESTAPI_capabilities_handler.h"
-#include "RESTAPI/RESTAPI_TelemetryWebSocket.h"
-#include "RESTAPI/RESTAPI_webSocketServer.h"
-
-namespace OpenWifi {
-
-    Poco::Net::HTTPRequestHandler * RESTAPI_external_server(const char *Path, RESTAPIHandler::BindingMap &Bindings,
-                                                            Poco::Logger & L, RESTAPI_GenericServer & S) {
-    	return RESTAPI_Router<
-				RESTAPI_devices_handler,
-				RESTAPI_device_handler,
-				RESTAPI_device_commandHandler,
-				RESTAPI_default_configurations,
-				RESTAPI_default_configuration,
-				RESTAPI_command,
-				RESTAPI_commands,
-				RESTAPI_ouis,
-				RESTAPI_file,
-				RESTAPI_system_command,
-				RESTAPI_deviceDashboardHandler,
-				RESTAPI_webSocketServer,
-				RESTAPI_blacklist,
-				RESTAPI_blacklist_list,
-				RESTAPI_capabilities_handler,
-				RESTAPI_TelemetryWebSocket>(Path,Bindings,L, S);
-    }
-
-    Poco::Net::HTTPRequestHandler * RESTAPI_internal_server(const char *Path, RESTAPIHandler::BindingMap &Bindings,
-                                                            Poco::Logger & L, RESTAPI_GenericServer & S) {
-    	return RESTAPI_Router_I<
-				RESTAPI_devices_handler,
-				RESTAPI_device_handler,
-				RESTAPI_device_commandHandler,
-				RESTAPI_default_configurations,
-				RESTAPI_default_configuration,
-				RESTAPI_command,
-				RESTAPI_commands,
-				RESTAPI_ouis,
-				RESTAPI_file, RESTAPI_blacklist,
-				RESTAPI_blacklist_list>(Path,Bindings,L, S);
-	}
-}

src/AuthClient.cpp

@@ -0,0 +1,59 @@
+//
+// Created by stephane bourque on 2021-06-30.
+//
+#include <utility>
+
+#include "AuthClient.h"
+#include "RESTAPI_SecurityObjects.h"
+#include "Daemon.h"
+#include "OpenAPIRequest.h"
+
+namespace uCentral {
+	class AuthClient * AuthClient::instance_ = nullptr;
+
+	int AuthClient::Start() {
+		return 0;
+	}
+
+	void AuthClient::Stop() {
+
+	}
+
+	void AuthClient::RemovedCachedToken(const std::string &Token) {
+		SubMutexGuard G(Mutex_);
+		UserCache_.erase(Token);
+	}
+
+	bool IsTokenExpired(const SecurityObjects::WebToken &T) {
+		return ((T.expires_in_+T.created_)<std::time(nullptr));
+	}
+
+	bool AuthClient::IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo ) {
+		SubMutexGuard G(Mutex_);
+
+		auto User = UserCache_.find(SessionToken);
+		if(User != UserCache_.end() && !IsTokenExpired(User->second.webtoken)) {
+			UInfo = User->second;
+			return true;
+		} else {
+			Types::StringPairVec QueryData;
+			QueryData.push_back(std::make_pair("token",SessionToken));
+			OpenAPIRequestGet	Req(uSERVICE_SECURITY,
+								  	"/api/v1/validateToken",
+									 QueryData,
+								  5000);
+			Poco::JSON::Object::Ptr Response;
+			if(Req.Do(Response)==Poco::Net::HTTPResponse::HTTP_OK) {
+				if(Response->has("tokenInfo") && Response->has("userInfo")) {
+					SecurityObjects::UserInfoAndPolicy	P;
+					P.from_json(Response);
+					UserCache_[SessionToken] = P;
+					UInfo = P;
+				}
+				return true;
+			}
+
+		}
+		return false;
+	}
+}

src/AuthClient.h

@@ -0,0 +1,45 @@
+//
+// Created by stephane bourque on 2021-06-30.
+//
+
+#ifndef UCENTRALGW_AUTHCLIENT_H
+#define UCENTRALGW_AUTHCLIENT_H
+
+#include "Poco/JSON/Object.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/HTTPServerResponse.h"
+#include "Poco/JWT/Signer.h"
+#include "Poco/SHA2Engine.h"
+#include "RESTAPI_SecurityObjects.h"
+#include "SubSystemServer.h"
+
+namespace uCentral {
+
+	class AuthClient : public SubSystemServer {
+	  public:
+		explicit AuthClient() noexcept:
+			SubSystemServer("Authentication", "AUTH-CLNT", "authentication")
+		{
+		}
+
+		static AuthClient *instance() {
+			if (instance_ == nullptr) {
+				instance_ = new AuthClient;
+			}
+			return instance_;
+		}
+
+		int Start() override;
+		void Stop() override;
+		bool IsAuthorized(Poco::Net::HTTPServerRequest & Request, std::string &SessionToken, SecurityObjects::UserInfoAndPolicy & UInfo );
+		void RemovedCachedToken(const std::string &Token);
+
+	  private:
+		static AuthClient 					*instance_;
+		SecurityObjects::UserInfoCache 		UserCache_;
+	};
+
+	inline AuthClient * AuthClient() { return AuthClient::instance(); }
+}
+
+#endif // UCENTRALGW_AUTHCLIENT_H

src/CentralConfig.cpp

@@ -7,15 +7,14 @@
 //
 #include <fstream>
 
+#include "CentralConfig.h"
+#include "Daemon.h"
+
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Parser.h"
 #include "Poco/File.h"
 
-#include "CentralConfig.h"
-#include "framework/MicroService.h"
-#include "Daemon.h"
-
-namespace OpenWifi::Config {
+namespace uCentral::Config {
 
 	static std::string DefaultConfiguration;
 
@@ -120,7 +119,7 @@ namespace OpenWifi::Config {
 })lit"};
 
 	void SetBasicConfigFile() {
-		Poco::File DefaultConfigFileName{MicroService::instance().DataDir()+"/default_config.json"};
+		Poco::File DefaultConfigFileName{Daemon()->DataDir()+"/default_config.json"};
 		DefaultConfiguration = BasicConfig;
 		std::ofstream F;
 		F.open(DefaultConfigFileName.path(),std::ios::binary);
@@ -135,7 +134,7 @@ namespace OpenWifi::Config {
 	void Config::Init() {
 		if(DefaultConfiguration.empty()) {
 			//	open the file
-			Poco::File DefaultConfigFileName{MicroService::instance().DataDir()+"/default_config.json"};
+			Poco::File DefaultConfigFileName{Daemon()->DataDir()+"/default_config.json"};
 			try {
 				if (!DefaultConfigFileName.exists()) {
 					SetBasicConfigFile();
@@ -233,7 +232,7 @@ namespace OpenWifi::Config {
         }
         catch ( const Poco::Exception & E )
         {
-            Daemon()->logger().log(E);
+            uCentral::Daemon::instance()->logger().warning(Poco::format("%s: Failed with: %s", std::string(__func__) , E.displayText()));
         }
     }
 

src/CentralConfig.h

@@ -12,7 +12,7 @@
 #include <string>
 #include "Poco/JSON/Object.h"
 
-namespace OpenWifi::Config {
+namespace uCentral::Config {
 
 	class Config {
     public:

src/CommandChannel.cpp

@@ -0,0 +1,164 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+#include "CommandChannel.h"
+#include "AuthClient.h"
+#include "CommandManager.h"
+#include "Daemon.h"
+#include "FileUploader.h"
+#include "RESTAPI_server.h"
+#include "StorageService.h"
+#include "WebSocketServer.h"
+#include <boost/algorithm/string.hpp>
+
+namespace uCentral {
+
+	class CommandChannel * CommandChannel::instance_ = nullptr;
+
+	std::string  CommandChannel::ProcessCommand(const std::string &Command) {
+		std::vector<std::string>	Tokens{};
+		std::string Result{"OK"};
+
+
+		try {
+			size_t pos, old_pos = 0 ;
+
+			Logger_.notice(Poco::format("COMMAND: %s",Command));
+
+			while((pos = Command.find(' ', old_pos)) != std::string::npos) {
+				Tokens.push_back(Command.substr(old_pos,pos-old_pos));
+				old_pos = pos + 1 ;
+			}
+
+			Tokens.push_back(Command.substr(old_pos));
+			boost::algorithm::to_lower(Tokens[0]);
+			boost::algorithm::to_lower(Tokens[1]);
+
+			if(Tokens[0]=="set") {
+				if(Tokens[1]=="loglevel") {
+					if(!Daemon()->SetSubsystemLogLevel(Tokens[3],Tokens[2]))
+						Result =  "ERROR: Invalid: set logLevel subsystem name:" + Tokens[3];
+				}
+			} else if(Tokens[0]=="get") {
+				if(Tokens[1]=="loglevel") {
+					std::cout << "LogLevels:" << std::endl;
+					std::cout << " Auth: " << AuthClient()->Logger().getLevel() << std::endl;
+					std::cout << " uFileUploader: " << FileUploader()->Logger().getLevel() << std::endl;
+					std::cout << " WebSocket: " << WebSocketServer()->Logger().getLevel() << std::endl;
+					std::cout << " Storage: " << Storage()->Logger().getLevel() << std::endl;
+					std::cout << " RESTAPI: " << RESTAPI_server()->Logger().getLevel() << std::endl;
+					std::cout << " CommandManager: " << Logger_.getLevel() << std::endl;
+					std::cout << " DeviceRegistry: " << DeviceRegistry()->Logger().getLevel() << std::endl;
+				} else if (Tokens[1]=="stats") {
+
+				} else {
+					Result =  "ERROR: Invalid: get command:" + Tokens[1];
+				}
+			} else if(Tokens[0]=="restart") {
+				Logger_.information("RESTART...");
+			} else if(Tokens[0]=="stop") {
+				Logger_.information("STOP...");
+			} else if(Tokens[0]=="stats") {
+				Logger_.information("STATS...");
+			} else {
+				Result = "ERROR: Invalid command: " + Tokens[0];
+			}
+			Logger_.notice(Poco::format("COMMAND-RESULT: %s",Result));
+		}
+		catch ( const Poco::Exception & E) {
+			Logger_.warning(Poco::format("COMMAND: Poco exception %s in performing command.",E.displayText()));
+		}
+		catch ( const std::exception & E) {
+			Logger_.warning(Poco::format("COMMAND: std::exception %s in performing command.",std::string(E.what())));
+		}
+
+		return Result;
+	}
+
+	/// This class handles all client connections.
+	class UnixSocketServerConnection: public Poco::Net::TCPServerConnection
+	{
+	  public:
+		explicit UnixSocketServerConnection(const Poco::Net::StreamSocket & S, Poco::Logger & Logger):
+			TCPServerConnection(S),
+		 	Logger_(Logger)
+		{
+		}
+
+		void run() override
+		{
+			try
+			{
+				std::string Message;
+				std::vector<char>	buffer(1024);
+				int n = 1;
+				while (n > 0)
+				{
+					n = socket().receiveBytes(&buffer[0], (int)buffer.size());
+					buffer[n] = '\0';
+					Message += &buffer[0];
+					Logger_.information(Poco::format("COMMAND-CHANNEL: %s",Message));
+					if(buffer.size() > n && !Message.empty())
+					{
+						CommandChannel()->ProcessCommand(Message);
+						Message.clear();
+					}
+				}
+			}
+			catch (const Poco::Exception & E)
+			{
+				Logger_.log(E);
+			}
+		}
+
+	  private:
+		Poco::Logger	& Logger_;
+	};
+
+	class UnixSocketServerConnectionFactory: public Poco::Net::TCPServerConnectionFactory
+	{
+	  public:
+		explicit UnixSocketServerConnectionFactory() :
+			Logger_(CommandChannel()->Logger())
+		{
+		}
+
+		Poco::Net::TCPServerConnection* createConnection(const Poco::Net::StreamSocket& socket) override
+		{
+			return new UnixSocketServerConnection(socket,Logger_);
+		}
+	  private:
+		Poco::Logger & Logger_;
+	};
+
+	CommandChannel::CommandChannel() noexcept:
+		SubSystemServer("CommandChannel", "COMMAND-CHANNEL", "commandchannel")
+	{
+	}
+
+	void CommandChannel::Stop() {
+		Logger_.notice("Stopping...");
+		Srv_->stop();
+	}
+
+	int CommandChannel::Start() {
+		Poco::File	F(Daemon()->ConfigPath("ucentral.system.commandchannel","/tmp/app.ucentralgw"));
+		try {
+			if (F.exists())
+				F.remove();
+		} catch (const Poco::Exception &E ) {
+
+		}
+		SocketFile_ = std::make_unique<Poco::File>(F);
+		UnixSocket_ = std::make_unique<Poco::Net::SocketAddress>(Poco::Net::SocketAddress::UNIX_LOCAL, SocketFile_->path());
+		Svs_ = std::make_unique<Poco::Net::ServerSocket>(*UnixSocket_);
+		Srv_ = std::make_unique<Poco::Net::TCPServer>(new UnixSocketServerConnectionFactory, *Svs_);
+		Srv_->start();
+		Logger_.notice("Starting...");
+		return 0;
+	}
+}

src/CommandChannel.h

@@ -0,0 +1,51 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRALGW_COMMANDCHANNEL_H
+#define UCENTRALGW_COMMANDCHANNEL_H
+
+#include "SubSystemServer.h"
+
+#include "Poco/File.h"
+#include "Poco/Net/Socket.h"
+#include "Poco/Net/SocketAddress.h"
+#include "Poco/Net/TCPServer.h"
+#include "Poco/Net/TCPServerConnection.h"
+#include "Poco/Net/TCPServerConnectionFactory.h"
+#include "Poco/Net/StreamSocket.h"
+#include "Poco/Net/ServerSocket.h"
+
+namespace uCentral {
+
+	class CommandChannel : public SubSystemServer {
+	  public:
+		static CommandChannel *instance() {
+			if (instance_ == nullptr) {
+				instance_ = new CommandChannel;
+			}
+			return instance_;
+		}
+
+		int Start() override;
+		void Stop() override;
+		std::string  ProcessCommand(const std::string &Command);
+
+	  private:
+		static CommandChannel * instance_;
+		std::unique_ptr<Poco::File> 				SocketFile_;
+		std::unique_ptr<Poco::Net::SocketAddress>	UnixSocket_;
+		std::unique_ptr<Poco::Net::ServerSocket>	Svs_;
+		std::unique_ptr<Poco::Net::TCPServer>		Srv_;
+
+		CommandChannel() noexcept;
+	};
+
+	inline CommandChannel * CommandChannel() { return CommandChannel::instance(); }
+}		//namespace
+
+#endif // UCENTRALGW_COMMANDCHANNEL_H

src/CommandManager.cpp

@@ -6,48 +6,41 @@
 //	Arilia Wireless Inc.
 //
 
+#include "CommandManager.h"
 #include <algorithm>
 
-#include "Poco/JSON/Parser.h"
-
 #include "CommandManager.h"
 #include "DeviceRegistry.h"
-#include "RESTObjects//RESTAPI_GWobjects.h"
+#include "RESTAPI_GWobjects.h"
+#include "RESTAPI_handler.h"
 #include "StorageService.h"
-#include "framework/MicroService.h"
-#include "framework/uCentral_Protocol.h"
+#include "uCentralProtocol.h"
 
+#include "Poco/JSON/Parser.h"
 
-namespace OpenWifi {
+namespace uCentral {
+
+    class CommandManager * CommandManager::instance_ = nullptr;
+
+	CommandManager::CommandManager() noexcept:
+		SubSystemServer("CommandManager", "CMD_MGR", "command.manager")
+    {
+    }
 
 	void CommandManager::run() {
 		Running_ = true;
         while(Running_)
         {
-            Poco::Thread::trySleep(30000);
+            Poco::Thread::trySleep(10000);
 			if(!Running_)
 				break;
-
             std::vector<GWObjects::CommandDetails> Commands;
-            if(StorageService()->GetReadyToExecuteCommands(1,200,Commands))
+
+            if(Storage()->GetReadyToExecuteCommands(0,1000,Commands))
             {
                 for(auto & Cmd: Commands)
                 {
-                	if(!Running_)
-                		break;
-
-					uint64_t RPC_Id;
-					Poco::JSON::Parser	P;
-
-					auto Params = P.parse(Cmd.Details).extract<Poco::JSON::Object::Ptr>();
-					if(SendCommand(	Cmd.SerialNumber,
-									Cmd.Command,
-									*Params,
-									Cmd.UUID,
-									RPC_Id)) {
-						StorageService()->SetCommandExecuted(Cmd.UUID);
-						Logger_.information(Poco::format("Sent command '%s' to '%s'",Cmd.Command,Cmd.SerialNumber));
-					} else {
+                    if(!SendCommand(Cmd)) {
                         Logger_.information(Poco::format("Failed to send command '%s' to %s",Cmd.Command,Cmd.SerialNumber));
                     }
                 }
@@ -75,85 +68,105 @@ namespace OpenWifi {
     }
 
 	void CommandManager::Janitor() {
-		std::lock_guard G(Mutex_);
+		SubMutexGuard G(SubMutex);
 		uint64_t Now = time(nullptr);
-		Logger_.information("Janitor starting.");
-		for(auto i=OutStandingRequests_.begin();i!=OutStandingRequests_.end();) {
-			if((Now-i->second.Submitted)>120)
-				i = OutStandingRequests_.erase(i);
+		for(auto i = Age_.begin(); i!= Age_.end();)
+			if((Now-i->first)>300)
+				Age_.erase(i++);
 			else
 				++i;
-		}
-		Logger_.information("Janitor finished.");
 	}
 
-	bool CommandManager::GetCommand(uint64_t Id, const std::string &SerialNumber, CommandTag &T) {
-		std::lock_guard G(Mutex_);
-		CommandTagIndex	TI{.Id=Id,.SerialNumber=SerialNumber};
-		auto Hint=OutStandingRequests_.find(TI);
-		if(Hint==OutStandingRequests_.end() || Hint->second.Completed==0)
-			return false;
-		T = Hint->second;
-		OutStandingRequests_.erase(Hint);
-		return true;
-	}
+	bool CommandManager::SendCommand(const std::string &SerialNumber,
+							  const std::string &Method,
+							  const Poco::JSON::Object &Params,
+							  std::shared_ptr<std::promise<Poco::JSON::Object::Ptr>> Promise,
+							  const std::string &UUID) {
 
-	bool CommandManager::SendCommand(	const std::string &SerialNumber,
-							  			const std::string &Method,
-										const Poco::JSON::Object &Params,
-							  			const std::string &UUID,
-									 	uint64_t & Id,
-									 	bool oneway_rpc) {
+		SubMutexGuard G(SubMutex);
 
-		std::stringstream ToSend;
-		std::unique_lock G(Mutex_);
-		if(oneway_rpc)
-			Id = 1;
-		else
-			Id = ++Id_;
-		Poco::JSON::Object CompleteRPC;
+		Poco::JSON::Object	CompleteRPC;
 		CompleteRPC.set(uCentralProtocol::JSONRPC, uCentralProtocol::JSONRPC_VERSION);
-		CompleteRPC.set(uCentralProtocol::ID, Id);
-		CompleteRPC.set(uCentralProtocol::METHOD, Method);
+		CompleteRPC.set(uCentralProtocol::ID, Id_);
+		CompleteRPC.set(uCentralProtocol::METHOD, Method );
 		CompleteRPC.set(uCentralProtocol::PARAMS, Params);
+		std::stringstream ToSend;
 		Poco::JSON::Stringifier::stringify(CompleteRPC, ToSend);
-		Logger_.information(
-			Poco::format("(%s): Sending command '%s', ID: %lu", SerialNumber, Method, Id));
-		CommandTagIndex Idx{.Id = Id, .SerialNumber = SerialNumber};
-		CommandTag Tag;
-		Tag.UUID = UUID;
-		Tag.Submitted = std::time(nullptr);
-		Tag.Completed = 0;
-		Tag.Result = Poco::makeShared<Poco::JSON::Object>();
-		OutStandingRequests_[Idx] = Tag;
-		G.unlock();
+
+		OutStandingRequests_[Id_] = std::make_pair(std::move(Promise),UUID);
+		Age_[Id_] = time(nullptr);
+		Id_++;
 		return DeviceRegistry()->SendFrame(SerialNumber, ToSend.str());
 	}
 
-	void CommandManager::PostCommandResult(const std::string &SerialNumber, Poco::JSON::Object::Ptr Obj) {
+	bool CommandManager::SendCommand(GWObjects::CommandDetails & Command) {
+		SubMutexGuard G(SubMutex);
 
+		Logger_.debug(Poco::format("Sending command to %s",Command.SerialNumber));
+		try {
+			Poco::JSON::Object Obj;
+
+			Obj.set(uCentralProtocol::JSONRPC,uCentralProtocol::JSONRPC_VERSION);
+			Obj.set(uCentralProtocol::ID,Id_);
+			Obj.set(uCentralProtocol::METHOD, Command.Custom ? uCentralProtocol::PERFORM : Command.Command );
+
+			bool FullCommand = true;
+			if(Command.Command==uCentralProtocol::REQUEST)
+				FullCommand = false;
+
+			// the params section was composed earlier... just include it here
+			Poco::JSON::Parser  parser;
+			auto ParsedMessage = parser.parse(Command.Details);
+			const auto & ParamsObj = ParsedMessage.extract<Poco::JSON::Object::Ptr>();
+			Obj.set(uCentralProtocol::PARAMS,ParamsObj);
+			std::stringstream ToSend;
+			Poco::JSON::Stringifier::stringify(Obj,ToSend);
+
+			if(DeviceRegistry()->SendFrame(Command.SerialNumber, ToSend.str())) {
+				Storage()->SetCommandExecuted(Command.UUID);
+				OutStandingRequests_[Id_] = std::make_pair(nullptr,Command.UUID);
+				Age_[Id_] = time(nullptr);
+				return true;
+			} else {
+
+			}
+			Id_++;
+		}
+		catch( const Poco::Exception & E )
+		{
+			Logger_.warning(Poco::format("COMMAND(%s): Exception while sending a command.",Command.SerialNumber));
+		}
+		return false;
+	}
+
+
+	void CommandManager::PostCommandResult(const std::string &SerialNumber, Poco::JSON::Object::Ptr Obj) {
 		if(!Obj->has(uCentralProtocol::ID)){
-			Logger_.error(Poco::format("(%s): Invalid RPC response.",SerialNumber));
+			Logger_.error("Invalid RPC response.");
 			return;
 		}
 
+		SubMutexGuard G(SubMutex);
+
 		uint64_t ID = Obj->get(uCentralProtocol::ID);
-		if(ID<2) {
-			Logger_.error(Poco::format("(%s): Ignoring RPC response.",SerialNumber));
-			return;
+		auto RPC = OutStandingRequests_.find(ID);
+		Age_.erase(ID);
+		if(RPC != OutStandingRequests_.end()) {
+			if(RPC->second.first.use_count() > 1) {
+				try {
+					RPC->second.first->set_value(std::move(Obj));
+				} catch (...) {
+					Logger_.error(Poco::format("COMPLETING-RPC(%Lu): future was lost", ID));
+					Storage()->CommandCompleted(RPC->second.second, Obj, true);
+				}
+			}
+			else {
+				Storage()->CommandCompleted(RPC->second.second, Obj, true);
+			}
+			OutStandingRequests_.erase(RPC);
+		} else {
+			Logger_.warning(Poco::format("OUTDATED-RPC(%lu): Nothing waiting for this RPC.",ID));
 		}
-		std::unique_lock G(Mutex_);
-		auto Idx = CommandTagIndex{.Id = ID, .SerialNumber = SerialNumber};
-		auto RPC = OutStandingRequests_.find(Idx);
-		if (RPC == OutStandingRequests_.end()) {
-			Logger_.warning(Poco::format("(%s): Outdated RPC %lu", SerialNumber, ID));
-			return;
-		}
-		RPC->second.Completed = std::time(nullptr);
-		RPC->second.Result = Obj;
-		Logger_.information(Poco::format("(%s): Received RPC answer %lu", SerialNumber, ID));
-		G.unlock();
-		StorageService()->CommandCompleted(RPC->second.UUID, Obj, true);
 	}
 
 }  // namespace

src/CommandManager.h

@@ -19,36 +19,10 @@
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
 
-#include "RESTObjects//RESTAPI_GWobjects.h"
-#include "framework/MicroService.h"
+#include "RESTAPI_GWobjects.h"
+#include "SubSystemServer.h"
 
-namespace OpenWifi {
-
-	struct CommandTagIndex {
-		uint64_t 	Id=0;
-		std::string SerialNumber;
-	};
-
-	inline bool operator <(const CommandTagIndex& lhs, const CommandTagIndex& rhs) {
-		if(lhs.Id<rhs.Id)
-			return true;
-		if(lhs.Id>rhs.Id)
-			return false;
-		return lhs.SerialNumber<rhs.SerialNumber;
-	}
-
-	inline bool operator ==(const CommandTagIndex& lhs, const CommandTagIndex& rhs) {
-		if(lhs.Id == rhs.Id && lhs.SerialNumber == rhs.SerialNumber)
-			return true;
-		return false;
-	}
-
-	struct CommandTag {
-		std::string 			UUID;
-		Poco::JSON::Object::Ptr Result;
-		uint64_t 				Submitted=0;
-		uint64_t 				Completed=0;
-	};
+namespace uCentral {
 
     class CommandManager : public SubSystemServer, Poco::Runnable {
 	    public:
@@ -57,32 +31,34 @@ namespace OpenWifi {
 			void WakeUp();
 			void PostCommandResult(const std::string &SerialNumber, Poco::JSON::Object::Ptr Obj);
 			bool SendCommand(	const std::string &SerialNumber,
-								const std::string &Method,
-								const Poco::JSON::Object &Params,
-								const std::string &UUID,
-							 	uint64_t & Id,
-							 	bool oneway_rpc=false);
+								 const std::string &Method,
+								 const Poco::JSON::Object &Params,
+								 std::shared_ptr<std::promise<Poco::JSON::Object::Ptr>> Promise,
+								 const std::string &UUID);
+			bool SendCommand( 	const std::string & SerialNumber,
+								 const std::string & Method,
+								 const Poco::JSON::Object &Params,
+								 const std::string & UUID);
+			bool SendCommand(GWObjects::CommandDetails & Command);
 			void Janitor();
 			void run() override;
 
-			bool GetCommand(uint64_t Id, const std::string & SerialNumber, CommandTag &T);
-
 			static CommandManager *instance() {
-			    static CommandManager *instance_ = new CommandManager;
+				if (instance_ == nullptr) {
+					instance_ = new CommandManager;
+				}
 				return instance_;
 			}
-			inline bool Running() const { return Running_; }
 
 	    private:
-			std::atomic_bool 			Running_ = false;
-			Poco::Thread    			ManagerThread;
-			uint64_t 					Id_=2;	//	do not start @1. We ignore ID=1 & 0 is illegal..
-			std::map<CommandTagIndex,CommandTag>	OutStandingRequests_;
+			static CommandManager 		* instance_;
+			std::atomic_bool 	Running_ = false;
+			Poco::Thread    	ManagerThread;
+			uint64_t 			Id_=1;
+			std::map< uint64_t , std::pair< std::shared_ptr<std::promise<Poco::JSON::Object::Ptr>>, std::string> >	OutStandingRequests_;
+			std::map< uint64_t , uint64_t >		Age_;
 
-			CommandManager() noexcept:
-				SubSystemServer("CommandManager", "CMD-MGR", "command.manager")
-				{
-				}
+			CommandManager() noexcept;
 	};
 
 	inline CommandManager * CommandManager() { return CommandManager::instance(); }

src/ConfigurationCache.cpp

@@ -1,8 +0,0 @@
-//
-// Created by stephane bourque on 2021-09-21.
-//
-
-#include "ConfigurationCache.h"
-
-namespace OpenWifi {
-}

src/ConfigurationCache.h

@@ -1,42 +0,0 @@
-//
-// Created by stephane bourque on 2021-09-21.
-//
-
-#ifndef OWGW_CONFIGURATIONCACHE_H
-#define OWGW_CONFIGURATIONCACHE_H
-
-#include <map>
-#include <string>
-#include <mutex>
-
-namespace OpenWifi {
-	class ConfigurationCache {
-	  public:
-
-		static ConfigurationCache & instance() {
-			static ConfigurationCache instance;
-			return instance;
-		}
-
-		inline uint64_t CurrentConfig(const std::string &SerialNumber) {
-			std::lock_guard G(Mutex_);
-			const auto Hint = Cache_.find(SerialNumber);
-			if(Hint==end(Cache_))
-				return 0;
-			return Hint->second;
-		}
-
-		inline void Add(const std::string &SerialNumber, uint64_t Id) {
-			std::lock_guard	G(Mutex_);
-			Cache_[SerialNumber]=Id;
-		}
-
-	  private:
-		std::mutex						Mutex_;
-		std::map<std::string,uint64_t>	Cache_;
-	};
-
-	inline uint64_t GetCurrentConfigurationID(const std::string &S) { return ConfigurationCache::instance().CurrentConfig(S); }
-	inline void SetCurrentConfigurationID(const std::string &S, uint64_t ID) { ConfigurationCache::instance().Add(S,ID); }
-}
-#endif // OWGW_CONFIGURATIONCACHE_H

src/Daemon.cpp

@@ -10,58 +10,68 @@
 #include "Poco/Util/Application.h"
 #include "Poco/Util/Option.h"
 #include "Poco/Environment.h"
+#include "Poco/Net/HTTPStreamFactory.h"
 
-#include "CentralConfig.h"
-#include "CommandManager.h"
 #include "Daemon.h"
+
+#include "CommandChannel.h"
+#include "CommandManager.h"
 #include "DeviceRegistry.h"
 #include "FileUploader.h"
-#include "OUIServer.h"
-#include "SerialNumberCache.h"
-#include "StorageArchiver.h"
+#include "RESTAPI_server.h"
 #include "StorageService.h"
-#include "TelemetryStream.h"
 #include "WebSocketServer.h"
-#include "framework/ConfigurationValidator.h"
-#include "framework/MicroService.h"
+#include "CentralConfig.h"
+#include "OUIServer.h"
+#include "StateProcessor.h"
+#include "Utils.h"
+#include "RESTAPI_InternalServer.h"
+#include "AuthClient.h"
+#include "StorageArchiver.h"
+
+namespace uCentral {
+	class Daemon *Daemon::instance_ = nullptr;
 
-namespace OpenWifi {
 	class Daemon *Daemon::instance() {
-	    static Daemon instance(vDAEMON_PROPERTIES_FILENAME,
+		if (instance_ == nullptr) {
+			instance_ = new Daemon(vDAEMON_PROPERTIES_FILENAME,
 								   vDAEMON_ROOT_ENV_VAR,
 								   vDAEMON_CONFIG_ENV_VAR,
 								   vDAEMON_APP_NAME,
 								   vDAEMON_BUS_TIMER,
-								   SubSystemVec{
-									   StorageService(),
-									   SerialNumberCache(),
-									   ConfigurationValidator(),
+								   Types::SubSystemVec{
+									   Storage(),
+									   AuthClient(),
 									   DeviceRegistry(),
+									   RESTAPI_server(),
+									   RESTAPI_InternalServer(),
 									   WebSocketServer(),
 									   CommandManager(),
 									   FileUploader(),
 									   OUIServer(),
+									   CommandChannel(),
 									   StorageArchiver(),
-									   TelemetryStream()
 								   });
-        return &instance;
+		}
+		return instance_;
 	}
 
-	void Daemon::initialize() {
+	void Daemon::initialize(Poco::Util::Application &self) {
+		MicroService::initialize(*this);
 		Config::Config::Init();
-        AutoProvisioning_ = config().getBool("openwifi.autoprovisioning",false);
+        AutoProvisioning_ = config().getBool("ucentral.autoprovisioning",false);
 
         // DeviceTypeIdentifications_
         Types::StringVec   Keys;
-        config().keys("openwifi.devicetypes",Keys);
+        config().keys("ucentral.devicetypes",Keys);
         for(const auto & i:Keys)
         {
-        	std::string Line = config().getString("openwifi.devicetypes."+i);
+            std::string Line = config().getString("ucentral.devicetypes."+i);
             auto P1 = Line.find_first_of(':');
             auto Type = Line.substr(0, P1);
             auto List = Line.substr(P1+1);
 
-            Types::StringVec  Tokens = Utils::Split(List);
+            Types::StringVec  Tokens = uCentral::Utils::Split(List);
 
             auto Entry = DeviceTypeIdentifications_.find(Type);
 			if(DeviceTypeIdentifications_.end() == Entry) {
@@ -74,10 +84,6 @@ namespace OpenWifi {
         }
     }
 
-    void MicroServicePostInitialization() {
-		Daemon()->initialize();
-	}
-
     [[nodiscard]] std::string Daemon::IdentifyDevice(const std::string & Id ) const {
         for(const auto &[Type,List]:DeviceTypeIdentifications_)
         {
@@ -88,12 +94,12 @@ namespace OpenWifi {
     }
 }
 
-
 int main(int argc, char **argv) {
 	try {
-
-		auto App = OpenWifi::Daemon::instance();
+		auto App = uCentral::Daemon::instance();
 		auto ExitCode =  App->run(argc, argv);
+		delete App;
+
 		return ExitCode;
 
 	} catch (Poco::Exception &exc) {

src/Daemon.h

@@ -26,34 +26,34 @@
 #include "Poco/Crypto/Cipher.h"
 
 #include "Dashboard.h"
-#include "framework/MicroService.h"
-#include "framework/OpenWifiTypes.h"
+#include "MicroService.h"
+#include "uCentralTypes.h"
 
-namespace OpenWifi {
+namespace uCentral {
 
-	static const char * vDAEMON_PROPERTIES_FILENAME = "owgw.properties";
-	static const char * vDAEMON_ROOT_ENV_VAR = "OWGW_ROOT";
-	static const char * vDAEMON_CONFIG_ENV_VAR = "OWGW_CONFIG";
+	static const char * vDAEMON_PROPERTIES_FILENAME = "ucentralgw.properties";
+	static const char * vDAEMON_ROOT_ENV_VAR = "UCENTRALGW_ROOT";
+	static const char * vDAEMON_CONFIG_ENV_VAR = "UCENTRALGW_CONFIG";
 	static const char * vDAEMON_APP_NAME = uSERVICE_GATEWAY.c_str();
 	static const uint64_t vDAEMON_BUS_TIMER = 10000;
 
     class Daemon : public MicroService {
 		public:
-			explicit Daemon(const std::string & PropFile,
-							const std::string & RootEnv,
-							const std::string & ConfigEnv,
-							const std::string & AppName,
+			explicit Daemon(std::string PropFile,
+							std::string RootEnv,
+							std::string ConfigEnv,
+							std::string AppName,
 						  	uint64_t 	BusTimer,
-							const SubSystemVec & SubSystems) :
+							Types::SubSystemVec SubSystems) :
 				MicroService( PropFile, RootEnv, ConfigEnv, AppName, BusTimer, SubSystems) {};
 
 			bool AutoProvisioning() const { return AutoProvisioning_ ; }
 			[[nodiscard]] std::string IdentifyDevice(const std::string & Compatible) const;
-			void initialize();
+			void initialize(Poco::Util::Application &self);
 			static Daemon *instance();
 			inline DeviceDashboard	& GetDashboard() { return DB_; }
-			Poco::Logger & Log() { return Poco::Logger::get(AppName()); }
 	  	private:
+			static Daemon 				*instance_;
 			bool                        AutoProvisioning_ = false;
 			Types::StringMapStringSet   DeviceTypeIdentifications_;
 			DeviceDashboard				DB_;

src/Dashboard.cpp

@@ -6,14 +6,14 @@
 #include "DeviceRegistry.h"
 #include "StorageService.h"
 
-namespace OpenWifi {
+namespace uCentral {
 	void DeviceDashboard::Create() {
 		uint64_t Now = std::time(nullptr);
 
 		if(LastRun_==0 || (Now-LastRun_)>120) {
 			DB_.reset();
-			StorageService()->AnalyzeCommands(DB_.commands);
-			StorageService()->AnalyzeDevices(DB_);
+			Storage()->AnalyzeCommands(DB_.commands);
+			DeviceRegistry()->AnalyzeRegistry(DB_);
 			LastRun_ = Now;
 		}
 	}

src/Dashboard.h

@@ -5,19 +5,18 @@
 #ifndef UCENTRALGW_DASHBOARD_H
 #define UCENTRALGW_DASHBOARD_H
 
-#include "RESTObjects//RESTAPI_GWobjects.h"
-#include "framework/OpenWifiTypes.h"
+#include "uCentralTypes.h"
+#include "RESTAPI_GWobjects.h"
 
-namespace OpenWifi {
+namespace uCentral {
 	class DeviceDashboard {
 	  public:
-			DeviceDashboard() { DB_.reset(); }
 			void Create();
-			[[nodiscard]] const GWObjects::Dashboard & Report() const { return DB_;}
+			const GWObjects::Dashboard & Report() const { return DB_;}
+			inline void Reset() { LastRun_=0; DB_.reset(); }
 	  private:
 			GWObjects::Dashboard 	DB_;
 			uint64_t 				LastRun_=0;
-			inline void Reset() { DB_.reset(); }
 	};
 }
 

src/DeviceRegistry.cpp

@@ -6,41 +6,50 @@
 //	Arilia Wireless Inc.
 //
 
+#include "DeviceRegistry.h"
+
+#include "RESTAPI_handler.h"
+#include "WebSocketServer.h"
+
+#include "DeviceRegistry.h"
+#include "OUIServer.h"
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Parser.h"
 
-#include "DeviceRegistry.h"
-#include "WebSocketServer.h"
-#include "OUIServer.h"
+namespace uCentral {
+    class DeviceRegistry *DeviceRegistry::instance_ = nullptr;
 
-namespace OpenWifi {
+	DeviceRegistry::DeviceRegistry() noexcept:
+		SubSystemServer("DeviceRegistry", "DevStatus", "devicestatus") {
+    }
 
 	int DeviceRegistry::Start() {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
         Logger_.notice("Starting ");
         return 0;
     }
 
     void DeviceRegistry::Stop() {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
         Logger_.notice("Stopping ");
     }
 
     bool DeviceRegistry::GetStatistics(const std::string &SerialNumber, std::string & Statistics) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
 
         auto Device = Devices_.find(SerialNumber);
-        if(Device == Devices_.end())
-			return false;
-
-		Statistics = Device->second->LastStats;
-		return true;
+        if(Device != Devices_.end()) {
+            Statistics = Device->second->LastStats;
+            return true;
+        }
+        return false;
     }
 
     void DeviceRegistry::SetStatistics(const std::string &SerialNumber, const std::string &Statistics) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
 
         auto Device = Devices_.find(SerialNumber);
+
         if(Device != Devices_.end())
         {
 			Device->second->Conn_.LastContact = time(nullptr);
@@ -49,18 +58,22 @@ namespace OpenWifi {
     }
 
     bool DeviceRegistry::GetState(const std::string &SerialNumber, GWObjects::ConnectionState & State) {
-		std::lock_guard		Guard(Mutex_);
-        auto Device = Devices_.find(SerialNumber);
-        if(Device == Devices_.end())
-			return false;
+		SubMutexGuard		Guard(Mutex_);
 
-		State = Device->second->Conn_;
-		return true;
+        auto Device = Devices_.find(SerialNumber);
+        if(Device != Devices_.end())
+        {
+            State = Device->second->Conn_;
+            return true;
+        }
+        return false;
     }
 
     void DeviceRegistry::SetState(const std::string & SerialNumber, GWObjects::ConnectionState & State) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
+
         auto Device = Devices_.find(SerialNumber);
+
         if(Device != Devices_.end())
         {
 			Device->second->Conn_.LastContact = time(nullptr);
@@ -69,7 +82,7 @@ namespace OpenWifi {
     }
 
 	bool DeviceRegistry::GetHealthcheck(const std::string &SerialNumber, GWObjects::HealthCheck & CheckData) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
 
 		auto Device = Devices_.find(SerialNumber);
 		if(Device != Devices_.end()) {
@@ -80,70 +93,86 @@ namespace OpenWifi {
 	}
 
 	void DeviceRegistry::SetHealthcheck(const std::string &SerialNumber, const GWObjects::HealthCheck & CheckData) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
 
 		auto Device = Devices_.find(SerialNumber);
+
 		if(Device != Devices_.end())
 		{
 			Device->second->LastHealthcheck = CheckData;
 		}
 	}
 
-	std::shared_ptr<DeviceRegistry::ConnectionEntry> DeviceRegistry::Register(const std::string & SerialNumber, WSConnection *Ptr, uint64_t & ConnectionId )
+	GWObjects::ConnectionState * DeviceRegistry::Register(const std::string & SerialNumber, WSConnection *Ptr)
     {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
 
-		const auto & E = Devices_[SerialNumber] = std::make_shared<ConnectionEntry>();
-		E->WSConn_ = Ptr;
-		E->Conn_.SerialNumber = SerialNumber;
-		E->Conn_.LastContact = std::time(nullptr);
-		E->Conn_.Connected = true ;
-		E->Conn_.UUID = 0 ;
-		E->Conn_.MessageCount = 0 ;
-		E->Conn_.Address = "";
-		E->Conn_.TX = 0 ;
-		E->Conn_.RX = 0;
-		E->Conn_.VerifiedCertificate = GWObjects::CertificateValidation::NO_CERTIFICATE;
-		ConnectionId = E->ConnectionId = ++Id_;
-		return E;
+        auto Device = Devices_.find(SerialNumber);
+        if( Device == Devices_.end()) {
+            auto E = std::make_unique<ConnectionEntry>();
+
+            E->WSConn_ = Ptr;
+            E->Conn_.SerialNumber = SerialNumber;
+            E->Conn_.LastContact = std::time(nullptr);
+            E->Conn_.Connected = true ;
+            E->Conn_.UUID = 0 ;
+            E->Conn_.MessageCount = 0 ;
+            E->Conn_.Address = "";
+            E->Conn_.TX = 0 ;
+            E->Conn_.RX = 0;
+			E->Conn_.VerifiedCertificate = GWObjects::CertificateValidation::NO_CERTIFICATE;
+			auto R=&E->Conn_;
+            Devices_[SerialNumber] = std::move(E);
+            return R;
+        }
+        else
+        {
+            Device->second->WSConn_ = Ptr;
+            Device->second->Conn_.Connected = true;
+            Device->second->Conn_.LastContact = std::time(nullptr);
+			Device->second->Conn_.VerifiedCertificate = GWObjects::CertificateValidation::NO_CERTIFICATE;
+            return &Device->second->Conn_;
+        }
     }
 
     bool DeviceRegistry::Connected(const std::string & SerialNumber) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
+
         auto Device = Devices_.find(SerialNumber);
+
         if(Device == Devices_.end())
             return false;
+
         return Device->second->Conn_.Connected;
     }
 
-    void DeviceRegistry::UnRegister(const std::string & SerialNumber, uint64_t ConnectionId) {
-		std::lock_guard		Guard(Mutex_);
-		auto It = Devices_.find(SerialNumber);
-		if(It!=Devices_.end()) {
-			if(It->second->ConnectionId == ConnectionId)
-				Devices_.erase(SerialNumber);
-		}
-	}
+    void DeviceRegistry::UnRegister(const std::string & SerialNumber, WSConnection *Ptr) {
+		SubMutexGuard		Guard(Mutex_);
+
+        auto Device = Devices_.find(SerialNumber);
+
+        if( Device != Devices_.end() && Device->second->WSConn_==Ptr) {
+            Device->second->Conn_.Address = "";
+            Device->second->WSConn_ = nullptr;
+            Device->second->Conn_.Connected = false;
+			Device->second->Conn_.VerifiedCertificate = GWObjects::NO_CERTIFICATE;
+        }
+
+    }
 
 	bool DeviceRegistry::SendFrame(const std::string & SerialNumber, const std::string & Payload) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
 		auto Device = Devices_.find(SerialNumber);
 		if(Device!=Devices_.end() && Device->second->WSConn_!= nullptr) {
-			try {
-				return Device->second->WSConn_->Send(Payload);
-			} catch (...) {
-				Logger_.debug(Poco::format("Could not send data to device '%s'", SerialNumber));
-				Device->second->Conn_.Address = "";
-				Device->second->WSConn_ = nullptr;
-				Device->second->Conn_.Connected = false;
-				Device->second->Conn_.VerifiedCertificate = GWObjects::NO_CERTIFICATE;
-			}
+			auto *WSConn =
+				static_cast<WSConnection *>(Device->second->WSConn_);
+			return WSConn->Send(Payload);
 		}
 		return false;
 	}
 
 	void DeviceRegistry::SetPendingUUID(const std::string & SerialNumber, uint64_t PendingUUID) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
 		auto Device = Devices_.find(SerialNumber);
 		if(Device!=Devices_.end()) {
 			Device->second->Conn_.PendingUUID = PendingUUID;
@@ -178,7 +207,7 @@ namespace OpenWifi {
 		if( T==100) return "100%";
 		if( T>90) return ">90%";
 		if( T>60) return ">60%";
-		return "<60%";
+		return "<60%%>";
 	}
 
 	std::string ComputeUpTimeTag(uint64_t T) {
@@ -208,7 +237,7 @@ namespace OpenWifi {
 	}
 
 	bool DeviceRegistry::AnalyzeRegistry(GWObjects::Dashboard &D) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
 
 		for(auto const &[SerialNumber,Connection]:Devices_) {
 			Types::UpdateCountedMap(D.status, Connection->Conn_.Connected ? "connected" : "not connected");

src/DeviceRegistry.h

@@ -6,16 +6,17 @@
 //	Arilia Wireless Inc.
 //
 
-#pragma once
+#ifndef UCENTRAL_UDEVICEREGISTRY_H
+#define UCENTRAL_UDEVICEREGISTRY_H
 
 #include "Poco/JSON/Object.h"
 
-#include "RESTObjects//RESTAPI_GWobjects.h"
-#include "framework/MicroService.h"
+#include "RESTAPI_GWobjects.h"
+#include "SubSystemServer.h"
 
 // class uCentral::WebSocket::WSConnection;
 
-namespace OpenWifi {
+namespace uCentral {
 
 	class WSConnection;
     class DeviceRegistry : public SubSystemServer {
@@ -25,11 +26,12 @@ namespace OpenWifi {
 			GWObjects::ConnectionState 	Conn_;
 			std::string        			LastStats;
 			GWObjects::HealthCheck		LastHealthcheck;
-			uint64_t 					ConnectionId=0;
 		};
 
         static DeviceRegistry *instance() {
-            static DeviceRegistry *instance_ = new DeviceRegistry;
+            if (instance_ == nullptr) {
+                instance_ = new DeviceRegistry;
+            }
             return instance_;
         }
 
@@ -41,24 +43,24 @@ namespace OpenWifi {
 		void SetState(const std::string & SerialNumber, GWObjects::ConnectionState & State);
 		bool GetHealthcheck(const std::string &SerialNumber, GWObjects::HealthCheck & CheckData);
 		void SetHealthcheck(const std::string &SerialNumber, const GWObjects::HealthCheck &H);
-		std::shared_ptr<ConnectionEntry> Register(const std::string & SerialNumber, WSConnection *, uint64_t & ConnectionId);
-		void UnRegister(const std::string & SerialNumber, uint64_t ConnectionId);
+		GWObjects::ConnectionState * Register(const std::string & SerialNumber, WSConnection *);
+		void UnRegister(const std::string & SerialNumber, WSConnection *);
 		bool SendCommand(GWObjects::CommandDetails & Command);
 		bool Connected(const std::string & SerialNumber);
 		bool SendFrame(const std::string & SerialNumber, const std::string & Payload);
 		void SetPendingUUID(const std::string & SerialNumber, uint64_t PendingUUID);
+
 		bool AnalyzeRegistry(GWObjects::Dashboard &D);
 
 	  private:
-		inline static std::atomic_uint64_t 						Id_=1;
-		std::map<std::string,std::shared_ptr<ConnectionEntry>>  Devices_;
+		static DeviceRegistry                          *instance_;
+		std::map<std::string,std::unique_ptr<ConnectionEntry>>   Devices_;
 
-		DeviceRegistry() noexcept:
-    		SubSystemServer("DeviceRegistry", "DevStatus", "devicestatus") {
-		}
+		DeviceRegistry() noexcept;
 	};
 
 	inline DeviceRegistry * DeviceRegistry() { return DeviceRegistry::instance(); }
 
 }  // namespace
 
+#endif //UCENTRAL_UDEVICEREGISTRY_H

src/FileUploader.cpp

@@ -10,6 +10,10 @@
 #include <fstream>
 #include <cstdio>
 
+#include "Daemon.h"
+#include "FileUploader.h"
+#include "StorageService.h"
+
 #include "Poco/Net/HTTPServerParams.h"
 #include "Poco/Net/HTTPServerResponse.h"
 #include "Poco/DynamicAny.h"
@@ -20,34 +24,26 @@
 #include "Poco/StreamCopier.h"
 #include "Poco/Exception.h"
 
-#include "FileUploader.h"
-#include "StorageService.h"
-#include "framework/MicroService.h"
+#include "Utils.h"
 
-namespace OpenWifi {
+namespace uCentral {
+    class FileUploader *FileUploader::instance_ = nullptr;
 
     static const std::string URI_BASE{"/v1/upload/"};
 
     int FileUploader::Start() {
         Logger_.notice("Starting.");
 
-        Poco::File UploadsDir(MicroService::instance().ConfigPath("openwifi.fileuploader.path","/tmp"));
-        Path_ = UploadsDir.path();
-        if(!UploadsDir.exists()) {
-        	try {
-        		UploadsDir.createDirectory();
-        	} catch (const Poco::Exception &E) {
-        		Logger_.log(E);
-        		Path_ = "/tmp";
-        	}
-        }
         for(const auto & Svr: ConfigServersList_) {
             std::string l{"Starting: " +
                           Svr.Address() + ":" + std::to_string(Svr.Port()) +
                           " key:" + Svr.KeyFile() +
                           " cert:" + Svr.CertFile()};
+
             Logger_.information(l);
 
+            Path_ = Daemon()->ConfigPath("ucentral.fileuploader.path","/tmp");
+
             auto Sock{Svr.CreateSecureSocket(Logger_)};
 
 			Svr.LogCert(Logger_);
@@ -59,40 +55,24 @@ namespace OpenWifi {
             Params->setMaxQueued(100);
 
             if(FullName_.empty()) {
-            	std::string TmpName = MicroService::instance().ConfigGetString("openwifi.fileuploader.uri","");
-            	if(TmpName.empty()) {
-            		FullName_ =
-            			"https://" + Svr.Name() + ":" + std::to_string(Svr.Port()) + URI_BASE;
-            	} else {
-            		FullName_ = TmpName + URI_BASE ;
-            	}
-            	Logger_.information(Poco::format("Uploader URI base is '%s'", FullName_));
+                FullName_ = "https://" + Svr.Name() + ":" + std::to_string(Svr.Port()) + URI_BASE;
+                Logger_.information(Poco::format("Uploader URI base is '%s'", FullName_));
             }
-
             auto NewServer = std::make_unique<Poco::Net::HTTPServer>(new FileUpLoaderRequestHandlerFactory(Logger_), Pool_, Sock, Params);
             NewServer->start();
             Servers_.push_back(std::move(NewServer));
         }
 
-        MaxSize_ = 1000 * MicroService::instance().ConfigGetInt("openwifi.fileuploader.maxsize", 10000);
-
         return 0;
     }
 
-	void FileUploader::reinitialize(Poco::Util::Application &self) {
-		MicroService::instance().LoadConfigurationFile();
-    	Logger_.information("Reinitializing.");
-		Stop();
-		Start();
-	}
-
     const std::string & FileUploader::FullName() {
         return FullName_;
     }
 
     //  if you pass in an empty UUID, it will just clean the list and not add it.
     bool FileUploader::AddUUID( const std::string & UUID) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
 
         uint64_t Now = time(nullptr) ;
 
@@ -111,13 +91,13 @@ namespace OpenWifi {
     }
 
     bool FileUploader::ValidRequest(const std::string &UUID) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
 
         return OutStandingUploads_.find(UUID)!=OutStandingUploads_.end();
     }
 
     void FileUploader::RemoveRequest(const std::string &UUID) {
-		std::lock_guard		Guard(Mutex_);
+		SubMutexGuard		Guard(Mutex_);
         OutStandingUploads_.erase(UUID);
     }
 
@@ -132,49 +112,35 @@ namespace OpenWifi {
 
         void handlePart(const Poco::Net::MessageHeader& Header, std::istream& Stream) override
         {
-			try {
-				Name_ = "(unnamed)";
-				if (Header.has("Content-Disposition")) {
-					std::string Disposition;
-					Poco::Net::NameValueCollection Parameters;
-					Poco::Net::MessageHeader::splitParameters(Header["Content-Disposition"],
-															  Disposition, Parameters);
-					Name_ = Parameters.get("filename", "(unnamed)");
-				}
+            FileType_ = Header.get("Content-Type", "(unspecified)");
+            if (Header.has("Content-Disposition"))
+            {
+                std::string Disposition;
+                Poco::Net::NameValueCollection Parameters;
+                Poco::Net::MessageHeader::splitParameters(Header["Content-Disposition"], Disposition, Parameters);
+                Name_ = Parameters.get("name", "(unnamed)");
+            }
 
-				std::string FinalFileName = FileUploader()->Path() + "/" + UUID_;
+			Poco::TemporaryFile 		TmpFile;
+            std::string FinalFileName = FileUploader()->Path() + "/" + UUID_ ;
+            Logger_.information(Poco::format("FILE-UPLOADER: uploading trace for %s",UUID_));
 
-				Logger_.information(Poco::format("FILE-UPLOADER: uploading trace for %s", FinalFileName));
-				Poco::CountingInputStream InputStream(Stream);
-				std::ofstream OutputStream(FinalFileName, std::ofstream::out);
-				Poco::StreamCopier::copyStream(InputStream, OutputStream);
-
-				Poco::File TmpFile(FinalFileName);
-				Length_ = TmpFile.getSize();
-				if (Length_ < FileUploader()->MaxSize()) {
-					Good_=true;
-				} else {
-					TmpFile.remove();
-					Error_ = "File is too large.";
-				}
-				return;
-			} catch (const Poco::Exception &E ) {
-				Logger_.log(E);
-				Error_ = std::string("Upload caused an internal error: ") + E.what() ;
-			}
-		}
+			Poco::CountingInputStream 	InputStream(Stream);
+            std::ofstream OutputStream(TmpFile.path(), std::ofstream::out);
+            Poco::StreamCopier::copyStream(InputStream, OutputStream);
+            Length_ = InputStream.chars();
+            rename(TmpFile.path().c_str(),FinalFileName.c_str());
+        }
 
         [[nodiscard]] uint64_t Length() const { return Length_; }
         [[nodiscard]] const std::string& Name() const { return Name_; }
-		[[nodiscard]] bool Good() const { return Good_; }
-		std::string & Error() { return Error_; }
+        [[nodiscard]] const std::string& ContentType() const { return FileType_; }
 
     private:
         uint64_t        Length_=0;
-		bool 			Good_=false;
+        std::string     FileType_;
         std::string     Name_;
         std::string     UUID_;
-		std::string 	Error_;
         Poco::Logger    & Logger_;
     };
 
@@ -199,15 +165,14 @@ namespace OpenWifi {
                 Response.setContentType("application/json");
 
 				Poco::JSON::Object	Answer;
-                if (partHandler.Good()) {
+                if (!partHandler.Name().empty()) {
 					Answer.set("filename", UUID_);
 					Answer.set("error", 0);
-					StorageService()->AttachFileToCommand(UUID_);
+					Storage()->AttachFileToCommand(UUID_);
 				} else {
 					Answer.set("filename", UUID_);
 					Answer.set("error", 13);
-					Answer.set("errorText", partHandler.Error() );
-					StorageService()->CancelWaitFile(UUID_, partHandler.Error() );
+					Answer.set("errorText", "File could not be uploaded");
 				}
 				std::ostream &ResponseStream = Response.send();
 				Poco::JSON::Stringifier::stringify(Answer, ResponseStream);
@@ -228,7 +193,7 @@ namespace OpenWifi {
 
     Poco::Net::HTTPRequestHandler *FileUpLoaderRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest & Request) {
 
-		Logger_.debug(Poco::format("REQUEST(%s): %s %s", Utils::FormatIPv6(Request.clientAddress().toString()), Request.getMethod(), Request.getURI()));
+		Logger_.debug(Poco::format("REQUEST(%s): %s %s", uCentral::Utils::FormatIPv6(Request.clientAddress().toString()), Request.getMethod(), Request.getURI()));
 
         //  The UUID should be after the /v1/upload/ part...
         auto UUIDLocation = Request.getURI().find_first_of(URI_BASE);
@@ -254,7 +219,6 @@ namespace OpenWifi {
         Logger_.notice("Stopping ");
         for( const auto & svr : Servers_ )
             svr->stop();
-		Servers_.clear();
     }
 
 }  //  Namespace

src/FileUploader.h

@@ -9,20 +9,20 @@
 #ifndef UCENTRAL_UFILEUPLOADER_H
 #define UCENTRAL_UFILEUPLOADER_H
 
+#include "SubSystemServer.h"
+
+#include "Poco/Net/HTTPServer.h"
 #include "Poco/Net/HTTPRequestHandler.h"
 #include "Poco/Net/HTTPRequestHandlerFactory.h"
-#include "Poco/Net/HTTPServer.h"
 #include "Poco/Net/HTTPServerRequest.h"
+#include "RESTAPI_handler.h"
 
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
+namespace uCentral {
 
     class FileUploader : public SubSystemServer {
     public:
 		int Start() override;
 		void Stop() override;
-		void reinitialize(Poco::Util::Application &self) override;
 		const std::string & FullName();
 		bool AddUUID( const std::string & UUID);
 		bool ValidRequest(const std::string & UUID);
@@ -30,23 +30,24 @@ namespace OpenWifi {
 		const std::string & Path() { return Path_; };
 
         static FileUploader *instance() {
-            static FileUploader * instance_ = new FileUploader;
-			return instance_;
+            if (instance_ == nullptr) {
+                instance_ = new FileUploader;
+            }
+            return instance_;
         }
 
-		[[nodiscard]] inline uint64_t MaxSize() const { return MaxSize_; }
-
     private:
+        static FileUploader *instance_;
         std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   Servers_;
 		Poco::ThreadPool				Pool_;
         std::string                     FullName_;
         std::map<std::string,uint64_t>  OutStandingUploads_;
         std::string                     Path_;
-		uint64_t 						MaxSize_=10000000;
 
 		explicit FileUploader() noexcept:
-			SubSystemServer("FileUploader", "FILE-UPLOAD", "openwifi.fileuploader")
+			SubSystemServer("FileUploader", "FILE-UPLOAD", "ucentral.fileuploader")
 		{
+			SubMutexGuard		Guard(Mutex_);
 		}
     };
 

src/KafkaManager.cpp

@@ -0,0 +1,221 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+#include <thread>
+
+#include "KafkaManager.h"
+
+#include "Daemon.h"
+#include "Utils.h"
+
+namespace uCentral {
+
+	class KafkaManager *KafkaManager::instance_ = nullptr;
+
+	KafkaManager::KafkaManager() noexcept:
+		SubSystemServer("KafkaManager", "KAFKA-SVR", "ucentral.kafka")
+	{
+	}
+
+	void KafkaManager::initialize(Poco::Util::Application & self) {
+		SubSystemServer::initialize(self);
+		KafkaEnabled_ = Daemon()->ConfigGetBool("ucentral.kafka.enable",false);
+	}
+
+#ifdef SMALL_BUILD
+
+	int KafkaManager::Start() {
+		return 0;
+	}
+	void KafkaManager::Stop() {
+	}
+
+#else
+
+	int KafkaManager::Start() {
+		if(!KafkaEnabled_)
+			return 0;
+		ProducerThr_ = std::make_unique<std::thread>([this]() { this->ProducerThr(); });
+		ConsumerThr_ = std::make_unique<std::thread>([this]() { this->ConsumerThr(); });
+		return 0;
+	}
+
+	void KafkaManager::Stop() {
+		if(KafkaEnabled_) {
+			ProducerRunning_ = ConsumerRunning_ = false;
+			ProducerThr_->join();
+			ConsumerThr_->join();
+			return;
+		}
+	}
+
+	void KafkaManager::ProducerThr() {
+		cppkafka::Configuration Config({
+										   { "client.id", Daemon()->ConfigGetString("ucentral.kafka.client.id") },
+										   { "metadata.broker.list", Daemon()->ConfigGetString("ucentral.kafka.brokerlist") }
+									   });
+		SystemInfoWrapper_ = 	R"lit({ "system" : { "id" : )lit" +
+								  	std::to_string(Daemon()->ID()) +
+									R"lit( , "host" : ")lit" + Daemon()->PrivateEndPoint() +
+									R"lit(" } , "payload" : )lit" ;
+		cppkafka::Producer	Producer(Config);
+		ProducerRunning_ = true;
+		while(ProducerRunning_) {
+			std::this_thread::sleep_for(std::chrono::milliseconds(200));
+			try
+			{
+				SubMutexGuard G(ProducerMutex_);
+				auto Num=0;
+				while (!Queue_.empty()) {
+					const auto M = Queue_.front();
+					Producer.produce(
+						cppkafka::MessageBuilder(M.Topic).key(M.Key).payload(M.PayLoad));
+					Queue_.pop();
+					Num++;
+				}
+				if(Num)
+					Producer.flush();
+			} catch (const cppkafka::HandleException &E ) {
+				Logger_.warning(Poco::format("Caught a Kafka exception (producer): %s",std::string{E.what()}));
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+			}
+		}
+	}
+
+	void KafkaManager::PartitionAssignment(const cppkafka::TopicPartitionList& partitions) {
+		Logger_.information(Poco::format("Partition assigned: %Lu...",(uint64_t )partitions.front().get_partition()));
+	}
+	void KafkaManager::PartitionRevocation(const cppkafka::TopicPartitionList& partitions) {
+		Logger_.information(Poco::format("Partition revocation: %Lu...",(uint64_t )partitions.front().get_partition()));
+	}
+
+	void KafkaManager::ConsumerThr() {
+		cppkafka::Configuration Config({
+										   { "client.id", Daemon()->ConfigGetString("ucentral.kafka.client.id") },
+										   { "metadata.broker.list", Daemon()->ConfigGetString("ucentral.kafka.brokerlist") },
+										   { "group.id", Daemon()->ConfigGetString("ucentral.kafka.group.id") },
+										   { "enable.auto.commit", Daemon()->ConfigGetBool("ucentral.kafka.auto.commit",false) },
+										   { "auto.offset.reset", "latest" } ,
+										   { "enable.partition.eof", false }
+									   });
+
+		cppkafka::TopicConfiguration topic_config = {
+			{ "auto.offset.reset", "smallest" }
+		};
+
+		// Now configure it to be the default topic config
+		Config.set_default_topic_configuration(topic_config);
+
+		cppkafka::Consumer Consumer(Config);
+		Consumer.set_assignment_callback([this](cppkafka::TopicPartitionList& partitions) {
+			if(!partitions.empty()) {
+				Logger_.information(Poco::format("Partition assigned: %Lu...",
+												 (uint64_t)partitions.front().get_partition()));
+			}
+		});
+		Consumer.set_revocation_callback([this](const cppkafka::TopicPartitionList& partitions) {
+			if(!partitions.empty()) {
+				Logger_.information(Poco::format("Partition revocation: %Lu...",
+												 (uint64_t)partitions.front().get_partition()));
+			}
+		});
+
+        bool AutoCommit = Daemon()->ConfigGetBool("ucentral.kafka.auto.commit",false);
+        auto BatchSize = Daemon()->ConfigGetInt("ucentral.kafka.consumer.batchsize",20);
+
+        Types::StringVec    Topics;
+		for(const auto &i:Notifiers_)
+			Topics.push_back(i.first);
+
+		Consumer.subscribe(Topics);
+
+		ConsumerRunning_ = true;
+		while(ConsumerRunning_) {
+			try {
+				std::vector<cppkafka::Message> MsgVec = Consumer.poll_batch(BatchSize, std::chrono::milliseconds(200));
+				for(auto const &Msg:MsgVec) {
+                    if (!Msg)
+                        continue;
+                    if (Msg.get_error()) {
+                        if (!Msg.is_eof()) {
+                            Logger_.error(Poco::format("Error: %s", Msg.get_error().to_string()));
+                        }if(!AutoCommit)
+                            Consumer.async_commit(Msg);
+                        continue;
+                    }
+                    SubMutexGuard G(ConsumerMutex_);
+                    auto It = Notifiers_.find(Msg.get_topic());
+                    if (It != Notifiers_.end()) {
+                        Types::TopicNotifyFunctionList &FL = It->second;
+                        std::string Key{Msg.get_key()};
+                        std::string Payload{Msg.get_payload()};
+                        for (auto &F : FL) {
+                            std::thread T(F.first, Key, Payload);
+                            T.detach();
+                        }
+                    }
+                    if (!AutoCommit)
+                        Consumer.async_commit(Msg);
+                }
+			} catch (const cppkafka::HandleException &E) {
+				Logger_.warning(Poco::format("Caught a Kafka exception (consumer): %s",std::string{E.what()}));
+			} catch (const Poco::Exception &E) {
+				Logger_.log(E);
+			}
+		}
+	}
+
+	std::string KafkaManager::WrapSystemId(const std::string & PayLoad) {
+		return std::move( SystemInfoWrapper_ + PayLoad + "}");
+	}
+
+	void KafkaManager::PostMessage(std::string topic, std::string key, std::string PayLoad, bool WrapMessage ) {
+		if(KafkaEnabled_) {
+			SubMutexGuard G(Mutex_);
+			KMessage M{
+				.Topic = topic,
+				.Key = key,
+				.PayLoad = WrapMessage ? WrapSystemId(PayLoad) : PayLoad };
+			Queue_.push(M);
+		}
+	}
+
+	int KafkaManager::RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction &F) {
+		if(KafkaEnabled_) {
+			SubMutexGuard G(Mutex_);
+			auto It = Notifiers_.find(Topic);
+			if(It == Notifiers_.end()) {
+				Types::TopicNotifyFunctionList L;
+				L.emplace(L.end(),std::make_pair(F,FunctionId_));
+				Notifiers_[Topic] = std::move(L);
+			} else {
+				It->second.emplace(It->second.end(),std::make_pair(F,FunctionId_));
+			}
+			return FunctionId_++;
+		} else {
+			return 0;
+		}
+	}
+
+	void KafkaManager::UnregisterTopicWatcher(const std::string &Topic, int Id) {
+		if(KafkaEnabled_) {
+			SubMutexGuard G(Mutex_);
+			auto It = Notifiers_.find(Topic);
+			if(It != Notifiers_.end()) {
+				Types::TopicNotifyFunctionList & L = It->second;
+				for(auto it=L.begin(); it!=L.end(); it++)
+					if(it->second == Id) {
+						L.erase(it);
+						break;
+					}
+			}
+		}
+	}
+
+#endif
+} // namespace

src/KafkaManager.h

@@ -0,0 +1,74 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#ifndef UCENTRALGW_KAFKAMANAGER_H
+#define UCENTRALGW_KAFKAMANAGER_H
+
+#include <queue>
+#include <thread>
+
+#include "SubSystemServer.h"
+#include "uCentralTypes.h"
+
+#include "cppkafka/cppkafka.h"
+
+namespace uCentral {
+
+	class KafkaManager : public SubSystemServer {
+	  public:
+
+		struct KMessage {
+					std::string Topic,
+								Key,
+								PayLoad;
+		};
+
+		void initialize(Poco::Util::Application & self) override;
+		static KafkaManager *instance() {
+			if(instance_== nullptr)
+				instance_ = new KafkaManager;
+			return instance_;
+		}
+
+		void ProducerThr();
+		void ConsumerThr();
+
+		int Start() override;
+		void Stop() override;
+
+		void PostMessage(std::string topic, std::string key, std::string payload, bool WrapMessage = true);
+		[[nodiscard]] std::string WrapSystemId(const std::string & PayLoad);
+		[[nodiscard]] bool Enabled() { return KafkaEnabled_; }
+		int RegisterTopicWatcher(const std::string &Topic, Types::TopicNotifyFunction & F);
+		void UnregisterTopicWatcher(const std::string &Topic, int FunctionId);
+		void WakeUp();
+		void PartitionAssignment(const cppkafka::TopicPartitionList& partitions);
+		void PartitionRevocation(const cppkafka::TopicPartitionList& partitions);
+
+	  private:
+		static KafkaManager 			*instance_;
+		SubMutex 						ProducerMutex_;
+		SubMutex 						ConsumerMutex_;
+		bool 							KafkaEnabled_ = false;
+		std::atomic_bool 				ProducerRunning_ = false;
+		std::atomic_bool 				ConsumerRunning_ = false;
+		std::queue<KMessage>			Queue_;
+		std::string 					SystemInfoWrapper_;
+		std::unique_ptr<std::thread>	ConsumerThr_;
+		std::unique_ptr<std::thread>	ProducerThr_;
+		int                       		FunctionId_=1;
+		Types::NotifyTable        		Notifiers_;
+		std::unique_ptr<cppkafka::Configuration>    Config_;
+
+		KafkaManager() noexcept;
+	};
+
+	inline KafkaManager * KafkaManager() { return KafkaManager::instance(); }
+}	// NameSpace
+
+#endif // UCENTRALGW_KAFKAMANAGER_H

src/Kafka_topics.h

@@ -1,14 +1,11 @@
 //
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
+// Created by stephane bourque on 2021-06-07.
 //
+
 #ifndef UCENTRALGW_KAFKA_TOPICS_H
 #define UCENTRALGW_KAFKA_TOPICS_H
 
-namespace OpenWifi::KafkaTopics {
+namespace uCentral::KafkaTopics {
 	static const std::string HEALTHCHECK{"healthcheck"};
 	static const std::string STATE{"state"};
 	static const std::string CONNECTION{"connection"};
@@ -16,7 +13,6 @@ namespace OpenWifi::KafkaTopics {
 	static const std::string ALERTS{"alerts"};
 	static const std::string COMMAND{"command"};
 	static const std::string SERVICE_EVENTS{"service_events"};
-	static const std::string DEVICE_EVENT_QUEUE{"device_event_queue"};
 
 	namespace ServiceEvents {
 		static const std::string EVENT_JOIN{"join"};

src/MicroService.cpp

@@ -0,0 +1,491 @@
+//
+// Created by stephane bourque on 2021-06-22.
+//
+#include <cstdlib>
+#include <boost/algorithm/string.hpp>
+
+#include "Poco/Util/Application.h"
+#include "Poco/Util/ServerApplication.h"
+#include "Poco/Util/Option.h"
+#include "Poco/Util/OptionSet.h"
+#include "Poco/Util/HelpFormatter.h"
+#include "Poco/Environment.h"
+#include "Poco/Net/HTTPSStreamFactory.h"
+#include "Poco/Net/HTTPStreamFactory.h"
+#include "Poco/Net/FTPSStreamFactory.h"
+#include "Poco/Net/FTPStreamFactory.h"
+#include "Poco/Path.h"
+#include "Poco/File.h"
+#include "Poco/String.h"
+#include "Poco/JSON/Object.h"
+#include "Poco/JSON/Parser.h"
+#include "Poco/JSON/Stringifier.h"
+
+#include "ALBHealthCheckServer.h"
+#ifndef SMALL_BUILD
+#include "KafkaManager.h"
+#endif
+#include "Kafka_topics.h"
+
+#include "MicroService.h"
+#include "Utils.h"
+
+#ifndef TIP_SECURITY_SERVICE
+#include "AuthClient.h"
+#endif
+
+namespace uCentral {
+
+	void MyErrorHandler::exception(const Poco::Exception & E) {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().log(E);
+		App_.logger().error(Poco::format("Exception occurred in %s",CurrentThread->getName()));
+	}
+
+	void MyErrorHandler::exception(const std::exception & E) {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().warning(Poco::format("std::exception on %s",CurrentThread->getName()));
+	}
+
+	void MyErrorHandler::exception() {
+		Poco::Thread * CurrentThread = Poco::Thread::current();
+		App_.logger().warning(Poco::format("exception on %s",CurrentThread->getName()));
+	}
+
+	void MicroService::Exit(int Reason) {
+		std::exit(Reason);
+	}
+
+	void MicroService::BusMessageReceived(const std::string &Key, const std::string & Message) {
+		SubMutexGuard G(InfraMutex_);
+		try {
+			Poco::JSON::Parser P;
+			auto Object = P.parse(Message).extract<Poco::JSON::Object::Ptr>();
+			if (Object->has(KafkaTopics::ServiceEvents::Fields::ID) &&
+				Object->has(KafkaTopics::ServiceEvents::Fields::EVENT)) {
+				uint64_t 	ID = Object->get(KafkaTopics::ServiceEvents::Fields::ID);
+				auto 		Event = Object->get(KafkaTopics::ServiceEvents::Fields::EVENT).toString();
+				if (ID != ID_) {
+					if(	Event==KafkaTopics::ServiceEvents::EVENT_JOIN ||
+						Event==KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE ||
+						Event==KafkaTopics::ServiceEvents::EVENT_LEAVE ) {
+						if(	Object->has(KafkaTopics::ServiceEvents::Fields::TYPE) &&
+						   	Object->has(KafkaTopics::ServiceEvents::Fields::PUBLIC) &&
+							Object->has(KafkaTopics::ServiceEvents::Fields::PRIVATE) &&
+						   	Object->has(KafkaTopics::ServiceEvents::Fields::VRSN) &&
+							Object->has(KafkaTopics::ServiceEvents::Fields::KEY)) {
+
+							if (Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE && Services_.find(ID) != Services_.end()) {
+								Services_[ID].LastUpdate = std::time(nullptr);
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_LEAVE) {
+								Services_.erase(ID);
+								logger().information(Poco::format("Service %s ID=%Lu leaving system.",Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),ID));
+							} else if (Event == KafkaTopics::ServiceEvents::EVENT_JOIN || Event == KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE) {
+								logger().information(Poco::format("Service %s ID=%Lu joining system.",Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),ID));
+								Services_[ID] = MicroServiceMeta{
+									.Id = ID,
+									.Type = Poco::toLower(Object->get(KafkaTopics::ServiceEvents::Fields::TYPE).toString()),
+									.PrivateEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PRIVATE).toString(),
+									.PublicEndPoint = Object->get(KafkaTopics::ServiceEvents::Fields::PUBLIC).toString(),
+									.AccessKey = Object->get(KafkaTopics::ServiceEvents::Fields::KEY).toString(),
+									.Version = Object->get(KafkaTopics::ServiceEvents::Fields::VRSN).toString(),
+									.LastUpdate = (uint64_t)std::time(nullptr)};
+								for (const auto &[Id, Svc] : Services_) {
+									logger().information(Poco::format("ID: %Lu Type: %s EndPoint: %s",Id,Svc.Type,Svc.PrivateEndPoint));
+								}
+							}
+						} else {
+							logger().error(Poco::format("KAFKA-MSG: invalid event '%s', missing a field.",Event));
+						}
+					} else if (Event==KafkaTopics::ServiceEvents::EVENT_REMOVE_TOKEN) {
+						if(Object->has(KafkaTopics::ServiceEvents::Fields::TOKEN)) {
+#ifndef TIP_SECURITY_SERVICE
+							AuthClient()->RemovedCachedToken(Object->get(KafkaTopics::ServiceEvents::Fields::TOKEN).toString());
+#endif
+						} else {
+							logger().error(Poco::format("KAFKA-MSG: invalid event '%s', missing token",Event));
+						}
+					} else {
+						logger().error(Poco::format("Unknown Event: %s Source: %Lu", Event, ID));
+					}
+				}
+			} else {
+				logger().error("Bad bus message.");
+			}
+		} catch (const Poco::Exception &E) {
+			logger().log(E);
+		}
+	}
+
+	MicroServiceMetaVec MicroService::GetServices(const std::string & Type) {
+		SubMutexGuard G(InfraMutex_);
+
+		auto T = Poco::toLower(Type);
+		MicroServiceMetaVec	Res;
+		for(const auto &[Id,ServiceRec]:Services_) {
+			if(ServiceRec.Type==T)
+				Res.push_back(ServiceRec);
+		}
+		return Res;
+	}
+
+	MicroServiceMetaVec MicroService::GetServices() {
+		SubMutexGuard G(InfraMutex_);
+
+		MicroServiceMetaVec	Res;
+		for(const auto &[Id,ServiceRec]:Services_) {
+			Res.push_back(ServiceRec);
+		}
+		return Res;
+	}
+
+	void MicroService::initialize(Poco::Util::Application &self) {
+		// add the default services
+		SubSystems_.push_back(KafkaManager());
+		SubSystems_.push_back(ALBHealthCheckServer());
+
+		Poco::Net::initializeSSL();
+		Poco::Net::HTTPStreamFactory::registerFactory();
+		Poco::Net::HTTPSStreamFactory::registerFactory();
+		Poco::Net::FTPStreamFactory::registerFactory();
+		Poco::Net::FTPSStreamFactory::registerFactory();
+		std::string Location = Poco::Environment::get(DAEMON_CONFIG_ENV_VAR,".");
+		Poco::Path ConfigFile;
+
+		ConfigFile = ConfigFileName_.empty() ? Location + "/" + DAEMON_PROPERTIES_FILENAME : ConfigFileName_;
+
+		if(!ConfigFile.isFile())
+		{
+			std::cerr << DAEMON_APP_NAME << ": Configuration "
+					  << ConfigFile.toString() << " does not seem to exist. Please set " + DAEMON_CONFIG_ENV_VAR
+												  + " env variable the path of the " + DAEMON_PROPERTIES_FILENAME + " file." << std::endl;
+			std::exit(Poco::Util::Application::EXIT_CONFIG);
+		}
+
+		static const char * LogFilePathKey = "logging.channels.c2.path";
+
+		loadConfiguration(ConfigFile.toString());
+
+		if(LogDir_.empty()) {
+			std::string OriginalLogFileValue = ConfigPath(LogFilePathKey);
+			config().setString(LogFilePathKey, OriginalLogFileValue);
+		} else {
+			config().setString(LogFilePathKey, LogDir_);
+		}
+		Poco::File	DataDir(ConfigPath("ucentral.system.data"));
+		DataDir_ = DataDir.path();
+		if(!DataDir.exists()) {
+			try {
+				DataDir.createDirectory();
+			} catch (const Poco::Exception &E) {
+				logger().log(E);
+			}
+		}
+		std::string KeyFile = ConfigPath("ucentral.service.key");
+		std::string KeyFilePassword = ConfigPath("ucentral.service.key.password" , "" );
+		AppKey_ = Poco::SharedPtr<Poco::Crypto::RSAKey>(new Poco::Crypto::RSAKey("", KeyFile, KeyFilePassword));
+		Cipher_ = CipherFactory_.createCipher(*AppKey_);
+		ID_ = Utils::GetSystemId();
+		if(!DebugMode_)
+			DebugMode_ = ConfigGetBool("ucentral.system.debug",false);
+		MyPrivateEndPoint_ = ConfigGetString("ucentral.system.uri.private");
+		MyPublicEndPoint_ = ConfigGetString("ucentral.system.uri.public");
+		UIURI_ = ConfigGetString("ucentral.system.uri.ui");
+		MyHash_ = CreateHash(MyPublicEndPoint_);
+		InitializeSubSystemServers();
+		ServerApplication::initialize(self);
+
+		Types::TopicNotifyFunction F = [this](std::string s1,std::string s2) { this->BusMessageReceived(s1,s2); };
+		KafkaManager()->RegisterTopicWatcher(KafkaTopics::SERVICE_EVENTS, F);
+	}
+
+	void MicroService::uninitialize() {
+		// add your own uninitialization code here
+		ServerApplication::uninitialize();
+	}
+
+	void MicroService::reinitialize(Poco::Util::Application &self) {
+		ServerApplication::reinitialize(self);
+		// add your own reinitialization code here
+	}
+
+	void MicroService::defineOptions(Poco::Util::OptionSet &options) {
+		ServerApplication::defineOptions(options);
+
+		options.addOption(
+			Poco::Util::Option("help", "", "display help information on command line arguments")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleHelp)));
+
+		options.addOption(
+			Poco::Util::Option("file", "", "specify the configuration file")
+				.required(false)
+				.repeatable(false)
+				.argument("file")
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleConfig)));
+
+		options.addOption(
+			Poco::Util::Option("debug", "", "to run in debug, set to true")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleDebug)));
+
+		options.addOption(
+			Poco::Util::Option("logs", "", "specify the log directory and file (i.e. dir/file.log)")
+				.required(false)
+				.repeatable(false)
+				.argument("dir")
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleLogs)));
+
+		options.addOption(
+			Poco::Util::Option("version", "", "get the version and quit.")
+				.required(false)
+				.repeatable(false)
+				.callback(Poco::Util::OptionCallback<MicroService>(this, &MicroService::handleVersion)));
+
+	}
+
+	void MicroService::handleHelp(const std::string &name, const std::string &value) {
+		HelpRequested_ = true;
+		displayHelp();
+		stopOptionsProcessing();
+	}
+
+	void MicroService::handleVersion(const std::string &name, const std::string &value) {
+		HelpRequested_ = true;
+		std::cout << Version() << std::endl;
+		stopOptionsProcessing();
+	}
+
+	void MicroService::handleDebug(const std::string &name, const std::string &value) {
+		if(value == "true")
+			DebugMode_ = true ;
+	}
+
+	void MicroService::handleLogs(const std::string &name, const std::string &value) {
+		LogDir_ = value;
+	}
+
+	void MicroService::handleConfig(const std::string &name, const std::string &value) {
+		ConfigFileName_ = value;
+	}
+
+	void MicroService::displayHelp() {
+		Poco::Util::HelpFormatter helpFormatter(options());
+		helpFormatter.setCommand(commandName());
+		helpFormatter.setUsage("OPTIONS");
+		helpFormatter.setHeader("A " + DAEMON_APP_NAME + " implementation for TIP.");
+		helpFormatter.format(std::cout);
+	}
+
+	void MicroService::InitializeSubSystemServers() {
+		for(auto i:SubSystems_)
+			addSubsystem(i);
+	}
+
+	void MicroService::StartSubSystemServers() {
+		for(auto i:SubSystems_) {
+			i->Start();
+		}
+		BusEventManager_.Start();
+	}
+
+	void MicroService::StopSubSystemServers() {
+		BusEventManager_.Stop();
+		for(auto i=SubSystems_.rbegin(); i!=SubSystems_.rend(); ++i)
+			(*i)->Stop();
+	}
+
+	std::string MicroService::CreateUUID() {
+		return UUIDGenerator_.create().toString();
+	}
+
+	bool MicroService::SetSubsystemLogLevel(const std::string &SubSystem, const std::string &Level) {
+		try {
+			auto P = Poco::Logger::parseLevel(Level);
+			auto Sub = Poco::toLower(SubSystem);
+
+			if (Sub == "all") {
+				for (auto i : SubSystems_) {
+					i->Logger().setLevel(P);
+				}
+				return true;
+			} else {
+				// std::cout << "Sub:" << SubSystem << " Level:" << Level << std::endl;
+				for (auto i : SubSystems_) {
+					if (Sub == Poco::toLower(i->Name())) {
+						i->Logger().setLevel(P);
+						return true;
+					}
+				}
+			}
+		} catch (const Poco::Exception & E) {
+			std::cout << "Exception" << std::endl;
+		}
+		return false;
+	}
+
+	Types::StringVec MicroService::GetSubSystems() const {
+		Types::StringVec Result;
+		for(auto i:SubSystems_)
+			Result.push_back(i->Name());
+		return Result;
+	}
+
+	Types::StringPairVec MicroService::GetLogLevels() const {
+		Types::StringPairVec Result;
+
+		for(auto &i:SubSystems_) {
+			auto P = std::make_pair( i->Name(), Utils::LogLevelToString(i->GetLoggingLevel()));
+			Result.push_back(P);
+		}
+		return Result;
+	}
+
+	const Types::StringVec & MicroService::GetLogLevelNames() const {
+		static Types::StringVec LevelNames{"none", "fatal", "critical", "error", "warning", "notice", "information", "debug", "trace" };
+		return LevelNames;
+	}
+
+	uint64_t MicroService::ConfigGetInt(const std::string &Key,uint64_t Default) {
+		return (uint64_t) config().getInt64(Key,Default);
+	}
+
+	uint64_t MicroService::ConfigGetInt(const std::string &Key) {
+		return config().getInt(Key);
+	}
+
+	uint64_t MicroService::ConfigGetBool(const std::string &Key,bool Default) {
+		return config().getBool(Key,Default);
+	}
+
+	uint64_t MicroService::ConfigGetBool(const std::string &Key) {
+		return config().getBool(Key);
+	}
+
+	std::string MicroService::ConfigGetString(const std::string &Key,const std::string & Default) {
+		return config().getString(Key, Default);
+	}
+
+	std::string MicroService::ConfigGetString(const std::string &Key) {
+		return config().getString(Key);
+	}
+
+	std::string MicroService::ConfigPath(const std::string &Key,const std::string & Default) {
+		std::string R = config().getString(Key, Default);
+		return Poco::Path::expand(R);
+	}
+
+	std::string MicroService::ConfigPath(const std::string &Key) {
+		std::string R = config().getString(Key);
+		return Poco::Path::expand(R);
+	}
+
+	std::string MicroService::Encrypt(const std::string &S) {
+		return Cipher_->encryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
+	}
+
+	std::string MicroService::Decrypt(const std::string &S) {
+		return Cipher_->decryptString(S, Poco::Crypto::Cipher::Cipher::ENC_BASE64);;
+	}
+
+	std::string MicroService::CreateHash(const std::string &S) {
+		SHA2_.update(S);
+		return Utils::ToHex(SHA2_.digest());
+	}
+
+	std::string MicroService::MakeSystemEventMessage( const std::string & Type ) const {
+		Poco::JSON::Object	Obj;
+		Obj.set(KafkaTopics::ServiceEvents::Fields::EVENT,Type);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::ID,ID_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::TYPE,Poco::toLower(DAEMON_APP_NAME));
+		Obj.set(KafkaTopics::ServiceEvents::Fields::PUBLIC,MyPublicEndPoint_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::PRIVATE,MyPrivateEndPoint_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::KEY,MyHash_);
+		Obj.set(KafkaTopics::ServiceEvents::Fields::VRSN,Version_);
+		std::stringstream ResultText;
+		Poco::JSON::Stringifier::stringify(Obj, ResultText);
+		return ResultText.str();
+	}
+
+	void BusEventManager::run() {
+		Running_ = true;
+		auto Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_JOIN);
+		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+		while(Running_) {
+			Poco::Thread::trySleep((unsigned long)Daemon()->DaemonBusTimer());
+			if(!Running_)
+				break;
+			auto Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_KEEP_ALIVE);
+			KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+		}
+		Msg = Daemon()->MakeSystemEventMessage(KafkaTopics::ServiceEvents::EVENT_LEAVE);
+		KafkaManager()->PostMessage(KafkaTopics::SERVICE_EVENTS,Daemon()->PrivateEndPoint(),Msg, false);
+	};
+
+	void BusEventManager::Start() {
+		if(KafkaManager()->Enabled()) {
+			Thread_.start(*this);
+		}
+	}
+
+	void BusEventManager::Stop() {
+		if(KafkaManager()->Enabled()) {
+			Running_ = false;
+			Thread_.wakeUp();
+			Thread_.join();
+		}
+	}
+
+	[[nodiscard]] bool MicroService::IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request) {
+		try {
+			auto APIKEY = Request.get("X-API-KEY");
+			return APIKEY == MyHash_;
+		} catch (const Poco::Exception &E) {
+			logger().log(E);
+		}
+		return false;
+	}
+
+	void MicroService::SavePID() {
+		try {
+			std::ofstream O;
+			O.open(Daemon()->DataDir() + "/pidfile",std::ios::binary | std::ios::trunc);
+			O << Poco::Process::id();
+			O.close();
+		} catch (...)
+		{
+			std::cout << "Could not save system ID" << std::endl;
+		}
+	}
+
+	int MicroService::main(const ArgVec &args) {
+
+		MyErrorHandler	ErrorHandler(*this);
+		Poco::ErrorHandler::set(&ErrorHandler);
+
+		if (!HelpRequested_) {
+			SavePID();
+			Poco::Logger &logger = Poco::Logger::get(DAEMON_APP_NAME);
+			logger.notice(Poco::format("Starting %s version %s.",DAEMON_APP_NAME, Version()));
+
+			if(Poco::Net::Socket::supportsIPv6())
+				logger.information("System supports IPv6.");
+			else
+				logger.information("System does NOT support IPv6.");
+
+			if (config().getBool("application.runAsDaemon", false)) {
+				logger.information("Starting as a daemon.");
+			}
+			logger.information(Poco::format("System ID set to %Lu",ID_));
+			StartSubSystemServers();
+			waitForTerminationRequest();
+			StopSubSystemServers();
+
+			logger.notice(Poco::format("Stopped %s...",DAEMON_APP_NAME));
+		}
+
+		return Application::EXIT_OK;
+	}
+}

src/MicroService.h

@@ -0,0 +1,174 @@
+//
+// Created by stephane bourque on 2021-06-22.
+//
+
+#ifndef UCENTRALGW_MICROSERVICE_H
+#define UCENTRALGW_MICROSERVICE_H
+
+#include <array>
+#include <iostream>
+#include <cstdlib>
+#include <vector>
+#include <set>
+
+#include "Poco/Util/Application.h"
+#include "Poco/Util/ServerApplication.h"
+#include "Poco/Util/Option.h"
+#include "Poco/Util/OptionSet.h"
+#include "Poco/UUIDGenerator.h"
+#include "Poco/ErrorHandler.h"
+#include "Poco/Crypto/RSAKey.h"
+#include "Poco/Crypto/CipherFactory.h"
+#include "Poco/Crypto/Cipher.h"
+#include "Poco/SHA2Engine.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Process.h"
+
+#include "uCentralTypes.h"
+#include "SubSystemServer.h"
+
+namespace uCentral {
+
+	static const std::string uSERVICE_SECURITY{"ucentralsec"};
+	static const std::string uSERVICE_GATEWAY{"ucentralgw"};
+	static const std::string uSERVICE_FIRMWARE{ "ucentralfws"};
+    static const std::string uSERVICE_TOPOLOGY{ "ucentraltopo"};
+    static const std::string uSERVICE_PROVISIONING{ "ucentralprov"};
+
+	class MyErrorHandler : public Poco::ErrorHandler {
+	  public:
+		explicit MyErrorHandler(Poco::Util::Application &App) : App_(App) {}
+		void exception(const Poco::Exception & E) override;
+		void exception(const std::exception & E) override;
+		void exception() override;
+	  private:
+		Poco::Util::Application	&App_;
+	};
+
+	class BusEventManager : public Poco::Runnable {
+	  public:
+		void run() override;
+		void Start();
+		void Stop();
+	  private:
+		std::atomic_bool 	Running_ = false;
+		Poco::Thread		Thread_;
+	};
+
+	struct MicroServiceMeta {
+		uint64_t 		Id=0;
+		std::string 	Type;
+		std::string 	PrivateEndPoint;
+		std::string 	PublicEndPoint;
+		std::string 	AccessKey;
+		std::string		Version;
+		uint64_t 		LastUpdate=0;
+	};
+
+	typedef std::map<uint64_t, MicroServiceMeta>	MicroServiceMetaMap;
+	typedef std::vector<MicroServiceMeta>			MicroServiceMetaVec;
+
+	class MicroService : public Poco::Util::ServerApplication {
+	  public:
+		explicit MicroService( 	std::string PropFile,
+					 	std::string RootEnv,
+					 	std::string ConfigVar,
+					 	std::string AppName,
+					  	uint64_t BusTimer,
+					  	Types::SubSystemVec Subsystems) :
+			DAEMON_PROPERTIES_FILENAME(std::move(PropFile)),
+			DAEMON_ROOT_ENV_VAR(std::move(RootEnv)),
+			DAEMON_CONFIG_ENV_VAR(std::move(ConfigVar)),
+			DAEMON_APP_NAME(std::move(AppName)),
+			DAEMON_BUS_TIMER(BusTimer),
+			SubSystems_(std::move(Subsystems)) {
+			std::string V{APP_VERSION};
+			std::string B{BUILD_NUMBER};
+			Version_ =  V + "(" + B +  ")";
+		}
+
+		int main(const ArgVec &args) override;
+		void initialize(Application &self) override;
+		void uninitialize() override;
+		void reinitialize(Application &self) override;
+		void defineOptions(Poco::Util::OptionSet &options) override;
+		void handleHelp(const std::string &name, const std::string &value);
+		void handleVersion(const std::string &name, const std::string &value);
+		void handleDebug(const std::string &name, const std::string &value);
+		void handleLogs(const std::string &name, const std::string &value);
+		void handleConfig(const std::string &name, const std::string &value);
+		void displayHelp();
+
+		void InitializeSubSystemServers();
+		void StartSubSystemServers();
+		void StopSubSystemServers();
+		void Exit(int Reason);
+		bool SetSubsystemLogLevel(const std::string & SubSystem, const std::string & Level);
+		[[nodiscard]] std::string Version() { return Version_; }
+		[[nodiscard]] const Poco::SharedPtr<Poco::Crypto::RSAKey> & Key() { return AppKey_; }
+		[[nodiscard]] inline const std::string & DataDir() { return DataDir_; }
+		[[nodiscard]] std::string CreateUUID();
+		[[nodiscard]] bool Debug() const { return DebugMode_; }
+		[[nodiscard]] uint64_t ID() const { return ID_; }
+		[[nodiscard]] Types::StringVec GetSubSystems() const;
+		[[nodiscard]] Types::StringPairVec GetLogLevels() const;
+		[[nodiscard]] const Types::StringVec & GetLogLevelNames() const;
+		[[nodiscard]] std::string ConfigGetString(const std::string &Key,const std::string & Default);
+		[[nodiscard]] std::string ConfigGetString(const std::string &Key);
+		[[nodiscard]] std::string ConfigPath(const std::string &Key,const std::string & Default);
+		[[nodiscard]] std::string ConfigPath(const std::string &Key);
+		[[nodiscard]] uint64_t ConfigGetInt(const std::string &Key,uint64_t Default);
+		[[nodiscard]] uint64_t ConfigGetInt(const std::string &Key);
+		[[nodiscard]] uint64_t ConfigGetBool(const std::string &Key,bool Default);
+		[[nodiscard]] uint64_t ConfigGetBool(const std::string &Key);
+		[[nodiscard]] std::string Encrypt(const std::string &S);
+		[[nodiscard]] std::string Decrypt(const std::string &S);
+		[[nodiscard]] std::string CreateHash(const std::string &S);
+		[[nodiscard]] std::string Hash() const { return MyHash_; };
+		[[nodiscard]] std::string ServiceType() const { return DAEMON_APP_NAME; };
+		[[nodiscard]] std::string PrivateEndPoint() const { return MyPrivateEndPoint_; };
+		[[nodiscard]] std::string PublicEndPoint() const { return MyPublicEndPoint_; };
+		[[nodiscard]] std::string MakeSystemEventMessage( const std::string & Type ) const ;
+		inline uint64_t DaemonBusTimer() const { return DAEMON_BUS_TIMER; };
+
+		void BusMessageReceived( const std::string & Key, const std::string & Message);
+		[[nodiscard]] MicroServiceMetaVec GetServices(const std::string & type);
+		[[nodiscard]] MicroServiceMetaVec GetServices();
+		[[nodiscard]] bool IsValidAPIKEY(const Poco::Net::HTTPServerRequest &Request);
+
+		void SavePID();
+		inline uint64_t GetPID() { return Poco::Process::id(); };
+		[[nodiscard]] inline const std::string GetPublicAPIEndPoint() const { return MyPublicEndPoint_ + "/api/v1"; };
+		[[nodiscard]] inline const std::string & GetUIURI() const { return UIURI_;};
+
+	  private:
+		bool                        HelpRequested_ = false;
+		std::string                 LogDir_;
+		std::string                 ConfigFileName_;
+		Poco::UUIDGenerator         UUIDGenerator_;
+		uint64_t                    ID_ = 1;
+		Poco::SharedPtr<Poco::Crypto::RSAKey>	AppKey_ = nullptr;
+		bool                        DebugMode_ = false;
+		std::string 				DataDir_;
+		Types::SubSystemVec			SubSystems_;
+		Poco::Crypto::CipherFactory & CipherFactory_ = Poco::Crypto::CipherFactory::defaultFactory();
+		Poco::Crypto::Cipher        * Cipher_ = nullptr;
+		Poco::SHA2Engine			SHA2_;
+		MicroServiceMetaMap			Services_;
+		std::string 				MyHash_;
+		std::string 				MyPrivateEndPoint_;
+		std::string 				MyPublicEndPoint_;
+		std::string                 UIURI_;
+		std::string 				Version_;
+		BusEventManager				BusEventManager_;
+		SubMutex 					InfraMutex_;
+
+		std::string DAEMON_PROPERTIES_FILENAME;
+		std::string DAEMON_ROOT_ENV_VAR;
+		std::string DAEMON_CONFIG_ENV_VAR;
+		std::string DAEMON_APP_NAME;
+		uint64_t 	DAEMON_BUS_TIMER;
+	};
+}
+
+#endif // UCENTRALGW_MICROSERVICE_H

src/OUIServer.cpp

@@ -6,6 +6,7 @@
 #include <vector>
 
 #include "OUIServer.h"
+#include "Daemon.h"
 
 #include "Poco/String.h"
 #include "Poco/StringTokenizer.h"
@@ -14,10 +15,10 @@
 #include "Poco/URI.h"
 #include "Poco/File.h"
 
-#include "OUIServer.h"
-#include "framework/MicroService.h"
+#include "Utils.h"
 
-namespace OpenWifi {
+namespace uCentral {
+	class OUIServer * OUIServer::instance_;
 
 	int OUIServer::Start() {
 		Running_=true;
@@ -37,17 +38,10 @@ namespace OpenWifi {
 		Updater.detach();
 	}
 
-	void OUIServer::reinitialize(Poco::Util::Application &self) {
-		MicroService::instance().LoadConfigurationFile();
-		Logger_.information("Reinitializing.");
-		Stop();
-		Start();
-	}
-
 	bool OUIServer::GetFile(const std::string &FileName) {
 		try {
 			std::unique_ptr<std::istream> pStr(
-				Poco::URIStreamOpener::defaultOpener().open(MicroService::instance().ConfigGetString("oui.download.uri")));
+				Poco::URIStreamOpener::defaultOpener().open(Daemon()->ConfigGetString("oui.download.uri")));
 			std::ofstream OS;
 			Poco::File	F(FileName);
 			if(F.exists())
@@ -103,12 +97,12 @@ namespace OpenWifi {
 		Updating_ = true;
 
 		//	fetch data from server, if not available, just use the file we already have.
-		std::string LatestOUIFileName{ MicroService::instance().DataDir() + "/newOUIFile.txt"};
-		std::string CurrentOUIFileName{ MicroService::instance().DataDir() + "/current_oui.txt"};
+		std::string LatestOUIFileName{ Daemon()->DataDir() + "/newOUIFile.txt"};
+		std::string CurrentOUIFileName{ Daemon()->DataDir() + "/current_oui.txt"};
 
 		OUIMap TmpOUIs;
 		if(GetFile(LatestOUIFileName) && ProcessFile(LatestOUIFileName, TmpOUIs)) {
-			std::lock_guard G(Mutex_);
+			SubMutexGuard G(Mutex_);
 			OUIs_ = std::move(TmpOUIs);
 			LastUpdate_ = time(nullptr);
 			Poco::File F1(CurrentOUIFileName);
@@ -120,7 +114,7 @@ namespace OpenWifi {
 		} else if(OUIs_.empty()) {
 			if(ProcessFile(CurrentOUIFileName, TmpOUIs)) {
 				LastUpdate_ = time(nullptr);
-				std::lock_guard G(Mutex_);
+				SubMutexGuard G(Mutex_);
 				OUIs_ = std::move(TmpOUIs);
 			}
 		}
@@ -128,7 +122,7 @@ namespace OpenWifi {
 	}
 
 	std::string OUIServer::GetManufacturer(const std::string &MAC) {
-		std::lock_guard Guard(Mutex_);
+		SubMutexGuard Guard(Mutex_);
 		auto Manufacturer = OUIs_.find(Utils::SerialNumberToOUI(MAC));
 		if(Manufacturer != OUIs_.end())
 			return Manufacturer->second;

src/OUIServer.h

@@ -5,9 +5,9 @@
 #ifndef UCENTRALGW_OUISERVER_H
 #define UCENTRALGW_OUISERVER_H
 
-#include "framework/MicroService.h"
+#include "SubSystemServer.h"
 
-namespace OpenWifi {
+namespace uCentral {
 
 	class OUIServer : public SubSystemServer {
 	  public:
@@ -15,15 +15,14 @@ namespace OpenWifi {
 		typedef std::map<uint64_t,std::string>	OUIMap;
 
 		static OUIServer *instance() {
-		    static OUIServer *instance_ = new OUIServer;
+			if (instance_ == nullptr) {
+				instance_ = new OUIServer;
+			}
 			return instance_;
 		}
 
 		int Start() override;
 		void Stop() override;
-
-		void reinitialize(Poco::Util::Application &self) override;
-
 		void Update();
 		void UpdateImpl();
 		[[nodiscard]] std::string GetManufacturer(const std::string &MAC);
@@ -31,6 +30,7 @@ namespace OpenWifi {
 		[[nodiscard]] bool ProcessFile(const std::string &FileName, OUIMap &Map);
 
 	  private:
+		static OUIServer 	* instance_;
 		uint64_t 			LastUpdate_ = 0 ;
 		bool 				ValidFile_=false;
 		OUIMap 				OUIs_;

src/OpenAPIRequest.cpp

@@ -0,0 +1,68 @@
+//
+// Created by stephane bourque on 2021-07-01.
+//
+#include <iostream>
+
+#include "OpenAPIRequest.h"
+
+#include "Poco/Net/HTTPSClientSession.h"
+#include <Poco/Net/HTTPClientSession.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/Net/HTTPResponse.h>
+#include <Poco/StreamCopier.h>
+#include <Poco/JSON/Parser.h>
+#include <Poco/Path.h>
+#include <Poco/URI.h>
+#include <Poco/Exception.h>
+#include "Utils.h"
+#include "Daemon.h"
+
+namespace uCentral {
+
+	OpenAPIRequestGet::OpenAPIRequestGet( 	const std::string & ServiceType,
+											const std::string & EndPoint,
+									 		Types::StringPairVec & QueryData,
+											uint64_t msTimeout):
+ 		Type_(ServiceType),
+ 		EndPoint_(EndPoint),
+		QueryData_(QueryData),
+		msTimeout_(msTimeout) {
+
+	}
+
+	int OpenAPIRequestGet::Do(Poco::JSON::Object::Ptr &ResponseObject) {
+		try {
+			auto Services = Daemon()->GetServices(Type_);
+			for(auto const &Svc:Services) {
+				Poco::URI	URI(Svc.PrivateEndPoint);
+				Poco::Net::HTTPSClientSession Session(URI.getHost(), URI.getPort());
+
+				URI.setPath(EndPoint_);
+				for (const auto &qp : QueryData_)
+					URI.addQueryParameter(qp.first, qp.second);
+
+				std::string Path(URI.getPathAndQuery());
+				Session.setTimeout(Poco::Timespan(5, 0));
+
+				Poco::Net::HTTPRequest Request(Poco::Net::HTTPRequest::HTTP_GET,
+											   Path,
+											   Poco::Net::HTTPMessage::HTTP_1_1);
+				Request.add("X-API-KEY", Svc.AccessKey);
+				Session.sendRequest(Request);
+
+				Poco::Net::HTTPResponse Response;
+				std::istream &is = Session.receiveResponse(Response);
+				if(Response.getStatus()==Poco::Net::HTTPResponse::HTTP_OK) {
+					Poco::JSON::Parser	P;
+					ResponseObject = P.parse(is).extract<Poco::JSON::Object::Ptr>();
+				}
+				return Response.getStatus();
+			}
+		}
+		catch (const Poco::Exception &E)
+		{
+			std::cerr << E.displayText() << std::endl;
+		}
+		return -1;
+	}
+}

src/OpenAPIRequest.h

@@ -0,0 +1,29 @@
+//
+// Created by stephane bourque on 2021-07-01.
+//
+
+#ifndef UCENTRALGW_OPENAPIREQUEST_H
+#define UCENTRALGW_OPENAPIREQUEST_H
+
+#include "Poco/JSON/Object.h"
+
+#include "uCentralTypes.h"
+
+namespace uCentral {
+
+	class OpenAPIRequestGet {
+	  public:
+		explicit OpenAPIRequestGet( const std::string & Type,
+								   	const std::string & EndPoint,
+									Types::StringPairVec & QueryData,
+									uint64_t msTimeout);
+		int Do(Poco::JSON::Object::Ptr &ResponseObject);
+	  private:
+		std::string 			Type_;
+		std::string 			EndPoint_;
+		Types::StringPairVec 	QueryData_;
+		uint64_t 				msTimeout_;
+	};
+}
+
+#endif // UCENTRALGW_OPENAPIREQUEST_H

src/RESTAPI/RESTAPI_RPC.cpp

@@ -1,118 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-28.
-//
-#include <cctype>
-#include <algorithm>
-#include <iostream>
-#include <iterator>
-#include <future>
-#include <numeric>
-#include <chrono>
-#include "RESTAPI_RPC.h"
-
-#include "CommandManager.h"
-#include "DeviceRegistry.h"
-#include "StorageService.h"
-#include "framework/uCentral_Protocol.h"
-
-namespace OpenWifi::RESTAPI_RPC {
-	void SetCommandStatus(GWObjects::CommandDetails &Cmd,
-							 Poco::Net::HTTPServerRequest &Request,
-							 Poco::Net::HTTPServerResponse &Response,
-					  		 RESTAPIHandler *Handler,
-					  		 OpenWifi::Storage::CommandExecutionType Status,
-							 Poco::Logger &Logger) {
-		if (StorageService()->AddCommand(Cmd.SerialNumber, Cmd, Status)) {
-			Poco::JSON::Object RetObj;
-			Cmd.to_json(RetObj);
-			Handler->ReturnObject(RetObj);
-			return;
-		} else {
-			Handler->ReturnStatus(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
-			return;
-		}
-	}
-
-	void WaitForCommand(GWObjects::CommandDetails &Cmd,
-						Poco::JSON::Object  & Params,
-						Poco::Net::HTTPServerRequest &Request,
-						Poco::Net::HTTPServerResponse &Response,
-						int64_t WaitTimeInMs,
-						Poco::JSON::Object * ObjectToReturn,
-						RESTAPIHandler * Handler,
-						Poco::Logger &Logger) {
-
-		// 	if the command should be executed in the future, or if the device is not connected, then we should just add the command to
-		//	the DB and let it figure out when to deliver the command.
-		if(Cmd.RunAt || !DeviceRegistry()->Connected(Cmd.SerialNumber)) {
-			SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_PENDING, Logger);
-			return;
-		}
-
-		Cmd.Executed = std::time(nullptr);
-
-		uint64_t RPC_Id=0;
-		if (CommandManager()->SendCommand(Cmd.SerialNumber, Cmd.Command, Params, Cmd.UUID, RPC_Id)) {
-			CommandTag T;
-			while (CommandManager()->Running() && WaitTimeInMs > 0) {
-				if (CommandManager()->GetCommand(RPC_Id, Cmd.SerialNumber, T)) {
-					auto Answer = T.Result;
-					if (Answer->has("result") && Answer->isObject("result")) {
-						auto ResultFields =
-							Answer->get("result").extract<Poco::JSON::Object::Ptr>();
-						if (ResultFields->has("status") && ResultFields->isObject("status")) {
-							auto StatusInnerObj =
-								ResultFields->get("status").extract<Poco::JSON::Object::Ptr>();
-							if (StatusInnerObj->has("error"))
-								Cmd.ErrorCode = StatusInnerObj->get("error");
-							if (StatusInnerObj->has("text"))
-								Cmd.ErrorText = StatusInnerObj->get("text").toString();
-							std::stringstream ResultText;
-							Poco::JSON::Stringifier::stringify(Answer->get("result"), ResultText);
-							Cmd.Results = ResultText.str();
-							Cmd.Status = "completed";
-							Cmd.Completed = time(nullptr);
-
-							if (Cmd.ErrorCode && Cmd.Command == uCentralProtocol::TRACE) {
-								Cmd.WaitingForFile = 0;
-								Cmd.AttachDate = Cmd.AttachSize = 0;
-								Cmd.AttachType = "";
-							}
-
-							//	Add the completed command to the database...
-							StorageService()->AddCommand(Cmd.SerialNumber, Cmd,
-												  Storage::COMMAND_COMPLETED);
-
-							if (ObjectToReturn) {
-								Handler->ReturnObject(*ObjectToReturn);
-							} else {
-								Poco::JSON::Object O;
-								Cmd.to_json(O);
-								Handler->ReturnObject(O);
-							}
-							return;
-						} else {
-							SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_FAILED, Logger);
-							Logger.information(Poco::format("Invalid response for command '%s'. Missing status.", Cmd.UUID));
-							return;
-						}
-					} else {
-						SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_FAILED, Logger);
-						Logger.information(Poco::format("Invalid response for command '%s'. Missing result.", Cmd.UUID));
-						return;
-					}
-				} else {
-					Poco::Thread::trySleep(100);
-					WaitTimeInMs -= 100;
-				}
-			}
-			if(WaitTimeInMs<0)
-				SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_TIMEDOUT, Logger);
-			else
-				SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_PENDING, Logger);
-		} else {
-			SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_PENDING, Logger);
-		}
-	}
-
-}

src/RESTAPI/RESTAPI_TelemetryWebSocket.cpp

@@ -1,48 +0,0 @@
-//
-// Created by stephane bourque on 2021-09-16.
-//
-
-#include "RESTAPI_TelemetryWebSocket.h"
-#include "Poco/Net/WebSocket.h"
-#include "Poco/Net/NetException.h"
-#include "TelemetryStream.h"
-
-namespace OpenWifi {
-
-void RESTAPI_TelemetryWebSocket::DoGet() {
-		//	try and upgrade this session to websocket...
-		if (Request->find("Upgrade") != Request->end() &&
-			Poco::icompare((*Request)["Upgrade"], "websocket") == 0) {
-			try {
-				Poco::URI U(Request->getURI());
-				std::string UUID, SerialNumber;
-				auto Parameters = U.getQueryParameters();
-				for (const auto &i : Parameters) {
-					if (i.first == "serialNumber") {
-						SerialNumber = i.second;
-					} else if(i.first=="uuid") {
-						UUID = i.second;
-					}
-				}
-				auto WS = Poco::SharedPtr<Poco::Net::WebSocket>( new Poco::Net::WebSocket(*Request, *Response));
-				new TelemetryClient(UUID, SerialNumber, WS, TelemetryStream()->NextReactor(), Logger_);
-			} catch (const Poco::Net::WebSocketException &E) {
-				Logger_.log(E);
-				switch (E.code()) {
-				case Poco::Net::WebSocket::WS_ERR_HANDSHAKE_UNSUPPORTED_VERSION:
-					Response->set("Sec-WebSocket-Version", Poco::Net::WebSocket::WEBSOCKET_VERSION);
-				// fallthrough
-				case Poco::Net::WebSocket::WS_ERR_NO_HANDSHAKE:
-				case Poco::Net::WebSocket::WS_ERR_HANDSHAKE_NO_VERSION:
-				case Poco::Net::WebSocket::WS_ERR_HANDSHAKE_NO_KEY:
-					Response->setStatusAndReason(Poco::Net::HTTPResponse::HTTP_BAD_REQUEST);
-					Response->setContentLength(0);
-					Response->send();
-					break;
-				}
-			} catch (const Poco::Exception &E) {
-				Logger_.log(E);
-			}
-		}
-	}
-}

src/RESTAPI/RESTAPI_TelemetryWebSocket.h

@@ -1,28 +0,0 @@
-//
-// Created by stephane bourque on 2021-09-16.
-//
-
-#ifndef OWGW_RESTAPI_TELEMETRYWEBSOCKET_H
-#define OWGW_RESTAPI_TELEMETRYWEBSOCKET_H
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-class RESTAPI_TelemetryWebSocket : public RESTAPIHandler {
-  public:
-	RESTAPI_TelemetryWebSocket(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, bool Internal)
-	: RESTAPIHandler(bindings, L,
-					 std::vector<std::string>{	Poco::Net::HTTPRequest::HTTP_GET,
-												  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-												  Server, Internal,false) {}
-												  static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/ws_telemetry"};}
-  	void DoGet() final;
-	void DoDelete() final {};
-	void DoPost() final {};
-	void DoPut() final {};
-  private:
-	void Process(const Poco::JSON::Object::Ptr &O, std::string &Answer);
-};
-}
-
-#endif // OWGW_RESTAPI_TELEMETRYWEBSOCKET_H

src/RESTAPI/RESTAPI_blacklist.cpp

@@ -1,120 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include <ctime>
-
-#include "Poco/JSON/Parser.h"
-#include "Poco/JSON/Stringifier.h"
-#include "RESTAPI_blacklist.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_errors.h"
-#include "framework/RESTAPI_protocol.h"
-
-namespace OpenWifi {
-	void RESTAPI_blacklist::DoDelete() {
-		auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-
-		if(SerialNumber.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-		}
-
-		GWObjects::BlackListedDevice	D;
-		if(!StorageService()->GetBlackListDevice(SerialNumber, D)) {
-			return NotFound();
-		}
-
-		if (StorageService()->DeleteBlackListDevice(SerialNumber)) {
-			return OK();
-		}
-		BadRequest(RESTAPI::Errors::CouldNotBeDeleted);
-	}
-
-	void RESTAPI_blacklist::DoGet() {
-		auto SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-
-		if(SerialNumber.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-		}
-
-		GWObjects::BlackListedDevice	D;
-		if(!StorageService()->GetBlackListDevice(SerialNumber, D)) {
-			return NotFound();
-		}
-
-		Poco::JSON::Object	Answer;
-		D.to_json(Answer);
-		return ReturnObject(Answer);
-	}
-
-	void RESTAPI_blacklist::DoPost() {
-		auto Obj = ParseStream();
-
-		GWObjects::BlackListedDevice	D;
-		if(!D.from_json(Obj)) {
-			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-		}
-
-		if(D.serialNumber.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-		}
-
-		Poco::toLowerInPlace(D.serialNumber);
-		if(StorageService()->IsBlackListed(D.serialNumber)) {
-			return BadRequest(RESTAPI::Errors::SerialNumberExists);
-		}
-
-		D.author = UserInfo_.userinfo.email;
-		D.created = std::time(nullptr);
-
-		if(StorageService()->AddBlackListDevice(D)) {
-			GWObjects::BlackListedDevice	CreatedDevice;
-
-			StorageService()->GetBlackListDevice(D.serialNumber,CreatedDevice);
-			Poco::JSON::Object	Answer;
-
-			CreatedDevice.to_json(Answer);
-			return ReturnObject(Answer);
-		}
-		return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-	}
-
-	void RESTAPI_blacklist::DoPut() {
-		auto SerialNumber = Poco::toLower(GetBinding(RESTAPI::Protocol::SERIALNUMBER, ""));
-
-		if(SerialNumber.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-		}
-
-		auto Obj = ParseStream();
-
-		GWObjects::BlackListedDevice	Existing;
-		if(!StorageService()->GetBlackListDevice(SerialNumber, Existing)) {
-			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-		}
-
-		GWObjects::BlackListedDevice	NewDevice;
-		if(!NewDevice.from_json(Obj)) {
-			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-		}
-
-		Existing.reason = NewDevice.reason;
-		Existing.author = UserInfo_.userinfo.email;
-
-		if(StorageService()->UpdateBlackListDevice(SerialNumber, Existing)) {
-			GWObjects::BlackListedDevice	CreatedDevice;
-
-			StorageService()->GetBlackListDevice(SerialNumber,CreatedDevice);
-			Poco::JSON::Object	Answer;
-
-			CreatedDevice.to_json(Answer);
-			return ReturnObject(Answer);
-		}
-		return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-	}
-
-}

src/RESTAPI/RESTAPI_blacklist_list.cpp

@@ -1,28 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-14.
-//
-
-#include "RESTAPI_blacklist_list.h"
-#include "Poco/JSON/Parser.h"
-#include "Poco/JSON/Stringifier.h"
-#include "StorageService.h"
-
-namespace OpenWifi {
-	void RESTAPI_blacklist_list::DoGet() {
-
-		std::vector<GWObjects::BlackListedDevice>	Devices;
-
-		Poco::JSON::Array	Arr;
-		Poco::JSON::Object	Answer;
-
-		if(StorageService()->GetBlackListDevices(QB_.Offset, QB_.Limit, Devices)) {
-			for(const auto &i:Devices) {
-				Poco::JSON::Object O;
-				i.to_json(O);
-				Arr.add(O);
-			}
-		}
-		Answer.set("devices", Arr);
-		return ReturnObject(Answer);
-	}
-}

src/RESTAPI/RESTAPI_blacklist_list.h

@@ -1,27 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-14.
-//
-
-#ifndef UCENTRALGW_RESTAPI_BLACKLIST_LIST_H
-#define UCENTRALGW_RESTAPI_BLACKLIST_LIST_H
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-	class RESTAPI_blacklist_list : public RESTAPIHandler {
-	  public:
-		RESTAPI_blacklist_list(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
-		: RESTAPIHandler(bindings, L,
-						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
-												  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-												  Server,
-												  Internal) {}
-												  static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/blacklist"};}
-		void DoGet() final;
-		void DoDelete() final {};
-		void DoPost() final {};
-		void DoPut() final {};
-	};
-}
-
-#endif // UCENTRALGW_RESTAPI_BLACKLIST_LIST_H

src/RESTAPI/RESTAPI_capabilities_handler.cpp

@@ -1,28 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-17.
-//
-
-#include "RESTAPI_capabilities_handler.h"
-#include "StorageService.h"
-
-namespace OpenWifi {
-
-	void RESTAPI_capabilities_handler::DoGet() {
-		Storage::DeviceCapabilitiesCache	DevCaps;
-
-		StorageService()->GetDeviceCapabilitiesCache(DevCaps);
-		Poco::JSON::Array	ObjArr;
-		for(const auto &[deviceType,capabilities]:DevCaps) {
-			Poco::JSON::Object	Inner;
-			Inner.set("deviceType",deviceType);
-			Poco::JSON::Parser	P;
-			auto R = P.parse(capabilities).extract<Poco::JSON::Object::Ptr>();
-			Inner.set("capabilities", R);
-			ObjArr.add(Inner);
-		}
-		Poco::JSON::Object	Answer;
-
-		Answer.set("devices",ObjArr);
-		return ReturnObject(Answer);
-	}
-}

src/RESTAPI/RESTAPI_capabilities_handler.h

@@ -1,26 +0,0 @@
-//
-// Created by stephane bourque on 2021-10-17.
-//
-
-#ifndef UCENTRALGW_RESTAPI_CAPABILITIES_HANDLER_H
-#define UCENTRALGW_RESTAPI_CAPABILITIES_HANDLER_H
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-	class RESTAPI_capabilities_handler : public RESTAPIHandler {
-	  public:
-		RESTAPI_capabilities_handler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
-		: RESTAPIHandler(bindings, L,
-						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
-												  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-												  Server,
-												  Internal) {}
-												  static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/capabilities"};}
-		void DoGet() final;
-		void DoDelete() final {};
-		void DoPost() final {};
-		void DoPut() final {};
-	};
-}
-#endif // UCENTRALGW_RESTAPI_CAPABILITIES_HANDLER_H

src/RESTAPI/RESTAPI_command.cpp

@@ -1,44 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include "RESTAPI_command.h"
-
-#include "StorageService.h"
-#include "framework/RESTAPI_errors.h"
-#include "framework/RESTAPI_protocol.h"
-
-namespace OpenWifi {
-	void RESTAPI_command::DoGet() {
-		auto CommandUUID = GetBinding(RESTAPI::Protocol::COMMANDUUID, "");
-		GWObjects::CommandDetails Command;
-		if (StorageService()->GetCommand(CommandUUID, Command)) {
-			Poco::JSON::Object RetObj;
-			Command.to_json(RetObj);
-			return ReturnObject(RetObj);
-		}
-		return NotFound();
-	}
-
-	void RESTAPI_command::DoDelete() {
-		auto UUID = GetBinding(RESTAPI::Protocol::COMMANDUUID, "");
-
-		if(UUID.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingUUID);
-		}
-
-		GWObjects::CommandDetails	C;
-		if(!StorageService()->GetCommand(UUID, C)) {
-			return NotFound();
-		}
-
-		if (StorageService()->DeleteCommand(UUID)) {
-			return OK();
-		}
-		return InternalError();
-	}
-}

src/RESTAPI/RESTAPI_commands.cpp

@@ -1,46 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include "RESTAPI_commands.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_errors.h"
-#include "framework/RESTAPI_protocol.h"
-
-namespace OpenWifi {
-	void RESTAPI_commands::DoGet() {
-		auto SerialNumber = GetParameter(RESTAPI::Protocol::SERIALNUMBER, "");
-		std::vector<GWObjects::CommandDetails> Commands;
-		if (QB_.Newest) {
-			StorageService()->GetNewestCommands(SerialNumber, QB_.Limit, Commands);
-		} else {
-			StorageService()->GetCommands(SerialNumber, QB_.StartDate, QB_.EndDate, QB_.Offset, QB_.Limit,
-								   Commands);
-		}
-		Poco::JSON::Array ArrayObj;
-		for (const auto &i : Commands) {
-			Poco::JSON::Object Obj;
-			i.to_json(Obj);
-			ArrayObj.add(Obj);
-		}
-		Poco::JSON::Object RetObj;
-		RetObj.set(RESTAPI::Protocol::COMMANDS, ArrayObj);
-		ReturnObject(RetObj);
-	}
-
-	void RESTAPI_commands::DoDelete() {
-		auto SerialNumber = GetParameter(RESTAPI::Protocol::SERIALNUMBER, "");
-
-		if(SerialNumber.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-		}
-		if (StorageService()->DeleteCommands(SerialNumber, QB_.StartDate, QB_.EndDate)) {
-			return OK();
-		}
-		InternalError();
-	}
-}

src/RESTAPI/RESTAPI_default_configuration.cpp

@@ -1,76 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include "Poco/JSON/Parser.h"
-
-#include "RESTAPI_default_configuration.h"
-
-#include "RESTObjects/RESTAPI_GWobjects.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_errors.h"
-#include "framework/RESTAPI_protocol.h"
-
-namespace OpenWifi {
-	void RESTAPI_default_configuration::DoGet() {
-		std::string Name = GetBinding(RESTAPI::Protocol::NAME, "");
-		GWObjects::DefaultConfiguration DefConfig;
-		if (StorageService()->GetDefaultConfiguration(Name, DefConfig)) {
-			Poco::JSON::Object Obj;
-			DefConfig.to_json(Obj);
-			return ReturnObject(Obj);
-		}
-		NotFound();
-	}
-
-	void RESTAPI_default_configuration::DoDelete() {
-		std::string Name = GetBinding(RESTAPI::Protocol::NAME, "");
-		if(Name.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		if (StorageService()->DeleteDefaultConfiguration(Name)) {
-			return OK();
-		}
-		BadRequest(RESTAPI::Errors::CouldNotBeDeleted);
-	}
-
-	void RESTAPI_default_configuration::DoPost() {
-		std::string Name = GetBinding(RESTAPI::Protocol::NAME, "");
-
-		if(Name.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		auto Obj = ParseStream();
-		GWObjects::DefaultConfiguration DefConfig;
-		if (!DefConfig.from_json(Obj)) {
-			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-		}
-
-		if (StorageService()->CreateDefaultConfiguration(Name, DefConfig)) {
-			return OK();
-		}
-		BadRequest(RESTAPI::Errors::RecordNotCreated);
-	}
-
-	void RESTAPI_default_configuration::DoPut() {
-		std::string Name = GetBinding(RESTAPI::Protocol::NAME, "");
-
-		auto  Obj = ParseStream();
-			GWObjects::DefaultConfiguration DefConfig;
-
-		if (!DefConfig.from_json(Obj)) {
-			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-		}
-
-		if (StorageService()->UpdateDefaultConfiguration(Name, DefConfig)) {
-			return OK();
-		}
-		BadRequest(RESTAPI::Errors::RecordNotUpdated);
-	}
-}

src/RESTAPI/RESTAPI_default_configurations.cpp

@@ -1,32 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include "Poco/Array.h"
-#include "Poco/JSON/Stringifier.h"
-
-#include "RESTAPI_default_configurations.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_protocol.h"
-
-namespace OpenWifi {
-	void RESTAPI_default_configurations::DoGet() {
-		std::vector<GWObjects::DefaultConfiguration> DefConfigs;
-		StorageService()->GetDefaultConfigurations(QB_.Offset, QB_.Limit, DefConfigs);
-
-		Poco::JSON::Array Objects;
-		for (const auto &i : DefConfigs) {
-			Poco::JSON::Object Obj;
-			i.to_json(Obj);
-			Objects.add(Obj);
-		}
-
-		Poco::JSON::Object RetObj;
-		RetObj.set(RESTAPI::Protocol::CONFIGURATIONS, Objects);
-		ReturnObject(RetObj);
-	}
-}

src/RESTAPI/RESTAPI_deviceDashboardHandler.cpp

@@ -1,16 +0,0 @@
-//
-// Created by stephane bourque on 2021-07-21.
-//
-
-#include "RESTAPI_deviceDashboardHandler.h"
-#include "Daemon.h"
-#include "Dashboard.h"
-
-namespace OpenWifi {
-	void RESTAPI_deviceDashboardHandler::DoGet() {
-		Daemon()->GetDashboard().Create();
-		Poco::JSON::Object	Answer;
-		Daemon()->GetDashboard().Report().to_json(Answer);
-		ReturnObject(Answer);
-	}
-}

src/RESTAPI/RESTAPI_device_commandHandler.cpp

@@ -1,816 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include <chrono>
-#include <algorithm>
-
-#include "Poco/UUIDGenerator.h"
-#include "Poco/JSON/Parser.h"
-
-#include "CentralConfig.h"
-#include "DeviceRegistry.h"
-#include "FileUploader.h"
-#include "RESTObjects/RESTAPI_GWobjects.h"
-#include "RESTAPI_device_commandHandler.h"
-#include "StorageService.h"
-#include "RESTAPI_RPC.h"
-#include "CommandManager.h"
-#include "TelemetryStream.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/uCentral_Protocol.h"
-#include "framework/KafkaTopics.h"
-#include "framework/RESTAPI_errors.h"
-
-namespace OpenWifi {
-
-	void RESTAPI_device_commandHandler::DoGet() {
-		if(!ValidateParameters()) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		GWObjects::Device	TheDevice;
-		if(!StorageService()->GetDevice(SerialNumber_,TheDevice)) {
-			return NotFound();
-		}
-
-		if (Command_ == RESTAPI::Protocol::CAPABILITIES){
-			return GetCapabilities();
-		} else if (Command_ == RESTAPI::Protocol::LOGS) {
-			return GetLogs();
-		} else if (Command_ == RESTAPI::Protocol::HEALTHCHECKS) {
-			return GetChecks();
-		} else if (Command_ == RESTAPI::Protocol::STATISTICS) {
-			return GetStatistics();
-		} else if (Command_ == RESTAPI::Protocol::STATUS) {
-			return GetStatus();
-		} else if (Command_ == RESTAPI::Protocol::RTTY) {
-			return Rtty();
-		} else {
-			return BadRequest(RESTAPI::Errors::InvalidCommand);
-		}
-	}
-
-
-	void RESTAPI_device_commandHandler::DoDelete() {
-		if(!ValidateParameters()) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		GWObjects::Device	TheDevice;
-		if(!StorageService()->GetDevice(SerialNumber_,TheDevice)) {
-			return NotFound();
-		}
-
-		if (Command_ == RESTAPI::Protocol::CAPABILITIES) {
-			return DeleteCapabilities();
-		} else if (Command_ == RESTAPI::Protocol::LOGS){
-			return DeleteLogs();
-		} else if (Command_ == RESTAPI::Protocol::HEALTHCHECKS){
-			return DeleteChecks();
-		} else if (Command_ == RESTAPI::Protocol::STATISTICS) {
-			return DeleteStatistics();
-		} else {
-			return BadRequest(RESTAPI::Errors::InvalidCommand);
-		}
-	}
-
-	void RESTAPI_device_commandHandler::DoPost() {
-		if(!ValidateParameters()) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		GWObjects::Device	TheDevice;
-		if(!StorageService()->GetDevice(SerialNumber_,TheDevice)) {
-			return NotFound();
-		}
-
-		if (Command_ == RESTAPI::Protocol::PERFORM) {
-			return ExecuteCommand();
-		} else if (Command_ == RESTAPI::Protocol::CONFIGURE) {
-			return Configure();
-		} else if (Command_ == RESTAPI::Protocol::UPGRADE) {
-			return Upgrade();
-		} else if (Command_ == RESTAPI::Protocol::REBOOT) {
-			return Reboot();
-		} else if (Command_ == RESTAPI::Protocol::FACTORY) {
-			return Factory();
-		} else if (Command_ == RESTAPI::Protocol::LEDS) {
-			return LEDs();
-		} else if (Command_ == RESTAPI::Protocol::TRACE) {
-			return Trace();
-		} else if (Command_ == RESTAPI::Protocol::REQUEST) {
-			return MakeRequest();
-		} else if (Command_ == RESTAPI::Protocol::WIFISCAN) {
-			return WifiScan();
-		} else if (Command_ == RESTAPI::Protocol::EVENTQUEUE) {
-			return EventQueue();
-		} else if (Command_ == RESTAPI::Protocol::TELEMETRY) {
-			return Telemetry();
-		} else {
-			return BadRequest(RESTAPI::Errors::InvalidCommand);
-		}
-	}
-
-void RESTAPI_device_commandHandler::GetCapabilities() {
-	GWObjects::Capabilities Caps;
-	if (StorageService()->GetDeviceCapabilities(SerialNumber_, Caps)) {
-		Poco::JSON::Object RetObj;
-		Caps.to_json(RetObj);
-		RetObj.set(RESTAPI::Protocol::SERIALNUMBER, SerialNumber_);
-		return ReturnObject(RetObj);
-	}
-	NotFound();
-}
-
-void RESTAPI_device_commandHandler::DeleteCapabilities() {
-	Logger_.information(Poco::format("DELETE-CAPABILITIES: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	if (StorageService()->DeleteDeviceCapabilities(SerialNumber_)) {
-		return OK();
-	}
-	NotFound();
-}
-
-void RESTAPI_device_commandHandler::GetStatistics() {
-	if (QB_.Lifetime) {
-		std::string Stats;
-		StorageService()->GetLifetimeStats(SerialNumber_, Stats);
-		Poco::JSON::Parser P;
-		if (Stats.empty())
-			Stats = uCentralProtocol::EMPTY_JSON_DOC;
-		auto Obj = P.parse(Stats).extract<Poco::JSON::Object::Ptr>();
-		return ReturnObject(*Obj);
-	} else if (QB_.LastOnly) {
-		std::string Stats;
-		if (DeviceRegistry()->GetStatistics(SerialNumber_, Stats)) {
-			Poco::JSON::Parser P;
-			if (Stats.empty())
-				Stats = uCentralProtocol::EMPTY_JSON_DOC;
-			auto Obj = P.parse(Stats).extract<Poco::JSON::Object::Ptr>();
-			return ReturnObject(*Obj);
-		} else {
-			return NotFound();
-		}
-	} else {
-		std::vector<GWObjects::Statistics> Stats;
-		if (QB_.Newest) {
-			StorageService()->GetNewestStatisticsData(SerialNumber_, QB_.Limit, Stats);
-		} else {
-			StorageService()->GetStatisticsData(SerialNumber_, QB_.StartDate, QB_.EndDate,
-												 QB_.Offset, QB_.Limit, Stats);
-		}
-		Poco::JSON::Array ArrayObj;
-		for (auto i : Stats) {
-			Poco::JSON::Object Obj;
-			i.to_json(Obj);
-			ArrayObj.add(Obj);
-		}
-		Poco::JSON::Object RetObj;
-		RetObj.set(RESTAPI::Protocol::DATA, ArrayObj);
-		RetObj.set(RESTAPI::Protocol::SERIALNUMBER, SerialNumber_);
-		return ReturnObject(RetObj);
-	}
-}
-
-void RESTAPI_device_commandHandler::DeleteStatistics() {
-	Logger_.information(Poco::format("DELETE-STATISTICS: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	if (QB_.Lifetime) {
-		if (StorageService()->ResetLifetimeStats(SerialNumber_)) {
-			return OK();
-		}
-	} else {
-		if (StorageService()->DeleteStatisticsData(SerialNumber_, QB_.StartDate, QB_.EndDate)) {
-			return OK();
-		}
-	}
-	NotFound();
-}
-
-void RESTAPI_device_commandHandler::GetStatus() {
-	GWObjects::ConnectionState State;
-
-	if (DeviceRegistry()->GetState(SerialNumber_, State)) {
-		Poco::JSON::Object RetObject;
-		State.to_json(RetObject);
-		return ReturnObject(RetObject);
-	}
-	NotFound();
-}
-
-void RESTAPI_device_commandHandler::Configure() {
-	//  get the configuration from the body of the message
-	Logger_.information(Poco::format("CONFIGURE: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	auto Obj = ParseStream();
-	if (Obj->has(RESTAPI::Protocol::SERIALNUMBER) &&
-		Obj->has(RESTAPI::Protocol::UUID) &&
-		Obj->has(RESTAPI::Protocol::CONFIGURATION)) {
-
-		auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-		if (SerialNumber_ != SNum) {
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
-		auto Configuration = GetS(RESTAPI::Protocol::CONFIGURATION, Obj,uCentralProtocol::EMPTY_JSON_DOC);
-		auto When = GetWhen(Obj);
-		uint64_t NewUUID;
-		if (StorageService()->UpdateDeviceConfiguration(SerialNumber_, Configuration, NewUUID)) {
-			GWObjects::CommandDetails Cmd;
-
-			Cmd.SerialNumber = SerialNumber_;
-			Cmd.UUID = MicroService::CreateUUID();
-			Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-			Cmd.Command = uCentralProtocol::CONFIGURE;
-			Cmd.RunAt = When;
-
-			Config::Config Cfg(Configuration);
-
-			Poco::JSON::Object Params;
-			Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-			Params.set(uCentralProtocol::UUID, NewUUID);
-			Params.set(uCentralProtocol::WHEN, When);
-			Params.set(uCentralProtocol::CONFIG, Cfg.to_json());
-			std::stringstream ParamStream;
-			Params.stringify(ParamStream);
-			Cmd.Details = ParamStream.str();
-
-			DeviceRegistry()->SetPendingUUID(SerialNumber_, NewUUID);
-			return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, nullptr, this, Logger_);
-		}
-		return BadRequest(RESTAPI::Errors::RecordNotUpdated);
-	}
-	BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-}
-
-void RESTAPI_device_commandHandler::Upgrade() {
-	Logger_.information(Poco::format("UPGRADE: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	auto Obj = ParseStream();
-
-	if (Obj->has(RESTAPI::Protocol::URI) &&
-		Obj->has(RESTAPI::Protocol::SERIALNUMBER)) {
-
-		auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-		if (SerialNumber_ != SNum) {
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
-		auto URI = GetS(RESTAPI::Protocol::URI, Obj);
-		auto When = GetWhen(Obj);
-
-		GWObjects::CommandDetails Cmd;
-
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = MicroService::CreateUUID();
-		Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-		Cmd.Command = uCentralProtocol::UPGRADE;
-		Cmd.RunAt = When;
-
-		Poco::JSON::Object Params;
-
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::URI, URI);
-		Params.set(uCentralProtocol::WHEN, When);
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-		Cmd.Details = ParamStream.str();
-
-		return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, nullptr, this, Logger_);
-	}
-	BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-}
-
-void RESTAPI_device_commandHandler::GetLogs() {
-	std::vector<GWObjects::DeviceLog> Logs;
-	if (QB_.Newest) {
-		StorageService()->GetNewestLogData(SerialNumber_, QB_.Limit, Logs, QB_.LogType);
-	} else {
-		StorageService()->GetLogData(SerialNumber_, QB_.StartDate, QB_.EndDate, QB_.Offset,
-									  QB_.Limit, Logs, QB_.LogType);
-	}
-
-	Poco::JSON::Array ArrayObj;
-	for (auto i : Logs) {
-		Poco::JSON::Object Obj;
-		i.to_json(Obj);
-		ArrayObj.add(Obj);
-	}
-	Poco::JSON::Object RetObj;
-	RetObj.set(RESTAPI::Protocol::VALUES, ArrayObj);
-	RetObj.set(RESTAPI::Protocol::SERIALNUMBER, SerialNumber_);
-	ReturnObject(RetObj);
-}
-
-void RESTAPI_device_commandHandler::DeleteLogs() {
-	Logger_.information(Poco::format("DELETE-LOGS: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	if (StorageService()->DeleteLogData(SerialNumber_, QB_.StartDate, QB_.EndDate,
-										 QB_.LogType)) {
-		return OK();
-	}
-	BadRequest(RESTAPI::Errors::NoRecordsDeleted);
-}
-
-void RESTAPI_device_commandHandler::GetChecks() {
-	std::vector<GWObjects::HealthCheck> Checks;
-
-	if (QB_.LastOnly) {
-		GWObjects::HealthCheck	HC;
-		if (DeviceRegistry()->GetHealthcheck(SerialNumber_, HC)) {
-			Poco::JSON::Object	Answer;
-			HC.to_json(Answer);
-			return ReturnObject(Answer);
-		} else {
-			return NotFound();
-		}
-	} else {
-		if (QB_.Newest) {
-			StorageService()->GetNewestHealthCheckData(SerialNumber_, QB_.Limit, Checks);
-		} else {
-			StorageService()->GetHealthCheckData(SerialNumber_, QB_.StartDate, QB_.EndDate,
-												  QB_.Offset, QB_.Limit, Checks);
-		}
-
-		Poco::JSON::Array ArrayObj;
-		for (auto i : Checks) {
-			Poco::JSON::Object Obj;
-			i.to_json(Obj);
-			ArrayObj.add(Obj);
-		}
-
-		Poco::JSON::Object RetObj;
-		RetObj.set(RESTAPI::Protocol::VALUES, ArrayObj);
-		RetObj.set(RESTAPI::Protocol::SERIALNUMBER, SerialNumber_);
-		ReturnObject(RetObj);
-	}
-}
-
-void RESTAPI_device_commandHandler::DeleteChecks() {
-	Logger_.information(Poco::format("DELETE-HEALTHCHECKS: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	if (StorageService()->DeleteHealthCheckData(SerialNumber_, QB_.StartDate, QB_.EndDate)) {
-		return OK();
-	}
-	BadRequest(RESTAPI::Errors::NoRecordsDeleted);
-}
-
-void RESTAPI_device_commandHandler::ExecuteCommand() {
-	Logger_.information(Poco::format("EXECUTE: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	auto Obj = ParseStream();
-	if (Obj->has(RESTAPI::Protocol::COMMAND) &&
-		Obj->has(RESTAPI::Protocol::SERIALNUMBER) &&
-		Obj->has(RESTAPI::Protocol::PAYLOAD)) {
-
-		auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-		if (SerialNumber_ != SNum) {
-			return BadRequest("Missing serial number.");
-		}
-
-		auto Command = GetS(RESTAPI::Protocol::COMMAND, Obj);
-		auto Payload = GetS(RESTAPI::Protocol::PAYLOAD, Obj);
-		auto When = GetWhen(Obj);
-
-		GWObjects::CommandDetails Cmd;
-
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = MicroService::CreateUUID();
-		Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-		Cmd.Command = Command;
-		Cmd.Custom = 1;
-		Cmd.RunAt = When;
-
-		Poco::JSON::Parser parser2;
-
-		Poco::Dynamic::Var result = parser2.parse(Payload);
-		const auto &PayloadObject = result.extract<Poco::JSON::Object::Ptr>();
-
-		Poco::JSON::Object Params;
-
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::COMMAND, Command);
-		Params.set(uCentralProtocol::WHEN, When);
-		Params.set(uCentralProtocol::PAYLOAD, PayloadObject);
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-		Cmd.Details = ParamStream.str();
-
-		return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, nullptr, this, Logger_);
-	}
-	BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-}
-
-void RESTAPI_device_commandHandler::Reboot() {
-	Logger_.information(Poco::format("REBOOT: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	auto Obj = ParseStream();
-
-	if (Obj->has(RESTAPI::Protocol::SERIALNUMBER)) {
-		auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-		if (SerialNumber_ != SNum) {
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
-		uint64_t When = GetWhen(Obj);
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = MicroService::CreateUUID();
-		Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-		Cmd.Command = uCentralProtocol::REBOOT;
-		Cmd.RunAt = When;
-
-		Poco::JSON::Object Params;
-
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::WHEN, When);
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-		Cmd.Details = ParamStream.str();
-
-		return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, nullptr, this, Logger_);
-	}
-	BadRequest(RESTAPI::Errors::MissingSerialNumber);
-}
-
-void RESTAPI_device_commandHandler::Factory() {
-	Logger_.information(Poco::format("FACTORY-RESET: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	Poco::JSON::Object::Ptr Obj = ParseStream();
-	if (Obj->has(RESTAPI::Protocol::KEEPREDIRECTOR) &&
-		Obj->has(RESTAPI::Protocol::SERIALNUMBER)) {
-
-		auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-
-		if (SerialNumber_ != SNum) {
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
-		auto KeepRedirector = GetB(RESTAPI::Protocol::KEEPREDIRECTOR, Obj, true);
-		uint64_t When = GetWhen(Obj);
-
-		GWObjects::CommandDetails Cmd;
-
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = MicroService::CreateUUID();
-		Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-		Cmd.Command = uCentralProtocol::FACTORY;
-		Cmd.RunAt = When;
-
-		Poco::JSON::Object Params;
-
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::KEEP_REDIRECTOR, KeepRedirector ? 1 : 0);
-		Params.set(uCentralProtocol::WHEN, When);
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-		Cmd.Details = ParamStream.str();
-
-		return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, nullptr, this, Logger_);
-	}
-	BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-}
-
-void RESTAPI_device_commandHandler::LEDs() {
-	Logger_.information(Poco::format("LEDS: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	auto Obj = ParseStream();
-
-	if (Obj->has(uCentralProtocol::PATTERN) &&
-		Obj->has(RESTAPI::Protocol::SERIALNUMBER)) {
-
-		auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-		if (SerialNumber_ != SNum) {
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
-		auto Pattern =
-			GetS(uCentralProtocol::PATTERN, Obj, uCentralProtocol::BLINK);
-		if (Pattern != uCentralProtocol::ON &&
-			Pattern != uCentralProtocol::OFF &&
-			Pattern != uCentralProtocol::BLINK) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		auto Duration = Get(uCentralProtocol::DURATION, Obj, 30);
-		auto When = GetWhen(Obj);
-
-		GWObjects::CommandDetails Cmd;
-
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = MicroService::CreateUUID();
-		Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-		Cmd.Command = uCentralProtocol::LEDS;
-		Cmd.RunAt = When;
-		Poco::JSON::Object Params;
-
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::DURATION, Duration);
-		Params.set(uCentralProtocol::WHEN, When);
-		Params.set(uCentralProtocol::PATTERN, Pattern);
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-		Cmd.Details = ParamStream.str();
-
-		return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, nullptr, this, Logger_);
-	}
-	BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-}
-
-void RESTAPI_device_commandHandler::Trace() {
-	Logger_.information(Poco::format("TRACE: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	auto Obj = ParseStream();
-
-	if 	(Obj->has(RESTAPI::Protocol::SERIALNUMBER) &&
-		(Obj->has(RESTAPI::Protocol::NETWORK) ||
-		 Obj->has(RESTAPI::Protocol::INTERFACE))) {
-
-		auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-		if (SerialNumber_ != SNum) {
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
-		auto Duration = Get(RESTAPI::Protocol::DURATION, Obj, 30);
-		auto When = GetWhen(Obj);
-		auto NumberOfPackets = Get(RESTAPI::Protocol::NUMBEROFPACKETS, Obj, 100);
-
-		auto Network = GetS(RESTAPI::Protocol::NETWORK, Obj);
-		auto Interface = GetS(RESTAPI::Protocol::INTERFACE, Obj);
-		auto UUID = MicroService::CreateUUID();
-		auto URI = FileUploader()->FullName() + UUID;
-
-		GWObjects::CommandDetails Cmd;
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = UUID;
-		Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-		Cmd.Command = uCentralProtocol::TRACE;
-		Cmd.RunAt = When;
-		Cmd.WaitingForFile = 1;
-		Cmd.AttachType = RESTAPI::Protocol::PCAP_FILE_TYPE;
-
-		Poco::JSON::Object Params;
-
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::DURATION, Duration);
-		Params.set(uCentralProtocol::WHEN, When);
-		Params.set(uCentralProtocol::PACKETS, NumberOfPackets);
-		Params.set(uCentralProtocol::NETWORK, Network);
-		Params.set(uCentralProtocol::INTERFACE, Interface);
-		Params.set(uCentralProtocol::URI, URI);
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-		Cmd.Details = ParamStream.str();
-
-		FileUploader()->AddUUID(UUID);
-		return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, nullptr, this, Logger_);
-	}
-	BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-}
-
-void RESTAPI_device_commandHandler::WifiScan() {
-	Logger_.information(Poco::format("WIFISCAN: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	auto Obj = ParseStream();
-
-	auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-	if (SerialNumber_ != SNum) {
-		return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-	}
-
-	if ((Obj->has(RESTAPI::Protocol::BANDS) &&
-			 Obj->isArray(RESTAPI::Protocol::BANDS) ||
-		 (Obj->has(RESTAPI::Protocol::CHANNELS) &&
-		  Obj->isArray(RESTAPI::Protocol::CHANNELS)) ||
-		 (!Obj->has(RESTAPI::Protocol::BANDS) &&
-		  !Obj->has(RESTAPI::Protocol::CHANNELS)))) {
-		bool Verbose = GetB(RESTAPI::Protocol::VERBOSE, Obj);
-		auto UUID = MicroService::CreateUUID();
-		GWObjects::CommandDetails Cmd;
-
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = UUID;
-		Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-		Cmd.Command = uCentralProtocol::WIFISCAN;
-
-		Poco::JSON::Object Params;
-
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::VERBOSE, Verbose);
-
-		if (Obj->has(uCentralProtocol::BANDS)) {
-			Params.set(uCentralProtocol::BANDS, Obj->get(RESTAPI::Protocol::BANDS));
-		} else if (Obj->has(uCentralProtocol::CHANNELS)) {
-			Params.set(uCentralProtocol::CHANNELS, Obj->get(RESTAPI::Protocol::CHANNELS));
-		}
-
-		if (Obj->has(RESTAPI::Protocol::ACTIVESCAN)) {
-			Params.set(uCentralProtocol::ACTIVE,
-					   (int)(Obj->get(RESTAPI::Protocol::ACTIVESCAN).toString() == "true") ? 1 : 0);
-		} else {
-			Params.set(uCentralProtocol::ACTIVE, 0);
-		}
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-		Cmd.Details = ParamStream.str();
-		RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, nullptr, this, Logger_);
-		if (Cmd.ErrorCode == 0) {
-			KafkaManager()->PostMessage(KafkaTopics::WIFISCAN, SerialNumber_, Cmd.Results);
-		}
-		return;
-	}
-	BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-}
-
-void RESTAPI_device_commandHandler::EventQueue() {
-	Logger_.information(Poco::format("EVENT-QUEUE: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	auto Obj = ParseStream();
-	if (Obj->has(RESTAPI::Protocol::SERIALNUMBER) &&
-		Obj->isArray(RESTAPI::Protocol::TYPES)) {
-
-		auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-		if (SerialNumber_ != SNum) {
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
-		auto Types = Obj->getArray(RESTAPI::Protocol::TYPES);
-
-		auto UUID = MicroService::CreateUUID();
-		GWObjects::CommandDetails Cmd;
-
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.UUID = UUID;
-		Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-		Cmd.Command = uCentralProtocol::EVENT;
-
-		Poco::JSON::Object Params;
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::TYPES, Types);
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-		Cmd.Details = ParamStream.str();
-
-		RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, nullptr, this, Logger_);
-		if(Cmd.ErrorCode==0) {
-			KafkaManager()->PostMessage(KafkaTopics::DEVICE_EVENT_QUEUE, SerialNumber_,
-										Cmd.Results);
-		}
-		return;
-	}
-	BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-}
-
-void RESTAPI_device_commandHandler::MakeRequest() {
-	Logger_.information(Poco::format("FORCE-REQUEST: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-	auto Obj = ParseStream();
-	if (Obj->has(RESTAPI::Protocol::SERIALNUMBER) &&
-		Obj->has(uCentralProtocol::MESSAGE)) {
-
-		auto SNum = GetS(RESTAPI::Protocol::SERIALNUMBER, Obj);
-		auto MessageType = GetS(uCentralProtocol::MESSAGE, Obj);
-
-		if ((SerialNumber_ != SNum) ||
-			(MessageType != uCentralProtocol::STATE &&
-			 MessageType != uCentralProtocol::HEALTHCHECK)) {
-			return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-		}
-
-		auto When = GetWhen(Obj);
-		GWObjects::CommandDetails Cmd;
-
-		Cmd.SerialNumber = SerialNumber_;
-		Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-		Cmd.UUID = MicroService::CreateUUID();
-		Cmd.Command = uCentralProtocol::REQUEST;
-		Cmd.RunAt = When;
-
-		Poco::JSON::Object Params;
-
-		Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-		Params.set(uCentralProtocol::WHEN, When);
-		Params.set(uCentralProtocol::MESSAGE, MessageType);
-		Params.set(uCentralProtocol::REQUEST_UUID, Cmd.UUID);
-
-		std::stringstream ParamStream;
-		Params.stringify(ParamStream);
-		Cmd.Details = ParamStream.str();
-
-		return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, nullptr, this, Logger_ );
-	}
-	BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-}
-
-	void RESTAPI_device_commandHandler::Rtty() {
-		Logger_.information(Poco::format("RTTY: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-		if (MicroService::instance().ConfigGetString("rtty.enabled", "false") == "true") {
-			GWObjects::Device	Device;
-			if (StorageService()->GetDevice(SerialNumber_, Device)) {
-				auto CommandUUID = MicroService::CreateUUID();
-
-				GWObjects::RttySessionDetails Rtty{
-					.SerialNumber = SerialNumber_,
-					.Server = MicroService::instance().ConfigGetString("rtty.server", "localhost"),
-					.Port = MicroService::instance().ConfigGetInt("rtty.port", 5912),
-					.Token = MicroService::instance().ConfigGetString("rtty.token", "nothing"),
-					.TimeOut = MicroService::instance().ConfigGetInt("rtty.timeout", 60),
-					.ConnectionId = CommandUUID,
-					.Started = (uint64_t)time(nullptr),
-					.CommandUUID = CommandUUID,
-					.ViewPort = MicroService::instance().ConfigGetInt("rtty.viewport", 5913),
-
-				};
-
-				Poco::JSON::Object ReturnedObject;
-				Rtty.to_json(ReturnedObject);
-
-				//	let's create the command for this request
-				GWObjects::CommandDetails Cmd;
-				Cmd.SerialNumber = SerialNumber_;
-				Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-				Cmd.UUID = CommandUUID;
-				Cmd.Command = uCentralProtocol::RTTY;
-
-				Poco::JSON::Object Params;
-
-				Params.set(uCentralProtocol::METHOD, uCentralProtocol::RTTY);
-				Params.set(uCentralProtocol::SERIAL, SerialNumber_);
-				Params.set(uCentralProtocol::ID, Rtty.ConnectionId);
-				Params.set(uCentralProtocol::TOKEN, Rtty.Token);
-				Params.set(uCentralProtocol::SERVER, Rtty.Server);
-				Params.set(uCentralProtocol::PORT, Rtty.Port);
-				Params.set(uCentralProtocol::USER, UserInfo_.webtoken.username_);
-				Params.set(uCentralProtocol::TIMEOUT, Rtty.TimeOut);
-				Params.set(uCentralProtocol::PASSWORD, Device.DevicePassword);
-
-				std::stringstream ParamStream;
-				Params.stringify(ParamStream);
-				Cmd.Details = ParamStream.str();
-				return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response, 60000, &ReturnedObject, this, Logger_);
-			}
-			return NotFound();
-		}
-		ReturnStatus(Poco::Net::HTTPResponse::HTTP_SERVICE_UNAVAILABLE);
-	}
-
-	void RESTAPI_device_commandHandler::Telemetry(){
-		Logger_.information(Poco::format("TELEMETRY: user=%s serial=%s", UserInfo_.userinfo.email,SerialNumber_));
-		auto Obj = ParseStream();
-
-		if (Obj->has(RESTAPI::Protocol::SERIALNUMBER) &&
-			Obj->has(RESTAPI::Protocol::INTERVAL) && Obj->has(RESTAPI::Protocol::TYPES)) {
-
-			auto SNum = Obj->get(RESTAPI::Protocol::SERIALNUMBER).toString();
-			if (SerialNumber_ != SNum) {
-				return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-			}
-
-			GWObjects::Device Device;
-			if (!StorageService()->GetDevice(SerialNumber_, Device)) {
-				return NotFound();
-			}
-
-			if (!DeviceRegistry()->Connected(SerialNumber_)) {
-				return BadRequest(RESTAPI::Errors::DeviceNotConnected);
-			}
-
-			auto Interval = Obj->get(RESTAPI::Protocol::INTERVAL);
-			std::string UUID;
-			if (Obj->has(RESTAPI::Protocol::UUID))
-				UUID = Obj->get(RESTAPI::Protocol::UUID).toString();
-
-			GWObjects::CommandDetails Cmd;
-
-			Cmd.SerialNumber = SerialNumber_;
-			Cmd.SubmittedBy = UserInfo_.webtoken.username_;
-			Cmd.Command = uCentralProtocol::TELEMETRY;
-			Poco::JSON::Object Params;
-
-			Params.set(RESTAPI::Protocol::SERIALNUMBER, SerialNumber_);
-			Params.set(RESTAPI::Protocol::INTERVAL, Interval);
-			if (Interval > 0)
-				Params.set(RESTAPI::Protocol::TYPES, Obj->getArray(RESTAPI::Protocol::TYPES));
-
-			std::string Endpoint, NewUUID;
-			Poco::JSON::Object Answer;
-			if (Interval) {
-				if (TelemetryStream()->CreateEndpoint(SerialNumber_, Endpoint, NewUUID)) {
-					Answer.set("serialNumber", SerialNumber_);
-					Answer.set("uuid", NewUUID);
-					Answer.set("uri", Endpoint);
-				}
-			} else {
-				return BadRequest(RESTAPI::Errors::CannotCreateWS);
-			}
-
-			Cmd.UUID = NewUUID;
-			std::stringstream ParamStream;
-			Params.stringify(ParamStream);
-			Cmd.Details = ParamStream.str();
-
-			return RESTAPI_RPC::WaitForCommand(Cmd, Params, *Request, *Response,
-										60000, &Answer, this, Logger_);
-		}
-		BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
-	}
-}

src/RESTAPI/RESTAPI_device_commandHandler.h

@@ -1,71 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#ifndef UCENTRAL_RESTAPI_DEVICECOMMANDHANDLER_H
-#define UCENTRAL_RESTAPI_DEVICECOMMANDHANDLER_H
-
-#include "framework/MicroService.h"
-#include "framework/RESTAPI_protocol.h"
-
-namespace OpenWifi {
-class RESTAPI_device_commandHandler : public RESTAPIHandler {
-  public:
-	RESTAPI_device_commandHandler(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
-		: RESTAPIHandler(bindings, L,
-						 std::vector<std::string>{
-							 Poco::Net::HTTPRequest::HTTP_GET, Poco::Net::HTTPRequest::HTTP_POST,
-							 Poco::Net::HTTPRequest::HTTP_DELETE,
-							 Poco::Net::HTTPRequest::HTTP_OPTIONS},
-						 Server,
-						 Internal) {}
-
-	void GetCapabilities();
-	void DeleteCapabilities();
-	void GetLogs();
-	void DeleteLogs();
-	void GetStatistics();
-	void DeleteStatistics();
-	void GetStatus();
-	void ExecuteCommand();
-	void Configure();
-	void GetChecks();
-	void DeleteChecks();
-	void Upgrade();
-	void Reboot();
-	void Factory();
-	void LEDs();
-	void Trace();
-	void MakeRequest();
-	void WifiScan();
-	void EventQueue();
-	void Rtty();
-	void Telemetry();
-
-	static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/device/{serialNumber}/{command}"}; };
-	void DoGet() final;
-	void DoDelete() final;
-	void DoPost() final;
-	void DoPut() final {};
-
-	inline bool ValidateParameters() {
-		Command_ =  GetBinding(RESTAPI::Protocol::COMMAND, "");
-		if (Command_.empty()) {
-			return false;
-		}
-		SerialNumber_ = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-		if (SerialNumber_.empty()) {
-			return false;
-		}
-		return true;
-	}
-
-  private:
-	std::string SerialNumber_, Command_;
-};
-}
-#endif //UCENTRAL_RESTAPI_DEVICECOMMANDHANDLER_H

src/RESTAPI/RESTAPI_device_handler.cpp

@@ -1,191 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include "RESTAPI_device_handler.h"
-#include "CentralConfig.h"
-#include "ConfigurationCache.h"
-#include "Poco/JSON/Parser.h"
-#include "StorageService.h"
-#include "framework/ConfigurationValidator.h"
-#include "framework/MicroService.h"
-#include "framework/RESTAPI_errors.h"
-#include "framework/RESTAPI_protocol.h"
-
-namespace OpenWifi {
-	void RESTAPI_device_handler::DoGet() {
-		std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-
-		if(SerialNumber.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-		}
-
-		GWObjects::Device Device;
-
-		if (StorageService()->GetDevice(SerialNumber, Device)) {
-			Poco::JSON::Object Obj;
-			Device.to_json(Obj);
-			return ReturnObject(Obj);
-		}
-		NotFound();
-	}
-
-	void RESTAPI_device_handler::DoDelete() {
-		std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-
-		if(SerialNumber.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-		}
-
-		std::string Arg;
-		if(HasParameter("oui",Arg) && Arg=="true" && SerialNumber.size()==6) {
-
-			std::set<std::string>	Set;
-			std::vector<GWObjects::Device>	Devices;
-
-			bool Done = false;
-			uint64_t Offset=1;
-			while(!Done) {
-
-				StorageService()->GetDevices(Offset,500,Devices);
-				for(const auto &i:Devices) {
-					if(i.SerialNumber.substr(0,6) == SerialNumber) {
-						Set.insert(i.SerialNumber);
-					}
-				}
-
-				if(Devices.size()<500)
-					Done=true;
-
-				Offset += Devices.size();
-			}
-
-			for(auto &i:Set) {
-				std::string SNum{i};
-				StorageService()->DeleteDevice(SNum);
-			}
-
-			return OK();
-
-		} else if (StorageService()->DeleteDevice(SerialNumber)) {
-			return OK();
-		}
-
-		NotFound();
-	}
-
-	void RESTAPI_device_handler::DoPost() {
-
-		std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-		if(SerialNumber.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-		}
-
-		std::string Arg;
-		if(HasParameter("validateOnly",Arg) && Arg=="true") {
-			auto Body = ParseStream();
-			if(!Body->has("configuration")) {
-				return BadRequest("Must have 'configuration' element.");
-			}
-			auto Config=Body->get("configuration").toString();
-			Poco::JSON::Object  Answer;
-			std::string 		Error;
-			auto Res = ValidateUCentralConfiguration(Config, Error);
-			Answer.set("valid",Res);
-			if(!Error.empty())
-				Answer.set("error",Error);
-			return ReturnObject(Answer);
-		}
-
-		if (!Utils::ValidSerialNumber(SerialNumber)) {
-			Logger_.warning(Poco::format("CREATE-DEVICE(%s): Illegal serial number.", SerialNumber));
-			return BadRequest( RESTAPI::Errors::InvalidSerialNumber);
-		}
-
-		auto Obj = ParseStream();
-		GWObjects::Device Device;
-		if (!Device.from_json(Obj)) {
-			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-		}
-
-		if(SerialNumber!=Device.SerialNumber) {
-			return BadRequest(RESTAPI::Errors::SerialNumberMismatch);
-		}
-
-		std::string Error;
-		if(Device.Configuration.empty() || (!Device.Configuration.empty() && !ValidateUCentralConfiguration(Device.Configuration,Error))) {
-			return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
-		}
-
-		for(auto &i:Device.Notes)
-			i.createdBy = UserInfo_.userinfo.email;
-
-		Config::Config NewConfig(Device.Configuration);
-		Device.UUID = std::time(nullptr);
-		NewConfig.SetUUID(Device.UUID);
-		Device.Configuration = NewConfig.get();
-
-		Poco::toLowerInPlace(Device.SerialNumber);
-
-		if (StorageService()->CreateDevice(Device)) {
-			SetCurrentConfigurationID(SerialNumber, Device.UUID);
-			Poco::JSON::Object DevObj;
-			Device.to_json(DevObj);
-			return ReturnObject(DevObj);
-		}
-		InternalError(RESTAPI::Errors::RecordNotCreated);
-	}
-
-	void RESTAPI_device_handler::DoPut() {
-		std::string SerialNumber = GetBinding(RESTAPI::Protocol::SERIALNUMBER, "");
-
-		if(SerialNumber.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingSerialNumber);
-		}
-
-		auto Obj = ParseStream();
-		GWObjects::Device NewDevice;
-		if (!NewDevice.from_json(Obj)) {
-			return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
-		}
-
-		GWObjects::Device	Existing;
-		if(!StorageService()->GetDevice(SerialNumber, Existing)) {
-			return NotFound();
-		}
-
-		if(!NewDevice.Configuration.empty()) {
-			std::string Error;
-			if (!ValidateUCentralConfiguration(NewDevice.Configuration, Error)) {
-				return BadRequest(RESTAPI::Errors::ConfigBlockInvalid);
-			}
-			Config::Config NewConfig(NewDevice.Configuration);
-			uint64_t NewConfigUUID = std::time(nullptr);
-			NewConfig.SetUUID(NewConfigUUID);
-			Existing.Configuration = NewConfig.get();
-			Existing.UUID = NewConfigUUID;
-		}
-
-		AssignIfPresent(Obj, "venue", Existing.Venue);
-		AssignIfPresent(Obj, "owner", Existing.Owner);
-		AssignIfPresent(Obj, "location", Existing.Location);
-
-		for(auto &i:NewDevice.Notes) {
-			i.createdBy = UserInfo_.userinfo.email;
-			Existing.Notes.push_back(i);
-		}
-
-		Existing.LastConfigurationChange = std::time(nullptr);
-		if (StorageService()->UpdateDevice(Existing)) {
-			SetCurrentConfigurationID(SerialNumber, Existing.UUID);
-			Poco::JSON::Object DevObj;
-			NewDevice.to_json(DevObj);
-			return ReturnObject(DevObj);
-		}
-		InternalError(RESTAPI::Errors::RecordNotUpdated);
-	}
-}

src/RESTAPI/RESTAPI_devices_handler.cpp

@@ -1,78 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include "Poco/Array.h"
-#include "Poco/JSON/Stringifier.h"
-
-#include "RESTAPI_devices_handler.h"
-#include "StorageService.h"
-#include "framework/RESTAPI_protocol.h"
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-	void RESTAPI_devices_handler::DoGet() {
-
-		auto serialOnly = GetBoolParameter(RESTAPI::Protocol::SERIALONLY, false);
-		auto deviceWithStatus = GetBoolParameter(RESTAPI::Protocol::DEVICEWITHSTATUS, false);
-
-		Poco::JSON::Object RetObj;
-		if (!QB_.Select.empty()) {
-			Poco::JSON::Array Objects;
-			std::vector<std::string> Numbers = Utils::Split(QB_.Select);
-			for (auto &i : Numbers) {
-				GWObjects::Device D;
-				if (StorageService()->GetDevice(i, D)) {
-					Poco::JSON::Object Obj;
-					if (deviceWithStatus)
-						D.to_json_with_status(Obj);
-					else
-						D.to_json(Obj);
-					Objects.add(Obj);
-				} else {
-					Logger_.error(
-						Poco::format("DEVICE(%s): device in select cannot be found.", i));
-				}
-			}
-			if (deviceWithStatus)
-				RetObj.set(RESTAPI::Protocol::DEVICESWITHSTATUS, Objects);
-			else
-				RetObj.set(RESTAPI::Protocol::DEVICES, Objects);
-
-		} else if (QB_.CountOnly == true) {
-			uint64_t Count = 0;
-			if (StorageService()->GetDeviceCount(Count)) {
-				return ReturnCountOnly(Count);
-			}
-		} else if (serialOnly) {
-			std::vector<std::string> SerialNumbers;
-			StorageService()->GetDeviceSerialNumbers(QB_.Offset, QB_.Limit, SerialNumbers);
-			Poco::JSON::Array Objects;
-			for (const auto &i : SerialNumbers) {
-				Objects.add(i);
-			}
-			RetObj.set(RESTAPI::Protocol::SERIALNUMBERS, Objects);
-		} else {
-			std::vector<GWObjects::Device> Devices;
-			StorageService()->GetDevices(QB_.Offset, QB_.Limit, Devices);
-			Poco::JSON::Array Objects;
-			for (const auto &i : Devices) {
-				Poco::JSON::Object Obj;
-				if (deviceWithStatus)
-					i.to_json_with_status(Obj);
-				else
-					i.to_json(Obj);
-				Objects.add(Obj);
-			}
-			if (deviceWithStatus)
-				RetObj.set(RESTAPI::Protocol::DEVICESWITHSTATUS, Objects);
-			else
-				RetObj.set(RESTAPI::Protocol::DEVICES, Objects);
-		}
-		ReturnObject(RetObj);
-	}
-}

src/RESTAPI/RESTAPI_file.cpp

@@ -1,47 +0,0 @@
-//
-//	License type: BSD 3-Clause License
-//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
-//
-//	Created by Stephane Bourque on 2021-03-04.
-//	Arilia Wireless Inc.
-//
-
-#include "RESTAPI_file.h"
-
-#include "FileUploader.h"
-#include "Poco/File.h"
-#include "StorageService.h"
-
-#include "framework/RESTAPI_errors.h"
-#include "framework/RESTAPI_protocol.h"
-#include <fstream>
-
-namespace OpenWifi {
-	void RESTAPI_file::DoGet() {
-		auto UUID = GetBinding(RESTAPI::Protocol::FILEUUID, "");
-		auto SerialNumber = GetParameter(RESTAPI::Protocol::SERIALNUMBER, "");
-
-		// does the file exist
-		Poco::File DownloadFile(FileUploader()->Path() + "/" + UUID);
-
-		std::string FileType;
-		if (!StorageService()->GetAttachedFile(UUID, SerialNumber, DownloadFile.path(), FileType)) {
-			return NotFound();
-		}
-		SendFile(DownloadFile, UUID);
-		DownloadFile.remove();
-	}
-
-	void RESTAPI_file::DoDelete() {
-		auto UUID = GetBinding(RESTAPI::Protocol::FILEUUID, "");
-
-		if (UUID.empty()) {
-			return BadRequest(RESTAPI::Errors::MissingUUID);
-		}
-
-		if (StorageService()->RemoveAttachedFile(UUID)) {
-			return OK();
-		}
-		BadRequest(RESTAPI::Errors::CouldNotBeDeleted);
-	}
-}

src/RESTAPI/RESTAPI_ouis.cpp

@@ -1,24 +0,0 @@
-//
-// Created by stephane bourque on 2021-06-17.
-//
-
-#include "RESTAPI_ouis.h"
-#include "OUIServer.h"
-
-namespace OpenWifi {
-	void RESTAPI_ouis::DoGet() {
-		Poco::JSON::Array Objects;
-		auto Select = GetParameter("macList","");
-		std::vector<std::string> Macs = Utils::Split(Select);
-		for (auto &i : Macs) {
-			Poco::JSON::Object O;
-			auto Manufacturer = OUIServer()->GetManufacturer(i);
-			O.set("tag", i);
-			O.set("value", Manufacturer);
-			Objects.add(O);
-		}
-		Poco::JSON::Object	RetObj;
-		RetObj.set("tagList",Objects);
-		ReturnObject(RetObj);
-	}
-}

src/RESTAPI/RESTAPI_webSocketServer.cpp

@@ -1,145 +0,0 @@
-//
-// Created by stephane bourque on 2021-08-12.
-//
-
-#include "Poco/Net/WebSocket.h"
-#include "Poco/Net/NetException.h"
-#include "Poco/Net/HTTPResponse.h"
-#include "Poco/JSON/Object.h"
-#include "Poco/JSON/Parser.h"
-#include "Poco/JSON/Stringifier.h"
-#include "RESTAPI_webSocketServer.h"
-#include "SerialNumberCache.h"
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-
-	void RESTAPI_webSocketServer::DoGet() {
-
-		//	try and upgrade this session to websocket...
-		if(Request->find("Upgrade") != Request->end() && Poco::icompare((*Request)["Upgrade"], "websocket") == 0) {
-			try
-			{
-				Poco::Net::WebSocket WS(*Request, *Response);
-				Logger_.information("WebSocket connection established.");
-				int flags;
-				int n;
-				bool Authenticated=false;
-				bool Done=false;
-				do
-				{
-					Poco::Buffer<char>			IncomingFrame(0);
-					n = WS.receiveFrame(IncomingFrame, flags);
-					auto Op = flags & Poco::Net::WebSocket::FRAME_OP_BITMASK;
-					switch(Op) {
-						case Poco::Net::WebSocket::FRAME_OP_PING: {
-							WS.sendFrame("", 0,
-										   (int)Poco::Net::WebSocket::FRAME_OP_PONG |
-										   (int)Poco::Net::WebSocket::FRAME_FLAG_FIN);
-							}
-							break;
-						case Poco::Net::WebSocket::FRAME_OP_PONG: {
-							}
-							break;
-						case Poco::Net::WebSocket::FRAME_OP_TEXT: {
-								IncomingFrame.append(0);
-								if(!Authenticated) {
-									std::string Frame{IncomingFrame.begin()};
-									auto Tokens = Utils::Split(Frame,':');
-									bool Expired=false;
-									if(Tokens.size()==2 && AuthClient()->IsAuthorized(Tokens[1], UserInfo_, Expired)) {
-										Authenticated=true;
-										std::string S{"Welcome! Bienvenue! Bienvenidos!"};
-										WS.sendFrame(S.c_str(),S.size());
-									} else {
-										std::string S{"Invalid token. Closing connection."};
-										WS.sendFrame(S.c_str(),S.size());
-										Done=true;
-									}
-
-								} else {
-									try {
-										Poco::JSON::Parser P;
-										auto Obj = P.parse(IncomingFrame.begin())
-													   .extract<Poco::JSON::Object::Ptr>();
-										std::string Answer;
-										Process(Obj, Answer);
-										if (!Answer.empty())
-											WS.sendFrame(Answer.c_str(), Answer.size());
-										else {
-											WS.sendFrame("{}", 2);
-										}
-									} catch (const Poco::JSON::JSONException & E) {
-										Logger_.log(E);
-									}
-								}
-							}
-							break;
-						case Poco::Net::WebSocket::FRAME_OP_CLOSE: {
-								Logger_.warning(Poco::format("CLOSE(%s): Client is closing its WS connection.", UserInfo_.userinfo.email));
-								Done=true;
-							}
-						break;
-
-						default:
-							{
-
-							}
-					}
-				}
-				while (!Done && (n > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != Poco::Net::WebSocket::FRAME_OP_CLOSE));
-				Logger_.information("WebSocket connection closed.");
-			}
-			catch (const Poco::Net::WebSocketException & E)
-			{
-				Logger_.log(E);
-				switch (E.code())
-				{
-				case Poco::Net::WebSocket::WS_ERR_HANDSHAKE_UNSUPPORTED_VERSION:
-					Response->set("Sec-WebSocket-Version", Poco::Net::WebSocket::WEBSOCKET_VERSION);
-					// fallthrough
-					case Poco::Net::WebSocket::WS_ERR_NO_HANDSHAKE:
-						case Poco::Net::WebSocket::WS_ERR_HANDSHAKE_NO_VERSION:
-							case Poco::Net::WebSocket::WS_ERR_HANDSHAKE_NO_KEY:
-								Response->setStatusAndReason(Poco::Net::HTTPResponse::HTTP_BAD_REQUEST);
-								Response->setContentLength(0);
-								Response->send();
-								break;
-				}
-			}
-			catch (const Poco::Exception &E) {
-				Logger_.log(E);
-			}
-		}
-	}
-
-	void RESTAPI_webSocketServer::Process(const Poco::JSON::Object::Ptr &O, std::string &Answer ) {
-		try {
-			if (O->has("command")) {
-				auto Command = O->get("command").toString();
-				if (Command == "serial_number_search" && O->has("serial_prefix")) {
-					auto Prefix = O->get("serial_prefix").toString();
-					uint64_t HowMany = 32;
-					if (O->has("howMany"))
-						HowMany = O->get("howMany");
-					Logger_.information(Poco::format("serial_number_search: %s", Prefix));
-					if (!Prefix.empty() && Prefix.length() < 13) {
-						std::vector<uint64_t> Numbers;
-						SerialNumberCache()->FindNumbers(Prefix, 50, Numbers);
-						Poco::JSON::Array A;
-						for (const auto &i : Numbers)
-							A.add(Utils::int_to_hex(i));
-						Poco::JSON::Object AO;
-						AO.set("serialNumbers", A);
-						AO.set("command","serial_number_search");
-						std::ostringstream SS;
-						Poco::JSON::Stringifier::stringify(AO, SS);
-						Answer = SS.str();
-					}
-				}
-			}
-		} catch (const Poco::Exception &E) {
-			Logger_.log(E);
-		}
-	}
-}

src/RESTAPI/RESTAPI_webSocketServer.h

@@ -1,28 +0,0 @@
-//
-// Created by stephane bourque on 2021-08-12.
-//
-
-#ifndef UCENTRALGW_RESTAPI_WEBSOCKETSERVER_H
-#define UCENTRALGW_RESTAPI_WEBSOCKETSERVER_H
-
-#include "framework/MicroService.h"
-
-namespace OpenWifi {
-	class RESTAPI_webSocketServer : public RESTAPIHandler {
-	  public:
-		RESTAPI_webSocketServer(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer &Server, bool Internal)
-		: RESTAPIHandler(bindings, L,
-						 std::vector<std::string>{	Poco::Net::HTTPRequest::HTTP_GET,
-												  	Poco::Net::HTTPRequest::HTTP_OPTIONS},
-													Server, Internal,false) {}
-		static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/ws"};}
-		void DoGet() final;
-		void DoDelete() final {};
-		void DoPost() final {};
-		void DoPut() final {};
-	  private:
-		void Process(const Poco::JSON::Object::Ptr &O, std::string &Answer);
-	};
-}
-
-#endif // UCENTRALGW_RESTAPI_WEBSOCKETSERVER_H

src/RESTAPI_BlackList.cpp

@@ -0,0 +1,125 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include <ctime>
+
+#include "Poco/JSON/Parser.h"
+#include "Poco/JSON/Stringifier.h"
+#include "RESTAPI_BlackList.h"
+#include "RESTAPI_protocol.h"
+#include "StorageService.h"
+
+namespace uCentral {
+	void RESTAPI_BlackList::handleRequest(Poco::Net::HTTPServerRequest &Request,
+										  Poco::Net::HTTPServerResponse &Response) {
+
+		if (!ContinueProcessing(Request, Response))
+			return;
+
+		if (!IsAuthorized(Request, Response))
+			return;
+
+		ParseParameters(Request);
+
+		try {
+			if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_DELETE)
+				DoDelete(Request, Response);
+			else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+				DoGet(Request, Response);
+			else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
+				DoPost(Request, Response);
+			return;
+		} catch (const Poco::Exception &E) {
+			Logger_.error(Poco::format("%s: failed with %s", std::string(__func__), E.displayText()));
+		}
+		BadRequest(Request, Response);
+	}
+
+	void RESTAPI_BlackList::DoDelete(Poco::Net::HTTPServerRequest &Request,
+									 Poco::Net::HTTPServerResponse &Response) {
+
+		try {
+			auto SerialNumber = GetBinding(uCentral::RESTAPI::Protocol::SERIALNUMBER, "");
+
+			if (!SerialNumber.empty()) {
+				if (Storage()->DeleteBlackListDevice(SerialNumber)) {
+					OK(Request, Response);
+				} else {
+					NotFound(Request, Response);
+				}
+				return;
+			}
+		} catch (const Poco::Exception &E) {
+			Logger_.log(E);
+		}
+		BadRequest(Request, Response);
+	}
+
+	void RESTAPI_BlackList::DoGet(Poco::Net::HTTPServerRequest &Request,
+								  Poco::Net::HTTPServerResponse &Response) {
+		try {
+			InitQueryBlock();
+			std::vector<GWObjects::BlackListedDevice> Devices;
+
+			Poco::JSON::Array Objects;
+			if (Storage()->GetBlackListDevices(QB_.Offset, QB_.Limit, Devices)) {
+				for (const auto &i : Devices) {
+					Poco::JSON::Object Obj;
+					i.to_json(Obj);
+					Objects.add(Obj);
+				}
+			}
+			Poco::JSON::Object RetObj;
+			RetObj.set(uCentral::RESTAPI::Protocol::DEVICES, Objects);
+			ReturnObject(Request, RetObj, Response);
+			return;
+		} catch (const Poco::Exception &E) {
+			Logger_.log(E);
+		}
+		BadRequest(Request, Response);
+	}
+
+	void RESTAPI_BlackList::DoPost(Poco::Net::HTTPServerRequest &Request,
+								   Poco::Net::HTTPServerResponse &Response) {
+		try {
+			Poco::JSON::Parser parser;
+			Poco::JSON::Object::Ptr Obj =
+				parser.parse(Request.stream()).extract<Poco::JSON::Object::Ptr>();
+
+			if (Obj->has(uCentral::RESTAPI::Protocol::DEVICES) &&
+				Obj->isArray(uCentral::RESTAPI::Protocol::DEVICES)) {
+				std::vector<GWObjects::BlackListedDevice> Devices;
+				auto DeviceArray = Obj->getArray(uCentral::RESTAPI::Protocol::DEVICES);
+				for (const auto &i : *DeviceArray) {
+					Poco::JSON::Parser pp;
+					auto InnerObj = pp.parse(i).extract<Poco::JSON::Object::Ptr>();
+					Poco::DynamicStruct Vars = *InnerObj;
+					if (Vars.contains(uCentral::RESTAPI::Protocol::SERIALNUMBER) &&
+						Vars.contains(uCentral::RESTAPI::Protocol::REASON)) {
+						auto SerialNumber = Vars[uCentral::RESTAPI::Protocol::SERIALNUMBER].toString();
+						auto Reason = Vars[uCentral::RESTAPI::Protocol::REASON].toString();
+						GWObjects::BlackListedDevice D{.SerialNumber = SerialNumber,
+															   .Reason = Reason,
+															   .Author = UserInfo_.webtoken.username_,
+															   .Created = (uint64_t)time(nullptr)};
+						Devices.push_back(D);
+					}
+				}
+				if (!Devices.empty()) {
+					if (Storage()->AddBlackListDevices(Devices)) {
+						OK(Request, Response);
+						return;
+					}
+				}
+			}
+		} catch (const Poco::Exception &E) {
+			Logger_.log(E);
+		}
+		BadRequest(Request, Response);
+	}
+}

src/RESTAPI_BlackList.h

@@ -9,25 +9,25 @@
 #ifndef UCENTRALGW_RESTAPI_BLACKLIST_H
 #define UCENTRALGW_RESTAPI_BLACKLIST_H
 
-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"
 
-namespace OpenWifi {
-	class RESTAPI_blacklist : public RESTAPIHandler {
+namespace uCentral {
+	class RESTAPI_BlackList : public RESTAPIHandler {
 	  public:
-		RESTAPI_blacklist(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
+		RESTAPI_BlackList(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
 			: RESTAPIHandler(bindings, L,
 							 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
 													  Poco::Net::HTTPRequest::HTTP_POST,
-													  Poco::Net::HTTPRequest::HTTP_PUT,
 													  Poco::Net::HTTPRequest::HTTP_DELETE,
 													  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-							 							Server,
 							 							Internal) {}
-		static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/blacklist/{serialNumber}"};}
-		void DoGet() final;
-		void DoDelete() final;
-		void DoPost() final;
-		void DoPut() final;
+		void handleRequest(Poco::Net::HTTPServerRequest &request,
+						   Poco::Net::HTTPServerResponse &response) override;
+
+		void DoGet(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
+		void DoDelete(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
+		void DoPost(Poco::Net::HTTPServerRequest &request, Poco::Net::HTTPServerResponse &response);
+		static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/blacklist"};}
 	};
 }
 

src/RESTAPI_GWobjects.cpp

@@ -15,18 +15,20 @@
 #endif
 
 #include "RESTAPI_GWobjects.h"
-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"
+#include "RESTAPI_utils.h"
+#include "Utils.h"
 
-using OpenWifi::RESTAPI_utils::field_to_json;
-using OpenWifi::RESTAPI_utils::field_from_json;
-using OpenWifi::RESTAPI_utils::EmbedDocument;
+using uCentral::RESTAPI_utils::field_to_json;
+using uCentral::RESTAPI_utils::field_from_json;
+using uCentral::RESTAPI_utils::EmbedDocument;
 
-namespace OpenWifi::GWObjects {
+namespace uCentral::GWObjects {
 
 	void Device::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"serialNumber", SerialNumber);
 #ifdef TIP_GATEWAY_SERVICE
-		field_to_json(Obj,"deviceType", Daemon::instance()->IdentifyDevice(Compatible));
+		field_to_json(Obj,"deviceType", uCentral::Daemon::instance()->IdentifyDevice(Compatible));
 #endif
 		field_to_json(Obj,"macAddress", MACAddress);
 		field_to_json(Obj,"manufacturer", Manufacturer);
@@ -55,20 +57,18 @@ namespace OpenWifi::GWObjects {
 		if (DeviceRegistry()->GetState(SerialNumber, ConState)) {
 			ConState.to_json(Obj);
 		} else {
-			field_to_json(Obj,"ipAddress", "");
+			field_to_json(Obj,"ipAddress", "N/A");
 			field_to_json(Obj,"txBytes", (uint64_t) 0);
 			field_to_json(Obj,"rxBytes", (uint64_t )0);
 			field_to_json(Obj,"messageCount", (uint64_t )0);
 			field_to_json(Obj,"connected", false);
-			field_to_json(Obj,"lastContact", "");
+			field_to_json(Obj,"lastContact", "N/A");
 			field_to_json(Obj,"verifiedCertificate", "NO_CERTIFICATE");
-			field_to_json(Obj,"associations_2G", (uint64_t) 0);
-			field_to_json(Obj,"associations_5G", (uint64_t) 0);
 		}
 #endif
 	}
 
-	bool Device::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool Device::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"serialNumber",SerialNumber);
 			field_from_json(Obj,"deviceType",DeviceType);
@@ -147,7 +147,7 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"attachFile", AttachDate);
 	}
 
-	bool DefaultConfiguration::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool DefaultConfiguration::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"name",Name);
 			field_from_json(Obj,"configuration",Configuration);
@@ -160,22 +160,10 @@ namespace OpenWifi::GWObjects {
 	}
 
 	void BlackListedDevice::to_json(Poco::JSON::Object &Obj) const {
-		field_to_json(Obj,"serialNumber", serialNumber);
-		field_to_json(Obj,"author", author);
-		field_to_json(Obj,"reason", reason);
-		field_to_json(Obj,"created", created);
-	}
-
-	bool BlackListedDevice::from_json(Poco::JSON::Object::Ptr &Obj) {
-		try {
-			field_from_json(Obj,"serialNumber",serialNumber);
-			field_from_json(Obj,"author",author);
-			field_from_json(Obj,"reason",reason);
-			field_from_json(Obj,"created",created);
-			return true;
-		} catch (const Poco::Exception &E) {
-		}
-		return false;
+		field_to_json(Obj,"serialNumber", SerialNumber);
+		field_to_json(Obj,"author", Author);
+		field_to_json(Obj,"reason", Reason);
+		field_to_json(Obj,"created", Created);
 	}
 
 	void ConnectionState::to_json(Poco::JSON::Object &Obj) const {
@@ -188,9 +176,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"connected", Connected);
 		field_to_json(Obj,"firmware", Firmware);
 		field_to_json(Obj,"lastContact", LastContact);
-		field_to_json(Obj,"associations_2G", Associations_2G);
-		field_to_json(Obj,"associations_5G", Associations_5G);
-
 		switch(VerifiedCertificate) {
 			case NO_CERTIFICATE:
 				field_to_json(Obj,"verifiedCertificate", "NO_CERTIFICATE"); break;
@@ -231,9 +216,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj,"healths",healths);
 		field_to_json(Obj,"certificates",certificates);
 		field_to_json(Obj,"lastContact",lastContact);
-		field_to_json(Obj,"associations",associations);
-		field_to_json(Obj,"snapshot",snapshot);
-		field_to_json(Obj,"numberOfDevices",numberOfDevices);
 	}
 
 	void Dashboard::reset()  {
@@ -249,15 +231,6 @@ namespace OpenWifi::GWObjects {
 		healths.clear();
 		certificates.clear();
 		lastContact.clear();
-		associations.clear();
-		numberOfDevices = 0 ;
-		snapshot = std::time(nullptr);
 	}
-
-	void CapabilitiesModel::to_json(Poco::JSON::Object &Obj) const{
-		field_to_json(Obj,"deviceType", deviceType);
-		field_to_json(Obj,"capabilities", capabilities);
-	};
-
 }
 

src/RESTAPI_GWobjects.h

@@ -12,7 +12,7 @@
 #include "Poco/JSON/Object.h"
 #include "RESTAPI_SecurityObjects.h"
 
-namespace OpenWifi::GWObjects {
+namespace uCentral::GWObjects {
 
 	enum CertificateValidation {
 		NO_CERTIFICATE,
@@ -24,12 +24,10 @@ namespace OpenWifi::GWObjects {
 	struct ConnectionState {
 		uint64_t MessageCount = 0 ;
 		std::string SerialNumber;
-		std::string Address;
+		std::string Address = "N/A";
 		uint64_t UUID = 0 ;
 		uint64_t PendingUUID = 0 ;
 		uint64_t TX = 0, RX = 0;
-		uint64_t Associations_2G=0;
-		uint64_t Associations_5G=0;
 		bool Connected = false;
 		uint64_t LastContact=0;
 		std::string Firmware;
@@ -59,12 +57,11 @@ namespace OpenWifi::GWObjects {
 		std::string DevicePassword;
 		void to_json(Poco::JSON::Object &Obj) const;
 		void to_json_with_status(Poco::JSON::Object &Obj) const;
-		bool from_json(Poco::JSON::Object::Ptr &Obj);
+		bool from_json(Poco::JSON::Object::Ptr Obj);
 		void Print() const;
 	};
 
 	struct Statistics {
-		std::string SerialNumber;
 		uint64_t 	UUID;
 		std::string Data;
 		uint64_t 	Recorded;
@@ -72,7 +69,6 @@ namespace OpenWifi::GWObjects {
 	};
 
 	struct HealthCheck {
-		std::string SerialNumber;
 		uint64_t 	UUID;
 		std::string Data;
 		uint64_t 	Recorded;
@@ -98,7 +94,6 @@ namespace OpenWifi::GWObjects {
 			LOG_INFO = 6,	 /* informational */
 			LOG_DEBUG = 7	 /* debug-level messages */
 		};
-		std::string SerialNumber;
 		std::string Log;
 		std::string Data;
 		uint64_t 	Severity;
@@ -116,7 +111,7 @@ namespace OpenWifi::GWObjects {
 		uint64_t 	Created;
 		uint64_t 	LastModified;
 		void 		to_json(Poco::JSON::Object &Obj) const;
-		bool 		from_json(Poco::JSON::Object::Ptr &Obj);
+		bool 		from_json(Poco::JSON::Object::Ptr Obj);
 	};
 
 	struct CommandDetails {
@@ -142,12 +137,11 @@ namespace OpenWifi::GWObjects {
 	};
 
 	struct BlackListedDevice {
-		std::string serialNumber;
-		std::string reason;
-		std::string author;
-		uint64_t created;
+		std::string SerialNumber;
+		std::string Reason;
+		std::string Author;
+		uint64_t Created;
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(Poco::JSON::Object::Ptr &Obj);
 	};
 
 	struct RttySessionDetails {
@@ -165,8 +159,6 @@ namespace OpenWifi::GWObjects {
 	};
 
 	struct Dashboard {
-		uint64_t 		  snapshot;
-		uint64_t 		  numberOfDevices;
 		Types::CountedMap commands;
 		Types::CountedMap upTimes;
 		Types::CountedMap memoryUsed;
@@ -179,17 +171,9 @@ namespace OpenWifi::GWObjects {
 		Types::CountedMap healths;
 		Types::CountedMap certificates;
 		Types::CountedMap lastContact;
-		Types::CountedMap associations;
 		void to_json(Poco::JSON::Object &Obj) const;
 		void reset();
 	};
-
-	struct CapabilitiesModel {
-		std::string deviceType;
-		std::string capabilities;
-
-		void to_json(Poco::JSON::Object &Obj) const;
-	};
 }
 
 #endif //UCENTRAL_RESTAPI_OBJECTS_H

src/RESTAPI_InternalServer.cpp

@@ -0,0 +1,80 @@
+//
+// Created by stephane bourque on 2021-06-29.
+//
+
+#include "RESTAPI_InternalServer.h"
+
+#include "Poco/URI.h"
+
+#include "RESTAPI_BlackList.h"
+#include "RESTAPI_command.h"
+#include "RESTAPI_commands.h"
+#include "RESTAPI_default_configuration.h"
+#include "RESTAPI_default_configurations.h"
+#include "RESTAPI_device_commandHandler.h"
+#include "RESTAPI_device_handler.h"
+#include "RESTAPI_devices_handler.h"
+#include "RESTAPI_file.h"
+#include "RESTAPI_ouis.h"
+#include "Utils.h"
+
+namespace uCentral {
+
+    class RESTAPI_InternalServer *RESTAPI_InternalServer::instance_ = nullptr;
+
+    RESTAPI_InternalServer::RESTAPI_InternalServer() noexcept: SubSystemServer("RESTAPIInternalServer", "REST-ISRV", "ucentral.internal.restapi")
+    {
+    }
+
+    int RESTAPI_InternalServer::Start() {
+        Logger_.information("Starting.");
+
+        for(const auto & Svr: ConfigServersList_) {
+            Logger_.information(Poco::format("Starting: %s:%s Keyfile:%s CertFile: %s", Svr.Address(), std::to_string(Svr.Port()),
+                                             Svr.KeyFile(),Svr.CertFile()));
+
+            auto Sock{Svr.CreateSecureSocket(Logger_)};
+
+            Svr.LogCert(Logger_);
+            if(!Svr.RootCA().empty())
+                Svr.LogCas(Logger_);
+            auto Params = new Poco::Net::HTTPServerParams;
+            Params->setMaxThreads(50);
+            Params->setMaxQueued(200);
+            Params->setKeepAlive(true);
+
+            auto NewServer = std::make_unique<Poco::Net::HTTPServer>(new InternalRequestHandlerFactory, Pool_, Sock, Params);
+            NewServer->start();
+            RESTServers_.push_back(std::move(NewServer));
+        }
+
+        return 0;
+    }
+
+    void RESTAPI_InternalServer::Stop() {
+        Logger_.information("Stopping ");
+        for( const auto & svr : RESTServers_ )
+            svr->stop();
+    }
+
+    Poco::Net::HTTPRequestHandler *InternalRequestHandlerFactory::createRequestHandler(const Poco::Net::HTTPServerRequest & Request) {
+
+        Logger_.debug(Poco::format("REQUEST(%s): %s %s", uCentral::Utils::FormatIPv6(Request.clientAddress().toString()), Request.getMethod(), Request.getURI()));
+
+        Poco::URI uri(Request.getURI());
+        const auto & Path = uri.getPath();
+        RESTAPIHandler::BindingMap Bindings;
+
+		return RESTAPI_Router_I<
+			RESTAPI_devices_handler,
+			RESTAPI_device_handler,
+			RESTAPI_device_commandHandler,
+			RESTAPI_default_configurations,
+			RESTAPI_default_configuration,
+			RESTAPI_command,
+			RESTAPI_commands,
+			RESTAPI_ouis,
+			RESTAPI_file,
+			RESTAPI_BlackList>(Path,Bindings,Logger_);    }
+
+}

src/RESTAPI_InternalServer.h

@@ -0,0 +1,53 @@
+//
+// Created by stephane bourque on 2021-06-29.
+//
+
+#ifndef UCENTRALSEC_RESTAPI_INTERNALSERVER_H
+#define UCENTRALSEC_RESTAPI_INTERNALSERVER_H
+
+#include "SubSystemServer.h"
+#include "Poco/Net/HTTPServer.h"
+#include "Poco/Net/HTTPRequestHandler.h"
+#include "Poco/Net/HTTPRequestHandlerFactory.h"
+#include "Poco/Net/HTTPServerRequest.h"
+#include "Poco/Net/NetException.h"
+
+namespace uCentral {
+
+    class RESTAPI_InternalServer : public SubSystemServer {
+
+    public:
+        RESTAPI_InternalServer() noexcept;
+
+        static RESTAPI_InternalServer *instance() {
+            if (instance_ == nullptr) {
+                instance_ = new RESTAPI_InternalServer;
+            }
+            return instance_;
+        }
+
+        int Start() override;
+        void Stop() override;
+
+    private:
+        static RESTAPI_InternalServer *instance_;
+        std::vector<std::unique_ptr<Poco::Net::HTTPServer>>   RESTServers_;
+        Poco::ThreadPool	Pool_;
+    };
+
+    inline RESTAPI_InternalServer * RESTAPI_InternalServer() { return RESTAPI_InternalServer::instance(); };
+
+    class InternalRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory {
+    public:
+        InternalRequestHandlerFactory() :
+                Logger_(RESTAPI_InternalServer()->Logger()){}
+
+        Poco::Net::HTTPRequestHandler *createRequestHandler(const Poco::Net::HTTPServerRequest &request) override;
+    private:
+        Poco::Logger    & Logger_;
+    };
+
+
+} //   namespace
+
+#endif //UCENTRALSEC_RESTAPI_INTERNALSERVER_H

src/RESTAPI_RPC.cpp

@@ -0,0 +1,132 @@
+//
+// Created by stephane bourque on 2021-06-28.
+//
+#include <cctype>
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <future>
+#include <numeric>
+#include <chrono>
+#include "RESTAPI_RPC.h"
+
+#include "StorageService.h"
+#include "DeviceRegistry.h"
+#include "CommandManager.h"
+
+namespace uCentral::RESTAPI_RPC {
+	void SetCommandAsPending(GWObjects::CommandDetails &Cmd,
+											 Poco::Net::HTTPServerRequest &Request,
+											 Poco::Net::HTTPServerResponse &Response, RESTAPIHandler *Handler) {
+		if (Storage()->AddCommand(Cmd.SerialNumber, Cmd, Storage::COMMAND_PENDING)) {
+			Poco::JSON::Object RetObj;
+			Cmd.to_json(RetObj);
+			Handler->ReturnObject(Request, RetObj, Response);
+			return;
+		} else {
+			Handler->ReturnStatus(Request, Response,
+								  Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
+			return;
+		}
+	}
+
+	void WaitForCommand(GWObjects::CommandDetails &Cmd,
+										Poco::JSON::Object  & Params,
+										Poco::Net::HTTPServerRequest &Request,
+										Poco::Net::HTTPServerResponse &Response,
+										std::chrono::milliseconds D,
+										Poco::JSON::Object * ObjectToReturn,
+										RESTAPIHandler * Handler) {
+
+		// 	if the command should be executed in the future, or if the device is not connected, then we should just add the command to
+		//	the DB and let it figure out when to deliver the command.
+		if(Cmd.RunAt || !DeviceRegistry()->Connected(Cmd.SerialNumber)) {
+			SetCommandAsPending(Cmd, Request, Response, Handler);
+			return;
+		} else if(Cmd.RunAt==0 && DeviceRegistry()->Connected(Cmd.SerialNumber)) {
+			auto Promise = std::make_shared<std::promise<Poco::JSON::Object::Ptr>>();
+			std::future<Poco::JSON::Object::Ptr> Future = Promise->get_future();
+
+			Cmd.Executed = time(nullptr);
+
+			if (CommandManager()->SendCommand(Cmd.SerialNumber, Cmd.Command, Params, Promise, Cmd.UUID)) {
+				auto Status = Future.wait_for(D);
+				if (Status == std::future_status::ready) {
+					auto Answer = Future.get();
+
+					if (Answer->has("result") && Answer->isObject("result")) {
+						auto ResultFields =
+							Answer->get("result").extract<Poco::JSON::Object::Ptr>();
+						if (ResultFields->has("status") && ResultFields->isObject("status")) {
+							auto StatusInnerObj =
+								ResultFields->get("status").extract<Poco::JSON::Object::Ptr>();
+							if (StatusInnerObj->has("error"))
+								Cmd.ErrorCode = StatusInnerObj->get("error");
+							if (StatusInnerObj->has("text"))
+								Cmd.ErrorText = StatusInnerObj->get("text").toString();
+							std::stringstream ResultText;
+							Poco::JSON::Stringifier::stringify(Answer->get("result"), ResultText);
+							Cmd.Results = ResultText.str();
+							Cmd.Status = "completed";
+							Cmd.Completed = time(nullptr);
+
+							//	Add the completed command to the database...
+							Storage()->AddCommand(Cmd.SerialNumber, Cmd,Storage::COMMAND_COMPLETED);
+
+							if(ObjectToReturn) {
+								Handler->ReturnObject(Request, *ObjectToReturn, Response);
+							} else {
+								Poco::JSON::Object O;
+								Cmd.to_json(O);
+								Handler->ReturnObject(Request, O, Response);
+							}
+							return;
+						}
+					} else {
+						SetCommandAsPending(Cmd, Request, Response, Handler);
+						return;
+					}
+				} else {
+					SetCommandAsPending(Cmd, Request, Response, Handler);
+					return;
+				}
+			} else {
+				SetCommandAsPending(Cmd, Request, Response, Handler);
+				return;
+			}
+		}
+	}
+
+	bool WaitForRPC(GWObjects::CommandDetails &Cmd,
+									Poco::Net::HTTPServerRequest &Request,
+									Poco::Net::HTTPServerResponse &Response, uint64_t Timeout,
+									bool ReturnValue,
+									RESTAPIHandler * Handler) {
+
+		if (DeviceRegistry()->Connected(Cmd.SerialNumber)) {
+			GWObjects::CommandDetails ResCmd;
+			while (Timeout > 0) {
+				Timeout -= 1000;
+				Poco::Thread::sleep(1000);
+				if (Storage()->GetCommand(Cmd.UUID, ResCmd)) {
+					if (ResCmd.Completed) {
+						if (ReturnValue) {
+							Poco::JSON::Object RetObj;
+							ResCmd.to_json(RetObj);
+							Handler->ReturnObject(Request, RetObj, Response);
+						}
+						return true;
+					}
+				}
+			}
+		}
+		if (ReturnValue) {
+			Poco::JSON::Object RetObj;
+			Cmd.to_json(RetObj);
+			Handler->ReturnObject(Request, RetObj, Response);
+		}
+		return false;
+	}
+
+
+}

src/RESTAPI_RPC.h

@@ -15,27 +15,29 @@
 #include "Poco/File.h"
 #include "Poco/JSON/Object.h"
 
-#include "RESTObjects//RESTAPI_GWobjects.h"
-#include "StorageService.h"
-#include "framework/MicroService.h"
+#include "RESTAPI_GWobjects.h"
+#include "RESTAPI_handler.h"
 
-namespace OpenWifi::RESTAPI_RPC {
+namespace uCentral::RESTAPI_RPC {
 
-	void WaitForCommand( 	GWObjects::CommandDetails &Cmd,
+	bool WaitForRPC(GWObjects::CommandDetails &Cmd,
+					   Poco::Net::HTTPServerRequest &Request,
+					   Poco::Net::HTTPServerResponse &Response,
+					   uint64_t Timeout,
+					   bool ReturnObject,
+					   RESTAPIHandler * Handler);
+
+	void WaitForCommand( GWObjects::CommandDetails &Cmd,
 							Poco::JSON::Object  & Params,
 							Poco::Net::HTTPServerRequest &Request,
 							Poco::Net::HTTPServerResponse &Response,
-							int64_t WaitTimeInMs,
+							std::chrono::milliseconds D,
 							Poco::JSON::Object * ObjectToReturn,
-							RESTAPIHandler * Handler,
-							Poco::Logger &Logger);
-
-	void SetCommandStatus(	GWObjects::CommandDetails &Cmd,
-							  Poco::Net::HTTPServerRequest &Request,
-							  Poco::Net::HTTPServerResponse &Response, RESTAPIHandler * handler,
-							  OpenWifi::Storage::CommandExecutionType Status,
-							  Poco::Logger &Logger);
+							RESTAPIHandler * Handler);
 
+	void SetCommandAsPending(GWObjects::CommandDetails &Cmd,
+								Poco::Net::HTTPServerRequest &Request,
+								Poco::Net::HTTPServerResponse &Response, RESTAPIHandler * handler);
 
 }
 #endif // UCENTRALGW_RESTAPI_RPC_H

src/RESTAPI_SecurityObjects.cpp

@@ -9,13 +9,13 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"
 
-#include "framework/MicroService.h"
 #include "RESTAPI_SecurityObjects.h"
+#include "RESTAPI_utils.h"
 
-using OpenWifi::RESTAPI_utils::field_to_json;
-using OpenWifi::RESTAPI_utils::field_from_json;
+using uCentral::RESTAPI_utils::field_to_json;
+using uCentral::RESTAPI_utils::field_from_json;
 
-namespace OpenWifi::SecurityObjects {
+namespace uCentral::SecurityObjects {
 
 	void AclTemplate::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"Read",Read_);
@@ -58,28 +58,21 @@ namespace OpenWifi::SecurityObjects {
             return CSR;
         else if (!Poco::icompare(U, "system"))
             return SYSTEM;
-        else if (!Poco::icompare(U, "installer"))
-            return INSTALLER;
-        else if (!Poco::icompare(U, "noc"))
-            return NOC;
-        else if (!Poco::icompare(U, "accounting"))
-            return ACCOUNTING;
+        else if (!Poco::icompare(U, "special"))
+            return SPECIAL;
         return UNKNOWN;
     }
 
     std::string UserTypeToString(USER_ROLE U) {
         switch(U) {
+            case UNKNOWN: return "unknown";
             case ROOT: return "root";
-            case ADMIN: return "admin";
             case SUBSCRIBER: return "subscriber";
             case CSR: return "csr";
             case SYSTEM: return "system";
-            case INSTALLER: return "installer";
-            case NOC: return "noc";
-            case ACCOUNTING: return "accounting";
-            case UNKNOWN:
-            default:
-                return "unknown";
+            case SPECIAL: return "special";
+            case ADMIN: return "admin";
+            default: return "unknown";
         }
     }
 
@@ -132,94 +125,6 @@ namespace OpenWifi::SecurityObjects {
 		return false;
 	}
 
-	void MobilePhoneNumber::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"number", number);
-	    field_to_json(Obj,"verified", verified);
-	    field_to_json(Obj,"primary", primary);
-	}
-
-	bool MobilePhoneNumber::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"number",number);
-	        field_from_json(Obj,"verified",verified);
-	        field_from_json(Obj,"primary",primary);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	};
-
-	void MfaAuthInfo::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"enabled", enabled);
-	    field_to_json(Obj,"method", method);
-	}
-
-	bool MfaAuthInfo::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"enabled",enabled);
-	        field_from_json(Obj,"method",method);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	}
-
-	void UserLoginLoginExtensions::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj, "mobiles", mobiles);
-	    field_to_json(Obj, "mfa", mfa);
-	}
-
-	bool UserLoginLoginExtensions::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"mobiles",mobiles);
-	        field_from_json(Obj,"mfa",mfa);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	}
-
-    void MFAChallengeRequest::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "uuid", uuid);
-        field_to_json(Obj, "question", question);
-        field_to_json(Obj, "created", created);
-        field_to_json(Obj, "method", method);
-    }
-
-    bool MFAChallengeRequest::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"uuid",uuid);
-	        field_from_json(Obj,"question",question);
-	        field_from_json(Obj,"created",created);
-	        field_from_json(Obj,"method",method);
-	        return true;
-	    } catch (...) {
-
-	    }
-	    return false;
-	};
-
-    void MFAChallengeResponse::to_json(Poco::JSON::Object &Obj) const {
-        field_to_json(Obj, "uuid", uuid);
-        field_to_json(Obj, "answer", answer);
-
-    }
-
-    bool MFAChallengeResponse::from_json(Poco::JSON::Object::Ptr &Obj) {
-        try {
-            field_from_json(Obj,"uuid",uuid);
-            field_from_json(Obj,"answer",answer);
-            return true;
-        } catch (...) {
-
-        }
-        return false;
-
-    }
-
     void UserInfo::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"Id",Id);
 		field_to_json(Obj,"name",name);
@@ -387,53 +292,26 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"note", note);
 	}
 
-	bool NoteInfo::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool NoteInfo::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"created",created);
 			field_from_json(Obj,"createdBy",createdBy);
 			field_from_json(Obj,"note",note);
-			return true;
 		} catch(...) {
 
 		}
 		return false;
 	}
 
-    bool MergeNotes(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes) {
-	    try {
-	        if(Obj->has("notes") && Obj->isArray("notes")) {
-	            SecurityObjects::NoteInfoVec NIV;
-	            NIV = RESTAPI_utils::to_object_array<SecurityObjects::NoteInfo>(Obj->get("notes").toString());
-	            for(auto const &i:NIV) {
-	                SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
-	                Notes.push_back(ii);
-	            }
-	        }
-	        return true;
-	    } catch(...) {
-
-	    }
-	    return false;
-	}
-
-	bool MergeNotes(const NoteInfoVec & NewNotes, const UserInfo &UInfo, NoteInfoVec & ExistingNotes) {
-	    for(auto const &i:NewNotes) {
-	        SecurityObjects::NoteInfo   ii{.created=(uint64_t)std::time(nullptr), .createdBy=UInfo.email, .note=i.note};
-	        ExistingNotes.push_back(ii);
-	    }
-        return true;
-	}
-
 	void ProfileAction::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"resource", resource);
 		field_to_json<ResourceAccessType>(Obj,"access", access, ResourceAccessTypeToString);
 	}
 
-	bool ProfileAction::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool ProfileAction::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"resource",resource);
 			field_from_json<ResourceAccessType>(Obj,"access",access,ResourceAccessTypeFromString );
-			return true;
 		} catch(...) {
 
 		}
@@ -449,7 +327,7 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj,"notes", notes);
 	}
 
-	bool SecurityProfile::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool SecurityProfile::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"id",id);
 			field_from_json(Obj,"name",name);
@@ -457,7 +335,6 @@ namespace OpenWifi::SecurityObjects {
 			field_from_json(Obj,"policy",policy);
 			field_from_json(Obj,"role",role);
 			field_from_json(Obj,"notes",notes);
-			return true;
 		} catch(...) {
 
 		}
@@ -468,51 +345,13 @@ namespace OpenWifi::SecurityObjects {
 		field_to_json(Obj, "profiles", profiles);
 	}
 
-	bool SecurityProfileList::from_json(Poco::JSON::Object::Ptr &Obj) {
+	bool SecurityProfileList::from_json(Poco::JSON::Object::Ptr Obj) {
 		try {
 			field_from_json(Obj,"profiles",profiles);
-			return true;
 		} catch(...) {
 
 		}
 		return false;
 	}
-
-    void ActionLink::to_json(Poco::JSON::Object &Obj) const {
-	    field_to_json(Obj,"id",id);
-	    field_to_json(Obj,"action",action);
-	    field_to_json(Obj,"userId",userId);
-	    field_to_json(Obj,"actionTemplate",actionTemplate);
-	    field_to_json(Obj,"variables",variables);
-	    field_to_json(Obj,"locale",locale);
-	    field_to_json(Obj,"message",message);
-	    field_to_json(Obj,"sent",sent);
-	    field_to_json(Obj,"created",created);
-	    field_to_json(Obj,"expires",expires);
-	    field_to_json(Obj,"completed",completed);
-	    field_to_json(Obj,"canceled",canceled);
-
-	}
-
-    bool ActionLink::from_json(Poco::JSON::Object::Ptr &Obj) {
-	    try {
-	        field_from_json(Obj,"id",id);
-	        field_from_json(Obj,"action",action);
-	        field_from_json(Obj,"userId",userId);
-	        field_from_json(Obj,"actionTemplate",actionTemplate);
-	        field_from_json(Obj,"variables",variables);
-	        field_from_json(Obj,"locale",locale);
-	        field_from_json(Obj,"message",message);
-	        field_from_json(Obj,"sent",sent);
-	        field_from_json(Obj,"created",created);
-	        field_from_json(Obj,"expires",expires);
-	        field_from_json(Obj,"completed",completed);
-	        field_from_json(Obj,"canceled",canceled);
-	        return true;
-	    } catch(...) {
-
-	    }
-	    return false;
-	}
 }
 

src/RESTAPI_SecurityObjects.h

@@ -10,9 +10,9 @@
 #define UCENTRAL_RESTAPI_SECURITYOBJECTS_H
 
 #include "Poco/JSON/Object.h"
-#include "framework/OpenWifiTypes.h"
+#include "uCentralTypes.h"
 
-namespace OpenWifi::SecurityObjects {
+namespace uCentral::SecurityObjects {
 
 	struct AclTemplate {
 		bool Read_ = true;
@@ -42,7 +42,7 @@ namespace OpenWifi::SecurityObjects {
 	};
 
     enum USER_ROLE {
-        UNKNOWN, ROOT, ADMIN, SUBSCRIBER, CSR, SYSTEM, INSTALLER, NOC, ACCOUNTING
+        UNKNOWN, ROOT, ADMIN, SUBSCRIBER, CSR, SYSTEM, SPECIAL
     };
 
     USER_ROLE UserTypeFromString(const std::string &U);
@@ -53,53 +53,10 @@ namespace OpenWifi::SecurityObjects {
 		std::string createdBy;
 		std::string note;
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(Poco::JSON::Object::Ptr &Obj);
+		bool from_json(Poco::JSON::Object::Ptr Obj);
 	};
 	typedef std::vector<NoteInfo>	NoteInfoVec;
 
-	struct MobilePhoneNumber {
-	    std::string number;
-	    bool verified = false;
-	    bool primary = false;
-
-	    void to_json(Poco::JSON::Object &Obj) const;
-	    bool from_json(Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct MfaAuthInfo {
-	    bool enabled = false;
-	    std::string method;
-
-	    void to_json(Poco::JSON::Object &Obj) const;
-	    bool from_json(Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct UserLoginLoginExtensions {
-	    std::vector<MobilePhoneNumber>  mobiles;
-	    struct MfaAuthInfo mfa;
-
-	    void to_json(Poco::JSON::Object &Obj) const;
-	    bool from_json(Poco::JSON::Object::Ptr &Obj);
-	};
-
-	struct MFAChallengeRequest {
-	    std::string uuid;
-	    std::string question;
-	    std::string method;
-	    uint64_t    created = std::time(nullptr);
-
-	    void to_json(Poco::JSON::Object &Obj) const;
-	    bool from_json(Poco::JSON::Object::Ptr &Obj);
-	};
-
-    struct MFAChallengeResponse {
-        std::string uuid;
-        std::string answer;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-        bool from_json(Poco::JSON::Object::Ptr &Obj);
-    };
-
 	struct UserInfo {
         std::string Id;
 		std::string name;
@@ -124,7 +81,7 @@ namespace OpenWifi::SecurityObjects {
 		bool suspended = false;
 		bool blackListed = false;
         USER_ROLE userRole;
-        UserLoginLoginExtensions userTypeProprietaryInfo;
+		std::string userTypeProprietaryInfo;
 		std::string securityPolicy;
 		uint64_t securityPolicyChange = 0 ;
 		std::string currentPassword;
@@ -137,10 +94,6 @@ namespace OpenWifi::SecurityObjects {
 	};
 	typedef std::vector<UserInfo>   UserInfoVec;
 
-	// bool append_from_json(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
-	bool MergeNotes(Poco::JSON::Object::Ptr Obj, const UserInfo &UInfo, NoteInfoVec & Notes);
-	bool MergeNotes(const NoteInfoVec & NewNotes, const UserInfo &UInfo, NoteInfoVec & ExistingNotes);
-
 	struct InternalServiceInfo {
 		std::string privateURI;
 		std::string publicURI;
@@ -161,9 +114,9 @@ namespace OpenWifi::SecurityObjects {
 	struct SystemEndpoint {
 		std::string type;
 		uint64_t 	id = 0;
-		std::string vendor{"OpenWiFi"};
+		std::string vendor;
 		std::string uri;
-		std::string authenticationType{"internal_v1"};
+		std::string authenticationType;
 		void to_json(Poco::JSON::Object &Obj) const;
 		bool from_json(const Poco::JSON::Object::Ptr &Obj);
 	};
@@ -200,49 +153,26 @@ namespace OpenWifi::SecurityObjects {
 		std::string resource;
 		ResourceAccessType access;
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(Poco::JSON::Object::Ptr &Obj);
+		bool from_json(Poco::JSON::Object::Ptr Obj);
 	};
 	typedef std::vector<ProfileAction>	ProfileActionVec;
 
 	struct SecurityProfile {
-		uint64_t id=0;
+		uint64_t id;
 		std::string name;
 		std::string description;
 		ProfileActionVec policy;
 		std::string role;
 		NoteInfoVec notes;
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(Poco::JSON::Object::Ptr &Obj);
+		bool from_json(Poco::JSON::Object::Ptr Obj);
 	};
 	typedef std::vector<SecurityProfile> SecurityProfileVec;
 
 	struct SecurityProfileList {
 		SecurityProfileVec profiles;
 		void to_json(Poco::JSON::Object &Obj) const;
-		bool from_json(Poco::JSON::Object::Ptr &Obj);
-	};
-
-	enum LinkActions {
-	    FORGOT_PASSWORD=1,
-	    VERIFY_EMAIL
-	};
-
-	struct ActionLink {
-	    std::string         id;
-	    uint64_t            action;
-	    std::string         userId;
-	    std::string         actionTemplate;
-	    Types::StringPairVec variables;
-	    std::string         locale;
-	    std::string         message;
-	    uint64_t            sent=0;
-	    uint64_t            created=std::time(nullptr);
-	    uint64_t            expires=0;
-	    uint64_t            completed=0;
-	    uint64_t            canceled=0;
-
-        void to_json(Poco::JSON::Object &Obj) const;
-	    bool from_json(Poco::JSON::Object::Ptr &Obj);
+		bool from_json(Poco::JSON::Object::Ptr Obj);
 	};
 }
 

src/RESTAPI_command.cpp

@@ -0,0 +1,49 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include "RESTAPI_command.h"
+
+#include "RESTAPI_protocol.h"
+#include "StorageService.h"
+
+namespace uCentral {
+void RESTAPI_command::handleRequest(Poco::Net::HTTPServerRequest &Request,
+									Poco::Net::HTTPServerResponse &Response) {
+	if (!ContinueProcessing(Request, Response))
+		return;
+
+	if (!IsAuthorized(Request, Response))
+		return;
+
+	try {
+		ParseParameters(Request);
+
+		if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET) {
+			auto CommandUUID = GetBinding(uCentral::RESTAPI::Protocol::COMMANDUUID, "");
+			GWObjects::CommandDetails Command;
+			if (Storage()->GetCommand(CommandUUID, Command)) {
+				Poco::JSON::Object RetObj;
+				Command.to_json(RetObj);
+				ReturnObject(Request, RetObj, Response);
+			} else
+				NotFound(Request, Response);
+		} else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_DELETE) {
+			auto CommandUUID = GetBinding(uCentral::RESTAPI::Protocol::COMMANDUUID, "");
+			if (Storage()->DeleteCommand(CommandUUID)) {
+				OK(Request, Response);
+			} else {
+				NotFound(Request, Response);
+			}
+		}
+		return;
+	} catch (const Poco::Exception &E) {
+		Logger_.error(Poco::format("%s: failed with %s", std::string(__func__), E.displayText()));
+	}
+	BadRequest(Request, Response);
+}
+}

src/RESTAPI_command.h

@@ -9,24 +9,21 @@
 #ifndef UCENTRAL_RESTAPI_COMMAND_H
 #define UCENTRAL_RESTAPI_COMMAND_H
 
-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"
 
-namespace OpenWifi {
+namespace uCentral {
 class RESTAPI_command : public RESTAPIHandler {
   public:
-	RESTAPI_command(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
+	RESTAPI_command(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
 		: RESTAPIHandler(bindings, L,
 						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
 												  Poco::Net::HTTPRequest::HTTP_DELETE,
 												  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-						 Server,
 						 Internal) {}
-		static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/command/{commandUUID}"};}
-		void DoGet() final;
-		void DoDelete() final;
-		void DoPost() final {};
-		void DoPut() final {};
-	};
+	void handleRequest(Poco::Net::HTTPServerRequest &request,
+					   Poco::Net::HTTPServerResponse &response) override;
+	static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/command/{commandUUID}"};}
+};
 }
 
 #endif //UCENTRAL_RESTAPI_COMMAND_H

src/RESTAPI_commands.cpp

@@ -0,0 +1,60 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include "RESTAPI_commands.h"
+#include "RESTAPI_protocol.h"
+#include "StorageService.h"
+#include "Utils.h"
+
+namespace uCentral {
+void RESTAPI_commands::handleRequest(Poco::Net::HTTPServerRequest &Request,
+									 Poco::Net::HTTPServerResponse &Response) {
+	if (!ContinueProcessing(Request, Response))
+		return;
+
+	if (!IsAuthorized(Request, Response))
+		return;
+
+	try {
+		ParseParameters(Request);
+		InitQueryBlock();
+
+		auto SerialNumber = GetParameter(uCentral::RESTAPI::Protocol::SERIALNUMBER, "");
+
+		if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET) {
+			std::vector<GWObjects::CommandDetails> Commands;
+			if (QB_.Newest) {
+				Storage()->GetNewestCommands(SerialNumber, QB_.Limit, Commands);
+			} else {
+				Storage()->GetCommands(SerialNumber, QB_.StartDate, QB_.EndDate, QB_.Offset,
+											   QB_.Limit, Commands);
+			}
+			Poco::JSON::Array ArrayObj;
+			for (const auto &i : Commands) {
+				Poco::JSON::Object Obj;
+				i.to_json(Obj);
+				ArrayObj.add(Obj);
+			}
+			Poco::JSON::Object RetObj;
+			RetObj.set(uCentral::RESTAPI::Protocol::COMMANDS, ArrayObj);
+			ReturnObject(Request, RetObj, Response);
+			return;
+
+		} else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_DELETE) {
+			if (Storage()->DeleteCommands(SerialNumber, QB_.StartDate, QB_.EndDate))
+				OK(Request, Response);
+			else
+				BadRequest(Request, Response);
+			return;
+		}
+	} catch (const Poco::Exception &E) {
+		Logger_.error(Poco::format("%s: failed with %s", std::string(__func__), E.displayText()));
+	}
+	BadRequest(Request, Response);
+}
+}

src/RESTAPI_commands.h

@@ -9,23 +9,20 @@
 #ifndef UCENTRAL_RESTAPI_COMMANDS_H
 #define UCENTRAL_RESTAPI_COMMANDS_H
 
-#include "framework/MicroService.h"
+#include "RESTAPI_handler.h"
 
-namespace OpenWifi {
+namespace uCentral {
 class RESTAPI_commands : public RESTAPIHandler {
   public:
-	RESTAPI_commands(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, RESTAPI_GenericServer & Server, bool Internal)
+	RESTAPI_commands(const RESTAPIHandler::BindingMap &bindings, Poco::Logger &L, bool Internal)
 		: RESTAPIHandler(bindings, L,
 						 std::vector<std::string>{Poco::Net::HTTPRequest::HTTP_GET,
 												  Poco::Net::HTTPRequest::HTTP_DELETE,
 												  Poco::Net::HTTPRequest::HTTP_OPTIONS},
-						 Server,
 						 Internal) {}
+	void handleRequest(Poco::Net::HTTPServerRequest &request,
+					   Poco::Net::HTTPServerResponse &response) override;
 	static const std::list<const char *> PathName() { return std::list<const char *>{"/api/v1/commands"};}
-	void DoGet() final;
-	void DoDelete() final;
-	void DoPost() final {};
-	void DoPut() final {};
 };
 }
 #endif //UCENTRAL_RESTAPI_COMMANDS_H

src/RESTAPI_default_configuration.cpp

@@ -0,0 +1,80 @@
+//
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
+//
+
+#include "Poco/JSON/Parser.h"
+
+#include "RESTAPI_default_configuration.h"
+
+#include "RESTAPI_GWobjects.h"
+#include "RESTAPI_protocol.h"
+#include "StorageService.h"
+
+namespace uCentral {
+void RESTAPI_default_configuration::handleRequest(Poco::Net::HTTPServerRequest &Request,
+												  Poco::Net::HTTPServerResponse &Response) {
+	if (!ContinueProcessing(Request, Response))
+		return;
+
+	if (!IsAuthorized(Request, Response))
+		return;
+
+	std::string Name = GetBinding(uCentral::RESTAPI::Protocol::NAME, "");
+	ParseParameters(Request);
+
+	if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET) {
+		GWObjects::DefaultConfiguration DefConfig;
+		if (Storage()->GetDefaultConfiguration(Name, DefConfig)) {
+			Poco::JSON::Object Obj;
+			DefConfig.to_json(Obj);
+			ReturnObject(Request, Obj, Response);
+		} else {
+			NotFound(Request, Response);
+		}
+	} else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_DELETE) {
+		if (Storage()->DeleteDefaultConfiguration(Name)) {
+			OK(Request, Response);
+		} else {
+			NotFound(Request, Response);
+		}
+	} else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST) {
+		Poco::JSON::Parser IncomingParser;
+		Poco::JSON::Object::Ptr Obj =
+			IncomingParser.parse(Request.stream()).extract<Poco::JSON::Object::Ptr>();
+		GWObjects::DefaultConfiguration DefConfig;
+
+		if (!DefConfig.from_json(Obj)) {
+			BadRequest(Request, Response);
+			return;
+		}
+
+		if (Storage()->CreateDefaultConfiguration(Name, DefConfig)) {
+			OK(Request, Response);
+		} else {
+			BadRequest(Request, Response);
+		}
+	} else if (Request.getMethod() == Poco::Net::HTTPRequest::HTTP_PUT) {
+		Poco::JSON::Parser IncomingParser;
+		Poco::JSON::Object::Ptr Obj =
+			IncomingParser.parse(Request.stream()).extract<Poco::JSON::Object::Ptr>();
+
+		GWObjects::DefaultConfiguration DefConfig;
+		if (!DefConfig.from_json(Obj)) {
+			BadRequest(Request, Response);
+			return;
+		}
+
+		if (Storage()->UpdateDefaultConfiguration(Name, DefConfig)) {
+			OK(Request, Response);
+		} else {
+			BadRequest(Request, Response);
+		}
+	} else {
+		BadRequest(Request, Response);
+	}
+}
+}