From 7b049a4da2c1aaa34afc38f33603f4642f01bed3 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 3 Aug 2021 11:38:24 +0200 Subject: [PATCH] schema: add support for adding per netdev speed and duplex settings Signed-off-by: John Crispin --- .../0037-netifd-update-to-latest-HEAD.patch | 4 +- feeds/ucentral/ucentral-schema/Makefile | 2 +- .../etc/ucentral/examples/switch-ports.json | 63 +++++++++++++++++++ 3 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/switch-ports.json diff --git a/backports/0037-netifd-update-to-latest-HEAD.patch b/backports/0037-netifd-update-to-latest-HEAD.patch index cc9cf83d2..72062e6c9 100644 --- a/backports/0037-netifd-update-to-latest-HEAD.patch +++ b/backports/0037-netifd-update-to-latest-HEAD.patch @@ -25,8 +25,8 @@ index 7061456b08..5717a400be 100644 -PKG_SOURCE_VERSION:=c00c8335d6188daa326ecfe5a62da15a9b9987e1 -PKG_MIRROR_HASH:=c740e51e0cec13eec336ba1c7a643db3b64a9a2235f8c1b73a566cb89e841190 +PKG_SOURCE_DATE:=2021-05-26 -+PKG_SOURCE_VERSION:=440eb0647708274cc8d7d9e7c2bb0cfdfba90023 -+PKG_MIRROR_HASH:= ++PKG_SOURCE_VERSION:=1eb0fafaa9865b729509a7d47ecf1f05c2c0595c ++PKG_MIRROR_HASH:=81ff2a20225b41e197fd2dcb86068459d868cbc8b23700c8f011806452d553e8 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index e3dc95238..897971fce 100644 --- a/feeds/ucentral/ucentral-schema/Makefile +++ b/feeds/ucentral/ucentral-schema/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/blogic/ucentral-schema.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2021-02-15 -PKG_SOURCE_VERSION:=b3c69b5ff1c57ac5b9b0e2f9359ea1f7b4b12d4c +PKG_SOURCE_VERSION:=ac9e815849fd549646c15ed48fefa86792856ca4 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause diff --git a/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/switch-ports.json b/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/switch-ports.json new file mode 100644 index 000000000..517a00811 --- /dev/null +++ b/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/switch-ports.json @@ -0,0 +1,63 @@ +{ + "uuid": 2, + + "ethernet": [ + { + "select-ports": [ + "WAN1" + ], + "speed": 100, + "duplex": "half" + }, + { + "select-ports": [ + "WAN2" + ], + "speed": 1000, + "duplex": "full" + }, + { + "select-ports": [ + "WAN3" + ], + "speed": 100, + "duplex": "half" + } + ], + + "interfaces": [ + { + "name": "WAN", + "role": "upstream", + "services": [ "lldp", "ssh" ], + "ethernet": [ + { + "select-ports": [ + "WAN*" + ] + } + ], + "ipv4": { + "addressing": "dynamic" + } + } + ], + "metrics": { + "statistics": { + "interval": 120, + "types": [ "ssids", "lldp", "clients" ] + }, + "health": { + "interval": 120 + } + }, + "services": { + "lldp": { + "describe": "uCentral", + "location": "universe" + }, + "ssh": { + "port": 22 + } + } +}