From: claudio Date: Sun, 9 Sep 2018 13:31:10 +0000 (+0000) Subject: Enable all the #notyet tests since the parser supports those now X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c3d9b1654e3524c28732f88fb700d74a7e903e8d;p=openbsd Enable all the #notyet tests since the parser supports those now --- diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.4.in b/regress/usr.sbin/bgpd/config/bgpd.conf.4.in index 0fc9d607cc7..a0ef9b4a00e 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.4.in +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.4.in @@ -1,4 +1,4 @@ -# $OpenBSD: bgpd.conf.4.in,v 1.1 2018/09/08 12:32:01 claudio Exp $ +# $OpenBSD: bgpd.conf.4.in,v 1.2 2018/09/09 13:31:10 claudio Exp $ # test neighbor and group statements AS 1 @@ -6,7 +6,7 @@ AS 1 neighbor 192.0.2.1 { remote-as 64496 } -#notyet neighbor 192.0.2.2 { remote-as 64496 } +neighbor 192.0.2.2 { remote-as 64496 } neighbor 192.0.2.3 { # test comment @@ -18,18 +18,18 @@ group testing { remote-as 64496 neighbor 192.0.2.4 - #notyet neighbor 192.0.2.5 { descr "test2-peer" } + neighbor 192.0.2.5 { descr "test2-peer" } neighbor 192.0.2.6 { remote-as 64497 descr "test2-peer" } - #notyet neighbor 192.0.2.7 { + neighbor 192.0.2.7 { # comment # another comment - #notyet } + } neighbor 192.0.2.8 } @@ -37,5 +37,5 @@ group test2 { remote-as 64497 neighbor 192.0.2.10 - #notyet neighbor 192.0.2.11 { descr "test3-peer" } + neighbor 192.0.2.11 { descr "test3-peer" } } diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok index 106ad26fee4..b88df48183a 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok @@ -11,8 +11,7 @@ rde rib Adj-RIB-Out no evaluate rde rib Loc-RIB rtable 0 fib-update yes -neighbor 192.0.2.3 { - descr "test-peer" +neighbor 192.0.2.2 { remote-as 64496 enforce neighbor-as yes enforce local-as yes @@ -24,21 +23,41 @@ neighbor 192.0.2.1 { enforce local-as yes announce IPv4 unicast } +neighbor 192.0.2.3 { + descr "test-peer" + remote-as 64496 + enforce neighbor-as yes + enforce local-as yes + announce IPv4 unicast +} group "testing" { - neighbor 192.0.2.8 { + neighbor 192.0.2.6 { + descr "test2-peer" + remote-as 64497 + enforce neighbor-as yes + enforce local-as yes + announce IPv4 unicast + } + neighbor 192.0.2.4 { remote-as 64496 enforce neighbor-as yes enforce local-as yes announce IPv4 unicast } - neighbor 192.0.2.6 { + neighbor 192.0.2.5 { descr "test2-peer" - remote-as 64497 + remote-as 64496 enforce neighbor-as yes enforce local-as yes announce IPv4 unicast } - neighbor 192.0.2.4 { + neighbor 192.0.2.8 { + remote-as 64496 + enforce neighbor-as yes + enforce local-as yes + announce IPv4 unicast + } + neighbor 192.0.2.7 { remote-as 64496 enforce neighbor-as yes enforce local-as yes @@ -47,6 +66,13 @@ group "testing" { } group "test2" { + neighbor 192.0.2.11 { + descr "test3-peer" + remote-as 64497 + enforce neighbor-as yes + enforce local-as yes + announce IPv4 unicast + } neighbor 192.0.2.10 { remote-as 64497 enforce neighbor-as yes diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.in b/regress/usr.sbin/bgpd/config/bgpd.conf.6.in index f11cc5ec6a7..d5a3182270e 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.in +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.in @@ -1,12 +1,12 @@ -# $OpenBSD: bgpd.conf.6.in,v 1.2 2018/09/09 12:58:04 claudio Exp $ +# $OpenBSD: bgpd.conf.6.in,v 1.3 2018/09/09 13:31:10 claudio Exp $ # test as-set blocks AS 1 -#notyet as-set empty { } +as-set empty { } as-set "test1" { 1 2 3 4 } -#notyet as-set "test2" { 1, 2, 3, 4 } +as-set "test2" { 1, 2, 3, 4 } as-set "test3" { 1 # with comment @@ -15,12 +15,12 @@ as-set "test3" { 4 # 5 # commented entry } -#notyet as-set "test4" { -# 1, -# 2, -# 3, -# 4 -#} +as-set "test4" { + 1, + 2, + 3, + 4 +} # concatenation test as-set "test5" { \ @@ -35,10 +35,10 @@ as-set "AS_SET_AS_PCH1" { 54145 54390 60313 197058 } -#notyet as-set "AS_SET_AS_PCH2" { -# 27, 42, 187, 297, 715, 3856, 10886, 11893, 13202, -# 6327, 16668, 19281, 20539, 21312, 21556, 24999, 25505, -# 27678, 32978, 32979, 35160, 38052, 42530, 44876, 45170, -# 45494, 48892, 50843, 51874, 51972, 52234, 52304, 52306, -# 54145, 54390, 60313, 197058 -#} +as-set "AS_SET_AS_PCH2" { + 27, 42, 187, 297, 715, 3856, 10886, 11893, 13202, + 6327, 16668, 19281, 20539, 21312, 21556, 24999, 25505, + 27678, 32978, 32979, 35160, 38052, 42530, 44876, 45170, + 45494, 48892, 50843, 51874, 51972, 52234, 52304, 52306, + 54145, 54390, 60313, 197058 +} diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok index 196d4346a2b..90adac327ef 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok @@ -3,14 +3,26 @@ router-id 127.0.0.1 socket "/var/run/bgpd.sock.0" holdtime min 3 fib-priority 48 +as-set "empty" { + +} + as-set "test1" { 1 2 3 4 } +as-set "test2" { + 1 2 3 4 +} + as-set "test3" { 1 2 3 4 } +as-set "test4" { + 1 2 3 4 +} + as-set "test5" { 1 2 3 4 } @@ -22,6 +34,13 @@ as-set "AS_SET_AS_PCH1" { 60313 197058 } +as-set "AS_SET_AS_PCH2" { + 27 42 187 297 715 3856 10886 11893 13202 6327 16668 19281 20539 21312 + 21556 24999 25505 27678 32978 32979 35160 38052 42530 44876 45170 + 45494 48892 50843 51874 51972 52234 52304 52306 54145 54390 60313 + 197058 +} + diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.in b/regress/usr.sbin/bgpd/config/bgpd.conf.7.in index e3c36af768d..d722a9f84ec 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.in +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.in @@ -1,9 +1,9 @@ -# $OpenBSD: bgpd.conf.7.in,v 1.2 2018/09/09 12:58:04 claudio Exp $ +# $OpenBSD: bgpd.conf.7.in,v 1.3 2018/09/09 13:31:10 claudio Exp $ # test prefix-set blocks AS 1 -#notyet prefix-set empty { } +prefix-set empty { } prefix-set test1 { 1.2.3/24 } prefix-set test2 { 1.2.3/24 1.2.8.0/22 prefixlen = 24 } @@ -22,12 +22,12 @@ prefix-set "test4_prefixes" { 192.0.160.0/19 prefixlen >= 22 } -#notyet prefix-set "test5_prefixes" { -# 192.0.211.0/24 prefixlen 24 - 32, -# 2222:69:c000::/48 prefixlen 48 - 64, -# 0.0.0.0/0 or-longer, -# 192.0.160.0/19 prefixlen >= 22 -#} +prefix-set "test5_prefixes" { + 192.0.211.0/24 prefixlen 24 - 32, + 2222:69:c000::/48 prefixlen 48 - 64, + 0.0.0.0/0 or-longer, + 192.0.160.0/19 prefixlen >= 22 +} # from the example bgpd.conf # list of networks that may be originated by our ASN diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok index 8af2b5f641d..9aebc82376b 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok @@ -3,6 +3,9 @@ router-id 127.0.0.1 socket "/var/run/bgpd.sock.0" holdtime min 3 fib-priority 48 +prefix-set "empty" { +} + prefix-set "test1" { 1.2.3.0/24 } @@ -21,6 +24,11 @@ prefix-set "test4_prefixes" { 0.0.0.0/0 or-longer, 192.0.160.0/19 prefixlen >= 22 } +prefix-set "test5_prefixes" { + 192.0.211.0/24 or-longer, 2222:69:c000::/48 prefixlen 48 - 64 + 0.0.0.0/0 or-longer, 192.0.160.0/19 prefixlen >= 22 +} + prefix-set "mynetworks" { 192.0.2.0/24, 2001:db8:abcd::/48 }