From 20f811096765700c5eff5fd86c29be3bd53f0d7b Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Thu, 18 Aug 2011 18:25:29 -0500
Subject: Move some more commands

  'clear ip route' to 'reset ip route'
  'clear ipv6 route' to 'reset ipv6 route'
  'clear ipv6 neighbors' to 'reset ipv6 route'

  Modified some telnet help text
(cherry picked from commit 8d494099bcbeda63eabe8ef268dbc8838a17ffe9)
---
 templates/clear/ip/route/cache/node.def                    | 2 --
 templates/clear/ip/route/cache/node.tag/node.def           | 3 ---
 templates/clear/ip/route/node.def                          | 1 -
 templates/clear/ipv6/neighbors/address/node.def            | 1 -
 templates/clear/ipv6/neighbors/address/node.tag/node.def   | 3 ---
 templates/clear/ipv6/neighbors/interface/node.def          | 1 -
 templates/clear/ipv6/neighbors/interface/node.tag/node.def | 3 ---
 templates/clear/ipv6/neighbors/node.def                    | 1 -
 templates/clear/ipv6/route/cache/node.def                  | 2 --
 templates/clear/ipv6/route/cache/node.tag/node.def         | 3 ---
 templates/clear/ipv6/route/node.def                        | 1 -
 templates/reset/ip/route/cache/node.def                    | 2 ++
 templates/reset/ip/route/cache/node.tag/node.def           | 3 +++
 templates/reset/ip/route/node.def                          | 1 +
 templates/reset/ipv6/neighbors/address/node.def            | 1 +
 templates/reset/ipv6/neighbors/address/node.tag/node.def   | 3 +++
 templates/reset/ipv6/neighbors/interface/node.def          | 1 +
 templates/reset/ipv6/neighbors/interface/node.tag/node.def | 3 +++
 templates/reset/ipv6/neighbors/node.def                    | 1 +
 templates/reset/ipv6/node.def                              | 1 +
 templates/reset/ipv6/route/cache/node.def                  | 2 ++
 templates/reset/ipv6/route/cache/node.tag/node.def         | 3 +++
 templates/reset/ipv6/route/node.def                        | 1 +
 templates/telnet/node.def                                  | 2 +-
 templates/telnet/node.tag/node.def                         | 2 +-
 templates/telnet/node.tag/node.tag/node.def                | 2 +-
 26 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 templates/clear/ip/route/cache/node.def
 delete mode 100644 templates/clear/ip/route/cache/node.tag/node.def
 delete mode 100644 templates/clear/ip/route/node.def
 delete mode 100644 templates/clear/ipv6/neighbors/address/node.def
 delete mode 100644 templates/clear/ipv6/neighbors/address/node.tag/node.def
 delete mode 100644 templates/clear/ipv6/neighbors/interface/node.def
 delete mode 100644 templates/clear/ipv6/neighbors/interface/node.tag/node.def
 delete mode 100644 templates/clear/ipv6/neighbors/node.def
 delete mode 100644 templates/clear/ipv6/route/cache/node.def
 delete mode 100644 templates/clear/ipv6/route/cache/node.tag/node.def
 delete mode 100644 templates/clear/ipv6/route/node.def
 create mode 100644 templates/reset/ip/route/cache/node.def
 create mode 100644 templates/reset/ip/route/cache/node.tag/node.def
 create mode 100644 templates/reset/ip/route/node.def
 create mode 100644 templates/reset/ipv6/neighbors/address/node.def
 create mode 100644 templates/reset/ipv6/neighbors/address/node.tag/node.def
 create mode 100644 templates/reset/ipv6/neighbors/interface/node.def
 create mode 100644 templates/reset/ipv6/neighbors/interface/node.tag/node.def
 create mode 100644 templates/reset/ipv6/neighbors/node.def
 create mode 100644 templates/reset/ipv6/node.def
 create mode 100644 templates/reset/ipv6/route/cache/node.def
 create mode 100644 templates/reset/ipv6/route/cache/node.tag/node.def
 create mode 100644 templates/reset/ipv6/route/node.def

