From da93c8faedf409b7fb55be3b041b15bee579e430 Mon Sep 17 00:00:00 2001 From: claudio Date: Sun, 9 Sep 2018 13:25:12 +0000 Subject: [PATCH] prefix-set printing was adjusted in last commit. Adjust test. --- regress/usr.sbin/bgpd/config/bgpd.conf.7.ok | 44 ++++++++++----------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok index c15f69e67a4..8af2b5f641d 100644 --- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok @@ -4,45 +4,41 @@ socket "/var/run/bgpd.sock.0" holdtime min 3 fib-priority 48 prefix-set "test1" { - 1.2.3.0/24 + 1.2.3.0/24 } prefix-set "test2" { - 1.2.3.0/24 1.2.8.0/22 prefixlen = 24 - + 1.2.3.0/24, 1.2.8.0/22 prefixlen = 24 } prefix-set "test3_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 - + 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 "test4_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 - + 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 - + 192.0.2.0/24, 2001:db8:abcd::/48 } prefix-set "bogons" { - 0.0.0.0/8 or-longer 10.0.0.0/8 or-longer - 100.64.0.0/10 or-longer 127.0.0.0/8 or-longer - 169.254.0.0/16 or-longer 172.16.0.0/12 or-longer - 192.0.2.0/24 or-longer 192.88.99.0/24 or-longer - 192.168.0.0/16 or-longer 198.18.0.0/15 or-longer - 198.51.100.0/24 or-longer 203.0.113.0/24 or-longer - 224.0.0.0/4 or-longer 240.0.0.0/4 or-longer - ::/8 or-longer 100::/64 or-longer - 2001:2::/48 or-longer 2001:10::/28 or-longer - 2001:db8::/32 or-longer 2002::/16 or-longer - 3ffe::/16 or-longer fc00::/7 or-longer - fe80::/10 or-longer fec0::/10 or-longer - ff00::/8 or-longer + 0.0.0.0/8 or-longer, 10.0.0.0/8 or-longer + 100.64.0.0/10 or-longer, 127.0.0.0/8 or-longer + 169.254.0.0/16 or-longer, 172.16.0.0/12 or-longer + 192.0.2.0/24 or-longer, 192.88.99.0/24 or-longer + 192.168.0.0/16 or-longer, 198.18.0.0/15 or-longer + 198.51.100.0/24 or-longer, 203.0.113.0/24 or-longer + 224.0.0.0/4 or-longer, 240.0.0.0/4 or-longer + ::/8 or-longer, 100::/64 or-longer + 2001:2::/48 or-longer, 2001:10::/28 or-longer + 2001:db8::/32 or-longer, 2002::/16 or-longer + 3ffe::/16 or-longer, fc00::/7 or-longer + fe80::/10 or-longer, fec0::/10 or-longer + ff00::/8 or-longer } -- 2.20.1