From 32de9a1871e3302724f19119cdbb6069c78cb617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Wed, 3 Jul 2024 10:32:46 +0200
Subject: [PATCH] Update automation/net-env/uni04delta.yaml mock

This change was created by running:
```
curl -o /tmp/uni04delta.yaml https://sf.hosted._redacted_/logs/openstack-uni-jobs-periodic-integration-rhoso18.0-rhel9/_redacted_/tripleo-ci/master/uni04delta-rhel9-rhoso18.0/1ce310e/logs/controller-0/ci-framework-data/artifacts/ci-env/networking-environment-definition.yml
cat /tmp/uni04delta.yaml | yq > automation/net-env/uni04delta.yaml
```
---
 automation/net-env/uni04delta.yaml | 604 ++++++++++++-----------------
 1 file changed, 249 insertions(+), 355 deletions(-)

diff --git a/automation/net-env/uni04delta.yaml b/automation/net-env/uni04delta.yaml
index ed9c17428..de5701780 100644
--- a/automation/net-env/uni04delta.yaml
+++ b/automation/net-env/uni04delta.yaml
@@ -6,522 +6,436 @@ instances:
     networks:
       ctlplane:
         interface_name: eth1
-        ip_v4: 192.168.122.111
-        mac_addr: "52:54:00:3a:60:69"
+        ip_v4: 192.168.122.106
+        is_trunk_parent: true
+        mac_addr: 52:54:05:a9:f2:c4
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
-      external:
-        interface_name: eth1
-        ip_v4: 10.46.22.135
-        mac_addr: "52:54:00:3a:60:69"
-        mtu: 1500
-        netmask_v4: 255.255.255.192
-        network_name: external
-        prefix_length_v4: 26
-        skip_nm: false
       internalapi:
-        interface_name: eth1.120
-        ip_v4: 172.17.0.111
-        mac_addr: "52:54:00:34:8e:48"
+        interface_name: eth1.20
+        ip_v4: 172.17.0.106
+        is_trunk_parent: false
+        mac_addr: 52:54:00:04:df:87
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: internalapi
         parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 120
+        trunk_parent: ctlplane
+        vlan_id: 20
       storage:
-        interface_name: eth1.121
-        ip_v4: 172.18.0.111
-        mac_addr: "52:54:00:10:9b:1d"
+        interface_name: eth1.21
+        ip_v4: 172.18.0.106
+        is_trunk_parent: false
+        mac_addr: 52:54:00:7e:b2:1c
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storage
         parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 121
+        trunk_parent: ctlplane
+        vlan_id: 21
       storagemgmt:
-        interface_name: eth1.123
-        ip_v4: 172.20.0.111
-        mac_addr: "52:54:00:0d:e9:95"
+        interface_name: eth1.23
+        ip_v4: 172.19.0.106
+        is_trunk_parent: false
+        mac_addr: 52:54:00:12:53:0e
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storagemgmt
         parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 123
+        trunk_parent: ctlplane
+        vlan_id: 23
   ceph-1:
     hostname: ceph-1
     name: ceph-1
     networks:
       ctlplane:
         interface_name: eth1
-        ip_v4: 192.168.122.112
-        mac_addr: "52:54:00:f0:a5:5f"
+        ip_v4: 192.168.122.107
+        is_trunk_parent: true
+        mac_addr: 52:54:06:1c:ff:4d
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
-      external:
-        interface_name: eth1
-        ip_v4: 10.46.22.136
-        mac_addr: "52:54:00:f0:a5:5f"
-        mtu: 1500
-        netmask_v4: 255.255.255.192
-        network_name: external
-        prefix_length_v4: 26
-        skip_nm: false
       internalapi:
-        interface_name: eth1.120
-        ip_v4: 172.17.0.112
-        mac_addr: "52:54:00:77:8d:d0"
+        interface_name: eth1.20
+        ip_v4: 172.17.0.107
+        is_trunk_parent: false
+        mac_addr: 52:54:00:04:df:87
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: internalapi
         parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 120
+        trunk_parent: ctlplane
+        vlan_id: 20
       storage:
-        interface_name: eth1.121
-        ip_v4: 172.18.0.112
-        mac_addr: "52:54:00:35:fc:f2"
+        interface_name: eth1.21
+        ip_v4: 172.18.0.107
+        is_trunk_parent: false
+        mac_addr: 52:54:00:7e:b2:1c
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storage
         parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 121
+        trunk_parent: ctlplane
+        vlan_id: 21
       storagemgmt:
-        interface_name: eth1.123
-        ip_v4: 172.20.0.112
-        mac_addr: "52:54:00:01:27:76"
+        interface_name: eth1.23
+        ip_v4: 172.19.0.107
+        is_trunk_parent: false
+        mac_addr: 52:54:00:12:53:0e
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storagemgmt
         parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 123
+        trunk_parent: ctlplane
+        vlan_id: 23
   ceph-2:
     hostname: ceph-2
     name: ceph-2
     networks:
       ctlplane:
         interface_name: eth1
-        ip_v4: 192.168.122.113
-        mac_addr: "52:54:00:55:f7:08"
+        ip_v4: 192.168.122.108
+        is_trunk_parent: true
+        mac_addr: 52:54:07:be:1b:6a
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
-      external:
-        interface_name: eth1
-        ip_v4: 10.46.22.137
-        mac_addr: "52:54:00:55:f7:08"
-        mtu: 1500
-        netmask_v4: 255.255.255.192
-        network_name: external
-        prefix_length_v4: 26
-        skip_nm: false
       internalapi:
-        interface_name: eth1.120
-        ip_v4: 172.17.0.113
-        mac_addr: "52:54:00:01:23:43"
+        interface_name: eth1.20
+        ip_v4: 172.17.0.108
+        is_trunk_parent: false
+        mac_addr: 52:54:00:04:df:87
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: internalapi
         parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 120
+        trunk_parent: ctlplane
+        vlan_id: 20
       storage:
-        interface_name: eth1.121
-        ip_v4: 172.18.0.113
-        mac_addr: "52:54:00:3a:1f:2f"
+        interface_name: eth1.21
+        ip_v4: 172.18.0.108
+        is_trunk_parent: false
+        mac_addr: 52:54:00:7e:b2:1c
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storage
         parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 121
+        trunk_parent: ctlplane
+        vlan_id: 21
       storagemgmt:
-        interface_name: eth1.123
-        ip_v4: 172.20.0.113
-        mac_addr: "52:54:00:23:96:dc"
+        interface_name: eth1.23
+        ip_v4: 172.19.0.108
+        is_trunk_parent: false
+        mac_addr: 52:54:00:12:53:0e
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storagemgmt
         parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 123
-  controller-0:
-    hostname: controller-0
-    name: controller-0
+        trunk_parent: ctlplane
+        vlan_id: 23
+  compute-0:
+    hostname: compute-0
+    name: compute-0
     networks:
       ctlplane:
         interface_name: eth1
-        ip_v4: 192.168.122.9
-        mac_addr: "52:54:00:aa:40:6d"
-        mtu: 1500
-        netmask_v4: 255.255.255.0
-        network_name: ctlplane
-        prefix_length_v4: 24
-        skip_nm: false
-  ocp-0:
-    hostname: osasinfra-master-0
-    name: ocp-0
-    networks:
-      ctlplane:
-        interface_name: enp6s0
-        ip_v4: 192.168.122.10
-        mac_addr: "52:54:00:28:4f:f0"
+        ip_v4: 192.168.122.100
+        is_trunk_parent: true
+        mac_addr: 52:54:03:6f:dc:42
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
       internalapi:
-        interface_name: enp6s0.120
-        ip_v4: 172.17.0.10
-        mac_addr: "52:54:00:56:0a:fb"
+        interface_name: eth1.20
+        ip_v4: 172.17.0.100
+        is_trunk_parent: false
+        mac_addr: 52:54:00:04:df:87
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: internalapi
-        parent_interface: enp6s0
-        prefix_length_v4: 24
-        skip_nm: false
-        vlan_id: 120
-      octavia:
-        interface_name: enp6s0.124
-        ip_v4: 172.23.0.10
-        mac_addr: "52:54:00:14:51:28"
-        mtu: 1500
-        netmask_v4: 255.255.255.0
-        network_name: octavia
-        parent_interface: enp6s0
+        parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 124
+        trunk_parent: ctlplane
+        vlan_id: 20
       storage:
