diff options
Diffstat (limited to 'templates/protocols/rip/redistribute')
16 files changed, 76 insertions, 76 deletions
diff --git a/templates/protocols/rip/redistribute/bgp/metric/node.def b/templates/protocols/rip/redistribute/bgp/metric/node.def index 270a810e..549cfdf1 100644 --- a/templates/protocols/rip/redistribute/bgp/metric/node.def +++ b/templates/protocols/rip/redistribute/bgp/metric/node.def @@ -1,3 +1,3 @@ type: u32 -help: "Metric for redistributed routes" -syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16" +help: Metric for redistributed routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/rip/redistribute/bgp/node.def b/templates/protocols/rip/redistribute/bgp/node.def index d69e22b2..84317dcd 100644 --- a/templates/protocols/rip/redistribute/bgp/node.def +++ b/templates/protocols/rip/redistribute/bgp/node.def @@ -1,16 +1,16 @@ -help: "Redistribute BGP routes" -delete: "touch /tmp/rip-redist-bgp.\\$PPID" -end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ +help: Redistribute BGP routes +delete:expression: "touch /tmp/rip-redist-bgp.$PPID" +end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute bgp \"; \ - if [ -f \"/tmp/rip-redist-bgp.\\$PPID\" ]; then \ - rm -rf /tmp/rip-redist-bgp.\\$PPID; \ + if [ -f \"/tmp/rip-redist-bgp.$PPID\" ]; then \ + rm -rf /tmp/rip-redist-bgp.$PPID; \ else \ - if [ -n \"$(./metric/@)\" ]; then \ - COND=\"metric $(./metric/@)\"; + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - COND=\"\\$COND route-map $(./route-map/@)\"; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ - -c \"redistribute bgp \\$COND\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ + -c \"redistribute bgp $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/bgp/route-map/node.def b/templates/protocols/rip/redistribute/bgp/route-map/node.def index f6e81288..a56f5668 100644 --- a/templates/protocols/rip/redistribute/bgp/route-map/node.def +++ b/templates/protocols/rip/redistribute/bgp/route-map/node.def @@ -1,4 +1,4 @@ type: txt -help: "Route map reference" -commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" +help: Route map reference +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist" diff --git a/templates/protocols/rip/redistribute/connected/metric/node.def b/templates/protocols/rip/redistribute/connected/metric/node.def index d7ca3c34..8234167e 100644 --- a/templates/protocols/rip/redistribute/connected/metric/node.def +++ b/templates/protocols/rip/redistribute/connected/metric/node.def @@ -1,6 +1,6 @@ type: u32 -help: "Metric for redistributed routes" -syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16" +help: Metric for redistributed routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/rip/redistribute/connected/node.def b/templates/protocols/rip/redistribute/connected/node.def index 46dc83f3..a7157811 100644 --- a/templates/protocols/rip/redistribute/connected/node.def +++ b/templates/protocols/rip/redistribute/connected/node.def @@ -1,16 +1,16 @@ -help: "Redistribute connected routes" -delete: "touch /tmp/rip-redist-connected.\\$PPID" -end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ +help: Redistribute connected routes +delete:expression: "touch /tmp/rip-redist-connected.$PPID" +end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute connected \"; \ - if [ -f \"/tmp/rip-redist-connected.\\$PPID\" ]; then \ - rm -rf /tmp/rip-redist-connected.\\$PPID; \ + if [ -f \"/tmp/rip-redist-connected.$PPID\" ]; then \ + rm -rf /tmp/rip-redist-connected.$PPID; \ else \ - if [ -n \"$(./metric/@)\" ]; then \ - COND=\"metric $(./metric/@)\"; + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - COND=\"\\$COND route-map $(./route-map/@)\"; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ - -c \"redistribute connected \\$COND\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ + -c \"redistribute connected $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/connected/route-map/node.def b/templates/protocols/rip/redistribute/connected/route-map/node.def index 5ce5f0ab..f2c6f7c2 100644 --- a/templates/protocols/rip/redistribute/connected/route-map/node.def +++ b/templates/protocols/rip/redistribute/connected/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: "Route map reference" -commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" +help: Route map reference +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist" diff --git a/templates/protocols/rip/redistribute/kernel/metric/node.def b/templates/protocols/rip/redistribute/kernel/metric/node.def index 270a810e..549cfdf1 100644 --- a/templates/protocols/rip/redistribute/kernel/metric/node.def +++ b/templates/protocols/rip/redistribute/kernel/metric/node.def @@ -1,3 +1,3 @@ type: u32 -help: "Metric for redistributed routes" -syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16" +help: Metric for redistributed routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/rip/redistribute/kernel/node.def b/templates/protocols/rip/redistribute/kernel/node.def index 6ac0b1ab..ca9a4412 100644 --- a/templates/protocols/rip/redistribute/kernel/node.def +++ b/templates/protocols/rip/redistribute/kernel/node.def @@ -1,16 +1,16 @@ -help: "Redistribute kernel routes" -delete: "touch /tmp/rip-redist-kernel.\\$PPID" -end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ +help: Redistribute kernel routes +delete:expression: "touch /tmp/rip-redist-kernel.$PPID" +end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute kernel \"; \ - if [ -f \"/tmp/rip-redist-kernel.\\$PPID\" ]; then \ - rm -rf /tmp/rip-redist-kernel.\\$PPID; \ + if [ -f \"/tmp/rip-redist-kernel.$PPID\" ]; then \ + rm -rf /tmp/rip-redist-kernel.$PPID; \ else \ - if [ -n \"$(./metric/@)\" ]; then \ - COND=\"metric $(./metric/@)\"; + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - COND=\"\\$COND route-map $(./route-map/@)\"; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ - -c \"redistribute kernel \\$COND\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ + -c \"redistribute kernel $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/kernel/route-map/node.def b/templates/protocols/rip/redistribute/kernel/route-map/node.def index 5ce5f0ab..f2c6f7c2 100644 --- a/templates/protocols/rip/redistribute/kernel/route-map/node.def +++ b/templates/protocols/rip/redistribute/kernel/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: "Route map reference" -commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" +help: Route map reference +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist" diff --git a/templates/protocols/rip/redistribute/node.def b/templates/protocols/rip/redistribute/node.def index e46c9122..00eefa88 100644 --- a/templates/protocols/rip/redistribute/node.def +++ b/templates/protocols/rip/redistribute/node.def @@ -1 +1 @@ -help: "Redistribute information from another routing protocol" +help: Redistribute information from another routing protocol diff --git a/templates/protocols/rip/redistribute/ospf/metric/node.def b/templates/protocols/rip/redistribute/ospf/metric/node.def index 01a2dda7..80d13b5e 100644 --- a/templates/protocols/rip/redistribute/ospf/metric/node.def +++ b/templates/protocols/rip/redistribute/ospf/metric/node.def @@ -1,4 +1,4 @@ type: u32 -help: "Metric for redistributed routes" -syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16" +help: Metric for redistributed routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/rip/redistribute/ospf/node.def b/templates/protocols/rip/redistribute/ospf/node.def index cc95c6a5..04c43c83 100644 --- a/templates/protocols/rip/redistribute/ospf/node.def +++ b/templates/protocols/rip/redistribute/ospf/node.def @@ -1,17 +1,17 @@ -help: "Redistribute OSPF routes" -delete: "touch /tmp/rip-redist-ospf.\\$PPID" -end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ +help: Redistribute OSPF routes +delete:expression: "touch /tmp/rip-redist-ospf.$PPID" +end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute ospf \"; \ - if [ -f \"/tmp/rip-redist-ospf.\\$PPID\" ]; then \ - rm -rf /tmp/rip-redist-ospf.\\$PPID; \ + if [ -f \"/tmp/rip-redist-ospf.$PPID\" ]; then \ + rm -rf /tmp/rip-redist-ospf.$PPID; \ else \ - if [ -n \"$(./metric/@)\" ]; then \ - COND=\"metric $(./metric/@)\"; + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - COND=\"\\$COND route-map $(./route-map/@)\"; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ - -c \"redistribute ospf \\$COND\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ + -c \"redistribute ospf $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/ospf/route-map/node.def b/templates/protocols/rip/redistribute/ospf/route-map/node.def index 5ce5f0ab..f2c6f7c2 100644 --- a/templates/protocols/rip/redistribute/ospf/route-map/node.def +++ b/templates/protocols/rip/redistribute/ospf/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: "Route map reference" -commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" +help: Route map reference +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist" diff --git a/templates/protocols/rip/redistribute/static/metric/node.def b/templates/protocols/rip/redistribute/static/metric/node.def index 270a810e..549cfdf1 100644 --- a/templates/protocols/rip/redistribute/static/metric/node.def +++ b/templates/protocols/rip/redistribute/static/metric/node.def @@ -1,3 +1,3 @@ type: u32 -help: "Metric for redistributed routes" -syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16" +help: Metric for redistributed routes +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/rip/redistribute/static/node.def b/templates/protocols/rip/redistribute/static/node.def index a4a7cbb7..ab170994 100644 --- a/templates/protocols/rip/redistribute/static/node.def +++ b/templates/protocols/rip/redistribute/static/node.def @@ -1,16 +1,16 @@ -help: "Redistribute static routes" -delete: "touch /tmp/rip-redist-static.\\$PPID" -end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ +help: Redistribute static routes +delete:expression: "touch /tmp/rip-redist-static.$PPID" +end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ -c \"no redistribute static \"; \ - if [ -f \"/tmp/rip-redist-static.\\$PPID\" ]; then \ - rm -rf /tmp/rip-redist-static.\\$PPID; \ + if [ -f \"/tmp/rip-redist-static.$PPID\" ]; then \ + rm -rf /tmp/rip-redist-static.$PPID; \ else \ - if [ -n \"$(./metric/@)\" ]; then \ - COND=\"metric $(./metric/@)\"; + if [ -n \"$VAR(./metric/@)\" ]; then \ + COND=\"metric $VAR(./metric/@)\"; fi; \ - if [ -n \"$(./route-map/@)\" ]; then \ - COND=\"\\$COND route-map $(./route-map/@)\"; \ + if [ -n \"$VAR(./route-map/@)\" ]; then \ + COND=\"$COND route-map $VAR(./route-map/@)\"; \ fi; \ - \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ - -c \"redistribute static \\$COND\"; \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ + -c \"redistribute static $COND\"; \ fi; " diff --git a/templates/protocols/rip/redistribute/static/route-map/node.def b/templates/protocols/rip/redistribute/static/route-map/node.def index 5ce5f0ab..f2c6f7c2 100644 --- a/templates/protocols/rip/redistribute/static/route-map/node.def +++ b/templates/protocols/rip/redistribute/static/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: "Route map reference" -commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist" +help: Route map reference +commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist" |