From 1cad3a64f87de843a0916205bfece40a7d15f394 Mon Sep 17 00:00:00 2001 From: claudio Date: Sun, 9 Sep 2018 12:58:04 +0000 Subject: [PATCH] Fixup regress test after the last burst of commits by benno@ --- regress/usr.sbin/bgpd/config/bgpd.conf.1.ok | 1 + regress/usr.sbin/bgpd/config/bgpd.conf.2.ok | 1 + regress/usr.sbin/bgpd/config/bgpd.conf.3.ok | 1 + regress/usr.sbin/bgpd/config/bgpd.conf.4.ok | 1 + regress/usr.sbin/bgpd/config/bgpd.conf.5.ok | 1 + regress/usr.sbin/bgpd/config/bgpd.conf.6.in | 4 +++- regress/usr.sbin/bgpd/config/bgpd.conf.6.ok | 13 +++++++------ regress/usr.sbin/bgpd/config/bgpd.conf.7.in | 4 +++- regress/usr.sbin/bgpd/config/bgpd.conf.7.ok | 13 +++++++------ regress/usr.sbin/bgpd/config/bgpd.conf.example.ok | 6 +++--- 10 files changed, 28 insertions(+), 17 deletions(-) diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok index f34143167b3..1c285489d40 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok @@ -5,6 +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 c8f94fff881..6cd30f72ea6 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.2.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.2.ok @@ -5,6 +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.3.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok index 912771bb9aa..36ddad3643a 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok @@ -8,6 +8,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.4.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok index 872b5bf3f29..106ad26fee4 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok @@ -5,6 +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.5.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok index bbeba06e585..8768463d2f6 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok @@ -4,6 +4,7 @@ socket "/var/run/bgpd.sock.0" holdtime min 3 fib-priority 48 + rdomain 1 { descr "a rdomain" fib-update yes diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.in b/regress/usr.sbin/bgpd/config/bgpd.conf.6.in index 9eba5d45651..f11cc5ec6a7 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.in +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.in @@ -1,8 +1,10 @@ -# $OpenBSD: bgpd.conf.6.in,v 1.1 2018/09/08 13:10:55 claudio Exp $ +# $OpenBSD: bgpd.conf.6.in,v 1.2 2018/09/09 12:58:04 claudio Exp $ # test as-set blocks AS 1 +#notyet as-set empty { } + as-set "test1" { 1 2 3 4 } #notyet as-set "test2" { 1, 2, 3, 4 } diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok index 9336b919a63..196d4346a2b 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok @@ -3,12 +3,6 @@ router-id 127.0.0.1 socket "/var/run/bgpd.sock.0" 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 - as-set "test1" { 1 2 3 4 } @@ -30,3 +24,10 @@ as-set "AS_SET_AS_PCH1" { + +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.in b/regress/usr.sbin/bgpd/config/bgpd.conf.7.in index 30402cdf96a..e3c36af768d 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.in +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.in @@ -1,8 +1,10 @@ -# $OpenBSD: bgpd.conf.7.in,v 1.1 2018/09/08 13:10:55 claudio Exp $ +# $OpenBSD: bgpd.conf.7.in,v 1.2 2018/09/09 12:58:04 claudio Exp $ # test prefix-set blocks AS 1 +#notyet prefix-set empty { } + prefix-set test1 { 1.2.3/24 } prefix-set test2 { 1.2.3/24 1.2.8.0/22 prefixlen = 24 } diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok index bdc229dc1c4..c15f69e67a4 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok @@ -3,12 +3,6 @@ router-id 127.0.0.1 socket "/var/run/bgpd.sock.0" 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 - prefix-set "test1" { 1.2.3.0/24 } @@ -53,3 +47,10 @@ 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 + + + diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.example.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.example.ok index b0e07055d65..08760a95586 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.example.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.example.ok @@ -8,13 +8,13 @@ holdtime min 3 fib-priority 48 +prefix-set "mynetworks" { 192.0.2.0/24 } + + rde rib Adj-RIB-In no evaluate rde rib Adj-RIB-Out no evaluate rde rib Loc-RIB rtable 0 fib-update yes -prefix-set "mynetworks" { 192.0.2.0/24 } - - neighbor 10.2.1.1 { remote-as 65023 local-address 10.0.0.8 -- 2.20.1