Configure BGP after IGP protocols (#2353)

ipspace · web-flow · commit 74f433ee6c26 · 2025-06-12T13:09:20.000+02:00
diff --git a/netsim/modules/bgp.yml b/netsim/modules/bgp.yml
@@ -13,7 +13,7 @@ no_propagate:
   rr_list:
   as_list:
 transform_after: [ vlan ]
-config_after: [ routing ]
+config_after: [ routing, ospf, isis, eigrp, ripv2 ]
 next_hop_self: true
 attributes:
   global:
diff --git a/tests/topology/expected/6pe.yml b/tests/topology/expected/6pe.yml
@@ -120,8 +120,8 @@ links:
     ipv4: 10.1.0.4/30
   type: p2p
 module:
-- bgp
 - isis
+- bgp
 - mpls
 mpls:
   ldp: true
@@ -430,8 +430,8 @@ nodes:
       ipv4: 192.168.121.101
       mac: 08:4f:a9:01:00:00
     module:
-    - bgp
     - isis
+    - bgp
     - mpls
     mpls:
       6pe:
@@ -545,8 +545,8 @@ nodes:
       ipv4: 192.168.121.102
       mac: 08:4f:a9:02:00:00
     module:
-    - bgp
     - isis
+    - bgp
     - mpls
     mpls:
       6pe:
diff --git a/tests/topology/expected/addressing-ipv6-only.yml b/tests/topology/expected/addressing-ipv6-only.yml
@@ -101,8 +101,8 @@ links:
     ipv6: 2001:db8:2:1::/64
   type: p2p
 module:
-- bgp
 - isis
+- bgp
 name: input
 nodes:
   r1:
diff --git a/tests/topology/expected/addressing-ipv6-prefix.yml b/tests/topology/expected/addressing-ipv6-prefix.yml
@@ -77,8 +77,8 @@ links:
     ipv6: 2001:db8:2::4/127
   type: p2p
 module:
-- bgp
 - isis
+- bgp
 name: input
 nodes:
   r1:
diff --git a/tests/topology/expected/bgp-anycast.yml b/tests/topology/expected/bgp-anycast.yml
@@ -33,8 +33,8 @@ links:
     ipv4: 10.1.0.0/30
   type: p2p
 module:
-- bgp
 - ospf
+- bgp
 name: input
 nodes:
   l1:
diff --git a/tests/topology/expected/bgp-autogroup.yml b/tests/topology/expected/bgp-autogroup.yml
@@ -136,8 +136,8 @@ links:
   role: external
   type: p2p
 module:
-- bgp
 - ospf
+- bgp
 name: input
 nodes:
   a1:
diff --git a/tests/topology/expected/bgp-community.yml b/tests/topology/expected/bgp-community.yml
@@ -53,8 +53,8 @@ links:
   role: external
   type: p2p
 module:
-- bgp
 - ospf
+- bgp
 name: input
 nodes:
   r1:
diff --git a/tests/topology/expected/bgp-ibgp.yml b/tests/topology/expected/bgp-ibgp.yml
@@ -76,8 +76,8 @@ links:
   node_count: 2
   type: p2p
 module:
-- bgp
 - ospf
+- bgp
 name: input
 nodes:
   l1:
@@ -180,8 +180,8 @@ nodes:
       ipv4: 192.168.121.101
       mac: 08:4f:a9:01:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: l1
     ospf:
       af:
@@ -295,8 +295,8 @@ nodes:
       ipv4: 192.168.121.102
       mac: 08:4f:a9:02:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: l2
     ospf:
       af:
@@ -418,8 +418,8 @@ nodes:
       ipv4: 192.168.121.103
       mac: 08:4f:a9:03:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: s1
     ospf:
       af:
@@ -540,8 +540,8 @@ nodes:
       ipv4: 192.168.121.104
       mac: 08:4f:a9:04:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: s2
     ospf:
       af:
diff --git a/tests/topology/expected/bgp-sessions.yml b/tests/topology/expected/bgp-sessions.yml
@@ -64,8 +64,8 @@ links:
     ipv6: 2001:db8:1:1::/64
   type: p2p
 module:
-- bgp
 - ospf
+- bgp
 name: input
 nodes:
   r1:
@@ -175,8 +175,8 @@ nodes:
       ipv4: 192.168.121.102
       mac: 08:4f:a9:02:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: r1
     ospf:
       af:
@@ -270,8 +270,8 @@ nodes:
       ipv4: 192.168.121.103
       mac: 08:4f:a9:03:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: r2
     ospf:
       af:
diff --git a/tests/topology/expected/bgp.yml b/tests/topology/expected/bgp.yml
@@ -187,8 +187,8 @@ links:
     ipv6: 2001:db8:1:4::/64
   type: p2p
 module:
-- bgp
 - ospf
+- bgp
 name: input
 nodes:
   e1:
@@ -264,8 +264,8 @@ nodes:
       ipv4: 192.168.121.105
       mac: 08:4f:a9:05:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: e1
     ospf:
       af:
@@ -376,8 +376,8 @@ nodes:
       ipv4: 192.168.121.106
       mac: 08:4f:a9:06:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: e2
     ospf:
       af:
@@ -546,8 +546,8 @@ nodes:
       ipv4: 192.168.121.103
       mac: 08:4f:a9:03:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: pe1
     ospf:
       af:
@@ -681,8 +681,8 @@ nodes:
       ipv4: 192.168.121.104
       mac: 08:4f:a9:04:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: pe2
     ospf:
       af:
@@ -815,8 +815,8 @@ nodes:
       ipv4: 192.168.121.101
       mac: 08:4f:a9:01:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: rr1
     ospf:
       af:
@@ -949,8 +949,8 @@ nodes:
       ipv4: 192.168.121.102
       mac: 08:4f:a9:02:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: rr2
     ospf:
       af:
diff --git a/tests/topology/expected/components.yml b/tests/topology/expected/components.yml
@@ -332,8 +332,8 @@ links:
   type: p2p
 module:
 - routing
-- bgp
 - ospf
+- bgp
 name: input
 nodes:
   c1:
diff --git a/tests/topology/expected/evpn-asymmetric-irb-ospf.yml b/tests/topology/expected/evpn-asymmetric-irb-ospf.yml
@@ -156,8 +156,8 @@ message: 'The devices under test are VLAN-to-VXLAN routers using asymmetric IRB
 module:
 - vlan
 - routing
-- bgp
 - ospf
+- bgp
 - vrf
 - vxlan
 - evpn
@@ -535,8 +535,8 @@ nodes:
       mac: 08:4f:a9:01:00:00
     module:
     - vlan
-    - bgp
     - ospf
+    - bgp
     - vrf
     - vxlan
     - evpn
@@ -861,8 +861,8 @@ nodes:
       mac: 08:4f:a9:02:00:00
     module:
     - vlan
-    - bgp
     - ospf
+    - bgp
     - vrf
     - vxlan
     - evpn
diff --git a/tests/topology/expected/evpn-l3vni-only.yml b/tests/topology/expected/evpn-l3vni-only.yml
@@ -67,8 +67,8 @@ links:
   vrf: red
 module:
 - vlan
-- bgp
 - ospf
+- bgp
 - vrf
 - vxlan
 - evpn
@@ -160,8 +160,8 @@ nodes:
       mac: 08:4f:a9:01:00:00
     module:
     - vlan
-    - bgp
     - ospf
+    - bgp
     - vrf
     - vxlan
     - evpn
@@ -285,8 +285,8 @@ nodes:
       mac: 08:4f:a9:02:00:00
     module:
     - vlan
-    - bgp
     - ospf
+    - bgp
     - vrf
     - vxlan
     - evpn
diff --git a/tests/topology/expected/evpn-vxlan.yml b/tests/topology/expected/evpn-vxlan.yml
@@ -119,8 +119,8 @@ links:
 module:
 - vlan
 - routing
-- bgp
 - ospf
+- bgp
 - vxlan
 - evpn
 name: input
@@ -508,9 +508,9 @@ nodes:
       mac: 08:4f:a9:01:00:00
     module:
     - vlan
+    - ospf
     - bgp
     - vxlan
-    - ospf
     - evpn
     name: s1
     ospf:
@@ -682,9 +682,9 @@ nodes:
       mac: 08:4f:a9:02:00:00
     module:
     - vlan
+    - ospf
     - bgp
     - vxlan
-    - ospf
     - evpn
     name: s2
     ospf:
@@ -840,9 +840,9 @@ nodes:
       mac: 08:4f:a9:03:00:00
     module:
     - vlan
+    - ospf
     - bgp
     - vxlan
-    - ospf
     - evpn
     name: s3
     ospf:
diff --git a/tests/topology/expected/groups-hierarchy.yml b/tests/topology/expected/groups-hierarchy.yml
@@ -57,8 +57,8 @@ links:
     ipv4: 10.1.0.0/30
   type: p2p
 module:
-- bgp
 - ospf
+- bgp
 name: input
 nodes:
   a:
@@ -239,8 +239,8 @@ nodes:
       ipv4: 192.168.121.105
       mac: 08:4f:a9:05:00:00
     module:
-    - bgp
     - ospf
+    - bgp
     name: e
     ospf:
       af:
diff --git a/tests/topology/expected/module-node-global-params.yml b/tests/topology/expected/module-node-global-params.yml
@@ -32,8 +32,8 @@ links:
     ipv4: 10.1.0.0/30
   type: p2p
 module:
-- bgp
 - ospf
+- bgp
 name: input
 nodes:
   r1:
diff --git a/tests/topology/expected/module-node-global.yml b/tests/topology/expected/module-node-global.yml
@@ -15,8 +15,8 @@ input:
 - topology/input/module-node-global.yml
 - package:topology-defaults.yml
 module:
-- bgp
 - ospf
+- bgp
 name: input
 nodes:
   r1:
diff --git a/tests/topology/expected/module-node-params.yml b/tests/topology/expected/module-node-params.yml
diff --git a/tests/topology/expected/module-reorder.yml b/tests/topology/expected/module-reorder.yml
diff --git a/tests/topology/expected/mpls-vpn-simple.yml b/tests/topology/expected/mpls-vpn-simple.yml
diff --git a/tests/topology/expected/mpls.yml b/tests/topology/expected/mpls.yml
diff --git a/tests/topology/expected/vrf-igp.yml b/tests/topology/expected/vrf-igp.yml
diff --git a/tests/topology/expected/vrf-links.yml b/tests/topology/expected/vrf-links.yml
diff --git a/tests/topology/expected/vrf-routing-blocks.yml b/tests/topology/expected/vrf-routing-blocks.yml
diff --git a/tests/topology/expected/vrf.yml b/tests/topology/expected/vrf.yml
