diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-03-14 11:12:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-14 11:12:54 +0100 |
| commit | 8413e2f7609245444d3dd268091ad0ef3ee9a5b9 (patch) | |
| tree | fe33df08f8e86baaddaf302837568b2c88d06015 | |
| parent | 894a5d6daee5f785834a2f360d66eb9b8e112465 (diff) | |
| parent | d9a08e109daacf2736bb599281ea049a3a385527 (diff) | |
| download | vyos-1x-8413e2f7609245444d3dd268091ad0ef3ee9a5b9.tar.gz vyos-1x-8413e2f7609245444d3dd268091ad0ef3ee9a5b9.zip | |
Merge pull request #772 from jack9603301/T2518
nat66: T2518: Modify the command line description of NAT/NAT66
| -rw-r--r-- | op-mode-definitions/nat.xml.in | 6 | ||||
| -rw-r--r-- | op-mode-definitions/nat66.xml.in | 26 | ||||
| -rwxr-xr-x | src/conf_mode/nat66.py | 1 |
3 files changed, 16 insertions, 17 deletions
diff --git a/op-mode-definitions/nat.xml.in b/op-mode-definitions/nat.xml.in index 949400eba..084e2e7e3 100644 --- a/op-mode-definitions/nat.xml.in +++ b/op-mode-definitions/nat.xml.in @@ -4,12 +4,12 @@ <children> <node name="nat"> <properties> - <help>Show Network Address Translation (NAT) information</help> + <help>Show IPv4 to IPv4 Network Address Translation (NAT) information</help> </properties> <children> <node name="source"> <properties> - <help>Show source Network Address Translation (NAT) information</help> + <help>Show source IPv4 to IPv4 Network Address Translation (NAT) information</help> </properties> <children> <node name="rules"> @@ -51,7 +51,7 @@ </node> <node name="destination"> <properties> - <help>Show destination Network Address Translation (NAT) information</help> + <help>Show destination IPv4 to IPv4 Network Address Translation (NAT) information</help> </properties> <children> <node name="rules"> diff --git a/op-mode-definitions/nat66.xml.in b/op-mode-definitions/nat66.xml.in index c57c7c8b3..1ec46eb11 100644 --- a/op-mode-definitions/nat66.xml.in +++ b/op-mode-definitions/nat66.xml.in @@ -4,34 +4,34 @@ <children> <node name="nat66"> <properties> - <help>Show Network Address Translation (NAT) information</help> + <help>Show IPv6 to IPv6 Network Address Translation (NAT66) information</help> </properties> <children> <node name="source"> <properties> - <help>Show source Network Address Translation (NAT) information</help> + <help>Show source IPv6 to IPv6 Network Address Translation (NAT66) information</help> </properties> <children> <node name="rules"> <properties> - <help>Show configured source NAT rules</help> + <help>Show configured source NAT66 rules</help> </properties> <command>${vyos_op_scripts_dir}/show_nat66_rules.py --source</command> </node> <node name="statistics"> <properties> - <help>Show statistics for configured source NAT rules</help> + <help>Show statistics for configured source NAT66 rules</help> </properties> <command>${vyos_op_scripts_dir}/show_nat66_statistics.py --source</command> </node> <node name="translations"> <properties> - <help>Show active source NAT translations</help> + <help>Show active source NAT66 translations</help> </properties> <children> <tagNode name="address"> <properties> - <help>Show active source NAT translations for an IP address</help> + <help>Show active source NAT66 translations for an IPv6 address</help> <completionHelp> <list><h:h:h:h:h:h:h:h></list> </completionHelp> @@ -40,7 +40,7 @@ </tagNode> <node name="detail"> <properties> - <help>Show active source NAT translations detail</help> + <help>Show active source NAT66 translations detail</help> </properties> <command>${vyos_op_scripts_dir}/show_nat66_translations.py --type=source --verbose</command> </node> @@ -51,29 +51,29 @@ </node> <node name="destination"> <properties> - <help>Show destination Network Address Translation (NAT) information</help> + <help>Show destination IPv6 to IPv6 Network Address Translation (NAT66) information</help> </properties> <children> <node name="rules"> <properties> - <help>Show configured destination NAT rules</help> + <help>Show configured destination NAT66 rules</help> </properties> <command>${vyos_op_scripts_dir}/show_nat66_rules.py --destination</command> </node> <node name="statistics"> <properties> - <help>Show statistics for configured destination NAT rules</help> + <help>Show statistics for configured destination NAT66 rules</help> </properties> <command>${vyos_op_scripts_dir}/show_nat66_statistics.py --destination</command> </node> <node name="translations"> <properties> - <help>Show active destination NAT translations</help> + <help>Show active destination NAT66 translations</help> </properties> <children> <tagNode name="address"> <properties> - <help>Show active NAT destination translations for an IP address</help> + <help>Show active NAT66 destination translations for an IPv6 address</help> <completionHelp> <list><h:h:h:h:h:h:h:h></list> </completionHelp> @@ -82,7 +82,7 @@ </tagNode> <node name="detail"> <properties> - <help>Show active destination NAT translations detail</help> + <help>Show active destination NAT66 translations detail</help> </properties> <command>${vyos_op_scripts_dir}/show_nat66_translations.py --type=destination --verbose</command> </node> diff --git a/src/conf_mode/nat66.py b/src/conf_mode/nat66.py index 86c27c77a..e2bd6417d 100755 --- a/src/conf_mode/nat66.py +++ b/src/conf_mode/nat66.py @@ -28,7 +28,6 @@ from vyos.util import cmd from vyos.util import check_kmod from vyos.util import dict_search from vyos.template import is_ipv6 -from vyos.template import is_ip_network from vyos.xml import defaults from vyos import ConfigError from vyos import airbag |