Work on new IPsec operational mode script. Integrate with more CLI commands

11 files changed, 19 insertions, 13 deletions

diff --git a/templates/show/vpn/ike/sa/peer/node.def b/templates/show/vpn/ike/sa/peer/node.def
index 73c39e4..c1ff1fb 100644
--- a/templates/show/vpn/ike/sa/peer/node.def
+++ b/templates/show/vpn/ike/sa/peer/node.def
@@ -1 +1 @@
-help: Show all currently active IKE Security Associations (SA) for a specific peer
+help: Show all currently active IKE Security Associations (SA) for a peer
diff --git a/templates/show/vpn/ipsec/sa/detail/connection/node.def b/templates/show/vpn/ipsec/sa/detail/connection/node.def
index 5c642fa..05b45cf 100644
--- a/templates/show/vpn/ipsec/sa/detail/connection/node.def
+++ b/templates/show/vpn/ipsec/sa/detail/connection/node.def
@@ -1 +1 @@
-help: Show detailed all active IPsec Security Associations (SA) for a specific connection
+help: Show details for all active IPsec Security Associations (SA) for a connection
diff --git a/templates/show/vpn/ipsec/sa/detail/connection/node.tag/node.def b/templates/show/vpn/ipsec/sa/detail/connection/node.tag/node.def
index c38a84c..5dd62a7 100644
--- a/templates/show/vpn/ipsec/sa/detail/connection/node.tag/node.def
+++ b/templates/show/vpn/ipsec/sa/detail/connection/node.tag/node.def
@@ -1,5 +1,3 @@
-help: Show detailed all active IPsec Security Associations (SA) for a specific connection
-
-run: sudo /opt/vyatta/bin/sudo-users/command_proc_show_vpn show_vpn_ipsec_sa.xsl --pname detail --pval y --pname conn --pval "$7"
-
-allowed: sudo /usr/sbin/ipsec status | grep '000 "peer-' | perl -p -e 's/^000 "([^"]*)":\s.*/\1/' | sort -u
+help: Show details for all active IPsec Security Associations (SA) for a connection
+allowed: /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --get-conn-for-cli
+run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ipsec-sa-conn-detail="$7"
diff --git a/templates/show/vpn/ipsec/sa/detail/node.def b/templates/show/vpn/ipsec/sa/detail/node.def
index d5307a5..1fb13e4 100644
--- a/templates/show/vpn/ipsec/sa/detail/node.def
+++ b/templates/show/vpn/ipsec/sa/detail/node.def
@@ -1,2 +1,2 @@
-help: Show detailed all active IPsec Security Associations (SA)
+help: Show details for all active IPsec Security Associations (SA)
 run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ipsec-sa-detail
diff --git a/templates/show/vpn/ipsec/sa/detail/peer/node.def b/templates/show/vpn/ipsec/sa/detail/peer/node.def
index 61a0e78..bbb34b8 100644
--- a/templates/show/vpn/ipsec/sa/detail/peer/node.def
+++ b/templates/show/vpn/ipsec/sa/detail/peer/node.def
@@ -1 +1 @@
-help: Show detailed all active IPsec Security Associations (SA) for a specific peer
+help: Show details for all active IPsec Security Associations (SA) for a peer
diff --git a/templates/show/vpn/ipsec/sa/detail/peer/node.tag/node.def b/templates/show/vpn/ipsec/sa/detail/peer/node.tag/node.def
index 6e43c91..cad43ba 100644
--- a/templates/show/vpn/ipsec/sa/detail/peer/node.tag/node.def
+++ b/templates/show/vpn/ipsec/sa/detail/peer/node.tag/node.def
@@ -1,3 +1,3 @@
-help: Show detailed all active IPsec Security Associations (SA) for a specific peer
-allowed: /opt/vyatta/bin/sudo-users/vyatta-vpn-op.pl --op=get-all-peers
-run: sudo /opt/vyatta/bin/sudo-users/command_proc_show_vpn show_vpn_ipsec_sa.xsl --pname detail --pval y --pname peer --pval "$7"
+help: Show details for all active IPsec Security Associations (SA) for a peer
+allowed: /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --get-peers-for-cli
+run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ipsec-sa-peer-detail="$7"
diff --git a/templates/show/vpn/ipsec/sa/peer/node.def b/templates/show/vpn/ipsec/sa/peer/node.def
index 089fa5a..7e5e913 100644
--- a/templates/show/vpn/ipsec/sa/peer/node.def
+++ b/templates/show/vpn/ipsec/sa/peer/node.def
@@ -1 +1 @@
-help: Show all active IPsec Security Associations (SA) for a specific peer
+help: Show all active IPsec Security Associations (SA) for a peer
diff --git a/templates/show/vpn/ipsec/sa/statistics/connection/node.def b/templates/show/vpn/ipsec/sa/statistics/connection/node.def
new file mode 100644
index 0000000..c88c2d0
--- /dev/null
+++ b/templates/show/vpn/ipsec/sa/statistics/connection/node.def
@@ -0,0 +1 @@
+help: Show stats for all active IPsec Security Associations (SA) for a connection
diff --git a/templates/show/vpn/ipsec/sa/statistics/connection/node.tag/node.def b/templates/show/vpn/ipsec/sa/statistics/connection/node.tag/node.def
new file mode 100644
index 0000000..4338e0c
--- /dev/null
+++ b/templates/show/vpn/ipsec/sa/statistics/connection/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show stats for all active IPsec Security Associations (SA) for a connection
+allowed: /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --get-conn-for-cli
+run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ipsec-sa-stats-conn="$7"
diff --git a/templates/show/vpn/ipsec/sa/statistics/peer/node.def b/templates/show/vpn/ipsec/sa/statistics/peer/node.def
new file mode 100644
index 0000000..b104a83
--- /dev/null
+++ b/templates/show/vpn/ipsec/sa/statistics/peer/node.def
@@ -0,0 +1 @@
+help: Show stats for all active IPsec Security Associations (SA) for a peer
diff --git a/templates/show/vpn/ipsec/sa/statistics/peer/node.tag/node.def b/templates/show/vpn/ipsec/sa/statistics/peer/node.tag/node.def
new file mode 100644
index 0000000..758333e
--- /dev/null
+++ b/templates/show/vpn/ipsec/sa/statistics/peer/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show stats for all active IPsec Security Associations (SA) for a peer
+allowed: /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --get-peers-for-cli
+run: sudo /opt/vyatta/bin/sudo-users/vyatta-op-vpn.pl --show-ipsec-sa-stats-peer="$7"