Fix envTest topologyRef race condition

Before this patch, the "updates topology" envTest was a single block of
instructions, but we actually need to check each of them provided that
the reconcile loop moves forward and certain conditions are satisfied.
This patch attempts to split the Eventually block so that:

- Each assertion gets its own retry logic (based on timeout, interval)
- Prevents early assertion failures from masking later issues

This approach has been applied already to other operators (e.g. Nova)
where there are many controllers trying to apply/remove finalizers to
the same resource.

Signed-off-by: Francesco Pantano <[email protected]>

Author: fmount

test/functional/neutronapi_controller_test.go

@@ -1633,25 +1633,50 @@ func getNeutronAPIControllerSuite(ml2MechanismDrivers []string) func() {
 				Eventually(func(g Gomega) {
 					th.SimulateJobSuccess(neutronDBSyncJobName)
 
+					neutron := GetNeutronAPI(neutronAPIName)
+					g.Expect(neutron.Status.LastAppliedTopology).ToNot(BeNil())
+					g.Expect(neutron.Status.LastAppliedTopology).To(Equal(topologyRefAlt))
+
+					// Simulate deployment being ready with empty network attachments (since this test doesn't use them)
+					th.SimulateDeploymentReadyWithPods(neutronDeploymentName, map[string][]string{})
+
+					// Wait for neutron to be fully ready before checking topology finalizers
+					th.ExpectCondition(
+						neutronAPIName,
+						ConditionGetterFunc(NeutronAPIConditionGetter),
+						condition.ReadyCondition,
+						corev1.ConditionTrue,
+					)
+				}, timeout, interval).Should(Succeed())
+
+				Eventually(func(g Gomega) {
+
+					th.ExpectCondition(
+						neutronAPIName,
+						ConditionGetterFunc(NeutronAPIConditionGetter),
+						condition.TopologyReadyCondition,
+						corev1.ConditionTrue,
+					)
+
 					tp := infra.GetTopology(types.NamespacedName{
 						Name:      topologyRefAlt.Name,
 						Namespace: topologyRefAlt.Namespace,
 					})
 					finalizers := tp.GetFinalizers()
 					g.Expect(finalizers).To(HaveLen(1))
-					neutron := GetNeutronAPI(neutronAPIName)
-					g.Expect(neutron.Status.LastAppliedTopology).ToNot(BeNil())
-					g.Expect(neutron.Status.LastAppliedTopology).To(Equal(topologyRefAlt))
 					g.Expect(finalizers).To(ContainElement(
 						fmt.Sprintf("openstack.org/neutronapi-%s", neutronAPIName.Name)))
+				}, timeout, interval).Should(Succeed())
+
+				Eventually(func(g Gomega) {
 					// Verify the previous referenced topology has no finalizers
-					tp = infra.GetTopology(types.NamespacedName{
+					prevTopology := infra.GetTopology(types.NamespacedName{
 						Name:      topologyRef.Name,
 						Namespace: topologyRef.Namespace,
 					})
-					finalizers = tp.GetFinalizers()
+					finalizers := prevTopology.GetFinalizers()
 					g.Expect(finalizers).To(BeEmpty())
-				}, timeout, interval).Should(Succeed())
+				}, 20*timeout, interval).Should(Succeed())
 			})
 
 			It("removes topologyRef from the spec", func() {