Merge pull request #29386 from maiqueb/revert-primary-udn-test-workaround-from-virt-tests

CORENET-5329: revert primary udn test workaround from virt tests

Author: openshift-merge-bot[bot]

test/extended/networking/livemigration.go

@@ -68,7 +68,7 @@ var _ = Describe("[sig-network][OCPFeatureGate:PersistentIPsForVirtualization][F
 			)
 
 			DescribeTableSubtree("created using",
-				func(createNetworkFn func(netConfig networkAttachmentConfigParams) networkAttachmentConfig) {
+				func(createNetworkFn func(netConfig networkAttachmentConfigParams)) {
 
 					DescribeTable("[Suite:openshift/network/virtualization] should keep ip", func(netConfig networkAttachmentConfigParams, vmResource string, opCmd func(cli *kubevirt.Client, vmNamespace, vmName string), wlConfig ...workloadNetworkConfig) {
 						var err error
@@ -108,16 +108,7 @@ var _ = Describe("[sig-network][OCPFeatureGate:PersistentIPsForVirtualization][F
 							isDualStack = true
 						}
 
-						provisionedNetConfig := createNetworkFn(netConfig)
-
-						for _, node := range workerNodes {
-							Eventually(func() bool {
-								isNetProvisioned, err := isNetworkProvisioned(oc, node.Name, provisionedNetConfig.networkName)
-								return err == nil && isNetProvisioned
-							}).WithPolling(time.Second).WithTimeout(udnNetworkReadyTimeout).Should(
-								BeTrueBecause("the network must be ready before creating workloads"),
-							)
-						}
+						createNetworkFn(netConfig)
 
 						httpServerPods := prepareHTTPServerPods(f, netConfig, workerNodes)
 						vmCreationParams := kubevirt.CreationTemplateParams{
@@ -314,25 +305,23 @@ var _ = Describe("[sig-network][OCPFeatureGate:PersistentIPsForVirtualization][F
 						),
 					)
 				},
-				Entry("NetworkAttachmentDefinitions", func(c networkAttachmentConfigParams) networkAttachmentConfig {
+				Entry("NetworkAttachmentDefinitions", func(c networkAttachmentConfigParams) {
 					netConfig := newNetworkAttachmentConfig(c)
 					nad := generateNAD(netConfig)
 					By(fmt.Sprintf("Creating NetworkAttachmentDefinitions %s/%s", nad.Namespace, nad.Name))
 					_, err := nadClient.NetworkAttachmentDefinitions(c.namespace).Create(context.Background(), nad, metav1.CreateOptions{})
 					Expect(err).NotTo(HaveOccurred())
-					return netConfig
 				}),
-				Entry("[OCPFeatureGate:NetworkSegmentation] UserDefinedNetwork", func(c networkAttachmentConfigParams) networkAttachmentConfig {
+				Entry("[OCPFeatureGate:NetworkSegmentation] UserDefinedNetwork", func(c networkAttachmentConfigParams) {
 					udnManifest := generateUserDefinedNetworkManifest(&c)
 					By(fmt.Sprintf("Creating UserDefinedNetwork %s/%s", c.namespace, c.name))
 					Expect(applyManifest(c.namespace, udnManifest)).To(Succeed())
 					Eventually(userDefinedNetworkReadyFunc(oc.AdminDynamicClient(), c.namespace, c.name), udnCrReadyTimeout, time.Second).Should(Succeed())
 
-					nad, err := nadClient.NetworkAttachmentDefinitions(c.namespace).Get(
+					_, err := nadClient.NetworkAttachmentDefinitions(c.namespace).Get(
 						context.Background(), c.name, metav1.GetOptions{},
 					)
 					Expect(err).NotTo(HaveOccurred())
-					return networkAttachmentConfig{networkAttachmentConfigParams{networkName: networkName(nad.Spec.Config)}}
 				}))
 		})
 	})
@@ -686,43 +675,6 @@ func checkEastWestTraffic(virtClient *kubevirt.Client, vmiName string, podIPsByN
 	}
 }
 
-func isNetworkProvisioned(oc *exutil.CLI, nodeName string, networkName string) (bool, error) {
-	ovnkubePodInfo, err := ovnkubePod(oc, nodeName)
-	if err != nil {
-		return false, err
-	}
-
-	lsName := logicalSwitchName(networkName)
-	out, err := adminExecInPod(
-		oc,
-		"openshift-ovn-kubernetes",
-		ovnkubePodInfo.podName,
-		ovnkubePodInfo.containerName,
-		fmt.Sprintf("ovn-nbctl list logical-switch %s", lsName),
-	)
-	if err != nil {
-		return false, fmt.Errorf("failed to find a logical switch for network %q: %w", networkName, err)
-	}
-
-	return strings.Contains(out, lsName), nil
-}
-
-func logicalSwitchName(networkName string) string {
-	netName := strings.ReplaceAll(networkName, "-", ".")
-	netName = strings.ReplaceAll(netName, "/", ".")
-	return fmt.Sprintf("%s_ovn_layer2_switch", netName)
-}
-
-func networkName(netSpecConfig string) string {
-	GinkgoHelper()
-	type netConfig struct {
-		Name string `json:"name,omitempty"`
-	}
-	var nc netConfig
-	Expect(json.Unmarshal([]byte(netSpecConfig), &nc)).To(Succeed())
-	return nc.Name
-}
-
 // formatAddressesAnnotation converts slice of IPs to the required JSON format for kubevirt addresses annotation
 func formatAddressesAnnotation(preconfiguredIPs []string) (string, error) {
 	const primaryUDNNetworkName = "overlay"