Fix: include VRF BGP sessions in the BGP graph (ipspace#2596)

Also: refactor the 'parse format keywords' code in D2/GV BGP graphs

Author: ipspace

netsim/outputs/_graph.py

@@ -6,7 +6,7 @@
 
 from ..data import get_box,get_empty_box
 from ..data.types import must_be_list
-from ..utils import log
+from ..utils import log,routing as _routing
 
 SHARED_GRAPH_ATTRIBUTES: Box                      # Graph attributes shared between all graph output modules
 
@@ -169,7 +169,7 @@ def bgp_sessions(graph: Box, topology: Box, settings: Box, g_type: str, rr_sessi
   for n_name,n_data in topology.nodes.items():
     if 'bgp' not in n_data:
       continue
-    for neighbor in n_data.bgp.get('neighbors',[]):
+    for neighbor in _routing.neighbors(n_data,vrf=True):
       if neighbor.name < n_name:
         continue
 

netsim/outputs/d2.py

@@ -173,8 +173,10 @@ def graph_topology(topology: Box, fname: str, settings: Box,g_format: typing.Opt
 
 def graph_bgp(topology: Box, fname: str, settings: Box, g_format: typing.Optional[list]) -> bool:
   rr_session = settings.get('rr_sessions',False)
-  if g_format is not None and len(g_format) > 1:
-    rr_session = g_format[1] == 'rr'
+  g_format = g_format or []
+  for kw in g_format[1:]:
+    if kw == 'rr':
+      rr_session = True
 
   graph = bgp_graph(topology,settings,'d2',rr_sessions=rr_session)
   if graph is None:

netsim/outputs/graph.py

@@ -194,8 +194,10 @@ def graph_topology(topology: Box, fname: str, settings: Box,g_format: typing.Opt
 
 def graph_bgp(topology: Box, fname: str, settings: Box,g_format: typing.Optional[list]) -> bool:
   rr_session = settings.get('rr_sessions',False)
-  if g_format is not None and len(g_format) > 1:
-    rr_session = g_format[1] == 'rr'
+  g_format = g_format or []
+  for kw in g_format[1:]:
+    if kw == 'rr':
+      rr_session = True
 
   graph = bgp_graph(topology,settings,'graph',rr_sessions=rr_session)
   if graph is None: