I ran bgpd to test diffs and stumbled across what looks like simple
disorder in the config checks.
bgpd must have changed in how it orders attributes within `set { ... }'
blocks; breaking the sets into multiple lines and diffing line-wise
instead of word-wise shows that the printed config indeed only differs
in the way set attributes from the config appear in bgpd output.
Still, I'd like any of the bgpd hackers to verify before I "fix" regress.
OK?
Index: regress/usr.sbin/bgpd/config/bgpd.conf.10.ok
===================================================================
RCS file: /cvs/src/regress/usr.sbin/bgpd/config/bgpd.conf.10.ok,v
retrieving revision 1.6
diff -u -p -r1.6 bgpd.conf.10.ok
--- regress/usr.sbin/bgpd/config/bgpd.conf.10.ok 17 Jul 2019 10:27:50
-0000 1.6
+++ regress/usr.sbin/bgpd/config/bgpd.conf.10.ok 5 Mar 2020 22:32:53
-0000
@@ -40,4 +40,4 @@ match from any large-community 1234:5678
match from any large-community 1234:5678:1 large-community 1234:5678:2
large-community 1234:5678:3
match from any community 1234:1 large-community 1234:5678:1
match from any large-community 1234:5678:1 community 1234:1
-match from any set { community delete 1234:5678 community delete 1234:*
community delete *:5678 community delete local-as:5678 community delete
local-as:neighbor-as large-community delete 1234:15:5678 large-community delete
*:15:5678 large-community delete local-as:15:5678 large-community delete
local-as:15:* large-community delete local-as:15:neighbor-as large-community
delete local-as:*:* community 1234:5678 community local-as:5678 community
local-as:neighbor-as large-community 1234:15:5678 large-community
local-as:15:5678 large-community local-as:15:neighbor-as }
+match from any set { community delete 1234:5678 large-community delete
1234:15:5678 community delete *:5678 large-community delete *:15:5678 community
delete local-as:5678 large-community delete local-as:15:5678 community delete
1234:* community delete local-as:neighbor-as large-community delete
local-as:15:* large-community delete local-as:*:* large-community delete
local-as:15:neighbor-as community 1234:5678 large-community 1234:15:5678
community local-as:5678 large-community local-as:15:5678 community
local-as:neighbor-as large-community local-as:15:neighbor-as }
Index: regress/usr.sbin/bgpd/config/bgpd.conf.11.ok
===================================================================
RCS file: /cvs/src/regress/usr.sbin/bgpd/config/bgpd.conf.11.ok,v
retrieving revision 1.5
diff -u -p -r1.5 bgpd.conf.11.ok
--- regress/usr.sbin/bgpd/config/bgpd.conf.11.ok 17 Jul 2019 10:27:50
-0000 1.5
+++ regress/usr.sbin/bgpd/config/bgpd.conf.11.ok 5 Mar 2020 22:35:04
-0000
@@ -33,7 +33,7 @@ match from any ext-community ovs invalid
match from any ext-community ovs not-found
match from any ext-community rt 64496:201 ext-community soo 64496:202
match from any ext-community rt 64496:301 ext-community soo 4200000001:302
ext-community odi 127.0.0.1:303
-match from any set { ext-community delete ovs valid ext-community delete odi
127.0.0.1:6003 ext-community delete soo 4200000001:6002 ext-community delete
ort 0x123456789abf ext-community delete rt 64496:6001 ext-community ovs valid
ext-community odi 127.0.0.1:5003 ext-community soo 4200000001:5002
ext-community ort 0x123456789abc ext-community rt 64496:5001 }
+match from any set { ext-community delete ovs valid ext-community delete ort
0x123456789abf ext-community delete rt 64496:6001 ext-community delete odi
127.0.0.1:6003 ext-community delete soo 4200000001:6002 ext-community ovs valid
ext-community ort 0x123456789abc ext-community rt 64496:5001 ext-community odi
127.0.0.1:5003 ext-community soo 4200000001:5002 }
match from any ext-community * *
match from any ext-community rt *
match from any ext-community soo *
@@ -47,7 +47,7 @@ match from any ext-community rt 127.0.0.
match from any ext-community soo 64496:*
match from any ext-community soo 4200000001:*
match from any ext-community soo 127.0.0.1:*
-match from any set { ext-community delete odi 127.0.0.1:* ext-community delete
soo 4200000001:* ext-community delete rt 64496:* ext-community delete mac-mob *
ext-community delete ovs * ext-community delete rt * ext-community delete soo *
ext-community delete odi * ext-community delete ort * }
+match from any set { ext-community delete ort * ext-community delete mac-mob *
ext-community delete ovs * ext-community delete rt * ext-community delete soo *
ext-community delete odi * ext-community delete rt 64496:* ext-community delete
odi 127.0.0.1:* ext-community delete soo 4200000001:* }
match from any ext-community rt 64496:local-as
match from any ext-community soo 4200000001:local-as
match from any ext-community odi 127.0.0.1:local-as
