From 8d899684fa07fc5301e39848facf6fa11933b949 Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Fri, 6 Jun 2008 08:03:49 +0000 Subject: Fix bug 3134 "delete interfaces <> <> ip rip split-horizon" sets "no ip rip split-horizon" under the routing engine which is unknown in the config - 'interfaces <.....> ip rip split-horizon' does nothing on set or delete documentation needs to be updated to reflect: :'interfaces <.....> ip rip' or 'interfaces <.....> ip rip split-horizon' do nothing on set or delete :CLI under 'interfaces <.....> ip rip split-horizon' be only used to control split horizon behaviour i.e. :either disable it using: 'set interfaces <.....> ip rip split-horizon disable' :or use split-horizon with poison reverse using: 'set interfaces <.....> ip rip split-horizon poison-reverse' :to set up RIP for an interface, RIP section under protocols is to be used --- .../node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def | 11 +---------- .../node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def | 11 +---------- .../ethernet/node.tag/ip/rip/split-horizon/node.def | 11 +---------- .../node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def | 11 +---------- .../node.tag/vif/node.tag/ip/rip/split-horizon/node.def | 13 +------------ .../loopback/node.tag/ip/rip/split-horizon/node.def | 8 +------- .../multilink/node.tag/ip/rip/split-horizon/node.def | 11 +---------- .../cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def | 11 +---------- .../frame-relay/vif/node.tag/ip/rip/split-horizon/node.def | 12 +----------- .../node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def | 12 +----------- .../tunnel/node.tag/ip/rip/split-horizon/node.def | 11 +---------- 11 files changed, 11 insertions(+), 111 deletions(-) (limited to 'templates/interfaces') 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 index abf686f6..ba39b616 100644 --- 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 @@ -1,10 +1 @@ -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 \" " +help: Set to control split horizon parameters on this interface 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 index dee817a5..ba39b616 100644 --- 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 @@ -1,10 +1 @@ -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 \" " +help: Set to control split horizon parameters on this interface 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 9e6cf85b..ba39b616 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,10 +1 @@ -help: Enable split horizon on specified 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 \" " +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def index dee817a5..ba39b616 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def @@ -1,10 +1 @@ -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 \" " +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/node.def index 74cd5bd3..ba39b616 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/node.def @@ -1,12 +1 @@ -help: Enable split horizon on this interface -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ - -c \"ip rip split-horizon \" " - -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ - -c \"no ip rip split-horizon \" " - - +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def index e2443995..598c6dc5 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def @@ -1,9 +1,3 @@ -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\" " +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/node.def index b91bfff7..ba39b616 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/node.def @@ -1,10 +1 @@ -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 \" " +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def index d9bb64ec..598c6dc5 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def @@ -1,12 +1,3 @@ -help: Enable split horizon on this interface -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ - -c \"ip rip split-horizon \" " - -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ - -c \"no ip rip split-horizon \" " +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def index d9bb64ec..a013a2bb 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def @@ -1,12 +1,2 @@ -help: Enable split horizon on this interface -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ - -c \"ip rip split-horizon \" " - -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ - -c \"no ip rip split-horizon \" " - +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def index d9bb64ec..a013a2bb 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def @@ -1,12 +1,2 @@ -help: Enable split horizon on this interface -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ - -c \"ip rip split-horizon \" " - -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ - -c \"no ip rip split-horizon \" " - +help: Set to control split horizon parameters on this interface diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/node.def index b91bfff7..ba39b616 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/node.def @@ -1,10 +1 @@ -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 \" " +help: Set to control split horizon parameters on this interface -- cgit v1.2.3