[NFV] Added IPV6 scenarios for NFV

mnietoji · mnietoji · commit 4234e3f9ca7a · 2025-11-27T11:40:38.000+01:00
Added IPV6 scenarios for IPV6:
* OVS DPDK SRIOV with 1 nodeset
* OVS DPDK SRIOV with 2 nodesets

Fixed some issues found that corrupted yaml files when containing
IPV6 addresses
diff --git a/roles/ci_gen_kustomize_values/templates/common/network-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/common/network-values/values.yaml.j2
@@ -19,6 +19,7 @@ data:
   node_{{ ns.ocp_index }}:
 {%     set ns.ocp_index = ns.ocp_index+1 %}
     name: {{ cifmw_networking_env_definition.instances[host]['hostname'] }}
+    node_name: {{ cifmw_networking_env_definition.instances[host]['hostname'] }}.ocp.openstack.lab
 {%     for network in cifmw_networking_env_definition.instances[host]['networks'].values() %}
 {%     set ns.interfaces = ns.interfaces |
                            combine({network.network_name: (network.parent_interface |
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2
@@ -0,0 +1,58 @@
+---
+# source: ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset-values/values.yaml.j2
+{% set instances_names = []                                                            %}
+{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
+{% set _original_nodes = _original_nodeset.nodes | default({})                         %}
+{% set _original_services = _original_nodeset['services'] | default([])                %}
+{% if cifmw_baremetal_hosts | default([]) | length > 0                                 %}
+{%   for _inst in cifmw_baremetal_hosts.keys()                                         %}
+{%     if (('label' in cifmw_baremetal_hosts[_inst]) and
+           (cifmw_baremetal_hosts[_inst]['label'] == 'openstack'))                     %}
+{%       set _ = instances_names.append(_inst)                                         %}
+{%     endif                                                                           %}
+{%   endfor                                                                            %}
+{% else                                                                                %}
+# Needed for verification gate
+{%   set _vm_type = (_original_nodes.keys() | first).split('-')[1]                     %}
+{%   for _inst in cifmw_networking_env_definition.instances.keys()                     %}
+{%     if _inst.startswith(_vm_type)                                                   %}
+{%       set _ = instances_names.append(_inst)                                         %}
+{%     endif                                                                           %}
+{%   endfor                                                                            %}
+{% endif                                                                               %}
+data:
+  ssh_keys:
+    authorized: {{ cifmw_ci_gen_kustomize_values_ssh_authorizedkeys | b64encode }}
+    private: {{ cifmw_ci_gen_kustomize_values_ssh_private_key | b64encode }}
+    public: {{ cifmw_ci_gen_kustomize_values_ssh_public_key | b64encode }}
+  nova:
+    migration:
+      ssh_keys:
+        private: {{ cifmw_ci_gen_kustomize_values_migration_priv_key | b64encode }}
+        public: {{ cifmw_ci_gen_kustomize_values_migration_pub_key | b64encode }}
+  nodeset:
+    ansible:
+      ansibleVars:
+        edpm_fips_mode: "{{ 'enabled' if cifmw_fips_enabled|default(false)|bool else 'check' }}"
+        timesync_ntp_servers:
+          - hostname: "{{ cifmw_ci_gen_kustomize_values_ntp_srv | default('pool.ntp.org') }}"
+{% if cifmw_ci_gen_kustomize_values_sshd_ranges | default([]) | length > 0             %}
+        edpm_sshd_allowed_ranges:
+{%   for range in cifmw_ci_gen_kustomize_values_sshd_ranges                            %}
+          - "{{ range }}"
+{%   endfor                                                                            %}
+{% endif                                                                               %}
+    nodes:
+{% for instance in instances_names                                                     %}
+      edpm-{{ instance }}:
+        hostName: {{ instance }}
+{% endfor                                                                              %}
+
+{% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and
+      ('repo-setup' in ci_gen_kustomize_edpm_nodeset_predeployed_services)             %}
+    services:
+      - "repo-setup"
+{%   for svc in _original_services                                                     %}
+      - "{{ svc }}"
+{%   endfor                                                                            %}
+{% endif                                                                               %}
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2
@@ -0,0 +1,58 @@
+---
+# source: ovs-dpdk-sriov-ipv6-2nodesets/edpm-nodeset2-values/values.yaml.j2
+{% set instances_names = []                                                            %}
+{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
+{% set _original_nodes = _original_nodeset.nodes | default({})                         %}
+{% set _original_services = _original_nodeset['services'] | default([])                %}
+{% if cifmw_baremetal_hosts | default([]) | length > 0                                 %}
+{%   for _inst in cifmw_baremetal_hosts.keys()                                         %}
+{%     if (('label' in cifmw_baremetal_hosts[_inst]) and
+           (cifmw_baremetal_hosts[_inst]['label'] == 'openstack-2'))                   %}
+{%       set _ = instances_names.append(_inst)                                         %}
+{%     endif                                                                           %}
+{%   endfor                                                                            %}
+{% else                                                                                %}
+# Needed for verification gate
+{%   set _vm_type = (_original_nodes.keys() | first).split('-')[1]                     %}
+{%   for _inst in cifmw_networking_env_definition.instances.keys()                     %}
+{%     if _inst.startswith(_vm_type)                                                   %}
+{%       set _ = instances_names.append(_inst)                                         %}
+{%     endif                                                                           %}
+{%   endfor                                                                            %}
+{% endif                                                                               %}
+data:
+  ssh_keys:
+    authorized: {{ cifmw_ci_gen_kustomize_values_ssh_authorizedkeys | b64encode }}
+    private: {{ cifmw_ci_gen_kustomize_values_ssh_private_key | b64encode }}
+    public: {{ cifmw_ci_gen_kustomize_values_ssh_public_key | b64encode }}
+  nova:
+    migration:
+      ssh_keys:
+        private: {{ cifmw_ci_gen_kustomize_values_migration_priv_key | b64encode }}
+        public: {{ cifmw_ci_gen_kustomize_values_migration_pub_key | b64encode }}
+  nodeset:
+    ansible:
+      ansibleVars:
+        edpm_fips_mode: "{{ 'enabled' if cifmw_fips_enabled|default(false)|bool else 'check' }}"
+        timesync_ntp_servers:
+          - hostname: "{{ cifmw_ci_gen_kustomize_values_ntp_srv | default('pool.ntp.org') }}"
+{% if cifmw_ci_gen_kustomize_values_sshd_ranges | default([]) | length > 0             %}
+        edpm_sshd_allowed_ranges:
+{%   for range in cifmw_ci_gen_kustomize_values_sshd_ranges                            %}
+          - "{{ range }}"
+{%   endfor                                                                            %}
+{% endif                                                                               %}
+    nodes:
+{% for instance in instances_names                                                     %}
+      edpm-{{ instance }}:
+        hostName: {{ instance }}
+{% endfor                                                                              %}
+
+{% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and
+      ('repo-setup' in ci_gen_kustomize_edpm_nodeset_predeployed_services)             %}
+    services:
+      - "repo-setup"
+{%   for svc in _original_services                                                     %}
+      - "{{ svc }}"
+{%   endfor                                                                            %}
+{% endif                                                                               %}
diff --git a/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2 b/roles/ci_gen_kustomize_values/templates/ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2
@@ -0,0 +1,45 @@
+---
+# source: ovs-dpdk-sriov-ipv6/edpm-nodeset-values/values.yaml.j2
+{% set instances_names = []                                                            %}
+{% set _original_nodeset = (original_content.data | default({})).nodeset | default({}) %}
+{% set _original_nodes = _original_nodeset.nodes | default({})                         %}
+{% set _original_services = _original_nodeset['services'] | default([])                %}
+{% for _inst in cifmw_baremetal_hosts.keys()                                           %}
+{%   set _ = instances_names.append(_inst)                                             %}
+{% endfor                                                                              %}
+data:
+  ssh_keys:
+    authorized: {{ cifmw_ci_gen_kustomize_values_ssh_authorizedkeys | b64encode }}
+    private: {{ cifmw_ci_gen_kustomize_values_ssh_private_key | b64encode }}
+    public: {{ cifmw_ci_gen_kustomize_values_ssh_public_key | b64encode }}
+  nova:
+    migration:
+      ssh_keys:
+        private: {{ cifmw_ci_gen_kustomize_values_migration_priv_key | b64encode }}
+        public: {{ cifmw_ci_gen_kustomize_values_migration_pub_key | b64encode }}
+  nodeset:
+    ansible:
+      ansibleVars:
+        edpm_fips_mode: "{{ 'enabled' if cifmw_fips_enabled|default(false)|bool else 'check' }}"
+        timesync_ntp_servers:
+          - hostname: "{{ cifmw_ci_gen_kustomize_values_ntp_srv | default('pool.ntp.org') }}"
+{% if cifmw_ci_gen_kustomize_values_sshd_ranges | default([]) | length > 0             %}
+        edpm_sshd_allowed_ranges:
+{%   for range in cifmw_ci_gen_kustomize_values_sshd_ranges                            %}
+          - "{{ range }}"
+{%   endfor                                                                            %}
+{% endif                                                                               %}
+    nodes:
+{% for instance in instances_names                                                     %}
+      edpm-{{ instance }}:
+        hostName: {{ instance }}
+{% endfor                                                                              %}
+
+{% if ('repo-setup' not in (_original_nodeset['services'] | default([]))) and
+      ('repo-setup' in ci_gen_kustomize_edpm_nodeset_predeployed_services)             %}
+    services:
+      - "repo-setup"
+{%   for svc in _original_services                                                     %}
+      - "{{ svc }}"
+{%   endfor                                                                            %}
+{% endif                                                                               %}
diff --git a/roles/dnsmasq/defaults/main.yml b/roles/dnsmasq/defaults/main.yml
@@ -27,3 +27,7 @@ cifmw_dnsmasq_listen_addresses: []
 cifmw_dnsmasq_enable_dns: false
 cifmw_dnsmasq_exclude_lo: false
 cifmw_dnsmasq_addresses: []
+# Use DHCPv6 range with start/end IPs instead of static mode
+# When true: generates dhcp-range with start and end IPs (e.g., ::2,::ff,64,1h)
+# When false: generates dhcp-range with static keyword (e.g., ::2,static,64,1h)
+cifmw_dnsmasq_ipv6_use_range: false
diff --git a/roles/dnsmasq/templates/network.conf.j2 b/roles/dnsmasq/templates/network.conf.j2
@@ -14,7 +14,13 @@ domain={{ range.domain }},{{ range_v4_allowed }},local
 {%      endif                                                                                       %}
 {%   endif                                                                                          %}
 {%   if range.start_v6 is defined and range.start_v6                                               -%}
+{%     if cifmw_dnsmasq_ipv6_use_range | default(true) | bool                                       -%}
+{%       set range_v6_end = (range.start_v6 ~ "/" ~ range.prefix_length_v6 | default('64')) |
+                             ansible.utils.ipaddr('last_usable')                                     -%}
+dhcp-range=set:{{ range.label }},{{ range.start_v6 }},{{ range_v6_end }},{{ range.prefix_length_v6 | default('64') }},{{ range.ttl | default('1h') }}
+{%     else                                                                                          -%}
 dhcp-range=set:{{ range.label }},{{ range.start_v6 }},static,{{ range.prefix_length_v6 | default('64') }},{{ range.ttl | default('1h') }}
+{%     endif                                                                                         -%}
 {%      if range.domain is defined and range.domain                                                -%}
 {%          set range_v6_allowed = (range.start_v6 ~ "/" ~ range.prefix_length_v6 | default('64')) |
                                     ansible.utils.ipaddr('range_usable') | replace("-",",")         %}
diff --git a/roles/libvirt_manager/tasks/generate_networking_data.yml b/roles/libvirt_manager/tasks/generate_networking_data.yml
@@ -182,12 +182,12 @@
       networks:
         {{ _lnet_data.name | replace('cifmw_', '') }}:
       {% if _lnet_data.ranges[0].start_v4 is defined and _lnet_data.ranges[0].start_v4                                  %}
-        {% set net_4 = _lnet_data.ranges[0].start_v4 | ansible.utils.ipsubnet(_lnet_data.ranges[0].prefix_length_v4)    %}
-          network-v4: {{ net_4}}
+        {%- set net_4 = _lnet_data.ranges[0].start_v4 | ansible.utils.ipsubnet(_lnet_data.ranges[0].prefix_length_v4)    %}
+          network-v4: '{{ net_4 }}'
       {% endif                                                                                                          %}
       {% if _lnet_data.ranges[0].start_v6 is defined and _lnet_data.ranges[0].start_v6                                  %}
-          {% set net_6 = _lnet_data.ranges[0].start_v6 | ansible.utils.ipsubnet(_lnet_data.ranges[0].prefix_length_v6)  %}
-          network-v6: {{ net_6 }}
+        {%- set net_6 = _lnet_data.ranges[0].start_v6 | ansible.utils.ipsubnet(_lnet_data.ranges[0].prefix_length_v6)  %}
+          network-v6: '{{ net_6 }}'
       {% endif %}
       group-templates:
       {% for group in _cifmw_libvirt_manager_layout.vms.keys() if group != 'controller' and
@@ -202,12 +202,12 @@
       {%     if cifmw_networking_definition['group-templates'][_gr ~ 's']['network-template'] is undefined %}
       {%       if net_4 is defined %}
               range-v4:
-                start: {{  net_4 | ansible.utils.nthhost(ns.ip_start | int ) }}
+                start: '{{  net_4 | ansible.utils.nthhost(ns.ip_start | int ) }}'
                 length: {{ _cifmw_libvirt_manager_layout.vms[group].amount | default(1) }}
       {%       endif %}
       {%       if net_6 is defined %}
               range-v6:
-                start: {{  net_6 | ansible.utils.nthhost(ns.ip_start | int) }}
+                start: '{{  net_6 | ansible.utils.nthhost(ns.ip_start | int) }}'
                 length: {{ _cifmw_libvirt_manager_layout.vms[group].amount | default(1) }}
       {%       endif %}
       {%   set ns.ip_start = ns.ip_start|int + (_cifmw_libvirt_manager_layout.vms[group].amount | default(1) | int ) + 1 %}
@@ -220,12 +220,12 @@
             {{ cifmw_libvirt_manager_pub_net }}:
       {%   if net_4 is defined and cifmw_networking_definition['group-templates']['baremetals']['network-template'] is undefined %}
               range-v4:
-                start: {{  net_4 | ansible.utils.nthhost(ns.ip_start) }}
+                start: '{{  net_4 | ansible.utils.nthhost(ns.ip_start) }}'
                 length: {{ cifmw_baremetal_hosts | length }}
       {%   endif %}
       {%   if net_6 is defined and cifmw_networking_definition['group-templates']['baremetals']['network-template'] is undefined %}
               range-v6:
-                start: {{  net_6 | ansible.utils.nthhost(ns.ip_start) }}
+                start: '{{  net_6 | ansible.utils.nthhost(ns.ip_start) }}'
                 length: {{ cifmw_baremetal_hosts | length }}
       {%   endif %}
       {% endif %}
@@ -235,10 +235,10 @@
           networks:
             {{ _lnet_data.name | replace('cifmw_', '') }}:
       {%   if net_4 is defined %}
-              ip-v4: "{{ net_4 | ansible.utils.nthhost(9) }}"
+              ip-v4: '{{ net_4 | ansible.utils.nthhost(9) }}'
       {%   endif %}
       {%   if net_6 is defined %}
-              ip-v6: "{{ net_6 | ansible.utils.nthhost(9) }}"
+              ip-v6: '{{ net_6 | ansible.utils.nthhost(9) }}'
       {%   endif %}
       {% endif %}
   block:
diff --git a/roles/nat64_appliance/defaults/main.yml b/roles/nat64_appliance/defaults/main.yml
@@ -40,6 +40,12 @@ cifmw_nat64_appliance_memory: 2
 cifmw_nat64_appliance_cpus: 2
 cifmw_nat64_appliance_ssh_pub_keys: []
 
+# Image download configuration
+# Set cifmw_nat64_appliance_image_url to download a pre-built image
+# instead of building it with DIB (saves ~5 minutes)
+cifmw_nat64_appliance_image_url: ""
+cifmw_nat64_appliance_image_checksum: ""  # Optional: "sha256:xxxxx"
+cifmw_nat64_appliance_download_timeout: 600  # 10 minutes
 
 cifmw_nat64_ipv6_prefix: "2620:cf:cf:fc00::/64"
 cifmw_nat64_ipv6_tayga_address: "2620:cf:cf:fc00::3"
diff --git a/roles/nat64_appliance/tasks/cleanup.yml b/roles/nat64_appliance/tasks/cleanup.yml
@@ -32,8 +32,19 @@
       community.libvirt.virt:
         command: list_vms
 
-    - name: Stop the nat64_appliance VM
+    - name: Get nat64_appliance VM state
       when: cifmw_nat64_appliance_name in _list_vms.list_vms
+      register: _vm_state
+      community.libvirt.virt:
+        command: status
+        name: "{{ cifmw_nat64_appliance_name }}"
+        uri: "{{ cifmw_nat64_libvirt_uri }}"
+
+    - name: Stop the nat64_appliance VM
+      when:
+        - cifmw_nat64_appliance_name in _list_vms.list_vms
+        - _vm_state.status is defined
+        - _vm_state.status == "running"
       community.libvirt.virt:
         command: destroy
         name: "{{ cifmw_nat64_appliance_name }}"
diff --git a/roles/nat64_appliance/tasks/main.yml b/roles/nat64_appliance/tasks/main.yml
@@ -29,7 +29,19 @@
     state: directory
     mode: "0755"
 
+- name: Download pre-built NAT64 appliance image
+  when:
+    - cifmw_nat64_appliance_image_url | length > 0
+  ansible.builtin.get_url:
+    url: "{{ cifmw_nat64_appliance_image_url }}"
+    dest: "{{ cifmw_nat64_appliance_workdir }}/nat64-appliance.qcow2"
+    checksum: "{{ cifmw_nat64_appliance_image_checksum | default(omit) }}"
+    timeout: "{{ cifmw_nat64_appliance_download_timeout }}"
+    mode: "0644"
+
 - name: Install required RPM packages
+  when:
+    - cifmw_nat64_appliance_image_url | length == 0
   tags:
     - packages
   become: true
@@ -42,6 +54,8 @@
     state: present
 
 - name: Install diskimage-builder in virtualenv
+  when:
+    - cifmw_nat64_appliance_image_url | length == 0
   tags:
     - packages
   ansible.builtin.pip:
@@ -52,6 +66,8 @@
       - setuptools
 
 - name: Copy files to cifmw_nat64_appliance_dir
+  when:
+    - cifmw_nat64_appliance_image_url | length == 0
   ansible.builtin.copy:
     src: "{{ item }}"
     dest: "{{ cifmw_nat64_appliance_workdir }}/{{ item }}"
@@ -61,12 +77,16 @@
     - nat64-appliance.yaml
 
 - name: Clone edpm-image-builder (reset-bls-entries dib element)
+  when:
+    - cifmw_nat64_appliance_image_url | length == 0
   ansible.builtin.git:
     repo: https://github.com/openstack-k8s-operators/edpm-image-builder.git
     dest: "{{ cifmw_nat64_appliance_workdir }}/edpm-image-builder"
     version: main
 
 - name: Build the nat64-appliance image using DIB
+  when:
+    - cifmw_nat64_appliance_image_url | length == 0
   become: "{{ cifmw_nat64_appliance_run_dib_as_root | default(false) | bool }}"
   environment:
     ELEMENTS_PATH: "{{ cifmw_nat64_appliance_workdir }}/elements:{{ cifmw_nat64_appliance_workdir }}/edpm-image-builder/dib/"
diff --git a/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-ipv6-2nodesets.yml b/scenarios/reproducers/dt-nfv-ovs-dpdk-sriov-ipv6-2nodesets.yml
diff --git a/scenarios/reproducers/va-nfv-ovs-dpdk-sriov-ipv6.yml b/scenarios/reproducers/va-nfv-ovs-dpdk-sriov-ipv6.yml
