Move packet capture to 'monitor interfaces'

(cherry picked from commit bc6ffc5d3503af09c65a58f7d5907562d3fef944)

72 files changed, 31 insertions, 88 deletions

diff --git a/templates/monitor/interfaces/bonding/node.def b/templates/monitor/interfaces/bonding/node.def
new file mode 100644
index 0000000..16f3822
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.def
@@ -0,0 +1 @@
+help: Monitor a bonding interface
diff --git a/templates/monitor/interfaces/bonding/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/node.def
new file mode 100644
index 0000000..61ad641
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/node.def
@@ -0,0 +1 @@
+help: Monitor a specified bonding interface
diff --git a/templates/monitor/interfaces/bonding/node.tag/traffic/node.def b/templates/monitor/interfaces/bonding/node.tag/traffic/node.def
new file mode 100644
index 0000000..e186876
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/traffic/node.def
@@ -0,0 +1,2 @@
+help: Monitor captured traffic on specified bonding interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.def
new file mode 100644
index 0000000..67db353
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/vif/node.def
@@ -0,0 +1 @@
+help: Monitor a vif
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/node.def
new file mode 100644
index 0000000..04350fb
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/node.def
@@ -0,0 +1 @@
+help: Monitor a specified vif
diff --git a/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/node.def b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/node.def
new file mode 100644
index 0000000..1237372
--- /dev/null
+++ b/templates/monitor/interfaces/bonding/node.tag/vif/node.tag/traffic/node.def
@@ -0,0 +1,2 @@
+help: Monitor captured traffic on specified bonding virtual interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6"
diff --git a/templates/monitor/interfaces/bridge/node.def b/templates/monitor/interfaces/bridge/node.def
new file mode 100644
index 0000000..347c0f2
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.def
@@ -0,0 +1 @@
+help: Monitor a bridge interface
diff --git a/templates/monitor/interfaces/bridge/node.tag/node.def b/templates/monitor/interfaces/bridge/node.tag/node.def
new file mode 100644
index 0000000..8f86b7c
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/node.def
@@ -0,0 +1 @@
+help: Monitor a specified bridge interface
diff --git a/templates/monitor/interfaces/bridge/node.tag/traffic/node.def b/templates/monitor/interfaces/bridge/node.tag/traffic/node.def
new file mode 100644
index 0000000..db42c6d
--- /dev/null
+++ b/templates/monitor/interfaces/bridge/node.tag/traffic/node.def
@@ -0,0 +1,2 @@
+help: Monitor captured traffic on specified bridge interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/monitor/interfaces/ethernet/node.def b/templates/monitor/interfaces/ethernet/node.def
new file mode 100644
index 0000000..d720c00
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.def
@@ -0,0 +1 @@
+help: Monitor a ethernet interface
diff --git a/templates/monitor/interfaces/ethernet/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/node.def
new file mode 100644
index 0000000..23616b5
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/node.def
@@ -0,0 +1 @@
+help: Monitor a specified ethernet interface
diff --git a/templates/monitor/interfaces/ethernet/node.tag/traffic/node.def b/templates/monitor/interfaces/ethernet/node.tag/traffic/node.def
new file mode 100644
index 0000000..359330f
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/traffic/node.def
@@ -0,0 +1,2 @@
+help: Monitor captured traffic on specified ethernet interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.def
new file mode 100644
index 0000000..67db353
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/vif/node.def
@@ -0,0 +1 @@
+help: Monitor a vif
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/node.def
new file mode 100644
index 0000000..9169460
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/node.def
@@ -0,0 +1 @@
+help: Monitor the specified vif
diff --git a/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/node.def b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/node.def
new file mode 100644
index 0000000..51182b2
--- /dev/null
+++ b/templates/monitor/interfaces/ethernet/node.tag/vif/node.tag/traffic/node.def
@@ -0,0 +1,2 @@
+help: Monitor captured traffic on specified ethernet virtual interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6"
diff --git a/templates/monitor/interfaces/loopback/node.def b/templates/monitor/interfaces/loopback/node.def
new file mode 100644
index 0000000..5266ca3
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.def
@@ -0,0 +1 @@
+help: Monitor a loopback interface
diff --git a/templates/monitor/interfaces/loopback/node.tag/node.def b/templates/monitor/interfaces/loopback/node.tag/node.def
new file mode 100644
index 0000000..b82e0c5
--- /dev/null
+++ b/templates/monitor/interfaces/loopback/node.tag/node.def
@@ -0,0 +1 @@
+help: Monitor a specified loopback interface
diff --git a/templates/show/interfaces/loopback/node.tag/capture/node.def b/templates/monitor/interfaces/loopback/node.tag/traffic/node.def
index 231ea09..013fc84 100644
--- a/templates/show/interfaces/loopback/node.tag/capture/node.def
+++ b/templates/monitor/interfaces/loopback/node.tag/traffic/node.def
@@ -1,2 +1,2 @@
-help: Show captured traffic on loopback interface
+help: Monitor captured traffic on loopback interface
 run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/monitor/interface/node.def b/templates/monitor/interfaces/node.def
