change vtsyh call

9 files changed, 8 insertions, 62 deletions

diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
index 6dc7c734..b499564d 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
@@ -5,9 +5,9 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
  	  -c \"neighbor $(../@) \\$peer\" \
           -c \"neighbor $(../@) dont-capability-negotiate \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"no neighbor $(../@) dont-capability-negotiate \" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
index 98c1b64a..5107ecf0 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
@@ -6,9 +6,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"no neighbor $(../../@) send-community extended\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"neighbor $(../../@) send-community extended\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
index 60787ebb..008b3db5 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
@@ -5,9 +5,9 @@ update: "if [ -n \"$(../../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
 	  -c \"neighbor $(../../@) \\$peer\" \
           -c \"no neighbor $(../../@) send-community standard\" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
           -c \"neighbor $(../../@) send-community standard\" "
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable/node.def
index 6f203b5a..f29ecde9 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable/node.def
@@ -5,8 +5,8 @@ update: "if [ -n \"$(../remote-as/@)\" ]; then \
          else \
            peer=\"peer-group $(../peer-group/@)\"; \
          fi; \
-	 /usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
+	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
 	  -c \"neighbor $(../@) \\$peer\" \
           -c \"no neighbor $(../@) activate \" "
-delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
+delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
           -c \"neighbor $(../@) activate \" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/dont-capability-negotiate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/dont-capability-negotiate/node.def
deleted file mode 100644
index b499564d..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/dont-capability-negotiate/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: "Do not perform capability negotiation"
-commit: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $(../../@) --neighbor $(../@)"
-update: "if [ -n \"$(../remote-as/@)\" ]; then \
-           peer=\"remote-as $(../remote-as/@)\"; \
-         else \
-           peer=\"peer-group $(../peer-group/@)\"; \
-         fi; \
-	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
- 	  -c \"neighbor $(../@) \\$peer\" \
-          -c \"neighbor $(../@) dont-capability-negotiate \" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-          -c \"no neighbor $(../@) dont-capability-negotiate \" "
-
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-activate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/no-activate/node.def
deleted file mode 100644
index f29ecde9..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-activate/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-help: "Disable the Address Family for this Neighbor"
-commit: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $(../../@) --neighbor $(../@)"
-update: "if [ -n \"$(../remote-as/@)\" ]; then \
-           peer=\"remote-as $(../remote-as/@)\"; \
-         else \
-           peer=\"peer-group $(../peer-group/@)\"; \
-         fi; \
-	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \ 
-	  -c \"neighbor $(../@) \\$peer\" \
-          -c \"no neighbor $(../@) activate \" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../@)\" \
-          -c \"neighbor $(../@) activate \" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/extended/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/extended/node.def
deleted file mode 100644
index 5107ecf0..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/extended/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-help: "Do not send extended community attributes"
-commit: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $(../../../@) --neighbor $(../../@)"
-commit: $(../../peer-group/) == ""; "You can't set no-send-community for neighbor $(../../@) in peer-group $(../../peer-group/@)"
-update: "if [ -n \"$(../../remote-as/@)\" ]; then \
-           peer=\"remote-as $(../../remote-as/@)\"; \
-         else \
-           peer=\"peer-group $(../../peer-group/@)\"; \
-         fi; \
-	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-	  -c \"neighbor $(../../@) \\$peer\" \
-          -c \"no neighbor $(../../@) send-community extended\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-          -c \"neighbor $(../../@) send-community extended\" "
-
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/node.def
deleted file mode 100644
index 6251cb84..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: "Do not send community attributes to this neighbor"
-commit: ($(./extended/) != "") || ($(./standard/) != ""); "You must specify the type of community."
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/standard/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/standard/node.def
deleted file mode 100644
index 008b3db5..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/no-send-community/standard/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: "Do not send standard community attributes"
-commit: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $(../../../@) --neighbor $(../../@)"
-update: "if [ -n \"$(../../remote-as/@)\" ]; then \
-           peer=\"remote-as $(../../remote-as/@)\"; \
-         else \
-           peer=\"peer-group $(../../peer-group/@)\"; \
-         fi; \
-	 \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-	  -c \"neighbor $(../../@) \\$peer\" \
-          -c \"no neighbor $(../../@) send-community standard\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
-          -c \"neighbor $(../../@) send-community standard\" "
-