From a9d4ab9d4806e0b8a0d151442bcffd4f63f65dda Mon Sep 17 00:00:00 2001
From: Robert Bays <robert@vyatta.com>
Date: Wed, 5 Sep 2012 10:57:02 -0700
Subject: add show command support for policy rules

---
 templates/clear/firewall/ipv6-modify/node.def                     | 1 -
 templates/clear/firewall/ipv6-modify/node.tag/counters/node.def   | 2 --
 templates/clear/firewall/ipv6-modify/node.tag/node.def            | 4 ----
 templates/clear/firewall/ipv6-modify/node.tag/rule/node.def       | 1 -
 .../firewall/ipv6-modify/node.tag/rule/node.tag/counters/node.def | 2 --
 .../clear/firewall/ipv6-modify/node.tag/rule/node.tag/node.def    | 5 -----
 templates/clear/firewall/modify/node.def                          | 1 -
 templates/clear/firewall/modify/node.tag/counters/node.def        | 2 --
 templates/clear/firewall/modify/node.tag/node.def                 | 4 ----
 templates/clear/firewall/modify/node.tag/rule/node.def            | 1 -
 .../firewall/modify/node.tag/rule/node.tag/counters/node.def      | 2 --
 templates/clear/firewall/modify/node.tag/rule/node.tag/node.def   | 5 -----
 templates/clear/policy/ipv6-route/node.def                        | 1 +
 templates/clear/policy/ipv6-route/node.tag/counters/node.def      | 2 ++
 templates/clear/policy/ipv6-route/node.tag/node.def               | 4 ++++
 templates/clear/policy/ipv6-route/node.tag/rule/node.def          | 1 +
 .../policy/ipv6-route/node.tag/rule/node.tag/counters/node.def    | 2 ++
 templates/clear/policy/ipv6-route/node.tag/rule/node.tag/node.def | 5 +++++
 templates/clear/policy/node.def                                   | 1 +
 templates/clear/policy/route/node.def                             | 1 +
 templates/clear/policy/route/node.tag/counters/node.def           | 2 ++
 templates/clear/policy/route/node.tag/node.def                    | 4 ++++
 templates/clear/policy/route/node.tag/rule/node.def               | 1 +
 .../clear/policy/route/node.tag/rule/node.tag/counters/node.def   | 2 ++
 templates/clear/policy/route/node.tag/rule/node.tag/node.def      | 5 +++++
 templates/show/firewall/ipv6-modify/node.def                      | 2 --
 templates/show/firewall/ipv6-modify/node.tag/node.def             | 7 -------
 templates/show/firewall/ipv6-modify/node.tag/rule/node.def        | 1 -
 .../show/firewall/ipv6-modify/node.tag/rule/node.tag/node.def     | 8 --------
 templates/show/firewall/ipv6-modify/node.tag/statistics/node.def  | 2 --
 templates/show/firewall/ipv6-modify/statistics/node.def           | 2 --
 templates/show/firewall/modify/node.def                           | 2 --
 templates/show/firewall/modify/node.tag/node.def                  | 7 -------
 templates/show/firewall/modify/node.tag/rule/node.def             | 1 -
 templates/show/firewall/modify/node.tag/rule/node.tag/node.def    | 8 --------
 templates/show/firewall/modify/node.tag/statistics/node.def       | 2 --
 templates/show/firewall/modify/statistics/node.def                | 2 --
 templates/show/firewall/node.def                                  | 2 +-
 templates/show/policy/ipv6-route/node.def                         | 2 ++
 templates/show/policy/ipv6-route/node.tag/node.def                | 7 +++++++
 templates/show/policy/ipv6-route/node.tag/rule/node.def           | 1 +
 templates/show/policy/ipv6-route/node.tag/rule/node.tag/node.def  | 8 ++++++++
 templates/show/policy/ipv6-route/node.tag/statistics/node.def     | 2 ++
 templates/show/policy/ipv6-route/statistics/node.def              | 2 ++
 templates/show/policy/node.def                                    | 2 ++
 templates/show/policy/route/node.def                              | 2 ++
 templates/show/policy/route/node.tag/node.def                     | 7 +++++++
 templates/show/policy/route/node.tag/rule/node.def                | 1 +
 templates/show/policy/route/node.tag/rule/node.tag/node.def       | 8 ++++++++
 templates/show/policy/route/node.tag/statistics/node.def          | 2 ++
 templates/show/policy/route/statistics/node.def                   | 2 ++
 51 files changed, 78 insertions(+), 75 deletions(-)
 delete mode 100644 templates/clear/firewall/ipv6-modify/node.def
 delete mode 100644 templates/clear/firewall/ipv6-modify/node.tag/counters/node.def
 delete mode 100644 templates/clear/firewall/ipv6-modify/node.tag/node.def
 delete mode 100644 templates/clear/firewall/ipv6-modify/node.tag/rule/node.def
 delete mode 100644 templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/counters/node.def
 delete mode 100644 templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/node.def
 delete mode 100644 templates/clear/firewall/modify/node.def
 delete mode 100644 templates/clear/firewall/modify/node.tag/counters/node.def
 delete mode 100644 templates/clear/firewall/modify/node.tag/node.def
 delete mode 100644 templates/clear/firewall/modify/node.tag/rule/node.def
 delete mode 100644 templates/clear/firewall/modify/node.tag/rule/node.tag/counters/node.def
 delete mode 100644 templates/clear/firewall/modify/node.tag/rule/node.tag/node.def
 create mode 100755 templates/clear/policy/ipv6-route/node.def
 create mode 100755 templates/clear/policy/ipv6-route/node.tag/counters/node.def
 create mode 100755 templates/clear/policy/ipv6-route/node.tag/node.def
 create mode 100755 templates/clear/policy/ipv6-route/node.tag/rule/node.def
 create mode 100644 templates/clear/policy/ipv6-route/node.tag/rule/node.tag/counters/node.def
 create mode 100755 templates/clear/policy/ipv6-route/node.tag/rule/node.tag/node.def
 create mode 100644 templates/clear/policy/node.def
 create mode 100755 templates/clear/policy/route/node.def
 create mode 100644 templates/clear/policy/route/node.tag/counters/node.def
 create mode 100755 templates/clear/policy/route/node.tag/node.def
 create mode 100755 templates/clear/policy/route/node.tag/rule/node.def
 create mode 100644 templates/clear/policy/route/node.tag/rule/node.tag/counters/node.def
 create mode 100755 templates/clear/policy/route/node.tag/rule/node.tag/node.def
 delete mode 100644 templates/show/firewall/ipv6-modify/node.def
 delete mode 100644 templates/show/firewall/ipv6-modify/node.tag/node.def
 delete mode 100644 templates/show/firewall/ipv6-modify/node.tag/rule/node.def
 delete mode 100644 templates/show/firewall/ipv6-modify/node.tag/rule/node.tag/node.def
 delete mode 100644 templates/show/firewall/ipv6-modify/node.tag/statistics/node.def
 delete mode 100644 templates/show/firewall/ipv6-modify/statistics/node.def
 delete mode 100644 templates/show/firewall/modify/node.def
 delete mode 100644 templates/show/firewall/modify/node.tag/node.def
 delete mode 100644 templates/show/firewall/modify/node.tag/rule/node.def
 delete mode 100644 templates/show/firewall/modify/node.tag/rule/node.tag/node.def
 delete mode 100644 templates/show/firewall/modify/node.tag/statistics/node.def
 delete mode 100644 templates/show/firewall/modify/statistics/node.def
 mode change 100644 => 100755 templates/show/firewall/node.def
 create mode 100644 templates/show/policy/ipv6-route/node.def
 create mode 100644 templates/show/policy/ipv6-route/node.tag/node.def
 create mode 100644 templates/show/policy/ipv6-route/node.tag/rule/node.def
 create mode 100644 templates/show/policy/ipv6-route/node.tag/rule/node.tag/node.def
 create mode 100644 templates/show/policy/ipv6-route/node.tag/statistics/node.def
 create mode 100644 templates/show/policy/ipv6-route/statistics/node.def
 create mode 100755 templates/show/policy/node.def
 create mode 100644 templates/show/policy/route/node.def
 create mode 100644 templates/show/policy/route/node.tag/node.def
 create mode 100644 templates/show/policy/route/node.tag/rule/node.def
 create mode 100644 templates/show/policy/route/node.tag/rule/node.tag/node.def
 create mode 100644 templates/show/policy/route/node.tag/statistics/node.def
 create mode 100644 templates/show/policy/route/statistics/node.def

