Minimal changes required for SR Linux 24.7.1

ipspace · Aug 29, 2024 · cb517d2 · cb517d2
1 parent 7288143
commit cb517d2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/docs/caveats.md b/docs/caveats.md
@@ -291,8 +291,9 @@ See also [](caveats-junos).
 
 (caveats-srlinux)=
 ## Nokia SR Linux
+
 * Only supported on top of *Containerlab*
-* Supports container image release 23.3.1 or later (due to YANG model changes)
+* Supports SR Linux release 24.7.1 or later (due to YANG model changes)
 * Requires `nokia.srlinux` Ansible Galaxy collection (minimum version 0.5.0). Use **ansible-galaxy collection install nokia.srlinux** command to install it.
 * MPLS and LDP are only supported on 7250 IXR (clab.type in ['ixr6','ixr6e','ixr10','ixr10e'])
 * Nokia SR Linux needs an EVPN control plane to enable VXLAN functionality. VXLAN ingress replication lists are built from EVPN Route Type 3 updates.

diff --git a/netsim/ansible/templates/bgp/srlinux.macro.j2 b/netsim/ansible/templates/bgp/srlinux.macro.j2
@@ -99,8 +99,8 @@
 {% set nh_self = bgp.next_hop_self|default(False) and type == 'ibgp' %}
 {% set nh_self_rr = nh_self and vrf_bgp.rr|default(False) %}
 {% set ep_name = (vrf + "_ibgp-" + af + "_export") if nh_self_rr else (vrf + "_bgp_export") %}
-    import-policy: {{ "ibgp-mark" if nh_self_rr else "accept_all" }}
-    export-policy: {{ ep_name }}
+    import-policy: [ {{ "ibgp-mark" if nh_self_rr else "accept_all" }} ]
+    export-policy: [ {{ ep_name }} ]
 {{ bgp_families(neighbor) }}
     timers:
       connect-retry: 10
@@ -143,7 +143,7 @@
 {{ bgp_export_policy(vrf,'bgp') }}
 {% if bgp.next_hop_self|default(False) %}
 {%   for afm in vrf_context.af %}
-{%     for n in vrf_bgp.neighbors if afm in n and n.type == 'ibgp' %}
+{%     for n in vrf_bgp.neighbors|default([]) if afm in n and n.type == 'ibgp' %}
 {%       if loop.first %}
 {{         bgp_export_policy(vrf,'ibgp-'+afm,loopback[afm]|ipaddr('address')) }}
 {%       endif %}

diff --git a/netsim/devices/srlinux.yml b/netsim/devices/srlinux.yml
@@ -17,7 +17,7 @@ bfd:                                    # SR Linux supports lower BFD timers tha
   min_tx: 100
   min_rx: 100
 clab:
-  image: ghcr.io/nokia/srlinux:24.3.2
+  image: ghcr.io/nokia/srlinux:24.7.1
   node:
     kind: srl
     type: ixrd2

diff --git a/netsim/extra/bgp.policy/srlinux.j2 b/netsim/extra/bgp.policy/srlinux.j2
@@ -9,7 +9,7 @@
     - peer-address: {{ n[af]|ipaddr('address') }}
 {% endif %}
 {% for direction in [ 'in','out' ] if direction in n.policy %}
-      {{ 'import' if direction=='in' else 'export' }}-policy: {{ n.policy[direction] }}
+      {{ 'import' if direction=='in' else 'export' }}-policy: [ {{ n.policy[direction] }} ]
 {% endfor %}
 {%- endmacro %}
 

diff --git a/tests/integration/evpn/03-vxlan-symmetric-irb.yml b/tests/integration/evpn/03-vxlan-symmetric-irb.yml
@@ -49,6 +49,20 @@ links:
   mtu: 1600
 
 validate:
+  ospf_adj_s1:
+    description: Check OSPF adjacencies with S1
+    wait: 40
+    nodes: [ s2 ]
+    wait_msg: Waiting for OSPF adjacency process to complete
+    plugin: ospf_neighbor(nodes.s1.ospf.router_id)
+
+  ibgp_adj_s1:
+    description: Check IBGP adjacencies with S1
+    wait: 40
+    nodes: [ s2 ]
+    wait_msg: Waiting for IGBP session
+    plugin: bgp_neighbor(node.bgp.neighbors,'s1')
+
   ping_vlan:
     description: Intra-VLAN ping-based reachability test
     wait_msg: Waiting for OSFP and STP to wake up