Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-op into hollywood

36 files changed, 87 insertions, 8 deletions

diff --git a/templates/clear/dhcp/client/node.def b/templates/clear/dhcp/client/node.def
deleted file mode 100644
index 1c658f0..0000000
--- a/templates/clear/dhcp/client/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear DHCP client information
diff --git a/templates/clear/dhcp/client/process/node.def b/templates/clear/dhcp/client/process/node.def
deleted file mode 100644
index c83dace..0000000
--- a/templates/clear/dhcp/client/process/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Restart the DHCP client process
-run: sudo ${vyatta_bindir}/sudo-users/vyatta-interfaces.pl --restart-dhclient
diff --git a/templates/node.def b/templates/node.def
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/templates/node.def
@@ -0,0 +1 @@
+ 
diff --git a/templates/release/dhcp/interface/node.def b/templates/release/dhcp/interface/node.def
new file mode 100644
index 0000000..e65989f
--- /dev/null
+++ b/templates/release/dhcp/interface/node.def
@@ -0,0 +1 @@
+help: Release DHCP client lease for specified interface
diff --git a/templates/release/dhcp/interface/node.tag/node.def b/templates/release/dhcp/interface/node.tag/node.def
new file mode 100644
index 0000000..2fadea2
--- /dev/null
+++ b/templates/release/dhcp/interface/node.tag/node.def
@@ -0,0 +1,9 @@
+help: Release DHCP IP address lease for specified interface
+allowed:
+         local -a array ;
+         array=( /var/lib/dhcp3/eth* ) ;
+         echo  -n ${array[@]##*/}
+
+run:
+       IFNAME=${4}
+       sudo /opt/vyatta/bin/sudo-users/vyatta-interfaces.pl --op-command "dhcp-release" --dev "$IFNAME"
diff --git a/templates/release/dhcp/node.def b/templates/release/dhcp/node.def
new file mode 100644
index 0000000..03365d7
--- /dev/null
+++ b/templates/release/dhcp/node.def
@@ -0,0 +1 @@
+help: Release DHCP client lease 
diff --git a/templates/release/node.def b/templates/release/node.def
new file mode 100644
index 0000000..36c8901
--- /dev/null
+++ b/templates/release/node.def
@@ -0,0 +1 @@
+help: Release specified variable
diff --git a/templates/renew/dhcp/interface/node.def b/templates/renew/dhcp/interface/node.def
new file mode 100644
index 0000000..87993a9
--- /dev/null
+++ b/templates/renew/dhcp/interface/node.def
@@ -0,0 +1 @@
+help: Renew DHCP client lease for specified interface
diff --git a/templates/renew/dhcp/interface/node.tag/node.def b/templates/renew/dhcp/interface/node.tag/node.def
new file mode 100644
index 0000000..9952a49
--- /dev/null
+++ b/templates/renew/dhcp/interface/node.tag/node.def
@@ -0,0 +1,9 @@
+help: Renew DHCP IP address lease for specified interface
+allowed:
+         local -a array ;
+         array=( /var/lib/dhcp3/eth* ) ;
+         echo  -n ${array[@]##*/}
+
+run:
+       IFNAME=${4}
+       sudo /opt/vyatta/bin/sudo-users/vyatta-interfaces.pl --op-command "dhcp-renew" --dev "$IFNAME"
diff --git a/templates/renew/dhcp/node.def b/templates/renew/dhcp/node.def
new file mode 100644
index 0000000..78b64fb
--- /dev/null
+++ b/templates/renew/dhcp/node.def
@@ -0,0 +1 @@
+help: Renew DHCP client lease
diff --git a/templates/renew/node.def b/templates/renew/node.def
new file mode 100644
index 0000000..9b4c9d4
--- /dev/null
+++ b/templates/renew/node.def
@@ -0,0 +1 @@
+help: Renew specified variable
diff --git a/templates/show/interfaces/bridge/node.tag/capture/node.def b/templates/show/interfaces/bridge/node.tag/capture/node.def
new file mode 100644
index 0000000..ef86b9c
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/node.def
@@ -0,0 +1,2 @@
+help: Show captured traffic on specified bridge interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/bridge/node.tag/capture/not/node.def b/templates/show/interfaces/bridge/node.tag/capture/not/node.def
new file mode 100644
index 0000000..ecae454
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/not/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified bridge interface port
diff --git a/templates/show/interfaces/bridge/node.tag/capture/not/port/node.def b/templates/show/interfaces/bridge/node.tag/capture/not/port/node.def
new file mode 100644
index 0000000..ecae454
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/not/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified bridge interface port
diff --git a/templates/show/interfaces/bridge/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/bridge/node.tag/capture/not/port/node.tag/node.def
new file mode 100644
index 0000000..271106c
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/not/port/node.tag/node.def
@@ -0,0 +1,4 @@
+help: Show captured traffic excluding the specified bridge interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$8" 1
+allowed: echo -n '<1-65535>'
+
diff --git a/templates/show/interfaces/bridge/node.tag/capture/port/node.def b/templates/show/interfaces/bridge/node.tag/capture/port/node.def
new file mode 100644
index 0000000..43d1b9c
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic on specified bridge interface port
diff --git a/templates/show/interfaces/bridge/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/bridge/node.tag/capture/port/node.tag/node.def
new file mode 100644
index 0000000..7ad54b7
--- /dev/null
+++ b/templates/show/interfaces/bridge/node.tag/capture/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic on specified bridge interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$7" 0
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/node.def
new file mode 100644
index 0000000..190fd2f
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/node.def
@@ -0,0 +1,2 @@
+help: Show captured traffic on specified ethernet virtual interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6"
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/node.def
new file mode 100644
index 0000000..7328773
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified ethernet virtual interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.def
new file mode 100644
index 0000000..7328773
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified ethernet virtual interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.tag/node.def
new file mode 100644
index 0000000..258c6dc
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic excluding the specified ethernet interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6" "${10}" 1
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.def
new file mode 100644
index 0000000..d61d229
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic on specified ethernet virtual interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.tag/node.def
new file mode 100644
index 0000000..4090508
--- /dev/null
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic on specified ethernet virtual interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6" "$9" 0
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/loopback/node.tag/capture/node.def b/templates/show/interfaces/loopback/node.tag/capture/node.def
new file mode 100644
index 0000000..231ea09
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/node.def
@@ -0,0 +1,2 @@
+help: Show captured traffic on loopback interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/loopback/node.tag/capture/not/node.def b/templates/show/interfaces/loopback/node.tag/capture/not/node.def
new file mode 100644
index 0000000..b5bd2e6
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/not/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding loopback interface port
diff --git a/templates/show/interfaces/loopback/node.tag/capture/not/port/node.def b/templates/show/interfaces/loopback/node.tag/capture/not/port/node.def
new file mode 100644
index 0000000..b5bd2e6
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/not/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding loopback interface port
diff --git a/templates/show/interfaces/loopback/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/loopback/node.tag/capture/not/port/node.tag/node.def
new file mode 100644
index 0000000..b8d8ff2
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/not/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic excluding loopback interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$8" 1
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/loopback/node.tag/capture/port/node.def b/templates/show/interfaces/loopback/node.tag/capture/port/node.def
new file mode 100644
index 0000000..e46cf42
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic on loopback interface port
diff --git a/templates/show/interfaces/loopback/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/loopback/node.tag/capture/port/node.tag/node.def
new file mode 100644
index 0000000..f1aedc4
--- /dev/null
+++ b/templates/show/interfaces/loopback/node.tag/capture/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic on specified ethernet interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$7" 0
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/node.def b/templates/show/interfaces/tunnel/node.tag/capture/node.def
new file mode 100644
index 0000000..b196a35
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/node.def
@@ -0,0 +1,2 @@
+help: Show captured traffic on specified tunnel interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/not/node.def b/templates/show/interfaces/tunnel/node.tag/capture/not/node.def
new file mode 100644
index 0000000..c957f71
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/not/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified tunnel interface port
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def
new file mode 100644
index 0000000..c957f71
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic excluding the specified tunnel interface port
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def
new file mode 100644
index 0000000..b5c87c9
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic excluding the specified tunnel interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$8" 1
+allowed: echo -n '<1-65535>'
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/port/node.def b/templates/show/interfaces/tunnel/node.tag/capture/port/node.def
new file mode 100644
index 0000000..ed3b544
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/port/node.def
@@ -0,0 +1 @@
+help: Show captured traffic on specified tunnel interface port
diff --git a/templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def
new file mode 100644
index 0000000..d1f01df
--- /dev/null
+++ b/templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show captured traffic on specified tunnel interface port
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4" "$7" 0
+allowed: echo -n '<1-65535>'
diff --git a/templates/traceroute/node.tag/node.def b/templates/traceroute/node.tag/node.def
index 55acbb7..83a3f31 100644
--- a/templates/traceroute/node.tag/node.def
+++ b/templates/traceroute/node.tag/node.def
@@ -6,9 +6,21 @@ help:   Track network path to specified <hostname|IPv4 address>
 allowed:
 	vyatta-allowed-hosts
 
-run: if /usr/bin/host $2 &>/dev/null
-     then
-        /usr/bin/traceroute $2
-     else
-        echo Cannot identify $2
+run:
+     if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv4 $2
+       then
+           /usr/bin/traceroute $2
+           echo
+       else
+           if cat /etc/resolv.conf | grep -q nameserver
+             then
+                 if /usr/bin/host $2 &> /dev/null
+                   then
+                       /usr/bin/traceroute $2
+                   else
+                       echo "Invalid IP address or host name '$2'"
+                 fi
+             else
+                 echo "Either enter a valid IPv4 address or configure Domain Name Server to resolve host names"
+           fi
      fi