From 08626ad3732b8d25b4f8c6b4cdc71613c6889c80 Mon Sep 17 00:00:00 2001 From: claudio Date: Fri, 13 Oct 2023 07:55:57 +0000 Subject: [PATCH] Force the router-id on all bgpd instances to make the expected output predictable. --- .../integrationtests/bgpd.ixp.rdomain2_1.conf | 1 + .../integrationtests/bgpd.ixp.rdomain2_2.conf | 1 + .../integrationtests/bgpd.ixp.rdomain2_3.conf | 1 + .../integrationtests/bgpd.ixp.rdomain2_4.conf | 1 + .../bgpd/integrationtests/ixp.rdomain1.ok | 44 +++++++++---------- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_1.conf b/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_1.conf index f18c505bfe2..1ca65615396 100644 --- a/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_1.conf +++ b/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_1.conf @@ -1,4 +1,5 @@ AS 1 +router-id 192.0.2.11 listen on 192.0.2.11 neighbor 192.0.2.2 { diff --git a/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_2.conf b/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_2.conf index a0d92e2bacf..76013463177 100644 --- a/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_2.conf +++ b/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_2.conf @@ -1,4 +1,5 @@ AS 2 +router-id 192.0.2.21 listen on 192.0.2.21 socket "/var/run/bgpd.sock.12_2" diff --git a/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_3.conf b/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_3.conf index a19a8f01e3c..3e7ef9fa54f 100644 --- a/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_3.conf +++ b/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_3.conf @@ -1,4 +1,5 @@ AS 3 +router-id 192.0.2.31 listen on 192.0.2.31 socket "/var/run/bgpd.sock.12_3" diff --git a/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_4.conf b/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_4.conf index a8de1f3fa1f..1453c9c4322 100644 --- a/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_4.conf +++ b/regress/usr.sbin/bgpd/integrationtests/bgpd.ixp.rdomain2_4.conf @@ -1,4 +1,5 @@ AS 4 +router-id 192.0.2.41 listen on 192.0.2.41 socket "/var/run/bgpd.sock.12_4" diff --git a/regress/usr.sbin/bgpd/integrationtests/ixp.rdomain1.ok b/regress/usr.sbin/bgpd/integrationtests/ixp.rdomain1.ok index a777215c126..75c1044e412 100644 --- a/regress/usr.sbin/bgpd/integrationtests/ixp.rdomain1.ok +++ b/regress/usr.sbin/bgpd/integrationtests/ixp.rdomain1.ok @@ -1,47 +1,47 @@ BGP routing table entry for 2.0.3.0/24 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 100, weight 0, ovs valid, avs unknown, external, valid, best Ext. Communities: ovs valid BGP routing table entry for 2.0.4.0/24 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 1, weight 0, ovs invalid, avs unknown, external, valid, best Communities: 65520:0 65520:14 65524:2 Ext. Communities: ovs invalid rt 65524:2 BGP routing table entry for 2.0.5.0/24 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Ext. Communities: ovs not-found BGP routing table entry for 2.0.6.0/24 2 2 2 2 2 2 2 2 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 1, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65520:0 65520:1 65524:2 Ext. Communities: ovs not-found rt 65524:2 BGP routing table entry for 2.0.7.0/24 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 1, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65520:0 65520:3 65524:2 Ext. Communities: ovs not-found rt 65524:2 BGP routing table entry for 2.0.9.0/24 2 - Nexthop 192.0.2.77 (via 192.0.2.77) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.77 (via 192.0.2.77) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 1, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65520:0 65520:5 65524:2 Ext. Communities: ovs not-found rt 65524:2 BGP routing table entry for 2.0.11.0/24 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65530:4 BLACKHOLE Ext. Communities: ovs not-found @@ -49,7 +49,7 @@ BGP routing table entry for 2.0.11.0/24 BGP routing table entry for 2.0.12.0/24 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65530:4 65534:0 Ext. Communities: ovs not-found @@ -57,7 +57,7 @@ BGP routing table entry for 2.0.12.0/24 BGP routing table entry for 2.0.13.0/24 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65530:4 Ext. Communities: ovs not-found @@ -65,48 +65,48 @@ BGP routing table entry for 2.0.13.0/24 BGP routing table entry for 2.0.14.0/25 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 1, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65520:0 65520:13 65524:2 Ext. Communities: ovs not-found rt 65524:2 BGP routing table entry for 2.0.15.0/24 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Ext. Communities: ovs not-found BGP routing table entry for 3.0.3.0/24 3 - Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.41) + Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.31) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65507:999 Ext. Communities: ovs not-found BGP routing table entry for 3.0.4.0/24 3 - Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.41) + Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.31) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Ext. Communities: ovs not-found Large Communities: 999:65508:999 BGP routing table entry for 3.0.5.0/24 3 - Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.41) + Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.31) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Ext. Communities: ovs not-found Large Communities: 999:0:999 BGP routing table entry for 3.0.6.0/24 3 - Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.41) + Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.31) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 0:1 Ext. Communities: ovs not-found BGP routing table entry for 3.0.7.0/24 3 - Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.41) + Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.31) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 0:999 Ext. Communities: ovs not-found @@ -114,42 +114,42 @@ BGP routing table entry for 3.0.7.0/24 BGP routing table entry for 3.0.8.0/24 3 - Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.41) + Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.31) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65521:1 Ext. Communities: ovs not-found BGP routing table entry for 3.0.9.0/24 3 - Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.41) + Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.31) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Ext. Communities: ovs not-found Large Communities: 999:65522:1 BGP routing table entry for 3.0.10.0/24 3 - Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.41) + Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.31) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65523:1 Ext. Communities: ovs not-found BGP routing table entry for 3.0.11.0/24 3 - Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.41) + Nexthop 192.0.2.31 (via 192.0.2.31) Neighbor AS3_1 client (192.0.2.31) Origin IGP, metric 0, localpref 100, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65521:65521 65522:65522 65523:65523 Ext. Communities: ovs not-found BGP routing table entry for 22.0.10.0/24 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 1, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65520:0 65520:12 65524:2 Ext. Communities: ovs not-found rt 65524:2 BGP routing table entry for 192.168.8.0/24 2 - Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.41) + Nexthop 192.0.2.21 (via 192.0.2.21) Neighbor AS2_1 client (192.0.2.21) Origin IGP, metric 0, localpref 1, weight 0, ovs not-found, avs unknown, external, valid, best Communities: 65520:0 65520:2 65524:2 Ext. Communities: ovs not-found rt 65524:2 -- 2.20.1