-        interface_name: enp6s0.121
-        ip_v4: 172.18.0.10
-        mac_addr: "52:54:00:62:0d:a2"
+        interface_name: eth1.21
+        ip_v4: 172.18.0.100
+        is_trunk_parent: false
+        mac_addr: 52:54:00:7e:b2:1c
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storage
-        parent_interface: enp6s0
+        parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 121
+        trunk_parent: ctlplane
+        vlan_id: 21
       tenant:
-        interface_name: enp6s0.122
-        ip_v4: 172.19.0.10
-        mac_addr: "52:54:00:09:be:0e"
+        interface_name: eth1.22
+        ip_v4: 172.20.0.100
+        is_trunk_parent: false
+        mac_addr: 52:54:00:12:d1:e1
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: tenant
-        parent_interface: enp6s0
+        parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 122
-  ocp-1:
-    hostname: osasinfra-master-1
-    name: ocp-1
+        trunk_parent: ctlplane
+        vlan_id: 22
+  compute-1:
+    hostname: compute-1
+    name: compute-1
     networks:
       ctlplane:
-        interface_name: enp6s0
-        ip_v4: 192.168.122.11
-        mac_addr: "52:54:00:14:39:b5"
+        interface_name: eth1
+        ip_v4: 192.168.122.101
+        is_trunk_parent: true
+        mac_addr: 52:54:04:a6:70:fb
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
       internalapi:
-        interface_name: enp6s0.120
-        ip_v4: 172.17.0.11
-        mac_addr: "52:54:00:7a:aa:0e"
+        interface_name: eth1.20
+        ip_v4: 172.17.0.101
+        is_trunk_parent: false
+        mac_addr: 52:54:00:04:df:87
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: internalapi
-        parent_interface: enp6s0
-        prefix_length_v4: 24
-        skip_nm: false
-        vlan_id: 120
-      octavia:
-        interface_name: enp6s0.124
-        ip_v4: 172.23.0.11
-        mac_addr: "52:54:00:26:c9:4c"
-        mtu: 1500
-        netmask_v4: 255.255.255.0
-        network_name: octavia
-        parent_interface: enp6s0
+        parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 124
+        trunk_parent: ctlplane
+        vlan_id: 20
       storage:
-        interface_name: enp6s0.121
-        ip_v4: 172.18.0.11
-        mac_addr: "52:54:00:19:5b:d2"
+        interface_name: eth1.21
+        ip_v4: 172.18.0.101
+        is_trunk_parent: false
+        mac_addr: 52:54:00:7e:b2:1c
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storage
-        parent_interface: enp6s0
+        parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 121
+        trunk_parent: ctlplane
+        vlan_id: 21
       tenant:
-        interface_name: enp6s0.122
-        ip_v4: 172.19.0.11
-        mac_addr: "52:54:00:1b:3e:25"
+        interface_name: eth1.22
+        ip_v4: 172.20.0.101
+        is_trunk_parent: false
+        mac_addr: 52:54:00:12:d1:e1
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: tenant
-        parent_interface: enp6s0
+        parent_interface: eth1
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 122
-  ocp-2:
-    hostname: osasinfra-master-2
-    name: ocp-2
+        trunk_parent: ctlplane
+        vlan_id: 22
+  controller-0:
+    hostname: controller-0
+    name: controller-0
     networks:
       ctlplane:
-        interface_name: enp6s0
-        ip_v4: 192.168.122.12
-        mac_addr: "52:54:00:de:3d:95"
+        interface_name: eth1
+        ip_v4: 192.168.122.9
+        mac_addr: 52:54:08:5f:4e:bb
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
-      internalapi:
-        interface_name: enp6s0.120
-        ip_v4: 172.17.0.12
-        mac_addr: "52:54:00:63:20:1c"
+  ocp-0:
+    hostname: master-0
+    name: ocp-0
+    networks:
+      ctlplane:
+        interface_name: enp7s0
+        ip_v4: 192.168.122.10
+        is_trunk_parent: true
+        mac_addr: 52:54:00:cb:fa:32
         mtu: 1500
         netmask_v4: 255.255.255.0
-        network_name: internalapi
-        parent_interface: enp6s0
+        network_name: ctlplane
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 120
-      octavia:
-        interface_name: enp6s0.124
-        ip_v4: 172.23.0.12
-        mac_addr: "52:54:00:1e:24:16"
+      internalapi:
+        interface_name: enp7s0.20
+        ip_v4: 172.17.0.10
+        is_trunk_parent: false
+        mac_addr: 52:54:00:04:df:87
         mtu: 1500
         netmask_v4: 255.255.255.0
