Update op mode templates for "show nat <source|destination>

translations".

19 files changed, 14 insertions, 42 deletions

diff --git a/templates-op/show/nat/destination/translations/address/node.def b/templates-op/show/nat/destination/translations/address/node.def
new file mode 100644
index 0000000..0f48bc8
--- /dev/null
+++ b/templates-op/show/nat/destination/translations/address/node.def
@@ -0,0 +1 @@
+help: Show active destination NAT translations for an IP address
diff --git a/templates-op/show/nat/translations/destination/address/node.tag/node.def b/templates-op/show/nat/destination/translations/address/node.tag/node.def
index 0ae5846..46ad259 100644
--- a/templates-op/show/nat/translations/destination/address/node.tag/node.def
+++ b/templates-op/show/nat/destination/translations/address/node.tag/node.def
@@ -1,9 +1,9 @@
-help: Show active NAT destination translations for an IP address
+help: Show active destination NAT translations for an IP address
 allowed: echo -n '<x.x.x.x>'
 run: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv4 $6 
        then
          sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl \
-                                                         --mode=dnat \
+                                                         --type=destination \
                                                          --verbose   \
                                                          --ipaddr="$6"
        else
diff --git a/templates-op/show/nat/translations/destination/detail/node.def b/templates-op/show/nat/destination/translations/detail/node.def
index 90990f2..66d4cbe 100644
--- a/templates-op/show/nat/translations/destination/detail/node.def
+++ b/templates-op/show/nat/destination/translations/detail/node.def
@@ -1,3 +1,3 @@
-help: Show active NAT destination translations detail
-run: sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --mode=dnat \
+help: Show active destination NAT translations detail
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --type=destination \
                                                                  --verbose
diff --git a/templates-op/show/nat/destination/translations/node.def b/templates-op/show/nat/destination/translations/node.def
new file mode 100644
index 0000000..0a3826e
--- /dev/null
+++ b/templates-op/show/nat/destination/translations/node.def
@@ -0,0 +1,2 @@
+help: Show active destination NAT translations
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --type=destination
diff --git a/templates-op/show/nat/source/translations/address/node.def b/templates-op/show/nat/source/translations/address/node.def
new file mode 100644
index 0000000..5b2439c
--- /dev/null
+++ b/templates-op/show/nat/source/translations/address/node.def
@@ -0,0 +1 @@
+help: Show active NAT source translations for an IP address
diff --git a/templates-op/show/nat/translations/source/address/node.tag/node.def b/templates-op/show/nat/source/translations/address/node.tag/node.def
index 0271dd1..f2edbad 100644
--- a/templates-op/show/nat/translations/source/address/node.tag/node.def
+++ b/templates-op/show/nat/source/translations/address/node.tag/node.def
@@ -1,9 +1,9 @@
-help: Show active NAT source translations for an IP address
+help: Show active source NAT translations for an IP address
 allowed: echo -n '<x.x.x.x>'
 run: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv4 $6 
        then
          sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl \
-                                                         --mode=snat \
+                                                         --type=source \
                                                          --verbose   \
                                                          --ipaddr="$6"
        else
diff --git a/templates-op/show/nat/translations/source/detail/node.def b/templates-op/show/nat/source/translations/detail/node.def
index 5f8af5b..fdbc7fb 100644
--- a/templates-op/show/nat/translations/source/detail/node.def
+++ b/templates-op/show/nat/source/translations/detail/node.def
@@ -1,3 +1,3 @@
-help: Show active NAT source translations detail
-run: sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --mode=snat \
+help: Show active source NAT translations detail
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --type=source \
                                                                  --verbose
