leverage built in jinja2 filters instead of .split("/")[0]

ryanmerolle · ryanmerolle · commit adc68de7b93d · 2026-01-23T08:31:04.000-05:00
diff --git a/templates/clab_topology.j2 b/templates/clab_topology.j2
@@ -119,10 +119,10 @@ topology:
 {%-                            set device2_name = endpoint2.split(":")[0] %}
 {#- Arista cEOS: Strip subinterface notation (e.g., "eth1/1/1" -> "eth1/1") -#}
 {%-                            if device_kinds.get(device1_name) == "arista_ceos" %}
-{%-                                set endpoint1 = endpoint1.split("/")[0] %}
+{%-                                set endpoint1 = endpoint1 | ipaddress_interface(attr='ip') %}
 {%-                            endif %}
 {%-                            if device_kinds.get(device2_name) == "arista_ceos" %}
-{%-                                set endpoint2 = endpoint2.split("/")[0] %}
+{%-                                set endpoint2 = endpoint2 | ipaddress_interface(attr='ip') %}
 {%-                            endif %}
     - endpoints: ["{{ endpoint1 }}", "{{ endpoint2 }}"]
 {%-                        endif %}
diff --git a/templates/configs/edges/cisco_ios.j2 b/templates/configs/edges/cisco_ios.j2
@@ -42,7 +42,7 @@ interface {{ interface.name }}
 ! OSPF Configuration
 {%- for ospf_config in ospf %}
 router ospf {{ ospf_config.process_id }}
-  router-id {{ ospf_config.router_id.split('/')[0] }}
+  router-id {{ ospf_config.router_id | ipaddress_interface(attr='ip') }}
   area {{ ospf_config.area }} authentication message-digest
   auto-cost reference-bandwidth {{ ospf_config.reference_bandwidth }}
   passive-interface default
@@ -57,7 +57,7 @@ router ospf {{ ospf_config.process_id }}
 ! BGP Configuration
 {%- for bgp_config in bgp %}
 router bgp {{ bgp_config.local_as.asn }}
-  router-id {{ bgp_config.router_id.address.split('/')[0] }}
+  router-id {{ bgp_config.router_id.address | ipaddress_interface(attr='ip') }}
 {%-     if bgp_config.graceful_restart %}
   graceful-restart
 {%-     endif %}
@@ -71,7 +71,7 @@ router bgp {{ bgp_config.local_as.asn }}
   exit-peer-policy
   !
   template peer-session {{ bgp_config.profile }}-SESSION
-    update-source {{ bgp_config.local_ip.address.split('/')[0] }}
+    update-source {{ bgp_config.local_ip.address | ipaddress_interface(attr='ip') }}
   exit-peer-session
   !
   address-family ipv4 unicast
@@ -81,7 +81,7 @@ router bgp {{ bgp_config.local_as.asn }}
   !
   address-family l2vpn evpn
 {%-     for session in bgp_config.sessions %}
-  neighbor {{ session.remote_ip.address.split('/')[0] }}
+  neighbor {{ session.remote_ip.address | ipaddress_interface(attr='ip') }}
     remote-as {{ session.remote_as.asn }}
     inherit peer-session {{ bgp_config.profile }}-SESSION
     address-family l2vpn evpn
diff --git a/templates/configs/edges/cisco_nxos.j2 b/templates/configs/edges/cisco_nxos.j2
@@ -42,7 +42,7 @@ interface {{ interface.name }}
 ! OSPF Configuration
 {%- for ospf_config in ospf %}
 router ospf {{ ospf_config.process_id }}
-  router-id {{ ospf_config.router_id.split('/')[0] }}
+  router-id {{ ospf_config.router_id | ipaddress_interface(attr='ip') }}
   area {{ ospf_config.area }} authentication message-digest
   auto-cost reference-bandwidth {{ ospf_config.reference_bandwidth }}
   passive-interface default
@@ -57,7 +57,7 @@ router ospf {{ ospf_config.process_id }}
 ! BGP Configuration
 {%- for bgp_config in bgp %}
 router bgp {{ bgp_config.local_as.asn }}
-  router-id {{ bgp_config.router_id.address.split('/')[0] }}
+  router-id {{ bgp_config.router_id.address | ipaddress_interface(attr='ip') }}
 {%-     if bgp_config.graceful_restart %}
   graceful-restart
 {%-     endif %}
@@ -71,7 +71,7 @@ router bgp {{ bgp_config.local_as.asn }}
   exit-peer-policy
   !
   template peer-session {{ bgp_config.profile }}-SESSION
-    update-source {{ bgp_config.local_ip.address.split('/')[0] }}
+    update-source {{ bgp_config.local_ip.address | ipaddress_interface(attr='ip') }}
   exit-peer-session
   !
   address-family ipv4 unicast
@@ -81,7 +81,7 @@ router bgp {{ bgp_config.local_as.asn }}
   !
   address-family l2vpn evpn
 {%-     for session in bgp_config.sessions %}
-  neighbor {{ session.remote_ip.address.split('/')[0] }}
+  neighbor {{ session.remote_ip.address | ipaddress_interface(attr='ip') }}
     remote-as {{ session.remote_as.asn }}
     inherit peer-session {{ bgp_config.profile }}-SESSION
     address-family l2vpn evpn
diff --git a/templates/configs/leafs/arista_eos.j2 b/templates/configs/leafs/arista_eos.j2
@@ -101,7 +101,7 @@ router bgp {{ bgp.local_as }}
    maximum-paths 4 ecmp 64
 {# Configure BGP neighbors from enhanced transform data #}
 {%- for neighbor in bgp.neighbors %}
-{%-     set neihbor_ip = neighbor.remote_ip.split('/')[0] %}
+{%-     set neihbor_ip = neighbor.remote_ip | ipaddress_interface(attr='ip') %}
    ! {{ neighbor.description or 'BGP Neighbor' }}
    neighbor {{ neihbor_ip }} remote-as {{ neighbor.remote_as }}
    neighbor {{ neihbor_ip }} update-source Loopback0
@@ -112,11 +112,11 @@ router bgp {{ bgp.local_as }}
    address-family ipv4
       redistribute connected route-map RM-CONN-2-BGP
 {%- for neighbor in bgp.neighbors %}
-      neighbor {{ neighbor.remote_ip.split('/')[0] }} activate
+      neighbor {{ neighbor.remote_ip | ipaddress_interface(attr='ip') }} activate
 {%- endfor %}
    address-family evpn
 {%- for neighbor in bgp.neighbors %}
-      neighbor {{ neighbor.remote_ip.split('/')[0] }} activate
+      neighbor {{ neighbor.remote_ip | ipaddress_interface(attr='ip') }} activate
 {%- endfor %}
 {# L2VPN EVPN for VLANs #}
 {%- for vlan in vlans %}
diff --git a/templates/configs/leafs/cisco_nxos.j2 b/templates/configs/leafs/cisco_nxos.j2
@@ -42,7 +42,7 @@ interface {{ interface.name }}
 ! OSPF Configuration
 {%- for ospf_config in ospf_configs %}
 router ospf {{ ospf_config.process_id }}
-  router-id {{ ospf_config.router_id.split('/')[0] }}
+  router-id {{ ospf_config.router_id | ipaddress_interface(attr='ip') }}
   area {{ ospf_config.area }} authentication message-digest
   auto-cost reference-bandwidth {{ ospf_config.reference_bandwidth }}
   passive-interface default
@@ -57,7 +57,7 @@ router ospf {{ ospf_config.process_id }}
 ! BGP Configuration
 {%- for bgp_config in bgp_profiles %}
 router bgp {{ bgp_config.local_as.asn }}
-  router-id {{ bgp_config.router_id.address.split('/')[0] }}
+  router-id {{ bgp_config.router_id.address | ipaddress_interface(attr='ip') }}
 {%-     if bgp_config.graceful_restart %}
   graceful-restart
 {%-     endif %}
@@ -70,7 +70,7 @@ router bgp {{ bgp_config.local_as.asn }}
 {%-     endif %}
   !
   template peer-session {{ bgp_config.profile }}-SESSION
-    update-source {{ bgp_config.local_ip.address.split('/')[0] }}
+    update-source {{ bgp_config.local_ip.address | ipaddress_interface(attr='ip') }}
   !
   address-family ipv4 unicast
 {%-     if bgp_config.multipath %}
@@ -79,7 +79,7 @@ router bgp {{ bgp_config.local_as.asn }}
   !
   address-family l2vpn evpn
 {%-     for session in bgp_config.sessions %}
-  neighbor {{ session.remote_ip.address.split('/')[0] }}
+  neighbor {{ session.remote_ip.address | ipaddress_interface(attr='ip') }}
     remote-as {{ session.remote_as.asn }}
     inherit peer-session {{ bgp_config.profile }}-SESSION
     address-family l2vpn evpn
diff --git a/templates/configs/leafs/dell_sonic.j2 b/templates/configs/leafs/dell_sonic.j2
@@ -102,7 +102,7 @@ router ospf {{ ospf.process_id }}
 router bgp {{ bgp.local_as }}
   router-id {{ bgp.router_id }}
 {% for neighbor in bgp.neighbors %}
-  neighbor {{ neighbor.remote_ip.split('/')[0] }}
+  neighbor {{ neighbor.remote_ip | ipaddress_interface(attr='ip') }}
     remote-as {{ neighbor.remote_as }}
     update-source loopback0
     address-family l2vpn evpn
diff --git a/templates/configs/leafs/juniper_junos.j2 b/templates/configs/leafs/juniper_junos.j2
@@ -8,7 +8,7 @@ system {
 
 {%- if ospf_configs and ospf_configs[0] and ospf_configs[0].router_id %}
     ## OSPF Router ID
-    ## router-id {{ ospf_configs[0].router_id.split('/')[0] }};
+    ## router-id {{ ospf_configs[0].router_id | ipaddress_interface(attr='ip') }};
 {%- endif %}
 
     services {
@@ -127,7 +127,7 @@ protocols {
 
 routing-options {
 {%-         if bgp_config.router_id and bgp_config.router_id.address %}
-    router-id {{ bgp_config.router_id.address.split('/')[0] }};
+    router-id {{ bgp_config.router_id.address | ipaddress_interface(attr='ip') }};
 {%-         endif %}
     autonomous-system {{ bgp_config.local_as.asn }};
 }
@@ -142,7 +142,7 @@ protocols {
         group {{ bgp_config.profile }} {
             type {{ 'internal' if bgp_config.session_type == 'INTERNAL' else 'external' }};
 {%-         if bgp_config.local_ip and bgp_config.local_ip.address %}
-            local-address {{ bgp_config.local_ip.address.split('/')[0] }};
+            local-address {{ bgp_config.local_ip.address | ipaddress_interface(attr='ip') }};
 {%-         endif %}
             family inet {
                 unicast {
@@ -159,7 +159,7 @@ protocols {
 {%-         endif %}
 
 {%-         for session in bgp_config.sessions %}
-            neighbor {{ session.remote_ip.address.split('/')[0] }} {
+            neighbor {{ session.remote_ip.address | ipaddress_interface(attr='ip') }} {
 {%-             if session.name %}
                 description "{{ session.name }}";
 {%-             endif %}
diff --git a/templates/configs/leafs/sonic.j2 b/templates/configs/leafs/sonic.j2
@@ -34,7 +34,7 @@
   },
   "BGP_NEIGHBOR": {
 {% for neighbor in bgp.neighbors %}
-    "{{ neighbor.remote_ip.split('/')[0] }}": {
+    "{{ neighbor.remote_ip | ipaddress_interface(attr='ip') }}": {
       "local_addr": "{{ bgp.router_id or default_router_id }}",
       "asn": "{{ neighbor.remote_as }}",
       "holdtime": "10",
@@ -84,7 +84,7 @@
   },
   "BGP_NEIGHBOR_AF": {
 {% for neighbor in bgp.neighbors %}
-    "{{ neighbor.remote_ip.split('/')[0] }}|l2vpn_evpn": {
+    "{{ neighbor.remote_ip | ipaddress_interface(attr='ip') }}|l2vpn_evpn": {
       "admin_status": "up"
     }{{ "," if not loop.last }}
 {% endfor %}
diff --git a/templates/configs/loadbalancers/f5_networks_linux.j2 b/templates/configs/loadbalancers/f5_networks_linux.j2
@@ -78,7 +78,7 @@ ltm pool {{ vip.hostname | replace('.', '_') | replace('-', '_') }}_pool {
 
 # Virtual Server configuration for {{ vip.hostname }}
 ltm virtual {{ vip.hostname | replace('.', '_') | replace('-', '_') }}_vs {
-    destination {{ vip.ip_address.split('/')[0] }}:80
+    destination {{ vip.ip_address | ipaddress_interface(attr='ip') }}:80
 {%-             if vip.ssl_certificate %}
     profiles {
         http { }
@@ -119,7 +119,7 @@ ltm profile client-ssl {{ vip.hostname | replace('.', '_') | replace('-', '_') }
 
 # HTTPS Virtual Server for {{ vip.hostname }}
 ltm virtual {{ vip.hostname | replace('.', '_') | replace('-', '_') }}_https_vs {
-    destination {{ vip.ip_address.split('/')[0] }}:443
+    destination {{ vip.ip_address | ipaddress_interface(attr='ip') }}:443
     profiles {
         http { }
         {{ vip.hostname | replace('.', '_') | replace('-', '_') }}_clientssl {
diff --git a/templates/configs/loadbalancers/haproxy_technologies_linux.j2 b/templates/configs/loadbalancers/haproxy_technologies_linux.j2
@@ -68,9 +68,9 @@ frontend {{ vip.hostname | replace('.', '_') | replace('-', '_') }}_frontend
     mode http
 {%-             endif %}
 
-    bind {{ vip.ip_address.split('/')[0] }}:80
+    bind {{ vip.ip_address | ipaddress_interface(attr='ip') }}:80
 {%-             if vip.ssl_certificate %}
-    bind {{ vip.ip_address.split('/')[0] }}:443 ssl crt {{ vip.ssl_certificate }}
+    bind {{ vip.ip_address | ipaddress_interface(attr='ip') }}:443 ssl crt {{ vip.ssl_certificate }}
 {%-                 if vip.mode == 'http' %}
     redirect scheme https if !{ ssl_fc }
 {%-                 endif %}
diff --git a/templates/configs/peering/arista_eos_bgp.j2 b/templates/configs/peering/arista_eos_bgp.j2
@@ -9,8 +9,8 @@
 {%-     set session = peering %}
 {%-     set local_as = session.local_as.asn %}
 {%-     set remote_as = session.remote_as.asn %}
-{%-     set local_ip = session.local_ip.address.split('/')[0] %}
-{%-     set remote_ip = session.remote_ip.address.split('/')[0] %}
+{%-     set local_ip = session.local_ip.address | ipaddress_interface(attr='ip') %}
+{%-     set remote_ip = session.remote_ip.address | ipaddress_interface(attr='ip') %}
 
 {%-     if session.session_scope == 'EXTERNAL' and session.external_organization %}
 ! External peering with {{ session.external_organization.name }}
@@ -128,8 +128,8 @@ route-map {{ session.peer_group.name }}-LOCAL-PREF-IN permit 10
 ! Session: {{ peering.name }}
 !   Local AS: {{ peering.local_as.asn }}
 !   Remote AS: {{ peering.remote_as.asn }}
-!   Local IP: {{ peering.local_ip.address.split('/')[0] }}
-!   Remote IP: {{ peering.remote_ip.address.split('/')[0] }}
+!   Local IP: {{ peering.local_ip.address | ipaddress_interface(attr='ip') }}
+!   Remote IP: {{ peering.remote_ip.address | ipaddress_interface(attr='ip') }}
 !   Type: {{ peering.peering_type }}
 !   Scope: {{ peering.session_scope }}
 !   Admin State: {{ peering.admin_state }}
diff --git a/templates/configs/peering/cisco_nxos_bgp.j2 b/templates/configs/peering/cisco_nxos_bgp.j2
@@ -9,8 +9,8 @@
 {%-     set session = peering %}
 {%-     set local_as = session.local_as.asn %}
 {%-     set remote_as = session.remote_as.asn %}
-{%-     set local_ip = session.local_ip.address.split('/')[0] %}
-{%-     set remote_ip = session.remote_ip.address.split('/')[0] %}
+{%-     set local_ip = session.local_ip.address | ipaddress_interface(attr='ip') %}
+{%-     set remote_ip = session.remote_ip.address | ipaddress_interface(attr='ip') %}
 
 {%-     if session.session_scope == 'EXTERNAL' and session.external_organization %}
 ! External peering with {{ session.external_organization.name }}
diff --git a/templates/configs/peering/cisco_nxos_ospf.j2 b/templates/configs/peering/cisco_nxos_ospf.j2
@@ -8,7 +8,7 @@
 {%- for peering in ospf_peering_sessions %}
 {%-     set session = peering %}
 {%-     set area = session.area.area_id %}
-{%-     set local_router_id = session.local_router_id.address.split('/')[0] %}
+{%-     set local_router_id = session.local_router_id.address | ipaddress_interface(attr='ip') %}
 
 {%-     if session.session_scope == 'EXTERNAL' and session.external_organization %}
 ! External OSPF peering with {{ session.external_organization.name }}
@@ -74,7 +74,7 @@ interface {{ interface.name }}
 {%-     if session.session_scope == 'EXTERNAL' %}
 ! External peering neighbor configuration
 {%-         if session.remote_router_id %}
-! Remote router ID: {{ session.remote_router_id.address.split('/')[0] }}
+! Remote router ID: {{ session.remote_router_id.address | ipaddress_interface(attr='ip') }}
 {%-         endif %}
 ! Network Type: {{ session.network_type }}
 ! Area Type: {{ session.area_type }}
diff --git a/templates/configs/spines/arista_eos.j2 b/templates/configs/spines/arista_eos.j2
@@ -67,7 +67,7 @@ router bgp {{ bgp.local_as }}
    peer-group EVPN-OVERLAY-PEERS maximum-routes 0
 {# Configure BGP neighbors from enhanced transform data #}
 {%- for neighbor in bgp.neighbors %}
-{%-     set neihbor_ip = neighbor.remote_ip.split('/')[0] %}
+{%-     set neihbor_ip = neighbor.remote_ip | ipaddress_interface(attr='ip') %}
    ! {{ neighbor.description or 'BGP Neighbor' }} (Route Reflector Client)
    neighbor {{ neihbor_ip }} peer-group EVPN-OVERLAY-PEERS
    neighbor {{ neihbor_ip }} description {{ neighbor.description or 'BGP Neighbor' }}
@@ -78,7 +78,7 @@ router bgp {{ bgp.local_as }}
       peer-group EVPN-OVERLAY-PEERS activate
 {# Configure route reflector clients for EVPN overlay #}
 {%- for neighbor in bgp.neighbors %}
-      neighbor {{ neighbor.remote_ip.split('/')[0] }} route-reflector-client
+      neighbor {{ neighbor.remote_ip | ipaddress_interface(attr='ip') }} route-reflector-client
 {%- endfor %}
 ! Configure route-maps
 route-map RM-CONN-2-BGP permit 10
diff --git a/templates/configs/spines/cisco_nxos.j2 b/templates/configs/spines/cisco_nxos.j2
@@ -37,7 +37,7 @@ interface {{ interface.name }}
 ! OSPF Configuration
 {%- for ospf_config in ospf_configs %}
 router ospf {{ ospf_config.process_id }}
-  router-id {{ ospf_config.router_id.split('/')[0] }}
+  router-id {{ ospf_config.router_id | ipaddress_interface(attr='ip') }}
   area {{ ospf_config.area }} authentication message-digest
   auto-cost reference-bandwidth {{ ospf_config.reference_bandwidth }}
   passive-interface default
@@ -52,7 +52,7 @@ router ospf {{ ospf_config.process_id }}
 ! BGP Configuration
 {%- for bgp_config in bgp_profiles %}
 router bgp {{ bgp_config.local_as.asn }}
-  router-id {{ bgp_config.router_id.address.split('/')[0] }}
+  router-id {{ bgp_config.router_id.address | ipaddress_interface(attr='ip') }}
 {%-     if bgp_config.graceful_restart %}
   graceful-restart
 {%-     endif %}
@@ -65,7 +65,7 @@ router bgp {{ bgp_config.local_as.asn }}
 {%-     endif %}
   !
   template peer-session {{ bgp_config.profile }}-SESSION
-    update-source {{ bgp_config.local_ip.address.split('/')[0] }}
+    update-source {{ bgp_config.local_ip.address | ipaddress_interface(attr='ip') }}
   !
   address-family ipv4 unicast
 {%-     if bgp_config.multipath %}
@@ -74,7 +74,7 @@ router bgp {{ bgp_config.local_as.asn }}
   !
   address-family l2vpn evpn
 {%-     for session in bgp_config.sessions %}
-  neighbor {{ session.remote_ip.address.split('/')[0] }}
+  neighbor {{ session.remote_ip.address | ipaddress_interface(attr='ip') }}
     remote-as {{ session.remote_as.asn }}
     inherit peer-session {{ bgp_config.profile }}-SESSION
     address-family l2vpn evpn
diff --git a/templates/configs/spines/dell_sonic.j2 b/templates/configs/spines/dell_sonic.j2
@@ -71,7 +71,7 @@ router ospf {{ ospf.process_id or default_ospf_process_id }}
 router bgp {{ bgp.local_as }}
   router-id {{ bgp.router_id or default_router_id }}
 {% for neighbor in bgp.neighbors %}
-  neighbor {{ neighbor.remote_ip.split('/')[0] }}
+  neighbor {{ neighbor.remote_ip | ipaddress_interface(attr='ip') }}
     remote-as {{ neighbor.remote_as }}
     update-source loopback0
     address-family l2vpn evpn
diff --git a/templates/configs/spines/edgecore_sonic.j2 b/templates/configs/spines/edgecore_sonic.j2
@@ -22,7 +22,7 @@
   },
   "BGP_NEIGHBOR": {
 {% for neighbor in bgp.neighbors %}
-    "{{ neighbor.remote_ip.split('/')[0] }}": {
+    "{{ neighbor.remote_ip | ipaddress_interface(attr='ip') }}": {
       "local_addr": "{{ bgp.router_id or default_router_id }}",
       "asn": "{{ neighbor.remote_as }}",
       "holdtime": "10",
@@ -68,7 +68,7 @@
   },
   "BGP_NEIGHBOR_AF": {
 {% for neighbor in bgp.neighbors %}
-    "{{ neighbor.remote_ip.split('/')[0] }} | l2vpn_evpn": {
+    "{{ neighbor.remote_ip | ipaddress_interface(attr='ip') }} | l2vpn_evpn": {
       "admin_status": "up",
       "route_reflector_client": "true"
     }{{ "," if not loop.last }}
diff --git a/templates/configs/spines/juniper_junos.j2 b/templates/configs/spines/juniper_junos.j2
diff --git a/templates/configs/spines/sonic.j2 b/templates/configs/spines/sonic.j2
