Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-proto-external: migrate from support to cni-protocol to external-protocol

Browse source 
As previously introduced cni protocol support (for netifd) has evolved more
to a multipurpose protocol useful for cni/netavark/some vpn/etc connections
I have decided to rename it from cni-protocol to external-protocol.

That's why also it's luci companion, luci-proto-cni, should be renamed
to luci-proto-external and migrated to support external-protocol.

This patch also adds support for new option in external-protocol, delay.

This closes promise made in #22702 on openwrt packages repository.

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
This commit is contained in:
Oskari Rauta 2023-11-30 07:35:48 +02:00 committed by Hannu Nyman
parent 1a1e63af45
commit 0dd348c87f
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
protocols/luci-proto-cni/Makefile → protocols/luci-proto-external/Makefile
View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=Support for CNI protocol LUCI_TITLE:=Support for externally managed protocol
LUCI_DEPENDS:=+cni-protocol LUCI_DEPENDS:=+external-protocol
include ../../luci.mk include ../../luci.mk

13
protocols/luci-proto-cni/htdocs/luci-static/resources/protocol/cni.js → protocols/luci-proto-external/htdocs/luci-static/resources/protocol/external.js
View file

@ -2,13 +2,13 @@
'require form'; 'require form';
'require network'; 'require network';
return network.registerProtocol('cni', { return network.registerProtocol('external', {
getI18n: function () { getI18n: function () {
return _('CNI (Externally managed interface)'); return _('Externally managed interface');
}, },
getOpkgPackage: function() { getOpkgPackage: function() {
return "cni-protocol"; return "external-protocol";
}, },
isFloating: function() { isFloating: function() {
@ -31,12 +31,17 @@ return network.registerProtocol('cni', {
o.optional = false; o.optional = false;
o.rmempty = false; o.rmempty = false;
o = s.taboption('general', form.Value, '_delay', _('Delay'), _('Afer making changes to network using CNI protocol, network must be manually restarted.')); o = s.taboption('general', form.Value, '_delay', _('Delay'), _('Afer making changes to network using external protocol, network must be manually restarted.'));
o.ucioption = 'delay'; o.ucioption = 'delay';
o.placeholder = '10'; o.placeholder = '10';
o.datatype = 'min(1)'; o.datatype = 'min(1)';
o.optional = true; o.optional = true;
o.rmempty = true; o.rmempty = true;
o = s.taboption('general', form.Value, '_searchdomain', _('Search domain'));
o.ucioption = 'searchdomain'
o.optional = true;
o.rmempty = true;
} }
}); });