From: benno Date: Mon, 10 Sep 2018 11:02:35 +0000 (+0000) Subject: update regression tests after previous commit. ok claudio@ X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8de4068c327b7ea9ab877a72ad9454e3f2ea4166;p=openbsd update regression tests after previous commit. ok claudio@ --- diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok index 1c285489d40..bd0405f70d1 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok @@ -5,10 +5,7 @@ holdtime min 3 fib-priority 48 - rde rib Adj-RIB-In no evaluate rde rib Adj-RIB-Out no evaluate rde rib Loc-RIB rtable 0 fib-update yes - - diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.2.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.2.ok index 6cd30f72ea6..98859d92b10 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.2.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.2.ok @@ -5,13 +5,10 @@ holdtime min 3 fib-priority 48 - rde rib Adj-RIB-In no evaluate rde rib Adj-RIB-Out no evaluate rde rib Loc-RIB rtable 0 fib-update yes - - allow from any community local-as:neighbor-as allow from any ext-community rt 1:2 allow from any ext-community l2vid 192.0.2.1:2 diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok index 36ddad3643a..73a8a6c28bb 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok @@ -8,12 +8,10 @@ holdtime min 3 fib-priority 48 - rde rib Adj-RIB-In no evaluate rde rib Adj-RIB-Out no evaluate rde rib Loc-RIB rtable 0 fib-update yes - neighbor 2001:db8::1 { descr "v6SOMEPEER" remote-as 64496 @@ -21,7 +19,6 @@ neighbor 2001:db8::1 { enforce local-as yes announce IPv6 unicast } - allow from 2001:db8::1 prefix 2001:db8:300::/64 allow from 2001:db8::1 prefix 2001:db8:200::/64 allow from 2001:db8::1 prefix 2001:db8:100::/64 diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok index b88df48183a..db6f44d203b 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok @@ -5,12 +5,10 @@ holdtime min 3 fib-priority 48 - rde rib Adj-RIB-In no evaluate rde rib Adj-RIB-Out no evaluate rde rib Loc-RIB rtable 0 fib-update yes - neighbor 192.0.2.2 { remote-as 64496 enforce neighbor-as yes @@ -81,4 +79,3 @@ group "test2" { } } - diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok index 8768463d2f6..f25a9f285ad 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok @@ -45,5 +45,3 @@ rde rib Adj-RIB-In no evaluate rde rib Adj-RIB-Out no evaluate rde rib Loc-RIB rtable 0 fib-update yes - - diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok index 2c4871754f6..49f2beb879b 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok @@ -3,6 +3,7 @@ router-id 127.0.0.1 socket "/var/run/bgpd.sock.0" holdtime min 3 fib-priority 48 + as-set "empty1" { } @@ -54,11 +55,7 @@ as-set "AS_SET_AS_PCH2" { } - - rde rib Adj-RIB-In no evaluate rde rib Adj-RIB-Out no evaluate rde rib Loc-RIB rtable 0 fib-update yes - - diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok index 355c834de88..d07f9b0a15a 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok @@ -3,6 +3,7 @@ router-id 127.0.0.1 socket "/var/run/bgpd.sock.0" holdtime min 3 fib-priority 48 + prefix-set "empty1" { } @@ -57,11 +58,7 @@ prefix-set "bogons" { } - - rde rib Adj-RIB-In no evaluate rde rib Adj-RIB-Out no evaluate rde rib Loc-RIB rtable 0 fib-update yes - -