-        network_name: octavia
-        parent_interface: enp6s0
+        network_name: internalapi
+        parent_interface: enp7s0
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 124
+        trunk_parent: ctlplane
+        vlan_id: 20
       storage:
-        interface_name: enp6s0.121
-        ip_v4: 172.18.0.12
-        mac_addr: "52:54:00:23:e0:ff"
+        interface_name: enp7s0.21
+        ip_v4: 172.18.0.10
+        is_trunk_parent: false
+        mac_addr: 52:54:00:7e:b2:1c
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: storage
-        parent_interface: enp6s0
+        parent_interface: enp7s0
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 121
+        trunk_parent: ctlplane
+        vlan_id: 21
       tenant:
-        interface_name: enp6s0.122
-        ip_v4: 172.19.0.12
-        mac_addr: "52:54:00:29:56:10"
+        interface_name: enp7s0.22
+        ip_v4: 172.20.0.10
+        is_trunk_parent: false
+        mac_addr: 52:54:00:12:d1:e1
         mtu: 1500
         netmask_v4: 255.255.255.0
         network_name: tenant
-        parent_interface: enp6s0
+        parent_interface: enp7s0
         prefix_length_v4: 24
         skip_nm: false
-        vlan_id: 122
-  networker-0:
-    hostname: networker-0
-    name: networker-0
-    networks:
-      ctlplane:
-        interface_name: eth1
-        ip_v4: 192.168.122.110
-        mac_addr: "52:54:00:17:15:43"
-        mtu: 1500
-        network_name: ctlplane
-        skip_nm: false
-      internalapi:
-        interface_name: eth1.20
-        ip_v4: 172.17.0.110
-        mac_addr: "52:54:00:05:ea:ef"
-        mtu: 1500
-        network_name: internalapi
-        parent_interface: eth1
-        skip_nm: false
-        vlan_id: 20
-  networker-1:
-    hostname: networker-1
-    name: networker-1
-    networks:
-      ctlplane:
-        interface_name: eth1
-        ip_v4: 192.168.122.111
-        mac_addr: "52:54:00:17:16:43"
-        mtu: 1500
-        network_name: ctlplane
-        skip_nm: false
-      internalapi:
-        interface_name: eth1.20
-        ip_v4: 172.17.0.111
-        mac_addr: "52:54:00:05:eb:ef"
-        mtu: 1500
-        network_name: internalapi
-        parent_interface: eth1
-        skip_nm: false
-        vlan_id: 20
-  networker-2:
-    hostname: networker-1
-    name: networker-1
-    networks:
-      ctlplane:
-        interface_name: eth1
-        ip_v4: 192.168.122.111
-        mac_addr: "52:54:00:17:16:43"
-        mtu: 1500
-        network_name: ctlplane
-        skip_nm: false
-      internalapi:
-        interface_name: eth1.20
-        ip_v4: 172.17.0.111
-        mac_addr: "52:54:00:05:eb:ef"
-        mtu: 1500
-        network_name: internalapi
-        parent_interface: eth1
-        skip_nm: false
-        vlan_id: 20
-  compute-0:
-    hostname: compute-0
-    name: compute-0
-    networks:
-      ctlplane:
-        interface_name: eth1
-        ip_v4: 192.168.122.100
-        mac_addr: "52:54:00:17:05:43"
-        mtu: 1500
-        network_name: ctlplane
-        skip_nm: false
-      internalapi:
-        interface_name: eth1.20
-        ip_v4: 172.17.0.100
-        mac_addr: "52:54:00:05:da:ef"
-        mtu: 1500
-        network_name: internalapi
-        parent_interface: eth1
-        skip_nm: false
-        vlan_id: 20
-      storage:
-        interface_name: eth1.21
-        ip_v4: 172.18.0.100
-        mac_addr: "52:54:00:59:8a:4c"
-        mtu: 1500
-        network_name: storage
-        parent_interface: eth1
-        skip_nm: false
-        vlan_id: 21
-      tenant:
-        interface_name: eth1.22
-        ip_v4: 172.19.0.100
-        mac_addr: "52:54:00:0b:1c:d7"
-        mtu: 1500
-        network_name: tenant
-        parent_interface: eth1
-        skip_nm: false
+        trunk_parent: ctlplane
         vlan_id: 22
