From b1c37ed9fe0e2cfac2ac46d757c6037c1c5436c2 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 16 Aug 2011 18:26:24 -0500
Subject: Create new ping command with the following semantics

    1. ping <ipv4|ipv6|hostname> will use
      * ping for a v4 address
      * ping6 for a v6 address
      * ping or ping6 for a hostname which ever resolves prefering ipv4
    2. ping ipv4 <ipv4|hostname> will ping
    3. ping ipv6 <ipv6|hostname> will ping6
    4. ping <node> option <advanced ping options>
       * allows for options to pass down to ping
       * this is a stop gap while we add the most common options
       * to the CLI
(cherry picked from commit 5145fd68da8f1c7f8289b99f58cb6eb96389fcef)
---
 templates/ping/ipv4/node.def                           | 4 ++++
 templates/ping/ipv4/node.tag/node.def                  | 8 ++++++++
 templates/ping/ipv4/node.tag/options/node.def          | 8 ++++++++
 templates/ping/ipv4/node.tag/options/node.tag/node.def | 8 ++++++++
 templates/ping/ipv6/node.def                           | 4 ++++
 templates/ping/ipv6/node.tag/node.def                  | 8 ++++++++
 templates/ping/ipv6/node.tag/options/node.def          | 8 ++++++++
 templates/ping/ipv6/node.tag/options/node.tag/node.def | 8 ++++++++
 templates/ping/node.def                                | 1 +
 templates/ping/node.tag/node.def                       | 6 +++---
 templates/ping/node.tag/options/node.def               | 8 ++++++++
 templates/ping/node.tag/options/node.tag/node.def      | 8 ++++++++
 templates/ping6/node.def                               | 4 ----
 templates/ping6/node.tag/node.def                      | 8 --------
 templates/show/system/boot-messages/commit/node.def    | 2 ++
 15 files changed, 78 insertions(+), 15 deletions(-)
 create mode 100644 templates/ping/ipv4/node.def
 create mode 100644 templates/ping/ipv4/node.tag/node.def
 create mode 100644 templates/ping/ipv4/node.tag/options/node.def
 create mode 100644 templates/ping/ipv4/node.tag/options/node.tag/node.def
 create mode 100644 templates/ping/ipv6/node.def
 create mode 100644 templates/ping/ipv6/node.tag/node.def
 create mode 100644 templates/ping/ipv6/node.tag/options/node.def
 create mode 100644 templates/ping/ipv6/node.tag/options/node.tag/node.def
 create mode 100644 templates/ping/node.tag/options/node.def
 create mode 100644 templates/ping/node.tag/options/node.tag/node.def
 delete mode 100644 templates/ping6/node.def
 delete mode 100644 templates/ping6/node.tag/node.def
 create mode 100644 templates/show/system/boot-messages/commit/node.def

(limited to 'templates')

diff --git a/templates/ping/ipv4/node.def b/templates/ping/ipv4/node.def
new file mode 100644
index 0000000..500ee3a
--- /dev/null
+++ b/templates/ping/ipv4/node.def
@@ -0,0 +1,4 @@
+#
+# Operational mode template for the "ping" command
+#
+help: Send IPv4 Internet Control Message Protocol (ICMP) echo request
diff --git a/templates/ping/ipv4/node.tag/node.def b/templates/ping/ipv4/node.tag/node.def
new file mode 100644
index 0000000..3b5d1a9
--- /dev/null
+++ b/templates/ping/ipv4/node.tag/node.def
@@ -0,0 +1,8 @@
+#
+# Operational mode front-end for "ping" command
+#
+
+help:   Send IPv4 ICMP echo request to specified <hostname|IPv4 address>
+allowed: echo -n '<hostname> <x:x:x:x:x>'
+
+run:	/bin/ping $2
diff --git a/templates/ping/ipv4/node.tag/options/node.def b/templates/ping/ipv4/node.tag/options/node.def
new file mode 100644
index 0000000..90b225d
--- /dev/null
+++ b/templates/ping/ipv4/node.tag/options/node.def
@@ -0,0 +1,8 @@
+#
+# Operational mode front-end for "ping" command
+#
+
+help:   Supply advanced options to ping
+allowed: echo -n 'option text'
+
+
diff --git a/templates/ping/ipv4/node.tag/options/node.tag/node.def b/templates/ping/ipv4/node.tag/options/node.tag/node.def
new file mode 100644
index 0000000..9d4fdca
--- /dev/null
+++ b/templates/ping/ipv4/node.tag/options/node.tag/node.def
@@ -0,0 +1,8 @@
+#
+# Operational mode front-end for "ping" command
+#
+
+help:   Supply advanced options to ping
+allowed: echo -n '<ping-options>'
+
+run:	/bin/ping ${*:5} $3
diff --git a/templates/ping/ipv6/node.def b/templates/ping/ipv6/node.def
new file mode 100644
index 0000000..20cc018
--- /dev/null
+++ b/templates/ping/ipv6/node.def
@@ -0,0 +1,4 @@
+#
+# Operational mode template for the "ping" command
+#
+help: Send IPv6 Internet Control Message Protocol (ICMP) echo request
diff --git a/templates/ping/ipv6/node.tag/node.def b/templates/ping/ipv6/node.tag/node.def
new file mode 100644
index 0000000..d5ec570
--- /dev/null
+++ b/templates/ping/ipv6/node.tag/node.def
@@ -0,0 +1,8 @@
+#
+# Operational mode front-end for "ping" command
+#
+
+help:   Send IPv6 ICMP echo request to specified <hostname|IPv6 address>
+allowed: echo -n '<hostname> <h:h:h:h:h:h:h:h>'
+
+run:	/bin/ping6 $2
diff --git a/templates/ping/ipv6/node.tag/options/node.def b/templates/ping/ipv6/node.tag/options/node.def
new file mode 100644
index 0000000..90b225d
--- /dev/null
+++ b/templates/ping/ipv6/node.tag/options/node.def
@@ -0,0 +1,8 @@
+#
+# Operational mode front-end for "ping" command
+#
+
+help:   Supply advanced options to ping
+allowed: echo -n 'option text'
+
+
diff --git a/templates/ping/ipv6/node.tag/options/node.tag/node.def b/templates/ping/ipv6/node.tag/options/node.tag/node.def
new file mode 100644
index 0000000..10c13a5
--- /dev/null
+++ b/templates/ping/ipv6/node.tag/options/node.tag/node.def
@@ -0,0 +1,8 @@
+#
+# Operational mode front-end for "ping" command
+#
+
+help:   Supply advanced options to ping
+allowed: echo -n '<ping-options>'
+
+run:	/bin/ping6 ${*:5} $3
diff --git a/templates/ping/node.def b/templates/ping/node.def
index 2639ddb..a1bac16 100644
--- a/templates/ping/node.def
+++ b/templates/ping/node.def
@@ -2,3 +2,4 @@
 # Operational mode template for the "ping" command
 #
 help: Send Internet Control Message Protocol (ICMP) echo request
