scottk/ols-ucentral-schema
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/ols-ucentral-schema.git synced 2025-11-02 19:18:05 +00:00
Code Issues Packages Projects Releases 3 Wiki Activity

add owe-transition support

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2022-08-07 14:00:32 +02:00
parent 29cfbcaecb
commit dff2e7af37
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
renderer/templates/interface.uc
View File

@@ -190,7 +190,7 @@
network, network,
openflow_prefix, openflow_prefix,
}); });
if (ssid?.encryption?.proto == 'owe') { if (ssid?.encryption?.proto == 'owe-transition') {
ssid.encryption.proto = 'none'; ssid.encryption.proto = 'none';
include('interface/ssid.uc', { include('interface/ssid.uc', {
location: location + '/ssids/' + i + '_owe', location: location + '/ssids/' + i + '_owe',

5
renderer/templates/interface/ssid.uc
View File

@@ -128,7 +128,7 @@
}; };
} }
if (ssid?.encryption?.proto in [ "owe" ]) if (ssid?.encryption?.proto in [ "owe", "owe-transition" ])
return { return {
proto: 'owe' proto: 'owe'
}; };
@@ -265,8 +265,9 @@ set wireless.{{ section }}=wifi-iface
set wireless.{{ section }}.ucentral_path={{ s(location) }} set wireless.{{ section }}.ucentral_path={{ s(location) }}
set wireless.{{ section }}.device={{ phy.section }} set wireless.{{ section }}.device={{ phy.section }}
set wireless.{{ section }}.ifname={{ s(ifname) }} set wireless.{{ section }}.ifname={{ s(ifname) }}
{% if (ssid?.encryption?.proto == 'owe'): %} {% if (ssid?.encryption?.proto == 'owe-transition'): %}
{% ssid.hidden_ssid = 1 %} {% ssid.hidden_ssid = 1 %}
{% ssid.name += '-OWE' %}
set wireless.{{ section }}.ifname={{ s(section) }} set wireless.{{ section }}.ifname={{ s(section) }}
set wireless.{{ section }}.owe_transition_ifname={{ s('o' + section) }} set wireless.{{ section }}.owe_transition_ifname={{ s('o' + section) }}
{% endif %} {% endif %}

1
schema/interface.ssid.encryption.yml
View File

@@ -10,6 +10,7 @@ properties:
enum: enum:
- none - none
- owe - owe
- owe-transition
- psk - psk
- psk2 - psk2
- psk-mixed - psk-mixed

4
schemareader.uc
View File

@@ -2497,8 +2497,8 @@ function instantiateInterfaceSsidEncryption(location, value, errors) {
if (type(value) != "string") if (type(value) != "string")
push(errors, [ location, "must be of type string" ]); push(errors, [ location, "must be of type string" ]);
if (!(value in [ "none", "owe", "psk", "psk2", "psk-mixed", "psk2-radius", "wpa", "wpa2", "wpa-mixed", "sae", "sae-mixed", "wpa3", "wpa3-192", "wpa3-mixed" ])) if (!(value in [ "none", "owe", "owe-transition", "psk", "psk2", "psk-mixed", "psk2-radius", "wpa", "wpa2", "wpa-mixed", "sae", "sae-mixed", "wpa3", "wpa3-192", "wpa3-mixed" ]))
push(errors, [ location, "must be one of \"none\", \"owe\", \"psk\", \"psk2\", \"psk-mixed\", \"psk2-radius\", \"wpa\", \"wpa2\", \"wpa-mixed\", \"sae\", \"sae-mixed\", \"wpa3\", \"wpa3-192\" or \"wpa3-mixed\"" ]); push(errors, [ location, "must be one of \"none\", \"owe\", \"owe-transition\", \"psk\", \"psk2\", \"psk-mixed\", \"psk2-radius\", \"wpa\", \"wpa2\", \"wpa-mixed\", \"sae\", \"sae-mixed\", \"wpa3\", \"wpa3-192\" or \"wpa3-mixed\"" ]);
return value; return value;
} }

1
ucentral.schema.json
View File

@@ -1032,6 +1032,7 @@
"enum": [ "enum": [
"none", "none",
"owe", "owe",
"owe-transition",
"psk", "psk",
"psk2", "psk2",
"psk-mixed", "psk-mixed",