diff options
| author | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-04-15 22:00:30 +0000 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-04-15 22:00:30 +0000 |
| commit | ead9e7014c6d3d6c578663dc3656dac7249977bf (patch) | |
| tree | 4e4b300d5c2cef87d91eea6907be70f2e0bf2be5 /templates | |
| parent | 40d23b3d1b2c6ae348059bf996b20a10480f1b1e (diff) | |
| download | vyatta-cfg-quagga-ead9e7014c6d3d6c578663dc3656dac7249977bf.tar.gz vyatta-cfg-quagga-ead9e7014c6d3d6c578663dc3656dac7249977bf.zip | |
Fix Bug 2849 "disable-split-horizon" needs to be implemented
-implemented 'split-horizon disable' for all interfaces that allow configuring RIP
Diffstat (limited to 'templates')
10 files changed, 13 insertions, 2 deletions
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 index 55024b2b..bb9c7449 100644 --- 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 @@ -9,4 +9,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -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. You may specify either one of the two options for split-horizon. (disable|poison-reverse)" +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/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 1eadef9e..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 @@ -10,5 +10,5 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -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. You may specify either one of the two options for split-horizon. (disable|poison-reverse)" +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/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 6e37ccc7..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 @@ -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/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 4d67c213..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 @@ -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/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def index d75f6e89..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 @@ -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/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def index d692e091..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 @@ -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/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 693e1cd9..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 @@ -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/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 693e1cd9..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 @@ -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/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 693e1cd9..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 @@ -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/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def index d692e091..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 @@ -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(../../../../@)" |