+allowed: echo -n '<hostname> <x.x.x.x> <h:h:h:h:h:h:h:h>'
diff --git a/templates/ping/node.tag/node.def b/templates/ping/node.tag/node.def
index efd7127..fe6dbce 100644
--- a/templates/ping/node.tag/node.def
+++ b/templates/ping/node.tag/node.def
@@ -2,7 +2,7 @@
 # Operational mode front-end for "ping" command
 #
 
-help:   Send ICMP echo request to specified <hostname|IPv4 address>
-allowed: echo -n '<hostname> <x.x.x.x>'
+help:   Send ICMP echo request to specified node
+allowed: echo -n '<hostname> <x.x.x.x> <h:h:h:h:h:h:h:h>'
 
-run:	/bin/ping $2
+run:	/opt/vyatta/bin/vyatta-ping $2
diff --git a/templates/ping/node.tag/options/node.def b/templates/ping/node.tag/options/node.def
new file mode 100644
index 0000000..90b225d
--- /dev/null
+++ b/templates/ping/node.tag/options/node.def
@@ -0,0 +1,8 @@
+#
+# Operational mode front-end for "ping" command
+#
+
+help:   Supply advanced options to ping
+allowed: echo -n 'option text'
+
+
diff --git a/templates/ping/node.tag/options/node.tag/node.def b/templates/ping/node.tag/options/node.tag/node.def
new file mode 100644
index 0000000..cd1efa8
--- /dev/null
+++ b/templates/ping/node.tag/options/node.tag/node.def
@@ -0,0 +1,8 @@
+#
+# Operational mode front-end for "ping" command
+#
+
+help:   Supply advanced options to ping
+allowed: echo -n '<ping-options>'
+
+run:	/opt/vyatta/bin/vyatta-ping $2 "${@:4}"
diff --git a/templates/ping6/node.def b/templates/ping6/node.def
deleted file mode 100644
index 20cc018..0000000
--- a/templates/ping6/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Operational mode template for the "ping" command
-#
-help: Send IPv6 Internet Control Message Protocol (ICMP) echo request
diff --git a/templates/ping6/node.tag/node.def b/templates/ping6/node.tag/node.def
deleted file mode 100644
index 9241a00..0000000
--- a/templates/ping6/node.tag/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Operational mode front-end for "ping" command
-#
-
-help:   Send IPv6 ICMP echo request to specified <hostname|IPv6 address>
-allowed: echo -n '<hostname> <x:x:x:x:x>'
-
-run:	/bin/ping6 $2
diff --git a/templates/show/system/boot-messages/commit/node.def b/templates/show/system/boot-messages/commit/node.def
new file mode 100644
index 0000000..60e1f67
--- /dev/null
+++ b/templates/show/system/boot-messages/commit/node.def
@@ -0,0 +1,2 @@
+help: Show the commit messages from this boot
+run: cat /var/log/vyatta/vyatta-commit-this-boot.log
-- 
cgit v1.2.3