(limited to 'templates')

diff --git a/templates/clear/firewall/ipv6-modify/node.def b/templates/clear/firewall/ipv6-modify/node.def
deleted file mode 100644
index 208c4f1..0000000
--- a/templates/clear/firewall/ipv6-modify/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear firewall statistics for chain
diff --git a/templates/clear/firewall/ipv6-modify/node.tag/counters/node.def b/templates/clear/firewall/ipv6-modify/node.tag/counters/node.def
deleted file mode 100644
index 1720f91..0000000
--- a/templates/clear/firewall/ipv6-modify/node.tag/counters/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Clear firewall counters
-run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/ip6tables" "mangle" "$4"
diff --git a/templates/clear/firewall/ipv6-modify/node.tag/node.def b/templates/clear/firewall/ipv6-modify/node.tag/node.def
deleted file mode 100644
index 693c0ae..0000000
--- a/templates/clear/firewall/ipv6-modify/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Clear firewall rules for a given chain
-allowed: local -a vals
-         eval "vals=($(cli-shell-api listActiveNodes firewall ipv6-modify))"
-         echo -n ${vals[@]}
diff --git a/templates/clear/firewall/ipv6-modify/node.tag/rule/node.def b/templates/clear/firewall/ipv6-modify/node.tag/rule/node.def
deleted file mode 100644
index ff490a2..0000000
--- a/templates/clear/firewall/ipv6-modify/node.tag/rule/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear firewall statistics for a rule
diff --git a/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/counters/node.def b/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/counters/node.def
deleted file mode 100644
index ad6c104..0000000
--- a/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/counters/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Clear counters for specified rule
-run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/ip6tables" "mangle" "$4" "$6"
diff --git a/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/node.def b/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/node.def
deleted file mode 100644
index f777438..0000000
--- a/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Clear firewall statistics for given rule
-allowed: local -a vals
-         eval "vals=($(cli-shell-api listActiveNodes \
-                       firewall ipv6-modify ${COMP_WORDS[COMP_CWORD-2]} rule))"
-         echo -n ${vals[@]}
diff --git a/templates/clear/firewall/modify/node.def b/templates/clear/firewall/modify/node.def
deleted file mode 100644
index 208c4f1..0000000
--- a/templates/clear/firewall/modify/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear firewall statistics for chain
diff --git a/templates/clear/firewall/modify/node.tag/counters/node.def b/templates/clear/firewall/modify/node.tag/counters/node.def
deleted file mode 100644
index e47bcdc..0000000
--- a/templates/clear/firewall/modify/node.tag/counters/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Clear firewall counters
-run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/iptables" "mangle" "$4"
diff --git a/templates/clear/firewall/modify/node.tag/node.def b/templates/clear/firewall/modify/node.tag/node.def
deleted file mode 100644
index 748872d..0000000
--- a/templates/clear/firewall/modify/node.tag/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Clear firewall rules for a given chain
-allowed: local -a vals
-         eval "vals=($(cli-shell-api listActiveNodes firewall modify))"
-         echo -n ${vals[@]}
diff --git a/templates/clear/firewall/modify/node.tag/rule/node.def b/templates/clear/firewall/modify/node.tag/rule/node.def
deleted file mode 100644
index ff490a2..0000000
--- a/templates/clear/firewall/modify/node.tag/rule/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Clear firewall statistics for a rule
diff --git a/templates/clear/firewall/modify/node.tag/rule/node.tag/counters/node.def b/templates/clear/firewall/modify/node.tag/rule/node.tag/counters/node.def
deleted file mode 100644
index d3cbae8..0000000
--- a/templates/clear/firewall/modify/node.tag/rule/node.tag/counters/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Clear counters for specified rule
-run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/iptables" "mangle" "$4" "$6"
diff --git a/templates/clear/firewall/modify/node.tag/rule/node.tag/node.def b/templates/clear/firewall/modify/node.tag/rule/node.tag/node.def
deleted file mode 100644
index 6682b94..0000000
--- a/templates/clear/firewall/modify/node.tag/rule/node.tag/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Clear firewall statistics for given rule
-allowed: local -a vals
-         eval "vals=($(cli-shell-api listActiveNodes \
-                         firewall modify ${COMP_WORDS[COMP_CWORD-2]} rule))"
-         echo -n ${vals[@]}
diff --git a/templates/clear/policy/ipv6-route/node.def b/templates/clear/policy/ipv6-route/node.def
new file mode 100755
index 0000000..ef1851f
--- /dev/null
+++ b/templates/clear/policy/ipv6-route/node.def
@@ -0,0 +1 @@
+help: Clear policy statistics for chain
diff --git a/templates/clear/policy/ipv6-route/node.tag/counters/node.def b/templates/clear/policy/ipv6-route/node.tag/counters/node.def
new file mode 100755
index 0000000..8d4810e
--- /dev/null
+++ b/templates/clear/policy/ipv6-route/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear policy counters
+run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/ip6tables" "mangle" "$4"
diff --git a/templates/clear/policy/ipv6-route/node.tag/node.def b/templates/clear/policy/ipv6-route/node.tag/node.def
new file mode 100755
index 0000000..b01a78f
--- /dev/null
+++ b/templates/clear/policy/ipv6-route/node.tag/node.def
@@ -0,0 +1,4 @@
+help: Clear firewall rules for a given chain
+allowed: local -a vals
+         eval "vals=($(cli-shell-api listActiveNodes policy ipv6-route))"
+         echo -n ${vals[@]}
diff --git a/templates/clear/policy/ipv6-route/node.tag/rule/node.def b/templates/clear/policy/ipv6-route/node.tag/rule/node.def
new file mode 100755
index 0000000..1ec9d53
--- /dev/null
+++ b/templates/clear/policy/ipv6-route/node.tag/rule/node.def
@@ -0,0 +1 @@
+help: Clear policy statistics for a rule
diff --git a/templates/clear/policy/ipv6-route/node.tag/rule/node.tag/counters/node.def b/templates/clear/policy/ipv6-route/node.tag/rule/node.tag/counters/node.def
new file mode 100644
index 0000000..ad6c104
--- /dev/null
+++ b/templates/clear/policy/ipv6-route/node.tag/rule/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear counters for specified rule
+run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/ip6tables" "mangle" "$4" "$6"
diff --git a/templates/clear/policy/ipv6-route/node.tag/rule/node.tag/node.def b/templates/clear/policy/ipv6-route/node.tag/rule/node.tag/node.def
new file mode 100755
index 0000000..b059b02
--- /dev/null
+++ b/templates/clear/policy/ipv6-route/node.tag/rule/node.tag/node.def
@@ -0,0 +1,5 @@
+help: Clear policy statistics for given rule
+allowed: local -a vals
+         eval "vals=($(cli-shell-api listActiveNodes \
+                       policy ipv6-route ${COMP_WORDS[COMP_CWORD-2]} rule))"
+         echo -n ${vals[@]}
diff --git a/templates/clear/policy/node.def b/templates/clear/policy/node.def
new file mode 100644
index 0000000..ac88481
--- /dev/null
+++ b/templates/clear/policy/node.def
@@ -0,0 +1 @@
+help: Clear policy statistics
diff --git a/templates/clear/policy/route/node.def b/templates/clear/policy/route/node.def
new file mode 100755
index 0000000..ef1851f
--- /dev/null
+++ b/templates/clear/policy/route/node.def
@@ -0,0 +1 @@
+help: Clear policy statistics for chain
diff --git a/templates/clear/policy/route/node.tag/counters/node.def b/templates/clear/policy/route/node.tag/counters/node.def
new file mode 100644
index 0000000..e47bcdc
--- /dev/null
+++ b/templates/clear/policy/route/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear firewall counters
+run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/iptables" "mangle" "$4"
diff --git a/templates/clear/policy/route/node.tag/node.def b/templates/clear/policy/route/node.tag/node.def
new file mode 100755
index 0000000..e54b196
--- /dev/null
+++ b/templates/clear/policy/route/node.tag/node.def
@@ -0,0 +1,4 @@
+help: Clear policy rules for a given chain
+allowed: local -a vals
+         eval "vals=($(cli-shell-api listActiveNodes policy route))"
+         echo -n ${vals[@]}
diff --git a/templates/clear/policy/route/node.tag/rule/node.def b/templates/clear/policy/route/node.tag/rule/node.def
new file mode 100755
index 0000000..1ec9d53
--- /dev/null
+++ b/templates/clear/policy/route/node.tag/rule/node.def
@@ -0,0 +1 @@
+help: Clear policy statistics for a rule
diff --git a/templates/clear/policy/route/node.tag/rule/node.tag/counters/node.def b/templates/clear/policy/route/node.tag/rule/node.tag/counters/node.def
new file mode 100644
index 0000000..d3cbae8
--- /dev/null
+++ b/templates/clear/policy/route/node.tag/rule/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear counters for specified rule
+run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/iptables" "mangle" "$4" "$6"
diff --git a/templates/clear/policy/route/node.tag/rule/node.tag/node.def b/templates/clear/policy/route/node.tag/rule/node.tag/node.def
new file mode 100755
index 0000000..ff425cf
--- /dev/null
+++ b/templates/clear/policy/route/node.tag/rule/node.tag/node.def
@@ -0,0 +1,5 @@
+help: Clear policy statistics for given rule
+allowed: local -a vals
+         eval "vals=($(cli-shell-api listActiveNodes \
+                         policy route ${COMP_WORDS[COMP_CWORD-2]} rule))"
+         echo -n ${vals[@]}
diff --git a/templates/show/firewall/ipv6-modify/node.def b/templates/show/firewall/ipv6-modify/node.def
deleted file mode 100644
index 4aee1ea..0000000
--- a/templates/show/firewall/ipv6-modify/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show IPv6 firewall modify chains
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall_detail.xsl
diff --git a/templates/show/firewall/ipv6-modify/node.tag/node.def b/templates/show/firewall/ipv6-modify/node.tag/node.def
deleted file mode 100644
index 60f872b..0000000
--- a/templates/show/firewall/ipv6-modify/node.tag/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Show rules for given IPv6 firewall modify chain
-
-allowed: local -a vals
-         eval "vals=($(cli-shell-api listActiveNodes firewall ipv6-modify))"
-         echo -n ${vals[@]}
-
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl
diff --git a/templates/show/firewall/ipv6-modify/node.tag/rule/node.def b/templates/show/firewall/ipv6-modify/node.tag/rule/node.def
deleted file mode 100644
index b4face1..0000000
--- a/templates/show/firewall/ipv6-modify/node.tag/rule/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show summary of IPv6 firewall modify rules
diff --git a/templates/show/firewall/ipv6-modify/node.tag/rule/node.tag/node.def b/templates/show/firewall/ipv6-modify/node.tag/rule/node.tag/node.def
deleted file mode 100644
index fa7b4cb..0000000
--- a/templates/show/firewall/ipv6-modify/node.tag/rule/node.tag/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: Show summary of IPv6 firewall modify rules
-
-allowed: local -a vals
-         eval "vals=($(cli-shell-api listActiveNodes \
-                       firewall ipv6-modify ${COMP_WORDS[COMP_CWORD-2]} rule))"
-         echo -n ${vals[@]}
-
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl "$6"
diff --git a/templates/show/firewall/ipv6-modify/node.tag/statistics/node.def b/templates/show/firewall/ipv6-modify/node.tag/statistics/node.def
deleted file mode 100644
index 707efa3..0000000
--- a/templates/show/firewall/ipv6-modify/node.tag/statistics/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show IPv6 firewall modify counter information
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_statistics.xsl
diff --git a/templates/show/firewall/ipv6-modify/statistics/node.def b/templates/show/firewall/ipv6-modify/statistics/node.def
deleted file mode 100644
index ae89dec..0000000
--- a/templates/show/firewall/ipv6-modify/statistics/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show firewall counter information
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall_statistics.xsl
diff --git a/templates/show/firewall/modify/node.def b/templates/show/firewall/modify/node.def
deleted file mode 100644
index 8a16e04..0000000
--- a/templates/show/firewall/modify/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show IPv4 firewall modify chains
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall_detail.xsl
diff --git a/templates/show/firewall/modify/node.tag/node.def b/templates/show/firewall/modify/node.tag/node.def
deleted file mode 100644
index 096bac0..0000000
--- a/templates/show/firewall/modify/node.tag/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Show rules for given IPv4 firewall modify chain
-
-allowed: local -a vals
-         eval "vals=($(cli-shell-api listActiveNodes firewall modify))"
-         echo -n ${vals[@]}
-
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl
diff --git a/templates/show/firewall/modify/node.tag/rule/node.def b/templates/show/firewall/modify/node.tag/rule/node.def
deleted file mode 100644
index 44a9e1a..0000000
--- a/templates/show/firewall/modify/node.tag/rule/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Show summary of IPv4 firewall modify rules
diff --git a/templates/show/firewall/modify/node.tag/rule/node.tag/node.def b/templates/show/firewall/modify/node.tag/rule/node.tag/node.def
deleted file mode 100644
index e79461e..0000000
--- a/templates/show/firewall/modify/node.tag/rule/node.tag/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: Show summary of IPv4 firewall modify rules
-
-allowed: local -a vals
-         eval "vals=($(cli-shell-api listActiveNodes \
-                         firewall modify ${COMP_WORDS[COMP_CWORD-2]} rule))"
-         echo -n ${vals[@]}
-
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl "$6"
diff --git a/templates/show/firewall/modify/node.tag/statistics/node.def b/templates/show/firewall/modify/node.tag/statistics/node.def
deleted file mode 100644
index a96479b..0000000
--- a/templates/show/firewall/modify/node.tag/statistics/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show IPv4 firewall modify counter information
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_statistics.xsl
diff --git a/templates/show/firewall/modify/statistics/node.def b/templates/show/firewall/modify/statistics/node.def
deleted file mode 100644
index ae89dec..0000000
--- a/templates/show/firewall/modify/statistics/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Show firewall counter information
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall_statistics.xsl
diff --git a/templates/show/firewall/node.def b/templates/show/firewall/node.def
old mode 100644
new mode 100755
index e09a6c2..6a4df96
--- a/templates/show/firewall/node.def
+++ b/templates/show/firewall/node.def
@@ -1,2 +1,2 @@
 help: Show firewall information
