add show command support for policy rules

33 files changed, 21 insertions, 18 deletions

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/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/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/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/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/firewall/ipv6-modify/node.tag/counters/node.def b/templates/clear/policy/ipv6-route/node.tag/counters/node.def
index 1720f91..8d4810e 100644..100755
--- a/templates/clear/firewall/ipv6-modify/node.tag/counters/node.def
+++ b/templates/clear/policy/ipv6-route/node.tag/counters/node.def
@@ -1,2 +1,2 @@
-help: Clear firewall counters
+help: Clear policy counters
 run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/ip6tables" "mangle" "$4"
diff --git a/templates/clear/firewall/modify/node.tag/node.def b/templates/clear/policy/ipv6-route/node.tag/node.def
index 748872d..b01a78f 100644..100755
--- a/templates/clear/firewall/modify/node.tag/node.def
+++ b/templates/clear/policy/ipv6-route/node.tag/node.def
@@ -1,4 +1,4 @@
 help: Clear firewall rules for a given chain
 allowed: local -a vals
-         eval "vals=($(cli-shell-api listActiveNodes firewall modify))"
+         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/firewall/ipv6-modify/node.tag/rule/node.tag/counters/node.def b/templates/clear/policy/ipv6-route/node.tag/rule/node.tag/counters/node.def
index ad6c104..ad6c104 100644
--- a/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/counters/node.def
+++ b/templates/clear/policy/ipv6-route/node.tag/rule/node.tag/counters/node.def
diff --git a/templates/clear/firewall/modify/node.tag/rule/node.tag/node.def b/templates/clear/policy/ipv6-route/node.tag/rule/node.tag/node.def
index 6682b94..b059b02 100644..100755
--- a/templates/clear/firewall/modify/node.tag/rule/node.tag/node.def
+++ b/templates/clear/policy/ipv6-route/node.tag/rule/node.tag/node.def
@@ -1,5 +1,5 @@
-help: Clear firewall statistics for given rule
+help: Clear policy statistics for given rule
 allowed: local -a vals
          eval "vals=($(cli-shell-api listActiveNodes \
-                         firewall modify ${COMP_WORDS[COMP_CWORD-2]} rule))"
+                       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/firewall/modify/node.tag/counters/node.def b/templates/clear/policy/route/node.tag/counters/node.def
index e47bcdc..e47bcdc 100644
--- a/templates/clear/firewall/modify/node.tag/counters/node.def
+++ b/templates/clear/policy/route/node.tag/counters/node.def
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/firewall/modify/node.tag/rule/node.tag/counters/node.def b/templates/clear/policy/route/node.tag/rule/node.tag/counters/node.def
index d3cbae8..d3cbae8 100644
--- a/templates/clear/firewall/modify/node.tag/rule/node.tag/counters/node.def
+++ b/templates/clear/policy/route/node.tag/rule/node.tag/counters/node.def
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/node.def b/templates/show/firewall/node.def
index e09a6c2..6a4df96 100644..100755
--- 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/firewall/ipv6-modify/node.def b/templates/show/policy/ipv6-route/node.def
index 4aee1ea..4aee1ea 100644
--- a/templates/show/firewall/ipv6-modify/node.def
+++ b/templates/show/policy/ipv6-route/node.def
diff --git a/templates/show/firewall/ipv6-modify/node.tag/node.def b/templates/show/policy/ipv6-route/node.tag/node.def
index 60f872b..60f872b 100644
--- a/templates/show/firewall/ipv6-modify/node.tag/node.def
+++ b/templates/show/policy/ipv6-route/node.tag/node.def
diff --git a/templates/show/firewall/ipv6-modify/node.tag/rule/node.def b/templates/show/policy/ipv6-route/node.tag/rule/node.def
index b4face1..b4face1 100644
--- a/templates/show/firewall/ipv6-modify/node.tag/rule/node.def
+++ b/templates/show/policy/ipv6-route/node.tag/rule/node.def
diff --git a/templates/show/firewall/ipv6-modify/node.tag/rule/node.tag/node.def b/templates/show/policy/ipv6-route/node.tag/rule/node.tag/node.def
index fa7b4cb..fa7b4cb 100644
--- a/templates/show/firewall/ipv6-modify/node.tag/rule/node.tag/node.def
+++ b/templates/show/policy/ipv6-route/node.tag/rule/node.tag/node.def
diff --git a/templates/show/firewall/ipv6-modify/node.tag/statistics/node.def b/templates/show/policy/ipv6-route/node.tag/statistics/node.def
index 707efa3..707efa3 100644
--- a/templates/show/firewall/ipv6-modify/node.tag/statistics/node.def
+++ b/templates/show/policy/ipv6-route/node.tag/statistics/node.def
diff --git a/templates/show/firewall/ipv6-modify/statistics/node.def b/templates/show/policy/ipv6-route/statistics/node.def
index ae89dec..ae89dec 100644
--- a/templates/show/firewall/ipv6-modify/statistics/node.def
+++ b/templates/show/policy/ipv6-route/statistics/node.def
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/firewall/modify/node.def b/templates/show/policy/route/node.def
index 8a16e04..8a16e04 100644
--- a/templates/show/firewall/modify/node.def
+++ b/templates/show/policy/route/node.def
diff --git a/templates/show/firewall/modify/node.tag/node.def b/templates/show/policy/route/node.tag/node.def
index 096bac0..096bac0 100644
--- a/templates/show/firewall/modify/node.tag/node.def
+++ b/templates/show/policy/route/node.tag/node.def
diff --git a/templates/show/firewall/modify/node.tag/rule/node.def b/templates/show/policy/route/node.tag/rule/node.def
index 44a9e1a..44a9e1a 100644
--- a/templates/show/firewall/modify/node.tag/rule/node.def
+++ b/templates/show/policy/route/node.tag/rule/node.def
diff --git a/templates/show/firewall/modify/node.tag/rule/node.tag/node.def b/templates/show/policy/route/node.tag/rule/node.tag/node.def
index e79461e..e79461e 100644
--- a/templates/show/firewall/modify/node.tag/rule/node.tag/node.def
+++ b/templates/show/policy/route/node.tag/rule/node.tag/node.def
diff --git a/templates/show/firewall/modify/node.tag/statistics/node.def b/templates/show/policy/route/node.tag/statistics/node.def
index a96479b..a96479b 100644
--- a/templates/show/firewall/modify/node.tag/statistics/node.def
+++ b/templates/show/policy/route/node.tag/statistics/node.def
diff --git a/templates/show/firewall/modify/statistics/node.def b/templates/show/policy/route/statistics/node.def
index ae89dec..ae89dec 100644
--- a/templates/show/firewall/modify/statistics/node.def
+++ b/templates/show/policy/route/statistics/node.def