index 9adbd67..9adbd67 100644
--- a/templates/monitor/interface/node.def
+++ b/templates/monitor/interfaces/node.def
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.def
new file mode 100644
index 0000000..c51a6f8
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.def
@@ -0,0 +1 @@
+help: Monitor a pseudo-ethernet interface
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def
new file mode 100644
index 0000000..459219b
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/node.def
@@ -0,0 +1 @@
+help: Monitor a specified pseudo-ethernet interface
diff --git a/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/node.def b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/node.def
new file mode 100644
index 0000000..8f0fc18
--- /dev/null
+++ b/templates/monitor/interfaces/pseudo-ethernet/node.tag/traffic/node.def
@@ -0,0 +1,2 @@
+help: Monitor captured traffic on specified pseudo ethernet interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/monitor/interfaces/tunnel/node.def b/templates/monitor/interfaces/tunnel/node.def
new file mode 100644
index 0000000..ca86e58
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.def
@@ -0,0 +1 @@
+help: Monitor a tunnel interface
diff --git a/templates/monitor/interfaces/tunnel/node.tag/node.def b/templates/monitor/interfaces/tunnel/node.tag/node.def
new file mode 100644
index 0000000..777ddb3
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/node.def
@@ -0,0 +1 @@
+help: Monitor a specified tunnel interface
diff --git a/templates/monitor/interfaces/tunnel/node.tag/traffic/node.def b/templates/monitor/interfaces/tunnel/node.tag/traffic/node.def
new file mode 100644
index 0000000..2f290eb
--- /dev/null
+++ b/templates/monitor/interfaces/tunnel/node.tag/traffic/node.def
@@ -0,0 +1,2 @@
+help: Monitor captured traffic on specified tunnel interface
+run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/bonding/node.tag/capture/node.def b/templates/show/interfaces/bonding/node.tag/capture/node.def
deleted file mode 100644
index fe96958..0000000
--- a/templates/show/interfaces/bonding/node.tag/capture/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show captured traffic on specified bonding interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/bonding/node.tag/capture/not/node.def b/templates/show/interfaces/bonding/node.tag/capture/not/node.def
deleted file mode 100644
index 3fbb818..0000000
--- a/templates/show/interfaces/bonding/node.tag/capture/not/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic excluding the specified bonding interface port
diff --git a/templates/show/interfaces/bonding/node.tag/capture/not/port/node.def b/templates/show/interfaces/bonding/node.tag/capture/not/port/node.def
deleted file mode 100644
index 3fbb818..0000000
--- a/templates/show/interfaces/bonding/node.tag/capture/not/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic excluding the specified bonding interface port
diff --git a/templates/show/interfaces/bonding/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/bonding/node.tag/capture/not/port/node.tag/node.def
deleted file mode 100644
index c8e76aa..0000000
--- a/templates/show/interfaces/bonding/node.tag/capture/not/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show captured traffic excluding the specified bonding 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/bonding/node.tag/capture/port/node.def b/templates/show/interfaces/bonding/node.tag/capture/port/node.def
deleted file mode 100644
index e7c3b56..0000000
--- a/templates/show/interfaces/bonding/node.tag/capture/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic on specified bonding interface port
diff --git a/templates/show/interfaces/bonding/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/bonding/node.tag/capture/port/node.tag/node.def
deleted file mode 100644
index 296ba4c..0000000
--- a/templates/show/interfaces/bonding/node.tag/capture/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show captured traffic on specified bonding 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/bonding/node.tag/vif/node.tag/capture/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/node.def
deleted file mode 100644
index 4cb7173..0000000
--- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show captured traffic on specified bonding virtual interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4.$6"
diff --git a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/node.def
deleted file mode 100644
index aef8d8b..0000000
--- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic excluding the specified bonding virtual interface port
diff --git a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.def
deleted file mode 100644
index aef8d8b..0000000
--- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic excluding the specified bonding virtual interface port
diff --git a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.tag/node.def
deleted file mode 100644
index 496f21c..0000000
--- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/not/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show captured traffic excluding the specified bonding 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/bonding/node.tag/vif/node.tag/capture/port/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.def
deleted file mode 100644
index 5e07aa5..0000000
--- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic on specified bonding virtual interface port
diff --git a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.tag/node.def
deleted file mode 100644
index 304b4e3..0000000
--- a/templates/show/interfaces/bonding/node.tag/vif/node.tag/capture/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show captured traffic on specified bonding 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/bridge/node.tag/capture/node.def b/templates/show/interfaces/bridge/node.tag/capture/node.def
deleted file mode 100644
index ef86b9c..0000000
--- a/templates/show/interfaces/bridge/node.tag/capture/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index ecae454..0000000
--- a/templates/show/interfaces/bridge/node.tag/capture/not/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ecae454..0000000
--- a/templates/show/interfaces/bridge/node.tag/capture/not/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 271106c..0000000
--- a/templates/show/interfaces/bridge/node.tag/capture/not/port/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 43d1b9c..0000000
--- a/templates/show/interfaces/bridge/node.tag/capture/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 7ad54b7..0000000
--- a/templates/show/interfaces/bridge/node.tag/capture/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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/capture/node.def b/templates/show/interfaces/ethernet/node.tag/capture/node.def
deleted file mode 100644
index 318f6cf..0000000
--- a/templates/show/interfaces/ethernet/node.tag/capture/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show captured traffic on specified ethernet interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/ethernet/node.tag/capture/not/node.def b/templates/show/interfaces/ethernet/node.tag/capture/not/node.def
deleted file mode 100644
index ca8a2ed..0000000
--- a/templates/show/interfaces/ethernet/node.tag/capture/not/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic excluding the specified ethernet interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.def b/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.def
deleted file mode 100644
index ca8a2ed..0000000
--- a/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic excluding the specified ethernet interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.tag/node.def
deleted file mode 100644
index a350ac5..0000000
--- a/templates/show/interfaces/ethernet/node.tag/capture/not/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show captured traffic excluding the specified ethernet 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/ethernet/node.tag/capture/port/node.def b/templates/show/interfaces/ethernet/node.tag/capture/port/node.def
deleted file mode 100644
index 7f6d889..0000000
--- a/templates/show/interfaces/ethernet/node.tag/capture/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic on specified ethernet interface port
diff --git a/templates/show/interfaces/ethernet/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/capture/port/node.tag/node.def
deleted file mode 100644
index f1aedc4..0000000
--- a/templates/show/interfaces/ethernet/node.tag/capture/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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/ethernet/node.tag/vif/node.tag/capture/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/node.def
deleted file mode 100644
index 190fd2f..0000000
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 7328773..0000000
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 7328773..0000000
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 258c6dc..0000000
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/not/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index d61d229..0000000
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 4090508..0000000
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/capture/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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/not/node.def b/templates/show/interfaces/loopback/node.tag/capture/not/node.def
deleted file mode 100644
index b5bd2e6..0000000
--- a/templates/show/interfaces/loopback/node.tag/capture/not/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index b5bd2e6..0000000
--- a/templates/show/interfaces/loopback/node.tag/capture/not/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index b8d8ff2..0000000
--- a/templates/show/interfaces/loopback/node.tag/capture/not/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index e46cf42..0000000
--- a/templates/show/interfaces/loopback/node.tag/capture/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index f1aedc4..0000000
--- a/templates/show/interfaces/loopback/node.tag/capture/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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/pseudo-ethernet/node.tag/capture/node.def b/templates/show/interfaces/pseudo-ethernet/node.tag/capture/node.def
deleted file mode 100644
index 8f1be5e..0000000
--- a/templates/show/interfaces/pseudo-ethernet/node.tag/capture/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show captured traffic on specified pseudo ethernet interface
-run: /opt/vyatta/bin/vyatta-tshark-interface-port.pl "$4"
diff --git a/templates/show/interfaces/pseudo-ethernet/node.tag/capture/not/node.def b/templates/show/interfaces/pseudo-ethernet/node.tag/capture/not/node.def
deleted file mode 100644
index a5ef553..0000000
--- a/templates/show/interfaces/pseudo-ethernet/node.tag/capture/not/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic excluding the specified pseudo ethernet interface port
diff --git a/templates/show/interfaces/pseudo-ethernet/node.tag/capture/not/port/node.def b/templates/show/interfaces/pseudo-ethernet/node.tag/capture/not/port/node.def
deleted file mode 100644
index a5ef553..0000000
--- a/templates/show/interfaces/pseudo-ethernet/node.tag/capture/not/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic excluding the specified pseudo ethernet interface port
diff --git a/templates/show/interfaces/pseudo-ethernet/node.tag/capture/not/port/node.tag/node.def b/templates/show/interfaces/pseudo-ethernet/node.tag/capture/not/port/node.tag/node.def
deleted file mode 100644
index 3a2b44e..0000000
--- a/templates/show/interfaces/pseudo-ethernet/node.tag/capture/not/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show captured traffic excluding the specified pseudo ethernet 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/pseudo-ethernet/node.tag/capture/port/node.def b/templates/show/interfaces/pseudo-ethernet/node.tag/capture/port/node.def
deleted file mode 100644
index efbe90e..0000000
--- a/templates/show/interfaces/pseudo-ethernet/node.tag/capture/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show captured traffic on specified pseudo ethernet interface port
diff --git a/templates/show/interfaces/pseudo-ethernet/node.tag/capture/port/node.tag/node.def b/templates/show/interfaces/pseudo-ethernet/node.tag/capture/port/node.tag/node.def
deleted file mode 100644
index d5e357e..0000000
--- a/templates/show/interfaces/pseudo-ethernet/node.tag/capture/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Show captured traffic on specified pseudo 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
deleted file mode 100644
index b196a35..0000000
--- a/templates/show/interfaces/tunnel/node.tag/capture/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index c957f71..0000000
--- a/templates/show/interfaces/tunnel/node.tag/capture/not/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index c957f71..0000000
--- a/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index b5c87c9..0000000
--- a/templates/show/interfaces/tunnel/node.tag/capture/not/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index ed3b544..0000000
--- a/templates/show/interfaces/tunnel/node.tag/capture/port/node.def
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index d1f01df..0000000
--- a/templates/show/interfaces/tunnel/node.tag/capture/port/node.tag/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-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>'