From 2718e30abd45070cd19b6c45caef6c3cf648d06a Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Mon, 4 Oct 2021 18:17:26 +0300 Subject: [PATCH] schema: add property to set OpenFlow datapath description Signed-off-by: Stijn Tintel --- renderer/templates/services/open_flow.uc | 3 +++ schema/service.open-flow.yml | 5 +++++ ucentral.schema.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/renderer/templates/services/open_flow.uc b/renderer/templates/services/open_flow.uc index da092d0..2135714 100644 --- a/renderer/templates/services/open_flow.uc +++ b/renderer/templates/services/open_flow.uc @@ -26,6 +26,9 @@ set openvswitch.ovs.key={{ s(files.add_anonymous(location, 'key', b64dec(open_fl delete openvswitch.@ovs_bridge[0] add openvswitch ovs_bridge set openvswitch.@ovs_bridge[-1].controller="{{ open_flow.mode }}:{{ open_flow.controller }}" +{% if (length(open_flow.datapath_description)): %} + set openvswitch.@ovs_bridge[-1].datapath_desc="{{ s(open_flow.datapath_description) }}" +{% endif %} set openvswitch.@ovs_bridge[-1].datapath_id="0x{{ serial }}" set openvswitch.@ovs_bridge[-1].name="br-ovs" diff --git a/schema/service.open-flow.yml b/schema/service.open-flow.yml index 1bf0d3f..77c6e6a 100644 --- a/schema/service.open-flow.yml +++ b/schema/service.open-flow.yml @@ -8,6 +8,11 @@ properties: type: string format: uc-cidr example: 192.168.10.1 + datapath-description: + description: + Set a human-readable description for the bridge. + type: string + example: Building 2, Floor 6, AP 2 mode: description: The mode to use for the OpenFlow controller target. diff --git a/ucentral.schema.json b/ucentral.schema.json index 47935ad..b28cc24 100644 --- a/ucentral.schema.json +++ b/ucentral.schema.json @@ -1850,6 +1850,10 @@ "format": "uc-cidr", "example": "192.168.10.1" }, + "datapath-description": { + "type": "string", + "example": "Building 2, Floor 6, AP 2" + }, "mode": { "type": "string", "enum": [