diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-02-20 06:52:57 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-02-20 06:52:57 +0100 |
| commit | 0b58083b29bff5bb4a2b16354a77a2794be7cc07 (patch) | |
| tree | 67d57a11902fb80d87f2954d47a2b3d87274471b | |
| parent | af219d4ac8208cfa676f5822ae45acf8660df30a (diff) | |
| download | vyatta-nat-lithium.tar.gz vyatta-nat-lithium.zip | |
Rename NPTv6 rule options for consistency with IPv4 NAT (fixes T554).lithium
| -rw-r--r-- | lib/VyOS/Nptv6Rule.pm | 7 | ||||
| -rw-r--r-- | templates-cfg/nat/nptv6/rule/node.tag/outbound-interface/node.def (renamed from templates-cfg/nat/nptv6/rule/node.tag/outside-interface/node.def) | 4 | ||||
| -rw-r--r-- | templates-cfg/nat/nptv6/rule/node.tag/source/node.def | 1 | ||||
| -rw-r--r-- | templates-cfg/nat/nptv6/rule/node.tag/source/prefix/node.def (renamed from templates-cfg/nat/nptv6/rule/node.tag/inside-prefix/node.def) | 2 | ||||
| -rw-r--r-- | templates-cfg/nat/nptv6/rule/node.tag/translation/node.def | 1 | ||||
| -rw-r--r-- | templates-cfg/nat/nptv6/rule/node.tag/translation/prefix/node.def (renamed from templates-cfg/nat/nptv6/rule/node.tag/outside-prefix/node.def) | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/lib/VyOS/Nptv6Rule.pm b/lib/VyOS/Nptv6Rule.pm index 3166325..d469020 100644 --- a/lib/VyOS/Nptv6Rule.pm +++ b/lib/VyOS/Nptv6Rule.pm @@ -58,10 +58,9 @@ sub setup { $config->setLevel("$level"); $self->{_rule_number} = $config->returnParent(".."); - $self->{_inside_if} = $config->returnValue("inside-interface"); - $self->{_outside_if} = $config->returnValue("outside-interface"); - $self->{_inside_pfx} = $config->returnValue("inside-prefix"); - $self->{_outside_pfx} = $config->returnValue("outside-prefix"); + $self->{_outside_if} = $config->returnValue("outbound-interface"); + $self->{_inside_pfx} = $config->returnValue("source prefix"); + $self->{_outside_pfx} = $config->returnValue("translation prefix"); $self->{_disable} = $config->exists("disable"); diff --git a/templates-cfg/nat/nptv6/rule/node.tag/outside-interface/node.def b/templates-cfg/nat/nptv6/rule/node.tag/outbound-interface/node.def index d0954ad..f7bf286 100644 --- a/templates-cfg/nat/nptv6/rule/node.tag/outside-interface/node.def +++ b/templates-cfg/nat/nptv6/rule/node.tag/outbound-interface/node.def @@ -1,6 +1,6 @@ type: txt -help: Outside interface of NPTv6 traffic +help: Outbound interface of NPTv6 traffic enumeration: existing-interfaces; echo "any" @@ -20,7 +20,7 @@ commit:expression: exec " fi let i++ done - intf_group_name_array=\"eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+\" + intf_group_name_array=\"eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+ vxlan+ vti+ l2tpeth+\" i=0 for i in $intf_group_name_array; do if [ \"$i\" == \"$VAR(@)\" ]; then diff --git a/templates-cfg/nat/nptv6/rule/node.tag/source/node.def b/templates-cfg/nat/nptv6/rule/node.tag/source/node.def new file mode 100644 index 0000000..5be9e47 --- /dev/null +++ b/templates-cfg/nat/nptv6/rule/node.tag/source/node.def @@ -0,0 +1 @@ +help: IPv6 source prefix options diff --git a/templates-cfg/nat/nptv6/rule/node.tag/inside-prefix/node.def b/templates-cfg/nat/nptv6/rule/node.tag/source/prefix/node.def index 7af7091..47df40d 100644 --- a/templates-cfg/nat/nptv6/rule/node.tag/inside-prefix/node.def +++ b/templates-cfg/nat/nptv6/rule/node.tag/source/prefix/node.def @@ -1,6 +1,6 @@ type: txt -help: Inside prefix to be translated +help: IPv6 prefix to be translated val_help: ipv6net; IPv6 prefix to match diff --git a/templates-cfg/nat/nptv6/rule/node.tag/translation/node.def b/templates-cfg/nat/nptv6/rule/node.tag/translation/node.def new file mode 100644 index 0000000..741f9ab --- /dev/null +++ b/templates-cfg/nat/nptv6/rule/node.tag/translation/node.def @@ -0,0 +1 @@ +help: Translated IPv6 prefix options diff --git a/templates-cfg/nat/nptv6/rule/node.tag/outside-prefix/node.def b/templates-cfg/nat/nptv6/rule/node.tag/translation/prefix/node.def index 7af7091..d9c7d5a 100644 --- a/templates-cfg/nat/nptv6/rule/node.tag/outside-prefix/node.def +++ b/templates-cfg/nat/nptv6/rule/node.tag/translation/prefix/node.def @@ -1,6 +1,6 @@ type: txt -help: Inside prefix to be translated +help: Translated IPv6 prefix val_help: ipv6net; IPv6 prefix to match |