diff options
Diffstat (limited to 'templates/interfaces')
304 files changed, 1285 insertions, 291 deletions
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/node.def new file mode 100644 index 00000000..624c74dc --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/node.def @@ -0,0 +1 @@ +help: Set interface IPv4 parameters diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def new file mode 100644 index 00000000..59cfc4fb --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def @@ -0,0 +1,23 @@ +tag: +type: u32 +help: Set MD5 key id +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" +commit:expression: $VAR(md5-key/) != ""; \ + "Must add the md5-key for key-id $VAR(@)" + +delete:expression: "touch /tmp/ospf-md5.$PPID" + +end:expression: "\ + if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../../../@) \" \ + -c \"no ip ospf message-digest-key $VAR(@)\"; \ + rm /tmp/ospf-md5.$PPID; \ + else \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../../../@) \" \ + -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ + fi; " + +comp_help: possible completions: + <1-255> Set the key id diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def new file mode 100644 index 00000000..ef35f7da --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -0,0 +1,9 @@ +type: txt +help: Set MD5 key +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo MD5 key must be 16 characters or less ; \ + exit 1 ; \ + fi ; " +comp_help: possible completions: + <text> MD5 Key (16 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/node.def new file mode 100644 index 00000000..d14a2583 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -0,0 +1 @@ +help: Set md5 key diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def new file mode 100644 index 00000000..db67395e --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def @@ -0,0 +1,11 @@ +help: Set MD5 key id +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"ip ospf authentication message-digest\"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../../@) \" \ + -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/node.def new file mode 100644 index 00000000..ff352a01 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/node.def @@ -0,0 +1,2 @@ +help: Set OSPF interface authentication + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def new file mode 100644 index 00000000..5b409620 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def @@ -0,0 +1,23 @@ +type: txt +help: Set plain text password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ + echo Password must be 8 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"ip ospf authentication \" \ + -c \"ip ospf authentication-key $VAR(@) \"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"no ip ospf authentication-key \"; " + +comp_help: possible completions: + <text> Plain text password (8 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def new file mode 100644 index 00000000..e63f500a --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def @@ -0,0 +1,16 @@ +type: u32 +help: Set bandwidth in kilobits/sec +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ + "Must be between 1-10000000" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../../@) \" \ + -c \"bandwidth $VAR(@) \"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../../@) \" \ + -c \"no bandwidth $VAR(@) \"; " + +comp_help: possible completions: + <1-10000000> Set bandwidth in kilobits/sec (for calculating OSPF cost) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def new file mode 100644 index 00000000..c04898c8 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def @@ -0,0 +1,11 @@ +type: u32 +help: Set interface cost +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../@)\" \ + -c \"ip ospf cost $VAR(@) \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../@)\" \ + -c \"no ip ospf cost \"; " +comp_help: possible completions: + <1-65535> Set Cost diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def new file mode 100644 index 00000000..34089a5e --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set interval after which a neighbor is declared dead +default: 40 +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ + -c \"ip ospf dead-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ + -c \"no ip ospf dead-interval \"; " +comp_help: possible completions: + <1-65535> Seconds (default 40) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def new file mode 100644 index 00000000..ac66f126 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set interval between HELLO packets +default: 10 +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@) \" \ + -c \"ip ospf hello-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@) \" \ + -c \"no ip ospf hello-interval \"; " +comp_help: possible completions: + <1-65535> Seconds (default 10) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def new file mode 100644 index 00000000..3c2f9b6d --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def @@ -0,0 +1,10 @@ +help: Disable Maximum Transmission Unit (MTU) mismatch detection +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../@)\" \ + -c \"ip ospf mtu-ignore\"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../@)\" \ + -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def new file mode 100644 index 00000000..b3b0fc3e --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def @@ -0,0 +1,20 @@ +type: txt +help: Set network type +syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ + "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../@) \" \ + -c \"ip ospf network $VAR(@) \"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../../@) \" \ + -c \"no ip ospf network \"; " + +comp_help: possible completions: + broadcast Set broadcast network type + non-broadcast Set non-broadcast network type + point-to-multipoint Set point-to-multipoint network type + point-to-point Set point-to-point network type diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def new file mode 100644 index 00000000..1702547a --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def @@ -0,0 +1 @@ +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def new file mode 100644 index 00000000..d861fc0a --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set router priority +default: 1 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ + -c \"ip ospf priority $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ + -c \"no ip ospf priority \"; " +comp_help: possible completions: + <0-255> Priority (default 1) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def new file mode 100644 index 00000000..e532b2bf --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set interval between retransmitting lost link state advertisements +default: 5 +syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ + -c \"ip ospf retransmit-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ + -c \"no ip ospf retransmit-interval \"; " +comp_help: possible completions: + <3-65535> Seconds (default 5) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def new file mode 100644 index 00000000..5d54cc0a --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set link state transmit delay +default: 1 +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ + -c \"ip ospf transmit-delay $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ + -c \"no ip ospf transmit-delay \"; " +comp_help: possible completions: + <1-65535> Seconds (default 1) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.def new file mode 100644 index 00000000..e1819c01 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.def @@ -0,0 +1,5 @@ +tag: +type: u32 +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/node.def new file mode 100644 index 00000000..488acd8c --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/node.def @@ -0,0 +1 @@ +help: Set authentication password diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def new file mode 100644 index 00000000..c6f34eaa --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def @@ -0,0 +1,23 @@ +type: txt +help: Set authentication password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo MD5 key must be 16 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../../../@)\" \ + -c \"ip rip authentication mode md5\" \ + -c \"ip rip authentication key-chain $VAR(../../../../../../../@)-rip\" \ + -c \"key chain $VAR(../../../../../../../@)-rip\" -c \"key $VAR(../@)\" \ + -c \"key-string $VAR(@)\" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../../../@)\" \ + -c \"no ip rip authentication mode md5\" \ + -c \"no ip rip authentication key-chain $VAR(../../../../../../../@)-rip\" \ + -c \"no key chain $VAR(../../../../../../../@)-rip\" " + +comp_help: possible completions: + <text> MD5 Key (16 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/node.def new file mode 100644 index 00000000..8756de35 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/node.def @@ -0,0 +1 @@ +help: Set authentication method diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/simple-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def index af7a0a1f..29de45eb 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/simple-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def @@ -1,19 +1,20 @@ type: txt -help: Simple password authentication key -syntax:expression: exec " \ - if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ +help: Set plain text password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo Password must be 16 characters or less ; \ - exit 1 ; \ + exit 1 ; \ fi ; " update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../../@)\" \ -c \"ip rip authentication mode text\" \ -c \"ip rip authentication string $VAR(@)\"; " delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../../@)\" \ -c \"no ip rip authentication mode\" \ -c \"no ip rip authentication string $VAR(@)\"; " + comp_help: possible completions: <text> Password (16 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def new file mode 100644 index 00000000..3ec8041e --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def @@ -0,0 +1 @@ +help: Set Routing Information Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..246f1f5c --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)" + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def new file mode 100644 index 00000000..d869fdf2 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def @@ -0,0 +1,10 @@ +help: Enable split horizon on this interface +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../../@) \" \ + -c \"ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../../@) \" \ + -c \"no ip rip split-horizon \" " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def new file mode 100644 index 00000000..3583f0e6 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def @@ -0,0 +1,13 @@ +help: Enable split-horizon with poison reverse +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../../../@) \" \ + -c \"ip rip split-horizon poisoned-reverse \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../../../@) \" \ + -c \"no ip rip split-horizon \" \ + -c \"ip rip split-horizon \" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)" + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/node.def new file mode 100644 index 00000000..624c74dc --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/node.def @@ -0,0 +1 @@ +help: Set interface IPv4 parameters diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def new file mode 100644 index 00000000..5bf02f80 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -0,0 +1,23 @@ +tag: +type: u32 +help: Set MD5 key id +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" +commit:expression: $VAR(md5-key/) != ""; \ + "Must add the md5-key for key-id $VAR(@)" + +delete:expression: "touch /tmp/ospf-md5.$PPID" + +end:expression: "\ + if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../../../@) \" \ + -c \"no ip ospf message-digest-key $VAR(@)\"; \ + rm /tmp/ospf-md5.$PPID; \ + else \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../../../@) \" \ + -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ + fi; " + +comp_help: possible completions: + <1-255> Set the key id diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def new file mode 100644 index 00000000..ef35f7da --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -0,0 +1,9 @@ +type: txt +help: Set MD5 key +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo MD5 key must be 16 characters or less ; \ + exit 1 ; \ + fi ; " +comp_help: possible completions: + <text> MD5 Key (16 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def new file mode 100644 index 00000000..d14a2583 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -0,0 +1 @@ +help: Set md5 key diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def new file mode 100644 index 00000000..9c8745d5 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def @@ -0,0 +1,11 @@ +help: Set MD5 key id +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"ip ospf authentication message-digest\"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../../@) \" \ + -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/node.def new file mode 100644 index 00000000..ff352a01 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/node.def @@ -0,0 +1,2 @@ +help: Set OSPF interface authentication + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def new file mode 100644 index 00000000..d89cbd12 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -0,0 +1,23 @@ +type: txt +help: Set plain text password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ + echo Password must be 8 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"ip ospf authentication \" \ + -c \"ip ospf authentication-key $VAR(@) \"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"no ip ospf authentication-key \"; " + +comp_help: possible completions: + <text> Plain text password (8 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def new file mode 100644 index 00000000..bb06c4d7 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def @@ -0,0 +1,16 @@ +type: u32 +help: Set bandwidth in kilobits/sec +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ + "Must be between 1-10000000" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoa$VAR(../../../@) \" \ + -c \"bandwidth $VAR(@) \"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoa$VAR(../../../@) \" \ + -c \"no bandwidth $VAR(@) \"; " + +comp_help: possible completions: + <1-10000000> Set bandwidth in kilobits/sec (for calculating OSPF cost) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def new file mode 100644 index 00000000..3686e26d --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def @@ -0,0 +1,11 @@ +type: u32 +help: Set interface cost +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../@)\" \ + -c \"ip ospf cost $VAR(@) \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../@)\" \ + -c \"no ip ospf cost \"; " +comp_help: possible completions: + <1-65535> Set Cost diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def new file mode 100644 index 00000000..acebb86b --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set interval after which a neighbor is declared dead +default: 40 +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ + -c \"ip ospf dead-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ + -c \"no ip ospf dead-interval \"; " +comp_help: possible completions: + <1-65535> Seconds (default 40) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def new file mode 100644 index 00000000..b8d7e114 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set interval between HELLO packets +default: 10 +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@) \" \ + -c \"ip ospf hello-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@) \" \ + -c \"no ip ospf hello-interval \"; " +comp_help: possible completions: + <1-65535> Seconds (default 10) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def new file mode 100644 index 00000000..e29de3af --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def @@ -0,0 +1,10 @@ +help: Disable Maximum Transmission Unit (MTU) mismatch detection +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../@)\" \ + -c \"ip ospf mtu-ignore\"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../@)\" \ + -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def new file mode 100644 index 00000000..f86c1325 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def @@ -0,0 +1,20 @@ +type: txt +help: Set network type +syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ + "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoa$VAR(../../../@) \" \ + -c \"ip ospf network $VAR(@) \"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoa$VAR(../../../@) \" \ + -c \"no ip ospf network \"; " + +comp_help: possible completions: + broadcast Set broadcast network type + non-broadcast Set non-broadcast network type + point-to-multipoint Set point-to-multipoint network type + point-to-point Set point-to-point network type diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def new file mode 100644 index 00000000..1702547a --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def @@ -0,0 +1 @@ +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def new file mode 100644 index 00000000..ba6938dc --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set router priority +default: 1 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ + -c \"ip ospf priority $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ + -c \"no ip ospf priority \"; " +comp_help: possible completions: + <0-255> Priority (default 1) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def new file mode 100644 index 00000000..c8ec1ef2 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set interval between retransmitting lost link state advertisements +default: 5 +syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ + -c \"ip ospf retransmit-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ + -c \"no ip ospf retransmit-interval \"; " +comp_help: possible completions: + <3-65535> Seconds (default 5) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def new file mode 100644 index 00000000..1c21017b --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set link state transmit delay +default: 1 +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ + -c \"ip ospf transmit-delay $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ + -c \"no ip ospf transmit-delay \"; " +comp_help: possible completions: + <1-65535> Seconds (default 1) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.def new file mode 100644 index 00000000..e1819c01 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.def @@ -0,0 +1,5 @@ +tag: +type: u32 +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/node.def new file mode 100644 index 00000000..488acd8c --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -0,0 +1 @@ +help: Set authentication password diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def new file mode 100644 index 00000000..c81695cb --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -0,0 +1,23 @@ +type: txt +help: Set authentication password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo MD5 key must be 16 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../../@)\" \ + -c \"ip rip authentication mode md5\" \ + -c \"ip rip authentication key-chain pppoa$VAR(../../../../../@)-rip\" \ + -c \"key chain pppoa$VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ + -c \"key-string $VAR(@)\" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../../@)\" \ + -c \"no ip rip authentication mode md5\" \ + -c \"no ip rip authentication key-chain pppoa$VAR(../../../../../@)-rip\" \ + -c \"no key chain pppoa$VAR(../../../../../@)-rip\" " + +comp_help: possible completions: + <text> MD5 Key (16 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/node.def new file mode 100644 index 00000000..8756de35 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/node.def @@ -0,0 +1 @@ +help: Set authentication method diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def new file mode 100644 index 00000000..be9f4120 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -0,0 +1,20 @@ +type: txt +help: Set plain text password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo Password must be 16 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../@)\" \ + -c \"ip rip authentication mode text\" \ + -c \"ip rip authentication string $VAR(@)\"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../@)\" \ + -c \"no ip rip authentication mode\" \ + -c \"no ip rip authentication string $VAR(@)\"; " + +comp_help: possible completions: + <text> Password (16 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def new file mode 100644 index 00000000..3ec8041e --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def @@ -0,0 +1 @@ +help: Set Routing Information Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..246f1f5c --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)" + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def new file mode 100644 index 00000000..abf686f6 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def @@ -0,0 +1,10 @@ +help: Enable split horizon on this interface +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoa$VAR(../../../@) \" \ + -c \"ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoa$VAR(../../../@) \" \ + -c \"no ip rip split-horizon \" " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def new file mode 100644 index 00000000..91168ca2 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -0,0 +1,13 @@ +help: Enable split-horizon with poison reverse +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoa$VAR(../../../../@) \" \ + -c \"ip rip split-horizon poisoned-reverse \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoa$VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" \ + -c \"ip rip split-horizon \" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)" + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/node.def new file mode 100644 index 00000000..624c74dc --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/node.def @@ -0,0 +1 @@ +help: Set interface IPv4 parameters diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def new file mode 100644 index 00000000..36fadfb7 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -0,0 +1,23 @@ +tag: +type: u32 +help: Set MD5 key id +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" +commit:expression: $VAR(md5-key/) != ""; \ + "Must add the md5-key for key-id $VAR(@)" + +delete:expression: "touch /tmp/ospf-md5.$PPID" + +end:expression: "\ + if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../../../@) \" \ + -c \"no ip ospf message-digest-key $VAR(@)\"; \ + rm /tmp/ospf-md5.$PPID; \ + else \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../../../@) \" \ + -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ + fi; " + +comp_help: possible completions: + <1-255> Set the key id diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def new file mode 100644 index 00000000..ef35f7da --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -0,0 +1,9 @@ +type: txt +help: Set MD5 key +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo MD5 key must be 16 characters or less ; \ + exit 1 ; \ + fi ; " +comp_help: possible completions: + <text> MD5 Key (16 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def new file mode 100644 index 00000000..d14a2583 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -0,0 +1 @@ +help: Set md5 key diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def new file mode 100644 index 00000000..d4918cdc --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def @@ -0,0 +1,11 @@ +help: Set MD5 key id +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"ip ospf authentication message-digest\"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../../@) \" \ + -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def new file mode 100644 index 00000000..ff352a01 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def @@ -0,0 +1,2 @@ +help: Set OSPF interface authentication + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def new file mode 100644 index 00000000..396fd8fb --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -0,0 +1,23 @@ +type: txt +help: Set plain text password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ + echo Password must be 8 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"ip ospf authentication \" \ + -c \"ip ospf authentication-key $VAR(@) \"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"no ip ospf authentication-key \"; " + +comp_help: possible completions: + <text> Plain text password (8 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def new file mode 100644 index 00000000..ce41cd0a --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def @@ -0,0 +1,16 @@ +type: u32 +help: Set bandwidth in kilobits/sec +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ + "Must be between 1-10000000" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoe$VAR(../../../@) \" \ + -c \"bandwidth $VAR(@) \"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoe$VAR(../../../@) \" \ + -c \"no bandwidth $VAR(@) \"; " + +comp_help: possible completions: + <1-10000000> Set bandwidth in kilobits/sec (for calculating OSPF cost) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def new file mode 100644 index 00000000..09d9d1ca --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def @@ -0,0 +1,11 @@ +type: u32 +help: Set interface cost +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../@)\" \ + -c \"ip ospf cost $VAR(@) \"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../@)\" \ + -c \"no ip ospf cost \"; " +comp_help: possible completions: + <1-65535> Set Cost diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def new file mode 100644 index 00000000..4e01710d --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set interval after which a neighbor is declared dead +default: 40 +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ + -c \"ip ospf dead-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ + -c \"no ip ospf dead-interval \"; " +comp_help: possible completions: + <1-65535> Seconds (default 40) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def new file mode 100644 index 00000000..623b5387 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set interval between HELLO packets +default: 10 +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \ + -c \"ip ospf hello-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \ + -c \"no ip ospf hello-interval \"; " +comp_help: possible completions: + <1-65535> Seconds (default 10) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def new file mode 100644 index 00000000..e2189016 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def @@ -0,0 +1,10 @@ +help: Disable Maximum Transmission Unit (MTU) mismatch detection +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../@)\" \ + -c \"ip ospf mtu-ignore\"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../@)\" \ + -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def new file mode 100644 index 00000000..25152314 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def @@ -0,0 +1,20 @@ +type: txt +help: Set network type +syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ + "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface pppoe$VAR(../../../@) \" \ + -c \"ip ospf network $VAR(@) \"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoe$VAR(../../../@) \" \ + -c \"no ip ospf network \"; " + +comp_help: possible completions: + broadcast Set broadcast network type + non-broadcast Set non-broadcast network type + point-to-multipoint Set point-to-multipoint network type + point-to-point Set point-to-point network type diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def new file mode 100644 index 00000000..1702547a --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def @@ -0,0 +1 @@ +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def new file mode 100644 index 00000000..16c79f7c --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set router priority +default: 1 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ + -c \"ip ospf priority $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ + -c \"no ip ospf priority \"; " +comp_help: possible completions: + <0-255> Priority (default 1) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def new file mode 100644 index 00000000..3c550513 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set interval between retransmitting lost link state advertisements +default: 5 +syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ + -c \"ip ospf retransmit-interval $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ + -c \"no ip ospf retransmit-interval \"; " +comp_help: possible completions: + <3-65535> Seconds (default 5) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def new file mode 100644 index 00000000..afa66613 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def @@ -0,0 +1,12 @@ +type: u32 +help: Set link state transmit delay +default: 1 +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ + -c \"ip ospf transmit-delay $VAR(@)\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ + -c \"no ip ospf transmit-delay \"; " +comp_help: possible completions: + <1-65535> Seconds (default 1) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def new file mode 100644 index 00000000..e1819c01 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def @@ -0,0 +1,5 @@ +tag: +type: u32 +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def new file mode 100644 index 00000000..488acd8c --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -0,0 +1 @@ +help: Set authentication password diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def new file mode 100644 index 00000000..d63c6ad3 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -0,0 +1,23 @@ +type: txt +help: Set authentication password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo MD5 key must be 16 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../../@)\" \ + -c \"ip rip authentication mode md5\" \ + -c \"ip rip authentication key-chain pppoe$VAR(../../../../../@)-rip\" \ + -c \"key chain pppoe$VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ + -c \"key-string $VAR(@)\" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../../@)\" \ + -c \"no ip rip authentication mode md5\" \ + -c \"no ip rip authentication key-chain pppoe$VAR(../../../../../@)-rip\" \ + -c \"no key chain pppoe$VAR(../../../../../@)-rip\" " + +comp_help: possible completions: + <text> MD5 Key (16 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/node.def new file mode 100644 index 00000000..8756de35 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/node.def @@ -0,0 +1 @@ +help: Set authentication method diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def new file mode 100644 index 00000000..2d4451c6 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -0,0 +1,20 @@ +type: txt +help: Set plain text password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo Password must be 16 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \ + -c \"ip rip authentication mode text\" \ + -c \"ip rip authentication string $VAR(@)\"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \ + -c \"no ip rip authentication mode\" \ + -c \"no ip rip authentication string $VAR(@)\"; " + +comp_help: possible completions: + <text> Password (16 characters or less) diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def new file mode 100644 index 00000000..3ec8041e --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def @@ -0,0 +1 @@ +help: Set Routing Information Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..246f1f5c --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)" + diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def new file mode 100644 index 00000000..dee817a5 --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def @@ -0,0 +1,10 @@ +help: Enable split horizon on this interface +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoe$VAR(../../../@) \" \ + -c \"ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoe$VAR(../../../@) \" \ + -c \"no ip rip split-horizon \" " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def new file mode 100644 index 00000000..7b821eae --- /dev/null +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -0,0 +1,13 @@ +help: Enable split-horizon with poison reverse +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoe$VAR(../../../../@) \" \ + -c \"ip rip split-horizon poisoned-reverse \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface pppoe$VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" \ + -c \"ip rip split-horizon \" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)" + diff --git a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def index 93b32142..601e61d4 100644 --- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def @@ -1,4 +1,4 @@ -help: ignore link state changes on this interface +help: Set to ignore link state changes on this interface update:${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ -c "interface $VAR(../@)" \ -c "no link-detect" diff --git a/templates/interfaces/ethernet/node.tag/ip/node.def b/templates/interfaces/ethernet/node.tag/ip/node.def index 713cca47..92e252e1 100644 --- a/templates/interfaces/ethernet/node.tag/ip/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/node.def @@ -1 +1 @@ -help: Interface IPv4 configuration commands +help: Set IPv4 parameters for specified interface diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def index 9d1353a1..9f1f2f5c 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Configure MD5 key id +help: Set MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" commit:expression: $VAR(md5-key/) != ""; \ "Must add the md5-key for key-id $VAR(@)" diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 7cbcad83..e007b689 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure md5 key +help: Set md5 key syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def index c90f5cf9..d14a2583 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -1 +1 @@ -help: Configure md5 key +help: Set md5 key diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def index 132ac718..6b2a3867 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def @@ -1,4 +1,4 @@ -help: Configure MD5 key id +help: Set MD5 key id update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def index 51ef9a4f..ff352a01 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def @@ -1,2 +1,2 @@ -help: Configure OSPF interface authentication +help: Set OSPF interface authentication diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def index af429604..ffb478a1 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def @@ -1,5 +1,5 @@ type: u32 -help: Bandwidth in kilobits/sec +help: Set bandwidth for specified interface (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def index 1ef9665e..62cd74f6 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interface cost +help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def index 78005e38..ec2a7881 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval after which a neighbor is declared dead +help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def index 3ae56a7f..435a82a6 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between HELLO packets +help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def index 8179fb87..7284924c 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,4 +1,4 @@ -help: Disable mtu mismatch detection +help: Disable Maximum Transmission Unit (MTU) mismatch detection create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def index 5664aa46..85854b38 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def @@ -1,5 +1,5 @@ type: txt -help: Network type +help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/node.def index a01474ec..1702547a 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/node.def @@ -1 +1 @@ -help: OSPF interface commands +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def index 7224417b..28643e2a 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def @@ -1,5 +1,5 @@ type: u32 -help: Router priority +help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def index 90205584..e24c06cd 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between retransmitting lost link state advertisements +help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def index 39ba835f..8216ab77 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def @@ -1,5 +1,5 @@ type: u32 -help: Link state transmit delay +help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def index 873a4370..8d165fe6 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 -help: MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def index 4306d008..488acd8c 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -1 +1 @@ -help: Authentication password +help: Set authentication password diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index c07b459b..bc653d00 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Authentication password +help: Set authentication password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def index 22039cf7..8756de35 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def @@ -1 +1 @@ -help: Authentication method +help: Set authentication method diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def index bb6c0eeb..958ba0ba 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -1,20 +1,22 @@ type: txt -help: Plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo Password must be 16 characters or less ; \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ - -c \"ip rip authentication mode text\" \ - -c \"ip rip authentication string $VAR(@)\"; " +commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ - -c \"no ip rip authentication mode\" \ - -c \"no ip rip authentication string $VAR(@)\"; " +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" -c "interface $VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)"; + +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" -c "interface $VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)"; comp_help: possible completions: <text> Password (16 characters or less) diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/node.def index 4cf2a137..d1f72a5f 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/node.def @@ -1 +1 @@ -help: RIP interface commands +help: Set Routing Information Protocol (RIP) for specified interface diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..bb9c7449 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,12 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def index b91bfff7..9e6cf85b 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def @@ -1,4 +1,4 @@ -help: Enable split horizon on this interface +help: Enable split horizon on specified interface update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 9057a4cd..7c761112 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,4 +1,4 @@ -help: With poison reverse +help: Enable poison reverse for split-horizon create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ @@ -9,3 +9,6 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)" + diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/node.def index 713cca47..624c74dc 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/node.def @@ -1 +1 @@ -help: Interface IPv4 configuration commands +help: Set interface IPv4 parameters diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def index f49686c2..36fadfb7 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Configure MD5 key id +help: Set MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" commit:expression: $VAR(md5-key/) != ""; \ "Must add the md5-key for key-id $VAR(@)" diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 7cbcad83..ef35f7da 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure md5 key +help: Set MD5 key syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def index c90f5cf9..d14a2583 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -1 +1 @@ -help: Configure md5 key +help: Set md5 key diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def index 25cf7b24..d4918cdc 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def @@ -1,4 +1,4 @@ -help: Configure MD5 key id +help: Set MD5 key id update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def index 51ef9a4f..ff352a01 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def @@ -1,2 +1,2 @@ -help: Configure OSPF interface authentication +help: Set OSPF interface authentication diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def index bbaa3247..396fd8fb 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def index c75167bd..ce41cd0a 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def @@ -1,5 +1,5 @@ type: u32 -help: Bandwidth in kilobits/sec +help: Set bandwidth in kilobits/sec syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def index 62396909..09d9d1ca 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interface cost +help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def index 1511e149..4e01710d 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval after which a neighbor is declared dead +help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def index c80a843a..623b5387 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between HELLO packets +help: Set interval between HELLO packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def index 8c44486d..e2189016 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,4 +1,4 @@ -help: Disable mtu mismatch detection +help: Disable Maximum Transmission Unit (MTU) mismatch detection create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def index 5ca16ffa..25152314 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def @@ -1,5 +1,5 @@ type: txt -help: Network type +help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def index a01474ec..1702547a 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def @@ -1 +1 @@ -help: OSPF interface commands +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def index 160f95dd..16c79f7c 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def @@ -1,5 +1,5 @@ type: u32 -help: Router priority +help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def index 97287668..3c550513 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between retransmitting lost link state advertisements +help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def index 1a524b5f..afa66613 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def @@ -1,5 +1,5 @@ type: u32 -help: Link state transmit delay +help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def index 873a4370..e1819c01 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,5 @@ tag: type: u32 -help: MD5 authentication key ID +help: Set MD5 authentication key ID syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def index 4306d008..488acd8c 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -1 +1 @@ -help: Authentication password +help: Set authentication password diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index ab0a7ba6..d63c6ad3 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Authentication password +help: Set authentication password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/node.def index 22039cf7..8756de35 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/node.def @@ -1 +1 @@ -help: Authentication method +help: Set authentication method diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def index 219bbf4d..2d4451c6 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo Password must be 16 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def index 4cf2a137..3ec8041e 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def @@ -1 +1 @@ -help: RIP interface commands +help: Set Routing Information Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..246f1f5c --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)" + diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def index c994fc61..7b821eae 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,4 +1,4 @@ -help: With poison reverse +help: Enable split-horizon with poison reverse create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../../@) \" \ @@ -9,3 +9,5 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ -c \"ip rip split-horizon \" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)" + diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def index 7f2d3ab1..89c27640 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def @@ -1,4 +1,4 @@ -help: ignore link state changes on this interface +help: Set to ignore link state changes on this interface update:${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal\" \ -c "interface $VAR(../../@).$VAR(../@)" \ -c "no link-detect" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/node.def index 713cca47..92e252e1 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/node.def @@ -1 +1 @@ -help: Interface IPv4 configuration commands +help: Set IPv4 parameters for specified interface diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index c52ba9e6..b3148950 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Configure MD5 key id +help: Set MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" commit:expression: $VAR(md5-key/) != ""; \ "Must add the md5-key for key-id $VAR(@)" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 7cbcad83..ef35f7da 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure md5 key +help: Set MD5 key syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def index c90f5cf9..3d83feec 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -1 +1 @@ -help: Configure md5 key +help: Set MD5 key diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def index 4735009c..3014b636 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,4 +1,4 @@ -help: Configure MD5 key id +help: Set MD5 key id update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/node.def index 51ef9a4f..ff352a01 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/node.def @@ -1,2 +1,2 @@ -help: Configure OSPF interface authentication +help: Set OSPF interface authentication diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index ac3c7b87..35731281 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def index a92ba393..2252541c 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def @@ -1,5 +1,5 @@ type: u32 -help: Bandwidth in kilobits/sec +help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def index 32c9cee9..7b317c47 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interface cost +help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def index ccc1137b..323128a5 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval after which a neighbor is declared dead +help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def index f84b05f1..7b4d964d 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between HELLO packets +help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def index 82ca1be0..36d6cc47 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,4 +1,4 @@ -help: Disable mtu mismatch detection +help: Disable Maximum Transmission Unit (MTU) mismatch detection create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def index 767ee431..d5c3e072 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def @@ -1,5 +1,5 @@ type: txt -help: Network type +help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/node.def index a01474ec..1702547a 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/node.def @@ -1 +1 @@ -help: OSPF interface commands +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def index 3c4736ce..1dcd5ed1 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def @@ -1,5 +1,5 @@ type: u32 -help: Router priority +help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def index bd1f4fc3..7d37fda1 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between retransmitting lost link state advertisements +help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def index a7b815c0..fcf8be3d 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -1,5 +1,5 @@ type: u32 -help: Link state transmit delay +help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.def index 873a4370..8d165fe6 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 -help: MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def index 4306d008..488acd8c 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -1 +1 @@ -help: Authentication password +help: Set authentication password diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index 02abbc77..0b2114d8 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Authentication password +help: Set authentication password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/node.def index 22039cf7..8756de35 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/node.def @@ -1 +1 @@ -help: Authentication method +help: Set authentication method diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 2b9dac5b..da94d143 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,17 +6,19 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ - -c \"ip rip authentication mode text \" \ - -c \"ip rip authentication string $VAR(@) \"; " +commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ - -c \"no ip rip authentication mode \" \ - -c \"no ip rip authentication string $VAR(@) \"; " +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)" + +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)" comp_help: possible completions: <text> Plain text password (16 characters or less) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def index 4cf2a137..793075b4 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def @@ -1 +1 @@ -help: RIP interface commands +help: Set Routing Inforamtion Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..af2f0c0a --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet Virtual InterFace $VAR(../../../../@)" + diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 6f7844e0..adffdae7 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,4 +1,4 @@ -help: With poison reverse +help: Enable split-horizon with poison reverse create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ @@ -8,3 +8,5 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet Virtual InterFace $VAR(../../../../@)" + diff --git a/templates/interfaces/loopback/node.tag/ip/node.def b/templates/interfaces/loopback/node.tag/ip/node.def index 713cca47..92e252e1 100644 --- a/templates/interfaces/loopback/node.tag/ip/node.def +++ b/templates/interfaces/loopback/node.tag/ip/node.def @@ -1 +1 @@ -help: Interface IPv4 configuration commands +help: Set IPv4 parameters for specified interface diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def index 673db1d1..88908e83 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Configure MD5 key id +help: Set MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" commit:expression: $VAR(md5-key/) != ""; \ "must add the md5-key for key-id $VAR(@)" diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 7cbcad83..ef35f7da 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure md5 key +help: Set MD5 key syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def index c90f5cf9..3d83feec 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -1 +1 @@ -help: Configure md5 key +help: Set MD5 key diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def index 0f0f0134..d81c06b3 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def @@ -1,4 +1,4 @@ -help: Configure MD5 key id +help: Set MD5 key id update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def index 51ef9a4f..0f8c7f80 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def @@ -1,2 +1,2 @@ -help: Configure OSPF interface authentication +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def index 92dc817f..2b763800 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def index cbe96ee1..e4d5a8a4 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interface cost +help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def index 93bc5a1b..8003c5c1 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval after which a neighbor is declared dead +help: Set interval after which a neighbor is declared dead syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def index dd3dd2cc..b86cf431 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between HELLO packets +help: Set interval between hello packets syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def index 9f6643e5..50452f78 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,4 +1,4 @@ -help: Disable mtu mismatch detection +help: Disable Maximum Transmission Unit (MTU) mismatch detection create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def index bc2ddf9d..1296ca18 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def @@ -1,5 +1,5 @@ type: txt -help: Network type +help: Set network type syntax:expression: $VAR(@) in "non-broadcast"; \ "Must be non-broadcast" diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/node.def index a01474ec..1702547a 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/node.def @@ -1 +1 @@ -help: OSPF interface commands +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def index cfb73389..ed1a63ab 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def @@ -1,5 +1,5 @@ type: u32 -help: Router priority +help: Set router priority syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def index 06a5d5e7..d6741f94 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between retransmitting lost link state advertisements +help: Set interval between retransmitting lost link state advertisements syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def index a9128624..d0a5193d 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def @@ -1,5 +1,5 @@ type: u32 -help: Link state transmit delay +help: Set link state transmit delay syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def index 873a4370..8d165fe6 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 -help: MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def index 4306d008..488acd8c 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -1 +1 @@ -help: Authentication password +help: Set authentication password diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index c07b459b..bc653d00 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Authentication password +help: Set authentication password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def index 22039cf7..8756de35 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def @@ -1 +1 @@ -help: Authentication method +help: Set authentication method diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def index bb6c0eeb..17a99a94 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,15 +6,17 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ - -c \"ip rip authentication mode text\" \ - -c \"ip rip authentication string $VAR(@)\"; " +commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ - -c \"no ip rip authentication mode\" \ - -c \"no ip rip authentication string $VAR(@)\"; " +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" -c "interface $VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)" + +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" -c "interface $VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)" comp_help: possible completions: <text> Password (16 characters or less) diff --git a/templates/interfaces/loopback/node.tag/ip/rip/node.def b/templates/interfaces/loopback/node.tag/ip/rip/node.def index 4cf2a137..3ec8041e 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/node.def @@ -1 +1 @@ -help: RIP interface commands +help: Set Routing Information Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..f8f93cd7 --- /dev/null +++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for loopback interface $VAR(../../../../@)" + diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 49034827..80b8a4a3 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,4 +1,4 @@ -help: With poison reverse +help: Enable split-horizon with poison reverse create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ -c \"interface $VAR(../../../../@)\" \ -c \"ip rip split-horizon poisoned-reverse\" " @@ -6,3 +6,5 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon\" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for loopback interface $VAR(../../../../@)" + diff --git a/templates/interfaces/multilink/node.tag/ip/node.def b/templates/interfaces/multilink/node.tag/ip/node.def index 713cca47..92e252e1 100644 --- a/templates/interfaces/multilink/node.tag/ip/node.def +++ b/templates/interfaces/multilink/node.tag/ip/node.def @@ -1 +1 @@ -help: Interface IPv4 configuration commands +help: Set IPv4 parameters for specified interface diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def index 9d1353a1..9f1f2f5c 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Configure MD5 key id +help: Set MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" commit:expression: $VAR(md5-key/) != ""; \ "Must add the md5-key for key-id $VAR(@)" diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 7cbcad83..ef35f7da 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure md5 key +help: Set MD5 key syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def index c90f5cf9..3d83feec 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -1 +1 @@ -help: Configure md5 key +help: Set MD5 key diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/node.def index 132ac718..6b2a3867 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/node.def @@ -1,4 +1,4 @@ -help: Configure MD5 key id +help: Set MD5 key id update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/node.def index 51ef9a4f..ff352a01 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/node.def @@ -1,2 +1,2 @@ -help: Configure OSPF interface authentication +help: Set OSPF interface authentication diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def index a55e38b0..5339e937 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def index af429604..13c9791f 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def @@ -1,5 +1,5 @@ type: u32 -help: Bandwidth in kilobits/sec +help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/cost/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/cost/node.def index 1ef9665e..62cd74f6 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interface cost +help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/dead-interval/node.def index 78005e38..ec2a7881 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/dead-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval after which a neighbor is declared dead +help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/hello-interval/node.def index 3ae56a7f..435a82a6 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/hello-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between HELLO packets +help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/mtu-ignore/node.def index 8179fb87..7284924c 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,4 +1,4 @@ -help: Disable mtu mismatch detection +help: Disable Maximum Transmission Unit (MTU) mismatch detection create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/network/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/network/node.def index 5664aa46..85854b38 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/network/node.def @@ -1,5 +1,5 @@ type: txt -help: Network type +help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/node.def index a01474ec..1702547a 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/node.def @@ -1 +1 @@ -help: OSPF interface commands +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/priority/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/priority/node.def index 7224417b..28643e2a 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/priority/node.def @@ -1,5 +1,5 @@ type: u32 -help: Router priority +help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/retransmit-interval/node.def index 90205584..e24c06cd 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between retransmitting lost link state advertisements +help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/transmit-delay/node.def index 39ba835f..8216ab77 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/transmit-delay/node.def @@ -1,5 +1,5 @@ type: u32 -help: Link state transmit delay +help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.def index 873a4370..8d165fe6 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 -help: MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/node.def index 4306d008..488acd8c 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -1 +1 @@ -help: Authentication password +help: Set authentication password diff --git a/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index c07b459b..bc653d00 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Authentication password +help: Set authentication password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/multilink/node.tag/ip/rip/authentication/node.def b/templates/interfaces/multilink/node.tag/ip/rip/authentication/node.def index 22039cf7..8756de35 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/authentication/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/authentication/node.def @@ -1 +1 @@ -help: Authentication method +help: Set authentication method diff --git a/templates/interfaces/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def index bb6c0eeb..99d59378 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -1,20 +1,22 @@ type: txt -help: Plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo Password must be 16 characters or less ; \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ - -c \"ip rip authentication mode text\" \ - -c \"ip rip authentication string $VAR(@)\"; " +commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ - -c \"no ip rip authentication mode\" \ - -c \"no ip rip authentication string $VAR(@)\"; " +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" -c "interface $VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)" + +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" -c "interface $VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)" comp_help: possible completions: <text> Password (16 characters or less) diff --git a/templates/interfaces/multilink/node.tag/ip/rip/node.def b/templates/interfaces/multilink/node.tag/ip/rip/node.def index 4cf2a137..3ec8041e 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/node.def @@ -1 +1 @@ -help: RIP interface commands +help: Set Routing Information Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..40f89ff9 --- /dev/null +++ b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for multilink interface $VAR(../../../../@)" + diff --git a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 9057a4cd..7323e1ed 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,4 +1,4 @@ -help: With poison reverse +help: Enable split-horizon with poison reverse create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ @@ -9,3 +9,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ -c \"ip rip split-horizon \" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for multilink interface $VAR(../../../../@)" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def index 713cca47..92e252e1 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def @@ -1 +1 @@ -help: Interface IPv4 configuration commands +help: Set IPv4 parameters for specified interface diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index c52e938c..67ab8069 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Configure MD5 key id +help: Set MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" commit:expression: $VAR(md5-key/) != ""; \ "Must add the md5-key for key-id $VAR(@)" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 7cbcad83..ef35f7da 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure md5 key +help: Set MD5 key syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def index c90f5cf9..3d83feec 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -1 +1 @@ -help: Configure md5 key +help: Set MD5 key diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def index c1977c7c..7ebefe6d 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,4 +1,4 @@ -help: Configure MD5 key id +help: Set MD5 key id update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def index 51ef9a4f..ff352a01 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def @@ -1,2 +1,2 @@ -help: Configure OSPF interface authentication +help: Set OSPF interface authentication diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 892c2392..5527b2a9 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def index ae9c2803..b906a189 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def @@ -1,5 +1,5 @@ type: u32 -help: Bandwidth in kilobits/sec +help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def index 95716870..c35677c5 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interface cost +help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def index 165a0232..60a61cf3 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval after which a neighbor is declared dead +help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def index 2b57c08b..b3b92839 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between HELLO packets +help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def index e4b4d713..9d6174db 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,4 +1,4 @@ -help: Disable mtu mismatch detection +help: Disable Maximum Transmission Unit (MTU) mismatch detection create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def index 70d0e201..4f3e1c00 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def @@ -1,5 +1,5 @@ type: txt -help: Network type +help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def index a01474ec..1702547a 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def @@ -1 +1 @@ -help: OSPF interface commands +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def index 8a186a9d..c6da51d8 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def @@ -1,5 +1,5 @@ type: u32 -help: Router priority +help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def index 9531ec6f..f0058e07 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between retransmitting lost link state advertisements +help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def index abe2098d..c6705de5 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -1,5 +1,5 @@ type: u32 -help: Link state transmit delay +help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def index 873a4370..8d165fe6 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 -help: MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def index 4306d008..488acd8c 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -1 +1 @@ -help: Authentication password +help: Set authentication password diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index a2d01a78..f881c441 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Authentication password +help: Set authentication password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def index 22039cf7..8756de35 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def @@ -1 +1 @@ -help: Authentication method +help: Set authentication method diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 1e124e8d..4a7f96b8 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -1,22 +1,22 @@ type: txt -help: Plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo Password must be 16 characters or less ; \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"ip rip authentication mode text \" \ - -c \"ip rip authentication string $VAR(@) \"; " +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"no ip rip authentication mode \" \ - -c \"no ip rip authentication string $VAR(@) \"; " +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)" comp_help: possible completions: <text> Plain text password (16 characters or less) diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def index 4cf2a137..3ec8041e 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def @@ -1 +1 @@ -help: RIP interface commands +help: Set Routing Information Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..bd98e5af --- /dev/null +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)" + diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index c5dfdfb8..0bae0b23 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,4 +1,4 @@ -help: With poison reverse +help: Enable split-horizon with poison reverse create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ @@ -8,3 +8,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def index 713cca47..92e252e1 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def @@ -1 +1 @@ -help: Interface IPv4 configuration commands +help: Set IPv4 parameters for specified interface diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index c52e938c..67ab8069 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Configure MD5 key id +help: Set MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" commit:expression: $VAR(md5-key/) != ""; \ "Must add the md5-key for key-id $VAR(@)" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 7cbcad83..ef35f7da 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure md5 key +help: Set MD5 key syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def index c90f5cf9..3d83feec 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -1 +1 @@ -help: Configure md5 key +help: Set MD5 key diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def index c1977c7c..7ebefe6d 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,4 +1,4 @@ -help: Configure MD5 key id +help: Set MD5 key id update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def index 51ef9a4f..ff352a01 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def @@ -1,2 +1,2 @@ -help: Configure OSPF interface authentication +help: Set OSPF interface authentication diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 892c2392..5527b2a9 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def index ae9c2803..b906a189 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def @@ -1,5 +1,5 @@ type: u32 -help: Bandwidth in kilobits/sec +help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def index 95716870..c35677c5 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interface cost +help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def index 165a0232..60a61cf3 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval after which a neighbor is declared dead +help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def index 2b57c08b..b3b92839 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between HELLO packets +help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def index e4b4d713..9d6174db 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,4 +1,4 @@ -help: Disable mtu mismatch detection +help: Disable Maximum Transmission Unit (MTU) mismatch detection create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def index 70d0e201..4f3e1c00 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def @@ -1,5 +1,5 @@ type: txt -help: Network type +help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def index a01474ec..1702547a 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def @@ -1 +1 @@ -help: OSPF interface commands +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def index 8a186a9d..c6da51d8 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def @@ -1,5 +1,5 @@ type: u32 -help: Router priority +help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def index 9531ec6f..f0058e07 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between retransmitting lost link state advertisements +help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def index abe2098d..c6705de5 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -1,5 +1,5 @@ type: u32 -help: Link state transmit delay +help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def index 873a4370..8d165fe6 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 -help: MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def index 4306d008..488acd8c 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -1 +1 @@ -help: Authentication password +help: Set authentication password diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index a2d01a78..f881c441 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Authentication password +help: Set authentication password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def index 22039cf7..8756de35 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def @@ -1 +1 @@ -help: Authentication method +help: Set authentication method diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 1e124e8d..cc83f470 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,17 +6,19 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"ip rip authentication mode text \" \ - -c \"ip rip authentication string $VAR(@) \"; " +commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"no ip rip authentication mode \" \ - -c \"no ip rip authentication string $VAR(@) \"; " +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)" + +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)" comp_help: possible completions: <text> Plain text password (16 characters or less) diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def index 4cf2a137..3ec8041e 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def @@ -1 +1 @@ -help: RIP interface commands +help: Set Routing Information Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..bd98e5af --- /dev/null +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)" + diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index c5dfdfb8..0bae0b23 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,4 +1,4 @@ -help: With poison reverse +help: Enable split-horizon with poison reverse create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ @@ -8,3 +8,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def index 713cca47..92e252e1 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def @@ -1 +1 @@ -help: Interface IPv4 configuration commands +help: Set IPv4 parameters for specified interface diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index c52e938c..67ab8069 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Configure MD5 key id +help: Set MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" commit:expression: $VAR(md5-key/) != ""; \ "Must add the md5-key for key-id $VAR(@)" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 7cbcad83..ef35f7da 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure md5 key +help: Set MD5 key syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def index c90f5cf9..3d83feec 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -1 +1 @@ -help: Configure md5 key +help: Set MD5 key diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def index c1977c7c..7ebefe6d 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,4 +1,4 @@ -help: Configure MD5 key id +help: Set MD5 key id update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def index 51ef9a4f..ff352a01 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def @@ -1,2 +1,2 @@ -help: Configure OSPF interface authentication +help: Set OSPF interface authentication diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 892c2392..5527b2a9 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def index ae9c2803..b906a189 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def @@ -1,5 +1,5 @@ type: u32 -help: Bandwidth in kilobits/sec +help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def index 95716870..c35677c5 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interface cost +help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def index 165a0232..60a61cf3 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval after which a neighbor is declared dead +help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def index 2b57c08b..b3b92839 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between HELLO packets +help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def index e4b4d713..9d6174db 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,4 +1,4 @@ -help: Disable mtu mismatch detection +help: Disable Maximum Transmission Unit (MTU) mismatch detection create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def index 70d0e201..4f3e1c00 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def @@ -1,5 +1,5 @@ type: txt -help: Network type +help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def index a01474ec..1702547a 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def @@ -1 +1 @@ -help: OSPF interface commands +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def index 8a186a9d..c6da51d8 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def @@ -1,5 +1,5 @@ type: u32 -help: Router priority +help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def index 9531ec6f..f0058e07 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between retransmitting lost link state advertisements +help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def index abe2098d..c6705de5 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -1,5 +1,5 @@ type: u32 -help: Link state transmit delay +help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def index 873a4370..8d165fe6 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 -help: MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def index 4306d008..488acd8c 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -1 +1 @@ -help: Authentication password +help: Set authentication password diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index a2d01a78..f881c441 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Authentication password +help: Set authentication password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def index 22039cf7..8756de35 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def @@ -1 +1 @@ -help: Authentication method +help: Set authentication method diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 1e124e8d..1bc3c650 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -1,22 +1,24 @@ type: txt -help: Plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo Password must be 16 characters or less ; \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"ip rip authentication mode text \" \ - -c \"ip rip authentication string $VAR(@) \"; " +commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"no ip rip authentication mode \" \ - -c \"no ip rip authentication string $VAR(@) \"; " +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)" + +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)" comp_help: possible completions: <text> Plain text password (16 characters or less) diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def index 4cf2a137..3ec8041e 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def @@ -1 +1 @@ -help: RIP interface commands +help: Set Routing Information Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..bd98e5af --- /dev/null +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)" + diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index c5dfdfb8..0bae0b23 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,4 +1,4 @@ -help: With poison reverse +help: Enable split-horizon with poison reverse create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ @@ -8,3 +8,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)" diff --git a/templates/interfaces/tunnel/node.tag/ip/node.def b/templates/interfaces/tunnel/node.tag/ip/node.def index 713cca47..92e252e1 100644 --- a/templates/interfaces/tunnel/node.tag/ip/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/node.def @@ -1 +1 @@ -help: Interface IPv4 configuration commands +help: Set IPv4 parameters for specified interface diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def index e16eb0f4..c58b0a12 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Configure MD5 key id +help: Set MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" commit:expression: $VAR(md5-key/) != ""; \ "Must add the md5-key for key-id $VAR(@)" diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 7cbcad83..ef35f7da 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure md5 key +help: Set MD5 key syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def index c90f5cf9..3d83feec 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def @@ -1 +1 @@ -help: Configure md5 key +help: Set MD5 key diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def index 1c98c41a..5e85d80e 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def @@ -1,4 +1,4 @@ -help: Configure MD5 key id +help: Set MD5 key id update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/node.def index 51ef9a4f..ff352a01 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/node.def @@ -1,2 +1,2 @@ -help: Configure OSPF interface authentication +help: Set OSPF interface authentication diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def index a55e38b0..5339e937 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure plain text password +help: Set plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def index af429604..13c9791f 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def @@ -1,5 +1,5 @@ type: u32 -help: Bandwidth in kilobits/sec +help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def index d976ace6..3dc62f2b 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interface cost +help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def index e8b1501b..dc1bf9db 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval after which a neighbor is declared dead +help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def index 3ae56a7f..435a82a6 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between HELLO packets +help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def index 8179fb87..7284924c 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,4 +1,4 @@ -help: Disable mtu mismatch detection +help: Disable Maximum Transmission Unit (MTU) mismatch detection create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def index 5664aa46..85854b38 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def @@ -1,5 +1,5 @@ type: txt -help: Network type +help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/node.def index a01474ec..1702547a 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/node.def @@ -1 +1 @@ -help: OSPF interface commands +help: Set Open Shortest Path First (OSPF) parameters for specified interface diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def index 0ac174ef..8f276f74 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def @@ -1,5 +1,5 @@ type: u32 -help: Router priority +help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def index 671d05ea..de9a7151 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,5 +1,5 @@ type: u32 -help: Interval between retransmitting lost link state advertisements +help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def index f124fca2..bb49108e 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def @@ -1,5 +1,5 @@ type: u32 -help: Link state transmit delay +help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.def index 873a4370..8d165fe6 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 -help: MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +help: Set MD5 authentication key ID +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/node.def index 4306d008..488acd8c 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/node.def @@ -1 +1 @@ -help: Authentication password +help: Set authentication password diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index c07b459b..bc653d00 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Authentication password +help: Set authentication password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo MD5 key must be 16 characters or less ; \ diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/node.def index 22039cf7..8756de35 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/node.def @@ -1 +1 @@ -help: Authentication method +help: Set authentication method diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def new file mode 100644 index 00000000..aaaae83e --- /dev/null +++ b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -0,0 +1,22 @@ +type: txt +help: Set plain text password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo Password must be 16 characters or less ; \ + exit 1 ; \ + fi ; " + +commit:expression: $VAR(../md5/) == "" ; "md5 password already set" + +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" -c "interface $VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)" + +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" -c "interface $VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)" + +comp_help: possible completions: + <text> Password (16 characters or less) diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/node.def index 4cf2a137..3ec8041e 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/node.def @@ -1 +1 @@ -help: RIP interface commands +help: Set Routing Information Protocol (RIP) parameters for specified interface diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def new file mode 100644 index 00000000..01740cf7 --- /dev/null +++ b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def @@ -0,0 +1,13 @@ +help: Disable split horizon on specified interface +create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip rip split-horizon \" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal \" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"ip rip split-horizon \" " + +commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for tunnel interface $VAR(../../../../@)" + diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 9057a4cd..60b45d60 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,4 +1,4 @@ -help: With poison reverse +help: Enable split-horizon with poison reverse create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ @@ -9,3 +9,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ -c \"ip rip split-horizon \" " +commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for tunnel interface $VAR(../../../../@)" |