From 47b396873be86699527c4fb137aa93dba00f675f Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 2 May 2023 17:37:21 +0200
Subject: [PATCH] ucentral-schema: update to latest HEAD

99cd625 captive: allow mutliple instances

Fixes: WIFI-12366
Signed-off-by: John Crispin <john@phrozen.org>
---
 feeds/ucentral/ucentral-schema/Makefile       |   4 +-
 .../ucentral/examples/captive-multiple.json   | 124 ++++++++++++++++++
 2 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/captive-multiple.json

diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile
index 5fd6ce672..8b96894ff 100644
--- a/feeds/ucentral/ucentral-schema/Makefile
+++ b/feeds/ucentral/ucentral-schema/Makefile
@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=2c69cddeef03cd02ec5343a003cdf91f392050f17d78fbd254a6c7255e115a35
+PKG_MIRROR_HASH:=6ebb832f3b71780701795accb6ba65e149a13633e5946a39b8747cad7c5e669e
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-05-29
-PKG_SOURCE_VERSION:=f2a7137c3a7c815c645a70178c5fcdbc08bd603c
+PKG_SOURCE_VERSION:=99cd625111ea56becd215313e434ff82bf04c10e
 
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/captive-multiple.json b/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/captive-multiple.json
new file mode 100644
index 000000000..640ea3cab
--- /dev/null
+++ b/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/captive-multiple.json
@@ -0,0 +1,124 @@
+{
+	"uuid": 2,
+	"radios": [
+		{
+			"band": "6G",
+			"country": "CA",
+			"channel-mode": "HE",
+			"channel-width": 80
+		},
+		{
+			"band": "5G",
+			"country": "CA",
+			"channel-mode": "HE",
+			"channel-width": 80
+		},
+		{
+			"band": "2G",
+			"country": "CA",
+			"channel-mode": "HE",
+			"channel-width": 80
+		}
+	],
+
+	"interfaces": [
+		{
+			"name": "WAN",
+			"role": "upstream",
+			"ethernet": [
+				{
+					"select-ports": [
+						"WAN*"
+					]
+				}
+			],
+			"ipv4": {
+				"addressing": "dynamic"
+			},
+			"ssids": [
+				{
+					"name": "OpenWifi-hotspot",
+					"services": [ "captive" ],
+					"wifi-bands": [
+						"5G",
+						"2G"
+					],
+					"bss-mode": "ap",
+					"encryption": {
+						"proto": "psk2",
+						"key": "OpenWifi",
+						"ieee80211w": "optional"
+					},
+					"captive": {
+						"auth-mode": "uam",
+						"uam-port": 3990,
+						"uam-secret": "hotsys123",
+						"uam-server": "https://customer.hotspotsystem.com/customer/hotspotlogin.php",
+						"nasid": "AlmondLabs",
+						"auth-server": "radius.hotspotsystem.com",
+						"auth-port": 1812,
+						"auth-secret": "hotsys123",
+						"final-redirect-url": "uam",
+						"walled-garden-fqdn": [
+							"*.google.com", "telecominfraproject.com", "customer.hotspotsystem.com"
+						]
+					}
+				}, {
+					"name": "OpenWifi-hotspot-click",
+					"services": [ "captive" ],
+					"wifi-bands": [
+						"5G",
+						"2G"
+					],
+					"bss-mode": "ap",
+					"encryption": {
+						"proto": "psk2",
+						"key": "OpenWifi",
+						"ieee80211w": "optional"
+					},
+					"captive": {
+						"auth-mode": "click-to-continue",
+						"walled-garden-fqdn": [
+							"*.google.com", "telecominfraproject.com"
+						]
+					}
+				}
+			]
+		},
+		{
+			"name": "LAN",
+			"role": "downstream",
+			"services": [ "ssh" ],
+			"ethernet": [
+				{
+					"select-ports": [
+						"LAN*"
+					]
+				}
+			],
+			"ipv4": {
+				"addressing": "static",
+				"subnet": "192.168.1.1/24",
+				"dhcp": {
+					"lease-first": 10,
+					"lease-count": 100,
+					"lease-time": "6h"
+				}
+			}
+		}
+	],
+	"metrics": {
+		"statistics": {
+			"interval": 120,
+			"types": [ "ssids", "lldp", "clients" ]
+		},
+		"health": {
+			"interval": 120
+		}
+	},
+	"services": {
+		"ssh": {
+			"port": 22
+		}
+	}
+}