From 0de42b056b4f35d43df7b942531727a0322645a8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 27 May 2020 18:53:54 +0200 Subject: [PATCH] luci-proto-vxlan: fix uci option names Fixes: d79bbdd5b ("luci-proto-vxlan: add vxlan protol handler") Signed-off-by: Jo-Philipp Wich --- .../htdocs/luci-static/resources/protocol/vxlan.js | 8 ++++---- .../htdocs/luci-static/resources/protocol/vxlan6.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js index 3a7f8a1d1..8afd476a5 100644 --- a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js +++ b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js @@ -37,19 +37,19 @@ return network.registerProtocol('vxlan', { renderFormOptions: function(s) { var o; - o = s.taboption('general', form.Value, 'remote', _('Remote IPv4 address'), _('The IPv4 address or the fully-qualified domain name of the remote end.')); + o = s.taboption('general', form.Value, 'peeraddr', _('Remote IPv4 address'), _('The IPv4 address or the fully-qualified domain name of the remote end.')); o.optional = false; o.datatype = 'or(hostname,ip4addr("nomask"))'; - o = s.taboption('general', form.Value, 'local', _('Local IPv4 address'), _('The local IPv4 address over which the tunnel is created (optional).')); + o = s.taboption('general', form.Value, 'ipaddr', _('Local IPv4 address'), _('The local IPv4 address over which the tunnel is created (optional).')); o.optional = true; o.datatype = 'ip4addr("nomask")'; - o = s.taboption('general', form.Value, 'id', _('VXLAN network identifier'), _('ID used to uniquely identify the VXLAN')); + o = s.taboption('general', form.Value, 'vid', _('VXLAN network identifier'), _('ID used to uniquely identify the VXLAN')); o.optional = true; o.datatype = 'range(1, 16777216)'; - o = s.taboption('general', widgets.NetworkSelect, 'link', _('Bind interface'), _('Bind the tunnel to this interface (optional).')); + o = s.taboption('general', widgets.NetworkSelect, 'tunlink', _('Bind interface'), _('Bind the tunnel to this interface (optional).')); o.exclude = s.section; o.nocreate = true; o.optional = true; diff --git a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js index 99bbeb369..f568e7e24 100644 --- a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js +++ b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js @@ -37,19 +37,19 @@ return network.registerProtocol('vxlan6', { renderFormOptions: function(s) { var o; - o = s.taboption('general', form.Value, 'remote', _('Remote IPv6 address'), _('The IPv6 address or the fully-qualified domain name of the remote end.')); + o = s.taboption('general', form.Value, 'peer6addr', _('Remote IPv6 address'), _('The IPv6 address or the fully-qualified domain name of the remote end.')); o.optional = false; o.datatype = 'or(hostname,cidr6)'; - o = s.taboption('general', form.Value, 'local', _('Local IPv6 address'), _('The local IPv6 address over which the tunnel is created (optional).')); + o = s.taboption('general', form.Value, 'ip6addr', _('Local IPv6 address'), _('The local IPv6 address over which the tunnel is created (optional).')); o.optional = true; o.datatype = 'cidr6'; - o = s.taboption('general', form.Value, 'id', _('VXLAN network identifier'), _('ID used to uniquely identify the VXLAN')); + o = s.taboption('general', form.Value, 'vid', _('VXLAN network identifier'), _('ID used to uniquely identify the VXLAN')); o.optional = true; o.datatype = 'range(1, 16777216)'; - o = s.taboption('general', widgets.NetworkSelect, 'link', _('Bind interface'), _('Bind the tunnel to this interface (optional).')); + o = s.taboption('general', widgets.NetworkSelect, 'tunlink', _('Bind interface'), _('Bind the tunnel to this interface (optional).')); o.exclude = s.section; o.nocreate = true; o.optional = true; -- 2.25.1