networklab 26.3__tar.gz → 26.4__tar.gz

{networklab-26.3/networklab.egg-info → networklab-26.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: networklab
-Version: 26.3
+Version: 26.4
 Summary: CLI-based Virtual Networking Lab Abstraction Layer
 Home-page: https://github.com/ipspace/netlab
 Author: Ivan Pepelnjak
@@ -60,7 +60,7 @@ Interested? [Read the documentation](https://netlab.tools) (also available on [G
 
 ## Releases
 
-The latest release is [release 26.03](https://github.com/ipspace/netlab/releases/tag/release_26.03). It should be pretty stable, but if you encounter bugs, please report them as [GitHub issues](https://github.com/ipspace/netlab/issues/new/choose) and use [release 26.02](https://github.com/ipspace/netlab/releases/tag/release_26.02).
+The latest release is [release 26.04](https://github.com/ipspace/netlab/releases/tag/release_26.04). It should be pretty stable, but if you encounter bugs, please report them as [GitHub issues](https://github.com/ipspace/netlab/issues/new/choose) and use [release 26.03](https://github.com/ipspace/netlab/releases/tag/release_26.03).
 
 <!--
 or [1.8.4-post2](https://github.com/ipspace/netlab/releases/tag/release_1.8.4-post2).

{networklab-26.3 → networklab-26.4}/README.md

@@ -17,7 +17,7 @@ Interested? [Read the documentation](https://netlab.tools) (also available on [G
 
 ## Releases
 
-The latest release is [release 26.03](https://github.com/ipspace/netlab/releases/tag/release_26.03). It should be pretty stable, but if you encounter bugs, please report them as [GitHub issues](https://github.com/ipspace/netlab/issues/new/choose) and use [release 26.02](https://github.com/ipspace/netlab/releases/tag/release_26.02).
+The latest release is [release 26.04](https://github.com/ipspace/netlab/releases/tag/release_26.04). It should be pretty stable, but if you encounter bugs, please report them as [GitHub issues](https://github.com/ipspace/netlab/issues/new/choose) and use [release 26.03](https://github.com/ipspace/netlab/releases/tag/release_26.03).
 
 <!--
 or [1.8.4-post2](https://github.com/ipspace/netlab/releases/tag/release_1.8.4-post2).

{networklab-26.3 → networklab-26.4}/netsim/__init__.py

@@ -2,7 +2,7 @@
 
 import sys
 
-__version__ = "26.03"
+__version__ = "26.04"
 
 abort = False
 

networklab-26.4/netsim/ansible/tasks/deploy-config/exos.yml

@@ -0,0 +1,4 @@
+- name: "exos_config: deploying {{ netsim_action }} from {{ config_template }}"
+  community.network.exos_config:
+    src: "{{ config_template }}"
+  tags: [ print_action, always ]

{networklab-26.3 → networklab-26.4}/netsim/ansible/tasks/deploy-custom-config.yml

@@ -42,11 +42,20 @@
     verbosity: 1
   tags: [ test, custom ]
 
-# Find deployment task list. It could be a config-specific tasklist (somewhere in paths_custom directories with
-# file name from paths_custom.tasks list) or a generic deployment tasklist from deployment directories and
-# using generic deployment task names (a combination of ansible_network_os and netlab_provider). missing.yml
-# in the deployment directory is the catch-all of last resort.
+# Find deployment task list. It could be a config-specific tasklist (somewhere
+# in paths_custom directories with file name from paths_custom.tasks list) or a
+# generic deployment tasklist from deployment directories and using generic
+# deployment task names (a combination of ansible_network_os and
+# netlab_provider). missing.yml in the deployment directory is the catch-all of
+# last resort.
 #
+# Please note that the 'paths_custom.dirs' is changed by netlab initial/config.
+# 'paths_custom.task_dirs' is a copy of the original 'paths_custom.dirs'
+#
+- block:
+  - debug: var=paths_custom.task_dirs
+  - debug: var=paths_custom.tasks
+  when: ansible_verbosity > 1
 - name: Find custom configuration deployment script
   set_fact:
     deploy_task:
@@ -55,7 +64,7 @@
   vars:
     node_provider: "{{ provider|default(netlab_provider) }}"
     c_params:
-      paths: "{{ paths_custom.dirs }}"
+      paths: "{{ paths_custom.task_dirs }}"
       files: "{{ paths_custom.tasks }}"
     d_params:
       paths: "{{ paths_deploy.dirs }}"

networklab-26.4/netsim/ansible/tasks/fetch-config/exos.yml

@@ -0,0 +1,3 @@
+---
+- community.network.exos_facts:
+      gather_subset: config

{networklab-26.3/netsim/ansible/tasks/fortinet.fortios.fortios → networklab-26.4/netsim/ansible/tasks/fortios}/initial.yml

@@ -52,4 +52,4 @@
   when: netlab_vdom_is_enabled
 
 - name: Deploy initial configuration from template
-  include_tasks: tasks/deploy-config/fortinet.fortios.fortios.yml
+  include_tasks: tasks/deploy-config/fortios.yml

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/arubacx.j2

@@ -23,33 +23,18 @@ router bgp {{ bgp.as }}
 {% for af in ['ipv4','ipv6'] if bgp[af] is defined %}
   address-family {{ af }} unicast
 !
-{% if bgp.import is defined %}
-{%   for s_proto,s_data in bgp.import.items() %}
+{%   if bgp.import is defined %}
+{%     for s_proto,s_data in bgp.import.items() %}
   redistribute {{ s_proto }}{%
     if s_proto == 'ospf' and af == 'ipv6' %}v3{% endif %}{%
     if 'policy' in s_data %} route-map {{ s_data.policy }}-{{ af }}{% endif +%}
-{%   endfor %}
-{% endif %}
-
-{%   if loopback[af] is defined and bgp.advertise_loopback %}
-{{     bgpcfg.bgp_network(af,loopback[af]) }}
+{%     endfor %}
 {%   endif %}
-!
-{%   for l in interfaces|default([]) if l.bgp.advertise|default("") and l[af] is defined and not 'vrf' in l %}
-{{     bgpcfg.bgp_network(af,l[af]) }}
-{%   endfor %}
-{%   for pfx in bgp.originate|default([]) if af == 'ipv4' %}
-{{     bgpcfg.bgp_network(af,pfx) }}
+{%   for pfx in bgp.advertise|default([]) if af in pfx %}
+  network {{ pfx[af] }}
 {%   endfor %}
 !
 {%   for n in bgp.neighbors if n[af] is defined and n.activate[af] is defined and n.activate[af] %}
 {{     bgpcfg.neighbor_af(n,n[af],bgp) }}
 {%   endfor %}
 {% endfor %}
-!
-{#
-  Add extra IPv4 prefixes
-#}
-{% for pfx in bgp.originate|default([]) %}
-ip route {{ pfx|ansible.utils.ipaddr('network') }} {{ pfx|ansible.utils.ipaddr('netmask') }} nullroute
-{% endfor %}

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/arubacx.macro.j2

@@ -38,9 +38,3 @@
 {%   endif %}
 {% endif %}
 {%- endmacro -%}
-{#
-   BGP network statement
-#}
-{% macro bgp_network(af,pfx) %}
-    network {{ pfx|ansible.utils.ipaddr('0') }}
-{%- endmacro %}

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/cumulus_nvue.macro.j2

@@ -35,19 +35,12 @@
 {{              redistribute.config(vrf_bgp,af=af)|indent(16,first=True) }}
 {%     endif %}
 {%     set _loopback = [ vrf.loopback[af]|ansible.utils.ipaddr(0) ] if vrf.loopback[af] is defined and bgp.advertise_loopback|default(True) else [] %}
-{%     set data = namespace(networks=_loopback) %}
-{%     for l in interfaces|default([]) if l.bgp.advertise|default("") and l[af] is defined and l.vrf|default('default')==vrf_name %}
-{%       set data.networks = data.networks + [ l[af]|ansible.utils.ipaddr(0) ] %}
-{%     endfor %}
-{%     for pfx in vrf_bgp.originate|default([]) if af == 'ipv4' %}
-{%       set data.networks = data.networks + [ pfx|ansible.utils.ipaddr(0) ] %}
-{%     endfor %}
-{%     if data.networks!=[] %}
+{%     for pfx in vrf_bgp.advertise|default([]) if af in pfx %}
+{%       if loop.first %}
                 network:
-{%       for pfx in data.networks|unique %}
-                  {{ pfx }}: {}
-{%       endfor %}
-{%     endif %}
+{%       endif %}
+                  {{ pfx[af] }}: {}
+{%     endfor %}
 {%   endfor %}
 {%   for n in vrf_bgp.neighbors|default([]) %}
 {%     if loop.first %}
@@ -112,14 +105,4 @@
 {%       endif %}
 {%     endfor %}
 {%   endfor %}
-{%   if vrf_bgp.originate is defined %}
-          static:
-{%     for pfx in vrf_bgp.originate|default([]) %}
-            {{ pfx|ansible.utils.ipaddr('0') }}:
-              address-family: ipv4-unicast
-              via:
-                blackhole:
-                  type: blackhole
-{%     endfor %}
-{%   endif %}
 {% endmacro %}

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/dellos10.j2

@@ -37,21 +37,9 @@ router bgp {{ bgp.as }}
  address-family {{ af }} unicast
 !
 {{     redistribute.config(bgp,af=af,ospf_pid=ospf_pid) }}
-{%     if loopback[af] is defined and bgp.advertise_loopback %}
-  network {{ loopback[af]|ansible.utils.ipaddr('0') }}
-{%     endif %}
-!
-{%     for l in interfaces|default([]) if l.bgp.advertise|default("") and l[af] is defined and not 'vrf' in l %}
-  network {{ l[af]|ansible.utils.ipaddr('0') }}
-{%     endfor %}
-!
-{%     for pfx in bgp.originate|default([]) if af == 'ipv4' %}
-  network {{ pfx|ansible.utils.ipaddr('0') }}
+{%     for pfx in bgp.advertise|default([]) if af in pfx %}
+  network {{ pfx[af] }}
 {%     endfor %}
 !
 {%   endif %}
 {% endfor %}
-!
-{% for pfx in bgp.originate|default([]) %}
-ip route {{ pfx|ansible.utils.ipaddr('0') }} interface null 0
-{% endfor %}

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/eos.j2

@@ -66,22 +66,8 @@ router bgp {{ bgp.as }}
  address-family {{ af }}
 {{     redistribute.config(bgp,af=af) }}
 !
-{%     for l in netlab_interfaces if l.bgp.advertise|default("") and l[af] is defined and not 'vrf' in l %}
-{%     if loop.first %}
-!
-! Originate networks from connected subnets
-!
-{%     endif %}
-  network {{ l[af]|ansible.utils.ipaddr('0') }}
-{%     endfor %}
-!
-{%     for pfx in bgp.originate|default([]) if af == 'ipv4' %}
-{%     if loop.first %}
-!
-! Originate networks from static routes
-!
-{%     endif %}
-  network {{ pfx|ansible.utils.ipaddr('0') }}
+{%     for pfx in bgp.advertise|default([]) if af in pfx %}
+  network {{ pfx[af] }}
 {%     endfor %}
 !
 {%     for n in bgp.neighbors if n.activate[af]|default(false) %}
@@ -99,7 +85,3 @@ router bgp {{ bgp.as }}
 {%     endfor %}
 {%   endif %}
 {% endfor %}
-!
-{% for pfx in bgp.originate|default([]) %}
-ip route {{ pfx|ansible.utils.ipaddr('0') }} Null0
-{% endfor %}

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/frr.j2

@@ -46,21 +46,8 @@ router bgp {{ bgp.as }}
  address-family {{ af }} unicast
 !
 {{   redistribute.config(bgp,af=af) }}
-{%   for l in netlab_interfaces if l.bgp.advertise|default("") and l[af] is defined and not 'vrf' in l %}
-{%     if loop.first %}
-!
-! Originate networks from connected subnets
-!
-{%     endif %}
-  network {{ l[af]|ansible.utils.ipaddr(0) }}
-{%   endfor %}
-{%   for pfx in bgp.originate|default([]) if af == 'ipv4' %}
-{%     if loop.first %}
-!
-! Originate networks from static routes
-!
-{%     endif %}
-  network {{ pfx|ansible.utils.ipaddr('0') }}
+{%   for pfx in bgp.advertise|default([]) if af in pfx %}
+  network {{ pfx[af] }}
 {%   endfor %}
 !
 {%   for n in bgp.neighbors if n.activate[af]|default(false) %}
@@ -87,11 +74,4 @@ router bgp {{ bgp.as }}
 {%   endfor %}
 {% endfor %}
 !
-{#
-    Advertise extra networks
-#}
-{% for pfx in bgp.originate|default([]) %}
-ip route {{ pfx|ansible.utils.ipaddr('0') }} Null0
-{% endfor %}
-!
 do write

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/ios.j2

@@ -36,31 +36,11 @@ router bgp {{ bgp.as }}
 {{     redistribute.config(bgp,af=af,ospf_pid=ospf_pid)|indent(1,first=True) }}
 {%   endif %}
 !
-{%   for l in netlab_interfaces if l.bgp.advertise|default("") and l[af] is defined and not 'vrf' in l %}
-{%     if loop.first %}
-!
-! Originate networks from connected subnets
-!
-{%     endif %}
-{{     bgpcfg.bgp_network(af,l[af]) }}
-{%   endfor %}
-{%   for pfx in bgp.originate|default([]) if af == 'ipv4' %}
-{%     if loop.first %}
-!
-! Originate networks from static routes
-!
-{%     endif %}
-{{     bgpcfg.bgp_network(af,pfx) }}
+{%   for pfx in bgp.advertise|default([]) if af in pfx %}
+{{     bgpcfg.bgp_network(af,pfx[af]) }}
 {%   endfor %}
 !
 {%   for n in bgp.neighbors if n.activate[af]|default(false) %}
 {{     bgpcfg.neighbor_af(n,n[af],bgp) }}
 {%   endfor %}
 {% endfor %}
-!
-{#
-  Add extra IPv4 prefixes
-#}
-{% for pfx in bgp.originate|default([]) %}
-ip route {{ pfx|ansible.utils.ipaddr('network') }} {{ pfx|ansible.utils.ipaddr('netmask') }} null 0
-{% endfor %}

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/iosxr.j2

@@ -57,14 +57,6 @@
 {%     endif %}
 {% endmacro -%}
 !
-{% if bgp.originate|default([]) %}
-router static
- address-family ipv4 unicast
-{%   for pfx in bgp.originate|default([]) %}
-  {{ pfx|ansible.utils.ipaddr('0') }} Null0
-{%   endfor %}
-{% endif %}
-!
 router bgp {{ bgp.as }}
 {{ bgp_common(bgp) }}
 {% if bgp.confederation is defined %}
@@ -79,15 +71,12 @@ router bgp {{ bgp.as }}
  address-family {{ af }} unicast
   bgp scan-time 5
 !
-{%   for l in netlab_interfaces if l.bgp.advertise|default("") and l[af] is defined and not 'vrf' in l %}
-  network {{ l[af]|ansible.utils.ipaddr(0) }}
-{%   endfor %}
 {%   if bgp.import is defined %}
 {{  redistribute.config(bgp,af=af,ospf_pid=ospf_pid,t_proto='bgp')|indent(1,first=True) }}
 {%   endif %}
 !
-{%   for pfx in bgp.originate|default([]) if af == 'ipv4' %}
-  network {{ pfx|ansible.utils.ipaddr('0') }}
+{%   for pfx in bgp.advertise|default([]) if af in pfx %}
+  network {{ pfx[af] }}
 {%   endfor %}
 {% endfor %}
 {% for af in ['ipv4','ipv6'] %}

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/junos.j2

@@ -6,12 +6,8 @@ routing-options {
 {% if bgp.router_id is defined %}
   router-id {{ bgp.router_id }}
 {% endif %}
-{% if bgp.originate is defined %}
-  static {
-{% for pfx in bgp.originate|default([]) %}
-    route {{ pfx|ansible.utils.ipaddr('0') }} discard;
-{% endfor %}
-  }
+{% if bgp.confederation is defined %}
+  confederation {{ bgp.confederation.as }} members [ {{ bgp.as }} {{ bgp.confederation.peers|join(' ') }} ]
 {% endif %}
 }
 
@@ -57,7 +53,7 @@ protocols {
         ];
       advertise-inactive;
 {# treat localas_ibgp as ebgp session --> no usage of local address #}
-{% for n in bgp.neighbors if (n.type == 'ebgp' or n.type == 'localas_ibgp') %}
+{% for n in bgp.neighbors if n.type in ['ebgp','confed_ebgp','localas_ibgp'] %}
 {%   for af in ['ipv4','ipv6'] if n[af] is defined %}
       neighbor {{ n[af] }} {
 {#     apply per-neighbor policies, if defined #}

networklab-26.4/netsim/ansible/templates/bgp/junos.macro.j2

@@ -0,0 +1,112 @@
+{#
+   Macro to create the common objects (mark community, bgp-final policy)
+#}
+{% macro common(vname) %}
+  delete: policy-statement bgp-{{ vname }}-redistribute;
+  delete: route-filter-list bgp-{{ vname }}-announce-ipv4;
+  delete: route-filter-list bgp-{{ vname }}-announce-ipv6;
+
+  community x-route-permit-mark members large:65535:0:65536;
+
+  policy-statement bgp-final {
+    term final-option {
+      from community x-route-permit-mark;
+      then {
+        community delete x-route-permit-mark;
+        accept;
+      }
+    }
+    term default-reject {
+      then reject;
+    }
+  }
+{% endmacro %}
+{#
+   Macro for BGP neighbor policy application
+   Uses custom neigh._junos_policy.xxx attributes
+#}
+{% macro bgp_neighbor_policy(n) %}
+{%   for p_direction in ['import', 'export'] %}
+{%     if n._junos_policy[p_direction]|default([]) %}
+        {{p_direction}} [ {{ n._junos_policy[p_direction]|join(' ') }} ];
+{%     endif %}
+{%   endfor %}
+{%- endmacro %}
+{#
+   Macro to create the per-routing-instance advertise prefix lists
+#}
+{% macro advertise_list(bgp,vname) %}
+{%   for bgp_af in ['ipv4','ipv6'] %}
+{%     for pfx in bgp.advertise|default([]) if bgp_af in pfx %}
+{%       if loop.first %}
+  route-filter-list bgp-{{ vname }}-announce-{{ bgp_af }} {
+{%       endif %}
+    {{ pfx[bgp_af] }} exact;
+{%       if loop.last %}
+  }
+{%       endif %}
+{%     endfor %}
+{%   endfor %}
+{% endmacro +%}
+{#
+   Macro to create per-routing-instance advertise terms
+#}
+{% macro advertise_terms(bgp,vname) %}
+{%   for bgp_af in af %}
+{%     for pfx in bgp.advertise|default([]) if bgp_af in pfx %}
+{%       if loop.first %}
+    term advertise-{{ bgp_af }} {
+      from {
+        route-filter-list bgp-{{ vname }}-announce-{{ bgp_af }};
+      }
+      then {
+        community add x-route-permit-mark;
+        next policy;
+      }
+    }
+{%      endif %}
+{%     endfor %}
+{%   endfor %}
+{% endmacro +%}
+{#
+   Macro to create terms for route redistribution
+#}
+{% macro import_terms(pdata) %}
+{%   set protomap = {
+       'connected': 'direct'
+     }
+%}
+{%   for proto in pdata.import|default({}) %}
+    term redist_{{ proto }} {
+      from {
+        protocol {{ protomap[proto]|default(proto) }};
+{%     if pdata.import[proto].policy is defined %}
+        policy [ {{ pdata.import[proto].policy }} bgp-final ];
+{%     endif %}
+      }
+      then {
+        community add x-route-permit-mark;
+        next policy;
+      }
+    }
+{%   endfor %}
+{% endmacro +%}
+{#
+   Macro to create per-routing-instance import/propagate/advertise policy
+#}
+{% macro redistribute(bgp,vname) %}
+  policy-statement bgp-{{ vname }}-redistribute {
+{{ advertise_terms(bgp,vname) }}
+    term redis_bgp {
+      from protocol bgp;
+      then {
+        community add x-route-permit-mark;
+        next policy;
+      }
+    }
+{{ import_terms(bgp) }}
+    term default {
+      then reject;
+    }
+  }
+{% endmacro +%}

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/junos.policy.j2

@@ -1,3 +1,4 @@
+{% import "junos.macro.j2" as bgpcfg with context %}
 {# initialize default policies #}
 
 {# internal community to handle policy flows #}
@@ -12,26 +13,16 @@
 #   - (custom policies - which may force accept/reject)
 #   - default final policy
 #}
-policy-options community x-route-permit-mark members large:65535:0:65536;
-
 policy-options {
-  delete: policy-statement bgp-advertise;
-  delete: policy-statement bgp-redistribute;
 {% for af in ['ipv4','ipv6'] %}
 {%   for nhs_type in ['ebgp','all'] %}
   delete: policy-statement next-hop-{{ nhs_type }}-{{ af }};
 {%   endfor %}
 {% endfor %}
-  delete: route-filter-list bgp-announce;
-}
-
-policy-options {
 
-  route-filter-list bgp-announce {
-{% for pfx in bgp.originate|default([]) %}
-    {{ pfx|ansible.utils.ipaddr('0') }} exact;
-{% endfor %}
-  }
+{{ bgpcfg.common('default') }}
+{{ bgpcfg.advertise_list(bgp,'default') }}
+{{ bgpcfg.redistribute(bgp,'default') }}
 
 {% for af in ('ipv4','ipv6') %}
 {%   for nh in ['ebgp','all'] %}
@@ -48,62 +39,9 @@ policy-options {
       }
     }
   }
-
 {%   endfor %}
 {% endfor %}
 
-  policy-statement bgp-advertise {
-    term advertise {
-      from {
-        protocol direct;
-        interface [ 
-          {% if bgp.advertise_loopback %} lo0.0 {% endif %}
-          {%- for l in interfaces if l.bgp.advertise|default("") and not 'vrf' in l %}
-          {{ l.ifname }}
-          {% endfor %} ];
-      }
-      then {
-        community add x-route-permit-mark;
-        next policy;
-      }
-    }
-
-    term originate {
-      from {
-        protocol static;
-        route-filter-list bgp-announce;
-      }
-      then {
-        community add x-route-permit-mark;
-        next policy;
-      }
-    }
-
-  }
-
-  policy-statement bgp-redistribute {
-    term redis_bgp {
-      from protocol bgp;
-      then {
-        community add x-route-permit-mark;
-        next policy;
-      }
-    }
-  }
-
-  policy-statement bgp-final {
-    term final-option {
-      from community x-route-permit-mark;
-      then {
-        community delete x-route-permit-mark;
-        accept;
-      }
-    }
-    term default-reject {
-      then reject;
-    }
-  }
-
   policy-statement bgp-initial {
     term initial-cleanup {
       from community x-route-permit-mark;
@@ -121,8 +59,7 @@ policy-options {
         route-filter 0.0.0.0/0 exact;
       }
       then {
-        community add x-route-permit-mark;
-        next policy;
+        accept;
       }
     }
     term default-route-v6 {
@@ -130,8 +67,7 @@ policy-options {
         route-filter ::/0 exact;
       }
       then {
-        community add x-route-permit-mark;
-        next policy;
+        accept;
       }
     }
   }

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/nxos.j2

@@ -15,16 +15,8 @@ router bgp {{ bgp.as }}
 !
  address-family {{ af }} unicast
 !
-{%   if loopback[af] is defined and bgp.advertise_loopback %}
-  network {{ loopback[af]|ansible.utils.ipaddr(0) }}
-{%   endif %}
-!
-{%   for l in interfaces|default([]) if l.bgp.advertise|default("") and l[af] is defined and not 'vrf' in l %}
-  network {{ l[af]|ansible.utils.ipaddr(0) }}
-{%   endfor %}
-!
-{%   for pfx in bgp.originate|default([]) if af == 'ipv4' %}
-  network {{ pfx|ansible.utils.ipaddr('0') }}
+{%   for pfx in bgp.advertise|default([]) if af in pfx %}
+  network {{ pfx[af] }}
 {%   endfor %}
 {% endfor %}
 !

{networklab-26.3 → networklab-26.4}/netsim/ansible/templates/bgp/openbsd.j2

@@ -9,18 +9,10 @@ log updates
 
 ## network announcements
 
-{% for pfx in bgp.originate|default([]) %}
-network {{ pfx|ansible.utils.ipaddr('0') }}
-{% endfor %}
-{% for intf in netlab_interfaces %}
-{%   if intf.bgp.advertise|default(False) %}
-{%     if intf.ipv4|default(False) %}
-network {{ intf.ipv4|ansible.utils.ipaddr('0') }}
-{%     endif %}
-{%     if intf.ipv6|default(False) %}
-network {{ intf.ipv6|ansible.utils.ipaddr('0') }}
-{%     endif %}
-{%   endif %}
+{% for pfx_af in ['ipv4','ipv6'] %}
+{%   for pfx in bgp.advertise|default([]) if pfx_af in pfx %}
+network {{ pfx[pfx_af] }}
+{%   endfor %}
 {% endfor %}
 
 ## neighbors and groups
@@ -108,4 +100,4 @@ rcctl restart bgpd
 
 {% for pfx in bgp.originate|default([]) %}
 route add -blackhole {{ pfx|ipaddr('0') }} -priority 63 localhost
-{% endfor %}
+{% endfor %}