Chg: update image tag in helm values to v3.0.2-RC1

WIFI-13542 Release merge

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ defaults:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
       DOCKER_REGISTRY_URL: tip-tip-wlan-cloud-ucentral.jfrog.io
       DOCKER_REGISTRY_USERNAME: ucentral

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(owprov VERSION 3.2.1)
+project(owprov VERSION 3.0.2)
 
 set(CMAKE_CXX_STANDARD 17)
 

build

@@ -1 +1 @@
-1
+23

helm/values.yaml

@@ -9,7 +9,7 @@ fullnameOverride: ""
 images:
   owprov:
     repository: tip-tip-wlan-cloud-ucentral.jfrog.io/owprov
-    tag: v4.0.0
+    tag: v3.0.2-RC1
     pullPolicy: Always
 #    regcred:
 #      registry: tip-tip-wlan-cloud-ucentral.jfrog.io

src/AutoDiscovery.cpp

@@ -5,7 +5,6 @@
 #include "AutoDiscovery.h"
 #include "Poco/JSON/Parser.h"
 #include "StorageService.h"
-#include "Tasks/VenueConfigUpdater.h"
 #include "framework/KafkaManager.h"
 #include "framework/KafkaTopics.h"
 #include "framework/ow_constants.h"
@@ -108,11 +107,6 @@ namespace OpenWifi {
                         if (!SerialNumber.empty() && Connected) {
                             StorageService()->InventoryDB().CreateFromConnection(
                                     SerialNumber, ConnectedIP, Compatible, Locale, isConnection);
-                            // Now that the entry has been created, we can try to push a config if
-                            // the connection was a capabilities message.
-                            if (isConnection){
-                                ComputeAndPushConfig(SerialNumber, Compatible, Logger());
-                            }
                         }
                     }
 				} catch (const Poco::Exception &E) {

src/RESTAPI/RESTAPI_inventory_handler.cpp

@@ -14,13 +14,28 @@
 #include "RESTAPI/RESTAPI_db_helpers.h"
 #include "SerialNumberCache.h"
 #include "StorageService.h"
-#include "Tasks/VenueConfigUpdater.h"
 #include "framework/utils.h"
 #include "sdks/SDK_gw.h"
 #include "sdks/SDK_sec.h"
 
 namespace OpenWifi {
 
+	void GetRejectedLines(const Poco::JSON::Object::Ptr &Response, Types::StringVec &Warnings) {
+		try {
+			if (Response->has("results")) {
+				auto Results = Response->get("results").extract<Poco::JSON::Object::Ptr>();
+				auto Status = Results->get("status").extract<Poco::JSON::Object::Ptr>();
+				auto Rejected = Status->getArray("rejected");
+				std::transform(
+					Rejected->begin(), Rejected->end(), std::back_inserter(Warnings),
+					[](auto i) -> auto { return i.toString(); });
+				//                for(const auto &i:*Rejected)
+				//                  Warnings.push_back(i.toString());
+			}
+		} catch (...) {
+		}
+	}
+
 	void RESTAPI_inventory_handler::DoGet() {
 
 		ProvObjects::InventoryTag Existing;
@@ -299,8 +314,6 @@ namespace OpenWifi {
 			return NotFound();
 		}
 
-		std::string previous_venue = Existing.venue;
-
 		auto RemoveSubscriber = GetParameter("removeSubscriber");
 		if (!RemoveSubscriber.empty()) {
 			if (Existing.subscriber == RemoveSubscriber) {
@@ -458,13 +471,6 @@ namespace OpenWifi {
 			SDK::GW::Device::SetOwnerShip(this, SerialNumber, Existing.entity, Existing.venue,
 										  Existing.subscriber);
 
-			// Attempt an automatic config push when the venue is set and different than what is
-			// in DB.
-			poco_information(Logger(), fmt::format("New Venue {} Old Venue {}", NewObject.venue, previous_venue));
-			if (!NewObject.venue.empty() && NewObject.venue != previous_venue) {
-				ComputeAndPushConfig(SerialNumber, NewObject.deviceType, Logger());
-			}
-
 			ProvObjects::InventoryTag NewObjectCreated;
 			DB_.GetRecord("id", Existing.info.id, NewObjectCreated);
 			Poco::JSON::Object Answer;

src/Tasks/VenueConfigUpdater.h

@@ -28,42 +28,6 @@ namespace OpenWifi {
 		}
 	}
 
-	[[maybe_unused]] static void ComputeAndPushConfig(const std::string &SerialNumber, const std::string &DeviceType, Poco::Logger &Logger) {
-		/*
-		Generic Helper to compute a device's config and push it down to the device.
-		*/
-		poco_information(Logger, fmt::format("Attempting to push venue config for device {}", SerialNumber));
-		auto DeviceConfig = std::make_shared<APConfig>(SerialNumber,
-														DeviceType, Logger, false);
-		auto Configuration = Poco::makeShared<Poco::JSON::Object>();
-		try {
-			if (DeviceConfig->Get(Configuration)) {
-				std::ostringstream OS;
-				Configuration->stringify(OS);
-				auto Response = Poco::makeShared<Poco::JSON::Object>();
-				poco_debug(Logger,
-							fmt::format("{}: Pushing configuration.", SerialNumber));
-				if (SDK::GW::Device::Configure(nullptr, SerialNumber, Configuration,
-												Response)) {
-					Logger.debug(
-						fmt::format("{}: Configuration pushed.", SerialNumber));
-					poco_information(Logger,
-										fmt::format("{}: Updated.", SerialNumber));
-				} else {
-					poco_information(Logger,
-										fmt::format("{}: Not updated.", SerialNumber));
-				}
-			} else {
-				poco_debug(Logger,
-							fmt::format("{}: Configuration is bad.", SerialNumber));
-			}
-		} catch (...) {
-			poco_debug(Logger,
-						fmt::format("{}: Configuration is bad (caused an exception).",
-									SerialNumber));
-		}
-	}
-
 	class VenueDeviceConfigUpdater : public Poco::Runnable {
 	  public:
 		VenueDeviceConfigUpdater(const std::string &UUID, const std::string &venue, Poco::Logger &L)

src/framework/AppServiceRegistry.h

@@ -67,9 +67,9 @@ namespace OpenWifi {
 
         bool Get(const char *key, std::vector<std::string> &Value) {
             if(Registry_->has(key) && !Registry_->isNull(key) && Registry_->isArray(key)) {
-                auto pArr = Registry_->getArray(key);
+                auto Arr = Registry_->get(key);
-                for(const auto &v : *pArr) {
+                for(const auto &v:Arr) {
-                    Value.emplace_back(v.toString());
+                    Value.emplace_back(v);
                 }
                 return true;
             }
@@ -91,4 +91,4 @@ namespace OpenWifi {
 
 	inline auto AppServiceRegistry() { return AppServiceRegistry::instance(); }
 
-} // namespace OpenWifi
+} // namespace OpenWifi

src/framework/ConfigurationValidator.cpp

@@ -28,6 +28,7 @@ static const std::vector<std::string> GitJSONSchemaURLs = {
 };
 
 static std::string DefaultAPSchema = R"foo(
+
 {
     "$id": "https://openwrt.org/ucentral.schema.json",
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -353,6 +354,14 @@ static std::string DefaultAPSchema = R"foo(
                         10000
                     ]
                 },
+                "duplex": {
+                    "description": "The duplex mode that shall be forced.",
+                    "type": "string",
+                    "enum": [
+                        "half",
+                        "full"
+                    ]
+                },
                 "enabled": {
                     "description": "This allows forcing the port to down state by default.",
                     "type": "boolean",
@@ -481,59 +490,7 @@ static std::string DefaultAPSchema = R"foo(
                 "bss-color": {
                     "description": "This enables BSS Coloring on the PHY. setting it to 0 disables the feature 1-63 sets the color and 64 will make hostapd pick a random color.",
                     "type": "integer",
-                    "minimum": 0,
+                    "default": 64
-                    "maximum": 64,
-                    "default": 0
-                }
-            }
-        },
-        "radio.he-6ghz": {
-            "type": "object",
-            "properties": {
-                "power-type": {
-                    "description": "This config is to set the 6 GHz Access Point type",
-                    "type": "string",
-                    "enum": [
-                        "indoor-power-indoor",
-                        "standard-power",
-                        "very-low-power"
-                    ],
-                    "default": "very-low-power"
-                },
-                "controller": {
-                    "description": "The URL of the AFC controller that the AP shall connect to.",
-                    "type": "string"
-                },
-                "ca-certificate": {
-                    "description": "The CA of the server. This enables mTLS.",
-                    "type": "string",
-                    "format": "uc-base64"
-                },
-                "serial-number": {
-                    "description": "The serial number that the AP shall send to the AFC controller.",
-                    "type": "string"
-                },
-                "certificate-ids": {
-                    "description": "The certificate IDs that the AP shall send to the AFC controller.",
-                    "type": "string"
-                },
-                "minimum-power": {
-                    "description": "The minimum power that the AP shall request from to the AFC controller.",
-                    "type": "number"
-                },
-                "frequency-ranges": {
-                    "description": "The list of frequency ranges that the AP shall request from to the AFC controller.",
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "operating-classes": {
-                    "description": "The list of frequency ranges that the AP shall request from to the AFC controller.",
-                    "type": "array",
-                    "items": {
-                        "type": "number"
-                    }
                 }
             }
         },
@@ -678,9 +635,6 @@ static std::string DefaultAPSchema = R"foo(
                 "he-settings": {
                     "$ref": "#/$defs/radio.he"
                 },
-                "he-6ghz-settings": {
-                    "$ref": "#/$defs/radio.he-6ghz"
-                },
                 "hostapd-iface-raw": {
                     "description": "This array allows passing raw hostapd.conf lines.",
                     "type": "array",
@@ -830,19 +784,8 @@ static std::string DefaultAPSchema = R"foo(
                 },
                 "use-dns": {
                     "description": "The DNS server sent to clients as DHCP option 6.",
-                    "anyOf": [
+                    "type": "string",
-                        {
+                    "format": "uc-ip"
-                            "type": "string",
-                            "format": "ipv4"
-                        },
-                        {
-                            "type": "array",
-                            "items": {
-                                "type": "string",
-                                "format": "ipv4"
-                            }
-                        }
-                    ]
                 }
             }
         },
@@ -1370,7 +1313,8 @@ static std::string DefaultAPSchema = R"foo(
                 "domain-identifier": {
                     "description": "Mobility Domain identifier (dot11FTMobilityDomainID, MDID).",
                     "type": "string",
-                    "format": "uc-mobility",
+                    "maxLength": 4,
+                    "minLength": 4,
                     "examples": [
                         "abcd"
                     ]
@@ -3757,42 +3701,6 @@ static std::string DefaultAPSchema = R"foo(
                 }
             }
         },
-        "service.fingerprint": {
-            "description": "This section can be used to configure device fingerprinting.",
-            "type": "object",
-            "properties": {
-                "mode": {
-                    "description": "Enable this option if you would like to enable the MDNS server on the unit.",
-                    "type": "string",
-                    "enum": [
-                        "polled",
-                        "final",
-                        "raw-data"
-                    ],
-                    "default": "final"
-                },
-                "minimum-age": {
-                    "description": "The minimum age a fingerprint must have before it is reported.",
-                    "type": "number",
-                    "default": 60
-                },
-                "maximum-age": {
-                    "description": "The age at which fingerprints get flushed from the local state.",
-                    "type": "number",
-                    "default": 60
-                },
-                "periodicity": {
-                    "description": "This value defines the period at which entries get reported.",
-                    "type": "number",
-                    "default": 600
-                },
-                "allow-wan": {
-                    "description": "Allow fingerprinting devices found on the WAN port.",
-                    "type": "boolean",
-                    "default": false
-                }
-            }
-        },
         "service": {
             "description": "This section describes all of the services that may be present on the AP. Each service is then referenced via its name inside an interface, ssid, ...",
             "type": "object",
@@ -3862,9 +3770,6 @@ static std::string DefaultAPSchema = R"foo(
                 },
                 "rrm": {
                     "$ref": "#/$defs/service.rrm"
-                },
-                "fingerprint": {
-                    "$ref": "#/$defs/service.fingerprint"
                 }
             }
         },

src/framework/KafkaManager.cpp

@@ -107,16 +107,7 @@ namespace OpenWifi {
 					NewMessage.partition(0);
 					NewMessage.payload(Msg->Payload());
 					Producer.produce(NewMessage);
-					if (Queue_.size() < 100) {
+					Producer.flush();
-						// use flush when internal queue is lightly loaded, i.e. flush after each
-						// message
-						Producer.flush();
-					}
-					else {
-						// use poll when internal queue is loaded to allow messages to be sent in
-						// batches
-						Producer.poll((std::chrono::milliseconds) 0);
-					}
 				}
 			} catch (const cppkafka::HandleException &E) {
 				poco_warning(Logger_,
@@ -126,13 +117,8 @@ namespace OpenWifi {
 			} catch (...) {
 				poco_error(Logger_, "std::exception");
 			}
-			if (Queue_.size() == 0) {
-				// message queue is empty, flush all previously sent messages
-				Producer.flush();
-			}
 			Note = Queue_.waitDequeueNotification();
 		}
-		Producer.flush();
 		poco_information(Logger_, "Stopped...");
 	}
 
@@ -338,4 +324,4 @@ namespace OpenWifi {
 											   partitions.front().get_partition()));
 	}
 
-} // namespace OpenWifi
+} // namespace OpenWifi