From 30c49970bdab8a3a202f38a2893fec4d9dd5b982 Mon Sep 17 00:00:00 2001 From: Andrew Bays Date: Thu, 7 Nov 2024 17:08:17 +0000 Subject: [PATCH] Fix OSCtlPlane scale KUTTL test --- README.md | 4 ++-- ...p-director_v1beta1_openstacknetconfig.yaml | 2 +- ...beta1_openstacknetconfig_multi_subnet.yaml | 2 +- .../create_openstacknetconfig-assert.yaml | 19 ++++++++++++++----- ..._openstacknetconfig_single_net-assert.yaml | 3 +++ ...stacknetconfig_single_net_ipv6-assert.yaml | 3 +++ ...controlplane_single_controller-assert.yaml | 2 ++ ...tackcontrolplane_3_controllers-assert.yaml | 6 ++++++ .../02-errors.yaml | 2 +- 9 files changed, 33 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index db1fddf2..fe3d6393 100644 --- a/README.md +++ b/README.md @@ -239,7 +239,7 @@ Create a base RHEL data volume prior to deploying OpenStack. This will be used port: - name: enp6s0 description: Linux bridge with enp6s0 as a port - name: br-ex + name: br-ex-osp state: up type: linux-bridge mtu: 1500 @@ -972,7 +972,7 @@ spec: port: - name: enp6s0 description: Linux bridge with enp6s0 as a port - name: br-ex + name: br-ex-osp state: up type: linux-bridge mtu: 1500 diff --git a/config/samples/osp-director_v1beta1_openstacknetconfig.yaml b/config/samples/osp-director_v1beta1_openstacknetconfig.yaml index b12131de..ef2c2582 100644 --- a/config/samples/osp-director_v1beta1_openstacknetconfig.yaml +++ b/config/samples/osp-director_v1beta1_openstacknetconfig.yaml @@ -70,7 +70,7 @@ spec: port: - name: enp6s0 description: Linux bridge with enp6s0 as a port - name: br-ex + name: br-ex-osp type: linux-bridge state: up ipv4: diff --git a/config/samples/osp-director_v1beta1_openstacknetconfig_multi_subnet.yaml b/config/samples/osp-director_v1beta1_openstacknetconfig_multi_subnet.yaml index 077ced16..c7e29728 100644 --- a/config/samples/osp-director_v1beta1_openstacknetconfig_multi_subnet.yaml +++ b/config/samples/osp-director_v1beta1_openstacknetconfig_multi_subnet.yaml @@ -34,7 +34,7 @@ spec: port: - name: enp6s0 description: Linux bridge with enp6s0 as a port - name: br-ex + name: br-ex-osp state: up type: linux-bridge mtu: 1500 diff --git a/tests/kuttl/common/tests/create_openstacknetconfig-assert.yaml b/tests/kuttl/common/tests/create_openstacknetconfig-assert.yaml index 214b5d2f..833bfee8 100644 --- a/tests/kuttl/common/tests/create_openstacknetconfig-assert.yaml +++ b/tests/kuttl/common/tests/create_openstacknetconfig-assert.yaml @@ -64,7 +64,7 @@ spec: ipv6: enabled: false mtu: 1500 - name: br-ex + name: br-ex-osp state: up type: linux-bridge nodeSelector: @@ -384,7 +384,7 @@ spec: ipv6: enabled: false mtu: 1500 - name: br-ex + name: br-ex-osp state: up type: linux-bridge nodeSelector: @@ -494,6 +494,9 @@ status: - reason: SuccessfullyConfigured status: "False" type: Degraded + - reason: ConfigurationProgressing + status: "False" + type: Progressing --- apiVersion: nmstate.io/v1alpha1 kind: NodeNetworkConfigurationPolicy @@ -501,11 +504,11 @@ metadata: finalizers: - openstacknetattachment labels: - ooo-bridge: br-ex + ooo-bridge: br-ex-osp osp-director.openstack.org/controller: osp-openstacknetattach osp-director.openstack.org/name: br-ex-bridge osp-director.openstack.org/namespace: openstack - name: br-ex + name: br-ex-osp spec: desiredState: interfaces: @@ -521,7 +524,7 @@ spec: ipv6: enabled: false mtu: 1500 - name: br-ex + name: br-ex-osp state: up type: linux-bridge nodeSelector: @@ -535,6 +538,9 @@ status: - reason: SuccessfullyConfigured status: "False" type: Degraded + - reason: ConfigurationProgressing + status: "False" + type: Progressing --- apiVersion: nmstate.io/v1alpha1 kind: NodeNetworkConfigurationPolicy @@ -585,6 +591,9 @@ status: - reason: SuccessfullyConfigured status: "False" type: Degraded + - reason: ConfigurationProgressing + status: "False" + type: Progressing --- apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackNet diff --git a/tests/kuttl/common/tests/create_openstacknetconfig_single_net-assert.yaml b/tests/kuttl/common/tests/create_openstacknetconfig_single_net-assert.yaml index 731dd076..40f1b374 100644 --- a/tests/kuttl/common/tests/create_openstacknetconfig_single_net-assert.yaml +++ b/tests/kuttl/common/tests/create_openstacknetconfig_single_net-assert.yaml @@ -167,6 +167,9 @@ status: - reason: SuccessfullyConfigured status: "False" type: Degraded + - reason: ConfigurationProgressing + status: "False" + type: Progressing --- apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackNet diff --git a/tests/kuttl/common/tests/create_openstacknetconfig_single_net_ipv6-assert.yaml b/tests/kuttl/common/tests/create_openstacknetconfig_single_net_ipv6-assert.yaml index 59a5ecd8..61f12c55 100644 --- a/tests/kuttl/common/tests/create_openstacknetconfig_single_net_ipv6-assert.yaml +++ b/tests/kuttl/common/tests/create_openstacknetconfig_single_net_ipv6-assert.yaml @@ -168,6 +168,9 @@ status: - reason: SuccessfullyConfigured status: "False" type: Degraded + - reason: ConfigurationProgressing + status: "False" + type: Progressing --- apiVersion: osp-director.openstack.org/v1beta1 kind: OpenStackNet diff --git a/tests/kuttl/common/tests/scale_down_openstackcontrolplane_single_controller-assert.yaml b/tests/kuttl/common/tests/scale_down_openstackcontrolplane_single_controller-assert.yaml index 0deaedf2..e1c8bd62 100644 --- a/tests/kuttl/common/tests/scale_down_openstackcontrolplane_single_controller-assert.yaml +++ b/tests/kuttl/common/tests/scale_down_openstackcontrolplane_single_controller-assert.yaml @@ -100,6 +100,8 @@ status: conditions: - status: "True" type: Ready + - status: "True" + type: DataVolumesReady - status: "True" type: LiveMigratable - status: "True" diff --git a/tests/kuttl/common/tests/scale_up_openstackcontrolplane_3_controllers-assert.yaml b/tests/kuttl/common/tests/scale_up_openstackcontrolplane_3_controllers-assert.yaml index 78e054fc..e2bf8b68 100644 --- a/tests/kuttl/common/tests/scale_up_openstackcontrolplane_3_controllers-assert.yaml +++ b/tests/kuttl/common/tests/scale_up_openstackcontrolplane_3_controllers-assert.yaml @@ -119,6 +119,8 @@ status: conditions: - status: "True" type: Ready + - status: "True" + type: DataVolumesReady - status: "True" type: LiveMigratable - status: "True" @@ -135,6 +137,8 @@ status: conditions: - status: "True" type: Ready + - status: "True" + type: DataVolumesReady - status: "True" type: LiveMigratable - status: "True" @@ -151,6 +155,8 @@ status: conditions: - status: "True" type: Ready + - status: "True" + type: DataVolumesReady - status: "True" type: LiveMigratable - status: "True" diff --git a/tests/kuttl/tests/openstacknetconfig_cleanup_nncp/02-errors.yaml b/tests/kuttl/tests/openstacknetconfig_cleanup_nncp/02-errors.yaml index 4b875ba4..bbebb706 100644 --- a/tests/kuttl/tests/openstacknetconfig_cleanup_nncp/02-errors.yaml +++ b/tests/kuttl/tests/openstacknetconfig_cleanup_nncp/02-errors.yaml @@ -46,7 +46,7 @@ metadata: labels: osp-director.openstack.org/controller: osp-openstacknet osp-director.openstack.org/namespace: openstack - name: br-ex + name: br-ex-osp --- apiVersion: nmstate.io/v1alpha1 kind: NodeNetworkConfigurationPolicy