Merge pull request #29482 from trozet/fix_live_migration_again

openshift-merge-bot[bot] · web-flow · commit f0ac431c4505 · 2025-01-28T02:17:34.000Z
SDN-4930: Fix live migration test detecting dualstack
diff --git a/test/extended/networking/livemigration.go b/test/extended/networking/livemigration.go
@@ -89,7 +89,10 @@ var _ = Describe("[sig-network][OCPFeatureGate:PersistentIPsForVirtualization][F
 						Expect(err).NotTo(HaveOccurred())
 						Expect(len(workerNodes)).To(BeNumerically(">=", 2))
 
-						isDualStack := getIPFamilyForCluster(f) == DualStack
+						isDualStack := false
+						if strings.Contains(netConfig.cidr, ",") {
+							isDualStack = true
+						}
 
 						provisionedNetConfig := createNetworkFn(netConfig)
 
diff --git a/test/extended/networking/network_segmentation.go b/test/extended/networking/network_segmentation.go
@@ -1364,7 +1364,8 @@ func generateIPAMLifecycle(params *networkAttachmentConfigParams) string {
 	if !params.allowPersistentIPs {
 		return ""
 	}
-	return "ipamLifecycle: Persistent"
+	return `ipam:
+      lifecycle: Persistent`
 }
 
 func createManifest(namespace, manifest string) (func(), error) {

Original file line number	Diff line number	Diff line change
`@@ -1364,7 +1364,8 @@ func generateIPAMLifecycle(params *networkAttachmentConfigParams) string {`
`1364`	`1364`	`if !params.allowPersistentIPs {`
`1365`	`1365`	`return ""`
`1366`	`1366`	`}`
`1367`		`- return "ipamLifecycle: Persistent"`
	`1367`	+ return `ipam:
	`1368`	+ lifecycle: Persistent`
`1368`	`1369`	`}`
`1369`	`1370`
`1370`	`1371`	`func createManifest(namespace, manifest string) (func(), error) {`