Fix: Add VRF information to BGP neighbor data (ipspace#2639)

ipspace · web-flow · commit f9ed607f0c26 · 2025-08-26T18:03:01.000+02:00
diff --git a/netsim/modules/bgp.py b/netsim/modules/bgp.py
@@ -304,6 +304,8 @@ def build_ebgp_sessions(node: Box, sessions: Box, topology: Box) -> None:
       extra_data.ifindex = l.ifindex
       if 'bgp' in ngb_ifdata and isinstance(ngb_ifdata.bgp,Box):      # Copy neighbor BGP interface attributes into neighbor data
         extra_data = ngb_ifdata.bgp + extra_data                      # ... useful for things like BGP roles
+      if isinstance(ngb_ifdata.get('vrf',None),str):                  # Are we attached to the neighbor's VRF?
+        extra_data._vrf = ngb_ifdata.vrf
 
       # Figure out whether both neighbors have IPv6 LLA and/or unnumbered IPv4 interfaces
       #
diff --git a/tests/topology/expected/bgp-vrf-local-as.yml b/tests/topology/expected/bgp-vrf-local-as.yml
@@ -236,7 +236,8 @@ nodes:
             connected:
               auto: true
           neighbors:
-          - activate:
+          - _vrf: blue
+            activate:
               ipv4: true
             as: 65000
             ifindex: 2
@@ -258,7 +259,8 @@ nodes:
             connected:
               auto: true
           neighbors:
-          - activate:
+          - _vrf: red
+            activate:
               ipv4: true
             as: 65000
             ifindex: 3
@@ -495,22 +497,25 @@ nodes:
             connected:
               auto: true
           neighbors:
-          - activate:
+          - _vrf: red
+            activate:
               ipv4: true
             as: 65001
             ifindex: 4
             ipv4: 10.1.0.1
             local_as: 65002
             name: r2
             type: ebgp
-          - activate:
+          - _vrf: blue
+            activate:
               ipv4: true
             as: 65100
             ifindex: 5
             ipv4: 10.1.0.5
             name: r1
             type: ebgp
-          - activate:
+          - _vrf: blue
+            activate:
               ipv4: true
             as: 65101
             ifindex: 7
@@ -533,22 +538,25 @@ nodes:
             connected:
               auto: true
           neighbors:
-          - activate:
+          - _vrf: blue
+            activate:
               ipv4: true
             as: 65002
             ifindex: 3
             ipv4: 10.1.0.2
             local_as: 65001
             name: r2
             type: ebgp
-          - activate:
+          - _vrf: red
+            activate:
               ipv4: true
             as: 65100
             ifindex: 6
             ipv4: 10.1.0.9
             name: r1
             type: ebgp
-          - activate:
+          - _vrf: red
+            activate:
               ipv4: true
             as: 65101
             ifindex: 8
@@ -690,7 +698,8 @@ nodes:
             connected:
               auto: true
           neighbors:
-          - activate:
+          - _vrf: blue
+            activate:
               ipv4: true
             as: 65000
             ifindex: 2
@@ -712,7 +721,8 @@ nodes:
             connected:
               auto: true
           neighbors:
-          - activate:
+          - _vrf: red
+            activate:
               ipv4: true
             as: 65000
             ifindex: 3
diff --git a/tests/topology/expected/ebgp.utils.yml b/tests/topology/expected/ebgp.utils.yml
@@ -303,6 +303,7 @@ nodes:
               auto: true
           neighbors:
           - _src_vrf: red
+            _vrf: red
             activate:
               ipv4: true
             as: 65002
@@ -455,6 +456,7 @@ nodes:
               auto: true
           neighbors:
           - _src_vrf: red
+            _vrf: red
             activate:
               ipv4: true
             allowas_in: 1
diff --git a/tests/topology/expected/vrf-igp.yml b/tests/topology/expected/vrf-igp.yml
@@ -666,7 +666,8 @@ nodes:
         - extended
       ipv4: true
       neighbors:
-      - activate:
+      - _vrf: red
+        activate:
           ipv4: true
         as: 65000
         ifindex: 1
diff --git a/tests/topology/expected/vrf-routing-blocks.yml b/tests/topology/expected/vrf-routing-blocks.yml
@@ -406,7 +406,8 @@ nodes:
             connected:
               auto: true
           neighbors:
-          - activate:
+          - _vrf: b_1
+            activate:
               ipv4: true
             as: 65001
             ifindex: 7
@@ -1080,7 +1081,8 @@ nodes:
             connected:
               auto: true
           neighbors:
-          - activate:
+          - _vrf: b_1
+            activate:
               ipv4: true
             as: 65000
             ifindex: 1
diff --git a/tests/topology/expected/vrf.yml b/tests/topology/expected/vrf.yml
@@ -294,7 +294,8 @@ nodes:
       ipv4: true
       ipv6: true
       neighbors:
-      - activate:
+      - _vrf: red
+        activate:
           ipv4: true
           ipv6: true
         as: 65000

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,8 @@ def build_ebgp_sessions(node: Box, sessions: Box, topology: Box) -> None:`
`304`	`304`	`extra_data.ifindex = l.ifindex`
`305`	`305`	`if 'bgp' in ngb_ifdata and isinstance(ngb_ifdata.bgp,Box): # Copy neighbor BGP interface attributes into neighbor data`
`306`	`306`	`extra_data = ngb_ifdata.bgp + extra_data # ... useful for things like BGP roles`
	`307`	`+ if isinstance(ngb_ifdata.get('vrf',None),str): # Are we attached to the neighbor's VRF?`
	`308`	`+ extra_data._vrf = ngb_ifdata.vrf`
`307`	`309`
`308`	`310`	`# Figure out whether both neighbors have IPv6 LLA and/or unnumbered IPv4 interfaces`
`309`	`311`	`#`