Merge pull request #29436 from ormergi/ovn-k-udn-wait-for-cond

OCPBUGS-48569,SDN-4930: e2e,ovn-k,net-seg: Wait for UDN condition populate

Author: openshift-merge-bot[bot]

test/extended/networking/network_segmentation.go

@@ -730,16 +730,27 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
 			DeferCleanup(cleanup)
 			Expect(err).NotTo(HaveOccurred())
 
-			conditionsJSON, err := e2ekubectl.RunKubectl(f.Namespace.Name, "get", "userdefinednetwork", primaryUdnName, "-o", "jsonpath={.status.conditions}")
-			Expect(err).NotTo(HaveOccurred())
-			var actualConditions []metav1.Condition
-			Expect(json.Unmarshal([]byte(conditionsJSON), &actualConditions)).To(Succeed())
-
-			Expect(actualConditions[0].Type).To(SatisfyAny(Equal("NetworkReady"), Equal("NetworkCreated")))
-			Expect(actualConditions[0].Status).To(Equal(metav1.ConditionFalse))
-			Expect(actualConditions[0].Reason).To(Equal("SyncError"))
 			expectedMessage := fmt.Sprintf("primary network already exist in namespace %q: %q", f.Namespace.Name, primaryNadName)
-			Expect(actualConditions[0].Message).To(Equal(expectedMessage))
+			Eventually(func(g Gomega) []metav1.Condition {
+				conditionsJSON, err := e2ekubectl.RunKubectl(f.Namespace.Name, "get", "userdefinednetwork", primaryUdnName, "-o", "jsonpath={.status.conditions}")
+				g.Expect(err).NotTo(HaveOccurred())
+				var actualConditions []metav1.Condition
+				g.Expect(json.Unmarshal([]byte(conditionsJSON), &actualConditions)).To(Succeed())
+				return normalizeConditions(actualConditions)
+			}, 5*time.Second, 1*time.Second).Should(SatisfyAny(
+				ConsistOf(metav1.Condition{
+					Type:    "NetworkCreated",
+					Status:  metav1.ConditionFalse,
+					Reason:  "SyncError",
+					Message: expectedMessage,
+				}),
+				ConsistOf(metav1.Condition{
+					Type:    "NetworkReady",
+					Status:  metav1.ConditionFalse,
+					Reason:  "SyncError",
+					Message: expectedMessage,
+				}),
+			))
 		})
 
 		Context("ClusterUserDefinedNetwork CRD Controller", func() {