diff --git a/templates/clear/ip/route/cache/node.def b/templates/clear/ip/route/cache/node.def
deleted file mode 100644
index b97e0c9..0000000
--- a/templates/clear/ip/route/cache/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Flush the kernel route cache
-run: sudo /sbin/ip route flush cache
diff --git a/templates/clear/ip/route/cache/node.tag/node.def b/templates/clear/ip/route/cache/node.tag/node.def
deleted file mode 100644
index 4af1915..0000000
--- a/templates/clear/ip/route/cache/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Flush the kernel route cache for a given route
-allowed: echo -n '<x.x.x.x | x.x.x.x/x>'
-run: sudo /sbin/ip route flush cache "$5"
diff --git a/templates/clear/ip/route/node.def b/templates/clear/ip/route/node.def
deleted file mode 100644
index 9b5753b..0000000
--- a/templates/clear/ip/route/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear IP route
diff --git a/templates/clear/ipv6/neighbors/address/node.def b/templates/clear/ipv6/neighbors/address/node.def
deleted file mode 100644
index ffb7376..0000000
--- a/templates/clear/ipv6/neighbors/address/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear ND cache for an IPv6 address
diff --git a/templates/clear/ipv6/neighbors/address/node.tag/node.def b/templates/clear/ipv6/neighbors/address/node.tag/node.def
deleted file mode 100644
index 4aaec8a..0000000
--- a/templates/clear/ipv6/neighbors/address/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Clear ND cache for an IPv6 address
-allowed: echo -n '<h:h:h:h:h:h:h:h>'
-run: sudo /sbin/ip -f inet6 neigh flush to "$5"
diff --git a/templates/clear/ipv6/neighbors/interface/node.def b/templates/clear/ipv6/neighbors/interface/node.def
deleted file mode 100644
index db4adaf..0000000
--- a/templates/clear/ipv6/neighbors/interface/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear IPv6 ND cache for interface
diff --git a/templates/clear/ipv6/neighbors/interface/node.tag/node.def b/templates/clear/ipv6/neighbors/interface/node.tag/node.def
deleted file mode 100644
index 20cb549..0000000
--- a/templates/clear/ipv6/neighbors/interface/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Clear IPv6 ND cache for interface
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all
-run: sudo /sbin/ip -f inet6 neigh flush dev "$5"
diff --git a/templates/clear/ipv6/neighbors/node.def b/templates/clear/ipv6/neighbors/node.def
deleted file mode 100644
index cde35f9..0000000
--- a/templates/clear/ipv6/neighbors/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear IPv6 Neighbor Discovery (ND) cache
diff --git a/templates/clear/ipv6/route/cache/node.def b/templates/clear/ipv6/route/cache/node.def
deleted file mode 100644
index 7dee140..0000000
--- a/templates/clear/ipv6/route/cache/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Flush the kernel IPv6 route cache
-run: sudo /sbin/ip -f inet6 route flush cache
diff --git a/templates/clear/ipv6/route/cache/node.tag/node.def b/templates/clear/ipv6/route/cache/node.tag/node.def
deleted file mode 100644
index af6a3db..0000000
--- a/templates/clear/ipv6/route/cache/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Flush the kernel IPv6 route cache for a given route
-allowed: echo -n '<h:h:h:h:h:h:h:h | h:h:h:h:h:h:h:h/x>'
-run: sudo /sbin/ip -f inet6 route flush cache "$5"
diff --git a/templates/clear/ipv6/route/node.def b/templates/clear/ipv6/route/node.def
deleted file mode 100644
index bb1b049..0000000
--- a/templates/clear/ipv6/route/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear IPv6 route
diff --git a/templates/reset/ip/route/cache/node.def b/templates/reset/ip/route/cache/node.def
new file mode 100644
index 0000000..b97e0c9
--- /dev/null
+++ b/templates/reset/ip/route/cache/node.def
@@ -0,0 +1,2 @@
+help: Flush the kernel route cache
+run: sudo /sbin/ip route flush cache
diff --git a/templates/reset/ip/route/cache/node.tag/node.def b/templates/reset/ip/route/cache/node.tag/node.def
new file mode 100644
index 0000000..4af1915
--- /dev/null
+++ b/templates/reset/ip/route/cache/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Flush the kernel route cache for a given route
+allowed: echo -n '<x.x.x.x | x.x.x.x/x>'
+run: sudo /sbin/ip route flush cache "$5"
diff --git a/templates/reset/ip/route/node.def b/templates/reset/ip/route/node.def
new file mode 100644
index 0000000..a4336f1
--- /dev/null
+++ b/templates/reset/ip/route/node.def
@@ -0,0 +1 @@
+help: Reset IP route
diff --git a/templates/reset/ipv6/neighbors/address/node.def b/templates/reset/ipv6/neighbors/address/node.def
new file mode 100644
index 0000000..e163359
--- /dev/null
+++ b/templates/reset/ipv6/neighbors/address/node.def
@@ -0,0 +1 @@
+help: Reset ND cache for an IPv6 address
diff --git a/templates/reset/ipv6/neighbors/address/node.tag/node.def b/templates/reset/ipv6/neighbors/address/node.tag/node.def
new file mode 100644
index 0000000..4aaec8a
--- /dev/null
+++ b/templates/reset/ipv6/neighbors/address/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Clear ND cache for an IPv6 address
+allowed: echo -n '<h:h:h:h:h:h:h:h>'
+run: sudo /sbin/ip -f inet6 neigh flush to "$5"
diff --git a/templates/reset/ipv6/neighbors/interface/node.def b/templates/reset/ipv6/neighbors/interface/node.def
new file mode 100644
index 0000000..c455aa1
--- /dev/null
+++ b/templates/reset/ipv6/neighbors/interface/node.def
@@ -0,0 +1 @@
+help: Reset IPv6 ND cache for interface
diff --git a/templates/reset/ipv6/neighbors/interface/node.tag/node.def b/templates/reset/ipv6/neighbors/interface/node.tag/node.def
new file mode 100644
index 0000000..46a89a9
--- /dev/null
+++ b/templates/reset/ipv6/neighbors/interface/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Reset IPv6 ND cache for interface
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all
+run: sudo /sbin/ip -f inet6 neigh flush dev "$5"
diff --git a/templates/reset/ipv6/neighbors/node.def b/templates/reset/ipv6/neighbors/node.def
new file mode 100644
index 0000000..138725d
--- /dev/null
+++ b/templates/reset/ipv6/neighbors/node.def
@@ -0,0 +1 @@
+help: Reset IPv6 Neighbor Discovery (ND) cache
diff --git a/templates/reset/ipv6/node.def b/templates/reset/ipv6/node.def
new file mode 100644
index 0000000..5c80950
--- /dev/null
+++ b/templates/reset/ipv6/node.def
@@ -0,0 +1 @@
+help: Reset Internet Protocol version 6 (IPv6) parameters
diff --git a/templates/reset/ipv6/route/cache/node.def b/templates/reset/ipv6/route/cache/node.def
new file mode 100644
index 0000000..7dee140
--- /dev/null
+++ b/templates/reset/ipv6/route/cache/node.def
@@ -0,0 +1,2 @@
+help: Flush the kernel IPv6 route cache
+run: sudo /sbin/ip -f inet6 route flush cache
diff --git a/templates/reset/ipv6/route/cache/node.tag/node.def b/templates/reset/ipv6/route/cache/node.tag/node.def
new file mode 100644
index 0000000..af6a3db
--- /dev/null
+++ b/templates/reset/ipv6/route/cache/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Flush the kernel IPv6 route cache for a given route
+allowed: echo -n '<h:h:h:h:h:h:h:h | h:h:h:h:h:h:h:h/x>'
+run: sudo /sbin/ip -f inet6 route flush cache "$5"
diff --git a/templates/reset/ipv6/route/node.def b/templates/reset/ipv6/route/node.def
new file mode 100644
index 0000000..72c83a8
--- /dev/null
+++ b/templates/reset/ipv6/route/node.def
@@ -0,0 +1 @@
+help: Reset IPv6 route
diff --git a/templates/telnet/node.def b/templates/telnet/node.def
index 99b1f46..e3ec3e0 100644
--- a/templates/telnet/node.def
+++ b/templates/telnet/node.def
@@ -1 +1 @@
-help: Telnet to <hostname|IPv4 address>
+help: Telnet to a node
diff --git a/templates/telnet/node.tag/node.def b/templates/telnet/node.tag/node.def
index 0b1ecf0..76e9b0a 100644
--- a/templates/telnet/node.tag/node.def
+++ b/templates/telnet/node.tag/node.def
@@ -1,5 +1,5 @@
 help: Telnet to host
-allowed: echo -n '<hostname> <x.x.x.x> <y:y:y:y:y>'
+allowed: echo -n '<hostname> <x.x.x.x> <h:h:h:h:h:h:h:h>'
 
 run: if [ -x /usr/bin/telnet ] ; then
      	/usr/bin/$*
diff --git a/templates/telnet/node.tag/node.tag/node.def b/templates/telnet/node.tag/node.tag/node.def
index 70a6402..21b78c4 100644
--- a/templates/telnet/node.tag/node.tag/node.def
+++ b/templates/telnet/node.tag/node.tag/node.def
@@ -1,4 +1,4 @@
-help: Telnet to <hostname|IPv4 address> <port|service>
+help: Telnet to <address> <port>
 allowed: echo -n '<0-65535>'
 run: if [ -x /usr/bin/telnet ] ; then
      	/usr/bin/$*
-- 
cgit v1.2.3