Merge pull request #25 from alkersan/current

T1596 Remove telnet and traceroute operations after xml-style rewrite

11 files changed, 0 insertions, 94 deletions

diff --git a/templates/monitor/traceroute/node.def b/templates/monitor/traceroute/node.def
deleted file mode 100644
index f07e6b3..0000000
--- a/templates/monitor/traceroute/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Monitor the path to a destination in realtime
diff --git a/templates/monitor/traceroute/node.tag/node.def b/templates/monitor/traceroute/node.tag/node.def
deleted file mode 100644
index 8c522de..0000000
--- a/templates/monitor/traceroute/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Monitor the path to a destination in realtime
-allowed: echo '<hostname> <x.x.x.x> <h:h:h:h:h:h:h:h>'
-run: mtr $3
diff --git a/templates/telnet/node.def b/templates/telnet/node.def
deleted file mode 100644
index e3ec3e0..0000000
--- a/templates/telnet/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Telnet to a node
diff --git a/templates/telnet/node.tag/node.def b/templates/telnet/node.tag/node.def
deleted file mode 100644
index 76e9b0a..0000000
--- a/templates/telnet/node.tag/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Telnet to host
-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/$*
-     elif [ -x /bin/busybox ] ; then
-	/bin/busybox $*
-     else
-	echo telnet not found
-     fi
diff --git a/templates/telnet/node.tag/node.tag/node.def b/templates/telnet/node.tag/node.tag/node.def
deleted file mode 100644
index 21b78c4..0000000
--- a/templates/telnet/node.tag/node.tag/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: Telnet to <address> <port>
-allowed: echo -n '<0-65535>'
-run: if [ -x /usr/bin/telnet ] ; then
-     	/usr/bin/$*
-     elif [ -x /bin/busybox ] ; then
-	/bin/busybox $*
-     else
-	echo telnet not found
-     fi
diff --git a/templates/traceroute/ipv4/node.def b/templates/traceroute/ipv4/node.def
deleted file mode 100644
index 2f618b1..0000000
--- a/templates/traceroute/ipv4/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Operational mode template for the "traceroute" command
-#
-help: Track network path to <hostname|IPv4 address>
diff --git a/templates/traceroute/ipv4/node.tag/node.def b/templates/traceroute/ipv4/node.tag/node.def
deleted file mode 100644
index a37ae5b..0000000
--- a/templates/traceroute/ipv4/node.tag/node.def
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Operational mode template for the "traceroute" command
-#
-
-help:   Track network path to specified <hostname|IPv4 address>
-allowed: echo -n '<hostname> <x:x:x:x>'
-
-run:
-     if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv4 $3
-       then
-           /usr/bin/traceroute $3
-           echo
-       else
-           if cat /etc/resolv.conf 2> /dev/null | grep -q nameserver
-             then
-                 if /usr/bin/host $3 &> /dev/null
-                   then
-                       /usr/bin/traceroute $3
-                   else
-                       echo "Invalid IPv4 address or host name '$3'"
-                 fi
-             else
-                 echo "Either enter a valid IPv4 address or configure Domain Name Server to resolve host names"
-           fi
-     fi
diff --git a/templates/traceroute/ipv6/node.def b/templates/traceroute/ipv6/node.def
deleted file mode 100644
index 1075c44..0000000
--- a/templates/traceroute/ipv6/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Operational mode template for the "traceroute" command
-#
-help: Track network path to <hostname|IPv6 address>
diff --git a/templates/traceroute/ipv6/node.tag/node.def b/templates/traceroute/ipv6/node.tag/node.def
deleted file mode 100644
index b746c3e..0000000
--- a/templates/traceroute/ipv6/node.tag/node.def
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Operational mode template for the "traceroute" command
-#
-
-help:   Track network path to specified <hostname|IPv6 address>
-allowed: echo -n '<hostname> <h:h:h:h:h:h:h:h>'
-
-run:
-     if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $3
-       then
-           /usr/bin/traceroute6 $3
-           echo
-       else
-           if cat /etc/resolv.conf 2> /dev/null | grep -q nameserver
-             then
-                 if /usr/bin/host $3 &> /dev/null
-                   then
-                       /usr/bin/traceroute6 $3
-                   else
-                       echo "Invalid IPv6 address or host name '$3'"
-                 fi
-             else
-                 echo "Either enter a valid IPv6 address or configure Domain Name Server to resolve host names"
-           fi
-     fi
diff --git a/templates/traceroute/node.def b/templates/traceroute/node.def
deleted file mode 100644
index 28e695c..0000000
--- a/templates/traceroute/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Operational mode template for the "traceroute" command
-#
-help: Track network path to node
diff --git a/templates/traceroute/node.tag/node.def b/templates/traceroute/node.tag/node.def
deleted file mode 100644
index 7b90221..0000000
--- a/templates/traceroute/node.tag/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Operational mode template for the "traceroute" command
-#
-
-help:   Track network path to specified node
-allowed: echo -n '<hostname> <x.x.x.x> <h:h:h:h:h:h:h:h>'
-
-run: /opt/vyatta/bin/vyatta-traceroute $2