diff --git a/templates-op/show/nat/translations/detail/node.def b/templates-op/show/nat/source/translations/node.def
index 0635e6d..e16d1e3 100644
--- a/templates-op/show/nat/translations/detail/node.def
+++ b/templates-op/show/nat/source/translations/node.def
@@ -1,2 +1,2 @@
-help: Show active NAT translations detail
-run: sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --verbose
+help: Show active source NAT translations
+run: sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --type=source
diff --git a/templates-op/show/nat/translations/destination/address/node.def b/templates-op/show/nat/translations/destination/address/node.def
deleted file mode 100644
index f103fe4..0000000
--- a/templates-op/show/nat/translations/destination/address/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show active NAT destination translations for an IP address
diff --git a/templates-op/show/nat/translations/destination/monitor/detail/node.def b/templates-op/show/nat/translations/destination/monitor/detail/node.def
deleted file mode 100644
index 2f9dd00..0000000
--- a/templates-op/show/nat/translations/destination/monitor/detail/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Show active NAT destination translations events detail
-run: LESSOPEN=cat
-     echo Type control-C to quit 
-     sudo /usr/sbin/conntrack -E -g -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --mode=dnat --pipe --verbose
diff --git a/templates-op/show/nat/translations/destination/monitor/node.def b/templates-op/show/nat/translations/destination/monitor/node.def
deleted file mode 100644
index 383f880..0000000
--- a/templates-op/show/nat/translations/destination/monitor/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Show active NAT destination translations events
-run: LESSOPEN=cat
-     echo Type control-C to quit 
-     sudo /usr/sbin/conntrack -E -g -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --mode=dnat --pipe
diff --git a/templates-op/show/nat/translations/destination/node.def b/templates-op/show/nat/translations/destination/node.def
deleted file mode 100644
index 347b034..0000000
--- a/templates-op/show/nat/translations/destination/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show active NAT destination translations
-run: sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --mode=dnat
diff --git a/templates-op/show/nat/translations/monitor/detail/node.def b/templates-op/show/nat/translations/monitor/detail/node.def
deleted file mode 100644
index 19d0c7a..0000000
--- a/templates-op/show/nat/translations/monitor/detail/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Show active NAT translations events verbose
-run: LESSOPEN=cat
-     echo Type control-C to quit 
-     sudo /usr/sbin/conntrack -E -n -g -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --pipe --verbose
diff --git a/templates-op/show/nat/translations/monitor/node.def b/templates-op/show/nat/translations/monitor/node.def
deleted file mode 100644
index c871dad..0000000
--- a/templates-op/show/nat/translations/monitor/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Show active NAT translations events
-run: LESSOPEN=cat
-     echo Type control-C to quit 
-     sudo /usr/sbin/conntrack -E -n -g -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --pipe
diff --git a/templates-op/show/nat/translations/node.def b/templates-op/show/nat/translations/node.def
deleted file mode 100644
index f71c365..0000000
--- a/templates-op/show/nat/translations/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show active NAT translations
-run: sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl
diff --git a/templates-op/show/nat/translations/source/address/node.def b/templates-op/show/nat/translations/source/address/node.def
deleted file mode 100644
index 42bfbba..0000000
--- a/templates-op/show/nat/translations/source/address/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show active NAT source translations for a IP address
diff --git a/templates-op/show/nat/translations/source/monitor/detail/node.def b/templates-op/show/nat/translations/source/monitor/detail/node.def
deleted file mode 100644
index d0ac59d..0000000
--- a/templates-op/show/nat/translations/source/monitor/detail/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Show active NAT source translations events
-run: LESSOPEN=cat
-     echo Type control-C to quit 
-     sudo /usr/sbin/conntrack -E -n -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --mode=snat --pipe --verbose
diff --git a/templates-op/show/nat/translations/source/monitor/node.def b/templates-op/show/nat/translations/source/monitor/node.def
deleted file mode 100644
index fcaec10..0000000
--- a/templates-op/show/nat/translations/source/monitor/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Show active NAT source translations events
-run: LESSOPEN=cat
-     echo Type control-C to quit 
-     sudo /usr/sbin/conntrack -E -n -o xml 2>/dev/null | ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --mode=snat --pipe
diff --git a/templates-op/show/nat/translations/source/node.def b/templates-op/show/nat/translations/source/node.def
deleted file mode 100644
index c14c955..0000000
--- a/templates-op/show/nat/translations/source/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show active NAT source translations
-run: sudo ${vyatta_bindir}/sudo-users/vyatta-nat-translations.pl --mode=snat