-run: ${vyatta_bindir}/vyatta-show-firewall.pl "all_all" /opt/vyatta/share/xsl/show_firewall_detail.xsl
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "firewall_all" /opt/vyatta/share/xsl/show_firewall_detail.xsl
diff --git a/templates/show/policy/ipv6-route/node.def b/templates/show/policy/ipv6-route/node.def
new file mode 100644
index 0000000..4aee1ea
--- /dev/null
+++ b/templates/show/policy/ipv6-route/node.def
@@ -0,0 +1,2 @@
+help: Show IPv6 firewall modify chains
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall_detail.xsl
diff --git a/templates/show/policy/ipv6-route/node.tag/node.def b/templates/show/policy/ipv6-route/node.tag/node.def
new file mode 100644
index 0000000..60f872b
--- /dev/null
+++ b/templates/show/policy/ipv6-route/node.tag/node.def
@@ -0,0 +1,7 @@
+help: Show rules for given IPv6 firewall modify chain
+
+allowed: local -a vals
+         eval "vals=($(cli-shell-api listActiveNodes firewall ipv6-modify))"
+         echo -n ${vals[@]}
+
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl
diff --git a/templates/show/policy/ipv6-route/node.tag/rule/node.def b/templates/show/policy/ipv6-route/node.tag/rule/node.def
new file mode 100644
index 0000000..b4face1
--- /dev/null
+++ b/templates/show/policy/ipv6-route/node.tag/rule/node.def
@@ -0,0 +1 @@
+help: Show summary of IPv6 firewall modify rules
diff --git a/templates/show/policy/ipv6-route/node.tag/rule/node.tag/node.def b/templates/show/policy/ipv6-route/node.tag/rule/node.tag/node.def
new file mode 100644
index 0000000..fa7b4cb
--- /dev/null
+++ b/templates/show/policy/ipv6-route/node.tag/rule/node.tag/node.def
@@ -0,0 +1,8 @@
+help: Show summary of IPv6 firewall modify rules
+
+allowed: local -a vals
+         eval "vals=($(cli-shell-api listActiveNodes \
+                       firewall ipv6-modify ${COMP_WORDS[COMP_CWORD-2]} rule))"
+         echo -n ${vals[@]}
+
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl "$6"
diff --git a/templates/show/policy/ipv6-route/node.tag/statistics/node.def b/templates/show/policy/ipv6-route/node.tag/statistics/node.def
new file mode 100644
index 0000000..707efa3
--- /dev/null
+++ b/templates/show/policy/ipv6-route/node.tag/statistics/node.def
@@ -0,0 +1,2 @@
+help: Show IPv6 firewall modify counter information
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_statistics.xsl
diff --git a/templates/show/policy/ipv6-route/statistics/node.def b/templates/show/policy/ipv6-route/statistics/node.def
new file mode 100644
index 0000000..ae89dec
--- /dev/null
+++ b/templates/show/policy/ipv6-route/statistics/node.def
@@ -0,0 +1,2 @@
+help: Show firewall counter information
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall_statistics.xsl
diff --git a/templates/show/policy/node.def b/templates/show/policy/node.def
new file mode 100755
index 0000000..c8c1c34
--- /dev/null
+++ b/templates/show/policy/node.def
@@ -0,0 +1,2 @@
+help: Show policy information
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "policy_all" /opt/vyatta/share/xsl/show_firewall_detail.xsl
diff --git a/templates/show/policy/route/node.def b/templates/show/policy/route/node.def
new file mode 100644
index 0000000..8a16e04
--- /dev/null
+++ b/templates/show/policy/route/node.def
@@ -0,0 +1,2 @@
+help: Show IPv4 firewall modify chains
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall_detail.xsl
diff --git a/templates/show/policy/route/node.tag/node.def b/templates/show/policy/route/node.tag/node.def
new file mode 100644
index 0000000..096bac0
--- /dev/null
+++ b/templates/show/policy/route/node.tag/node.def
@@ -0,0 +1,7 @@
+help: Show rules for given IPv4 firewall modify chain
+
+allowed: local -a vals
+         eval "vals=($(cli-shell-api listActiveNodes firewall modify))"
+         echo -n ${vals[@]}
+
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl
diff --git a/templates/show/policy/route/node.tag/rule/node.def b/templates/show/policy/route/node.tag/rule/node.def
new file mode 100644
index 0000000..44a9e1a
--- /dev/null
+++ b/templates/show/policy/route/node.tag/rule/node.def
@@ -0,0 +1 @@
+help: Show summary of IPv4 firewall modify rules
diff --git a/templates/show/policy/route/node.tag/rule/node.tag/node.def b/templates/show/policy/route/node.tag/rule/node.tag/node.def
new file mode 100644
index 0000000..e79461e
--- /dev/null
+++ b/templates/show/policy/route/node.tag/rule/node.tag/node.def
@@ -0,0 +1,8 @@
+help: Show summary of IPv4 firewall modify rules
+
+allowed: local -a vals
+         eval "vals=($(cli-shell-api listActiveNodes \
+                         firewall modify ${COMP_WORDS[COMP_CWORD-2]} rule))"
+         echo -n ${vals[@]}
+
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl "$6"
diff --git a/templates/show/policy/route/node.tag/statistics/node.def b/templates/show/policy/route/node.tag/statistics/node.def
new file mode 100644
index 0000000..a96479b
--- /dev/null
+++ b/templates/show/policy/route/node.tag/statistics/node.def
@@ -0,0 +1,2 @@
+help: Show IPv4 firewall modify counter information
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_statistics.xsl
diff --git a/templates/show/policy/route/statistics/node.def b/templates/show/policy/route/statistics/node.def
new file mode 100644
index 0000000..ae89dec
--- /dev/null
+++ b/templates/show/policy/route/statistics/node.def
@@ -0,0 +1,2 @@
+help: Show firewall counter information
+run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_all" /opt/vyatta/share/xsl/show_firewall_statistics.xsl
-- 
cgit v1.2.3