-  compute-1:
-    hostname: compute-1
-    name: compute-1
+  ocp-1:
+    hostname: master-1
+    name: ocp-1
     networks:
       ctlplane:
-        interface_name: eth1
-        ip_v4: 192.168.122.101
-        mac_addr: "52:54:00:17:05:44"
+        interface_name: enp7s0
+        ip_v4: 192.168.122.11
+        is_trunk_parent: true
+        mac_addr: 52:54:01:86:d1:0e
         mtu: 1500
+        netmask_v4: 255.255.255.0
         network_name: ctlplane
+        prefix_length_v4: 24
         skip_nm: false
       internalapi:
-        interface_name: eth1.20
-        ip_v4: 172.17.0.101
-        mac_addr: "52:54:00:05:db:00"
+        interface_name: enp7s0.20
+        ip_v4: 172.17.0.11
+        is_trunk_parent: false
+        mac_addr: 52:54:00:04:df:87
         mtu: 1500
+        netmask_v4: 255.255.255.0
         network_name: internalapi
-        parent_interface: eth1
+        parent_interface: enp7s0
+        prefix_length_v4: 24
         skip_nm: false
+        trunk_parent: ctlplane
         vlan_id: 20
       storage:
-        interface_name: eth1.21
-        ip_v4: 172.18.0.101
-        mac_addr: "52:54:00:59:8a:4e"
+        interface_name: enp7s0.21
+        ip_v4: 172.18.0.11
+        is_trunk_parent: false
+        mac_addr: 52:54:00:7e:b2:1c
         mtu: 1500
+        netmask_v4: 255.255.255.0
         network_name: storage
-        parent_interface: eth1
+        parent_interface: enp7s0
+        prefix_length_v4: 24
         skip_nm: false
+        trunk_parent: ctlplane
         vlan_id: 21
       tenant:
-        interface_name: eth1.22
-        ip_v4: 172.19.0.101
-        mac_addr: "52:54:00:0b:1c:d5"
+        interface_name: enp7s0.22
+        ip_v4: 172.20.0.11
+        is_trunk_parent: false
+        mac_addr: 52:54:00:12:d1:e1
         mtu: 1500
+        netmask_v4: 255.255.255.0
         network_name: tenant
-        parent_interface: eth1
+        parent_interface: enp7s0
+        prefix_length_v4: 24
         skip_nm: false
+        trunk_parent: ctlplane
         vlan_id: 22
-  compute-2:
-    hostname: compute-2
-    name: compute-2
+  ocp-2:
+    hostname: master-2
+    name: ocp-2
     networks:
       ctlplane:
-        interface_name: eth1
-        ip_v4: 192.168.122.102
-        mac_addr: "52:54:00:17:05:46"
+        interface_name: enp7s0
+        ip_v4: 192.168.122.12
+        is_trunk_parent: true
+        mac_addr: 52:54:02:18:86:bb
         mtu: 1500
+        netmask_v4: 255.255.255.0
         network_name: ctlplane
+        prefix_length_v4: 24
         skip_nm: false
       internalapi:
-        interface_name: eth1.20
-        ip_v4: 172.17.0.102
-        mac_addr: "52:54:00:05:db:02"
+        interface_name: enp7s0.20
+        ip_v4: 172.17.0.12
+        is_trunk_parent: false
+        mac_addr: 52:54:00:04:df:87
         mtu: 1500
+        netmask_v4: 255.255.255.0
         network_name: internalapi
-        parent_interface: eth1
+        parent_interface: enp7s0
+        prefix_length_v4: 24
         skip_nm: false
+        trunk_parent: ctlplane
         vlan_id: 20
       storage:
-        interface_name: eth1.21
-        ip_v4: 172.18.0.102
-        mac_addr: "52:54:00:59:8a:50"
+        interface_name: enp7s0.21
+        ip_v4: 172.18.0.12
+        is_trunk_parent: false
+        mac_addr: 52:54:00:7e:b2:1c
         mtu: 1500
+        netmask_v4: 255.255.255.0
         network_name: storage
-        parent_interface: eth1
+        parent_interface: enp7s0
+        prefix_length_v4: 24
         skip_nm: false
+        trunk_parent: ctlplane
         vlan_id: 21
       tenant:
-        interface_name: eth1.22
-        ip_v4: 172.19.0.102
-        mac_addr: "52:54:00:0b:1c:d7"
+        interface_name: enp7s0.22
+        ip_v4: 172.20.0.12
+        is_trunk_parent: false
+        mac_addr: 52:54:00:12:d1:e1
         mtu: 1500
+        netmask_v4: 255.255.255.0
         network_name: tenant
-        parent_interface: eth1
+        parent_interface: enp7s0
+        prefix_length_v4: 24
         skip_nm: false
+        trunk_parent: ctlplane
         vlan_id: 22
 networks:
   ctlplane:
@@ -557,25 +471,29 @@ networks:
             length: 21
             start: 192.168.122.100
             start_host: 100
+          - end: 192.168.122.200
+            end_host: 200
+            length: 51
+            start: 192.168.122.150
+            start_host: 150
         ipv6_ranges: []
   external:
-    dns_v4:
-      - 10.46.22.128
+    dns_v4: []
     dns_v6: []
-    gw_v4: 10.46.22.189
     mtu: 1500
     network_name: external
-    network_v4: 10.46.22.128/26
+    network_v4: 192.168.32.0/20
     search_domain: external.example.com
     tools:
       netconfig:
         ipv4_ranges:
-          - end: 10.46.22.143
-            end_host: 15
-            length: 13
-            start: 10.46.22.131
-            start_host: 3
+          - end: 192.168.32.250
+            end_host: 250
+            length: 121
+            start: 192.168.32.130
+            start_host: 130
         ipv6_ranges: []
+    vlan_id: 22
   internalapi:
     dns_v4: []
     dns_v6: []
@@ -608,31 +526,7 @@ networks:
             start: 172.17.0.100
             start_host: 100
         ipv6_ranges: []
-    vlan_id: 120
-  octavia:
-    dns_v4: []
-    dns_v6: []
-    network_name: octavia
-    network_v4: 172.23.0.0/24
-    search_domain: octavia.example.com
-    tools:
-      multus:
-        ipv4_ranges:
-          - end: 172.23.0.70
-            end_host: 70
-            length: 41
-            start: 172.23.0.30
-            start_host: 30
-        ipv6_ranges: []
-      netconfig:
-        ipv4_ranges:
-          - end: 172.23.0.250
-            end_host: 250
-            length: 151
-            start: 172.23.0.100
-            start_host: 100
-        ipv6_ranges: []
-    vlan_id: 124
+    vlan_id: 20
   storage:
     dns_v4: []
     dns_v6: []
@@ -665,55 +559,55 @@ networks:
             start: 172.18.0.100
             start_host: 100
         ipv6_ranges: []
-    vlan_id: 121
+    vlan_id: 21
   storagemgmt:
     dns_v4: []
     dns_v6: []
     mtu: 1500
     network_name: storagemgmt
-    network_v4: 172.20.0.0/24
+    network_v4: 172.19.0.0/24
     search_domain: storagemgmt.example.com
     tools:
       netconfig:
         ipv4_ranges:
-          - end: 172.20.0.250
+          - end: 172.19.0.250
             end_host: 250
             length: 151
-            start: 172.20.0.100
+            start: 172.19.0.100
             start_host: 100
         ipv6_ranges: []
-    vlan_id: 123
+    vlan_id: 23
   tenant:
     dns_v4: []
     dns_v6: []
     mtu: 1500
     network_name: tenant
-    network_v4: 172.19.0.0/24
+    network_v4: 172.20.0.0/24
     search_domain: tenant.example.com
     tools:
       metallb:
         ipv4_ranges:
-          - end: 172.19.0.90
+          - end: 172.20.0.90
             end_host: 90
             length: 11
-            start: 172.19.0.80
+            start: 172.20.0.80
             start_host: 80
         ipv6_ranges: []
       multus:
         ipv4_ranges:
-          - end: 172.19.0.70
+          - end: 172.20.0.70
             end_host: 70
             length: 41
-            start: 172.19.0.30
+            start: 172.20.0.30
             start_host: 30
         ipv6_ranges: []
       netconfig:
         ipv4_ranges:
-          - end: 172.19.0.250
+          - end: 172.20.0.250
             end_host: 250
             length: 151
-            start: 172.19.0.100
+            start: 172.20.0.100
             start_host: 100
         ipv6_ranges: []
-    vlan_id: 122
+    vlan_id: 22
 routers: {}