From e9f5aec95510bd83ae9d61853393704f29849b41 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 22 May 2023 09:56:55 +0200
Subject: [PATCH] ucentral-schema: update to latest HEAD

c3d8380 add new dhcp-relay render code
a39410a remove old dhcp-relay code

Signed-off-by: John Crispin <john@phrozen.org>
---
 feeds/ucentral/ucentral-schema/Makefile       |  4 +-
 .../etc/ucentral/examples/dhcp-relay.json     | 65 ++++++++++---------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile
index 67353fbd8..67b59afab 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:=7f6f8961e8e71b24250e741efca0b66adfceed9f5f570eca639e359d543042d9
+PKG_MIRROR_HASH:=905b74f581dd41d37bf49d12e179ef2e7e98880272e03e9ceaf5d6bd4bb3b24b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-05-29
-PKG_SOURCE_VERSION:=84f53b2d6813a7c75eb79122f1c5ba229b8db7c6
+PKG_SOURCE_VERSION:=c3d8380fc2e324c8dbea78bfe08568a1ae0c1380
 
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/dhcp-relay.json b/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/dhcp-relay.json
index 50722bf70..f31f6bc2f 100644
--- a/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/dhcp-relay.json
+++ b/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/dhcp-relay.json
@@ -5,8 +5,8 @@
 			"band": "2G",
 			"country": "CA",
 			"channel-mode": "HE",
-			"channel-width": 80,
-			"channel": 32
+			"channel-width": 20,
+			"channel": 1
 		}
 	],
 
@@ -14,7 +14,6 @@
 		{
 			"name": "WAN",
 			"role": "upstream",
-			"services": [ "lldp" ],
 			"ethernet": [
 				{
 					"select-ports": [
@@ -27,28 +26,25 @@
 			}
 		},
 		{
-			"name": "LAN",
-			"role": "downstream",
-			"services": [ "ssh", "lldp" ],
+			"name": "WAN10",
+			"role": "upstream",
+			"services": [ "dhcp-relay" ],
+			"vlan": {
+				"id": 10
+			},
 			"ethernet": [
 				{
 					"select-ports": [
-						"LAN*"
+						"WAN*"
 					]
 				}
 			],
 			"ipv4": {
-				"addressing": "static",
-				"subnet": "192.168.1.1/24",
-				"dhcp": {
-					"relay-server" : "192.168.178.1",
-					"circuit-id-format": "{Interface}:{VLAN-Id}:{SSID}:{Model}:{Name}:{AP-MAC}:{Location}",
-                                        "remote-id-format": "{Client-MAC-Hex} {SSID}"
-				}
+				"addressing": "dynamic"
 			},
 			"ssids": [
 				{
-					"name": "OpenWifi",
+					"name": "Maverick",
 					"wifi-bands": [
 						"2G"
 					],
@@ -60,25 +56,36 @@
 					}
 				}
 			]
-
+		},
+		{
+			"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": {
-		"lldp": {
-			"describe": "uCentral",
-			"location": "universe"
-		},
 		"ssh": {
 			"port": 22
+		},
+		"dhcp-relay": {
+			"select-ports": [ "WAN*" ],
+			"relay-server": "192.168.178.1"
 		}
 	}
 }