scottk/ols-ucentral-schema
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/ols-ucentral-schema.git synced 2025-10-30 01:32:26 +00:00
Code Issues Packages Projects Releases 3 Wiki Activity

schame: tunnel peer-addr is ipv4

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-06-01 13:00:38 +02:00
parent f7c2d39c98
commit fb16e56f80
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
schema/interface.tunnel.gre.yml
View File

@@ -12,7 +12,7 @@ properties:
This is the IP address of the remote host, that the GRE tunnel shall be This is the IP address of the remote host, that the GRE tunnel shall be
established with. established with.
type: string type: string
format: uc-cidr4 format: ipv4
example: '192.168.100.1' example: '192.168.100.1'
vlan-id: vlan-id:
description: description:

2
schema/interface.tunnel.vxlan.yml
View File

@@ -12,7 +12,7 @@ properties:
This is the IP address of the remote host, that the VXLAN tunnel shall be This is the IP address of the remote host, that the VXLAN tunnel shall be
established with. established with.
type: string type: string
format: uc-cidr4 format: ipv4
example: '192.168.100.1' example: '192.168.100.1'
peer-port: peer-port:
description: description:

8
schemareader.uc
View File

@@ -2708,8 +2708,8 @@ function instantiateInterfaceTunnelVxlan(location, value, errors) {
function parsePeerAddress(location, value, errors) { function parsePeerAddress(location, value, errors) {
if (type(value) == "string") { if (type(value) == "string") {
if (!matchUcCidr4(value)) if (!matchIpv4(value))
push(errors, [ location, "must be a valid IPv4 CIDR" ]); push(errors, [ location, "must be a valid IPv4 address" ]);
} }
@@ -2772,8 +2772,8 @@ function instantiateInterfaceTunnelGre(location, value, errors) {
function parsePeerAddress(location, value, errors) { function parsePeerAddress(location, value, errors) {
if (type(value) == "string") { if (type(value) == "string") {
if (!matchUcCidr4(value)) if (!matchIpv4(value))
push(errors, [ location, "must be a valid IPv4 CIDR" ]); push(errors, [ location, "must be a valid IPv4 address" ]);
} }

4
ucentral.schema.json
View File

@@ -1089,7 +1089,7 @@
}, },
"peer-address": { "peer-address": {
"type": "string", "type": "string",
"format": "uc-cidr4", "format": "ipv4",
"example": "192.168.100.1" "example": "192.168.100.1"
}, },
"peer-port": { "peer-port": {
@@ -1111,7 +1111,7 @@
}, },
"peer-address": { "peer-address": {
"type": "string", "type": "string",
"format": "uc-cidr4", "format": "ipv4",
"example": "192.168.100.1" "example": "192.168.100.1"
}, },
"vlan-id": { "vlan-id": {