vmservice - remove IP check if private network (#3610)

Author: kavyashree-r

tests/e2e/vmservice_vm.go

@@ -210,6 +210,7 @@ var _ bool = ginkgo.Describe("[vmsvc] vm service with csi vol tests", func() {
 
 		var pandoraSyncWaitTime int
 		var err error
+		var vmIp string
 		curtime := time.Now().Unix()
 		curtimestring := strconv.FormatInt(curtime, 10)
 		pvcName := "cns-pvc-" + curtimestring
@@ -303,26 +304,26 @@ var _ bool = ginkgo.Describe("[vmsvc] vm service with csi vol tests", func() {
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}()
 
-		ginkgo.By("Wait for VM to come up and get an IP")
-		vmIp, err := waitNgetVmsvcVmIp(ctx, vmopC, namespace, vm.Name)
-		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
+		if !isPrivateNetwork {
+			ginkgo.By("Wait for VM to come up and get an IP")
+			vmIp, err = waitNgetVmsvcVmIp(ctx, vmopC, namespace, vm.Name)
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
-		ginkgo.By("Wait and verify PVCs are attached to the VM")
-		gomega.Expect(waitNverifyPvcsAreAttachedToVmsvcVm(ctx, vmopC, cnsopC, vm,
-			[]*v1.PersistentVolumeClaim{pvc, staticPvc})).NotTo(gomega.HaveOccurred())
+			ginkgo.By("Wait and verify PVCs are attached to the VM")
+			gomega.Expect(waitNverifyPvcsAreAttachedToVmsvcVm(ctx, vmopC, cnsopC, vm,
+				[]*v1.PersistentVolumeClaim{pvc, staticPvc})).NotTo(gomega.HaveOccurred())
 
-		if latebinding {
-			ginkgo.By("Validating that the PVC transitions to Bound state after the " +
-				"volume is attached to the VM using a late-binding storage policy")
-			pvs, err := fpv.WaitForPVClaimBoundPhase(ctx, client, []*v1.PersistentVolumeClaim{pvc, staticPvc}, pollTimeout)
-			gomega.Expect(err).NotTo(gomega.HaveOccurred())
-			pv := pvs[0]
-			volHandle = pv.Spec.CSI.VolumeHandle
-			gomega.Expect(volHandle).NotTo(gomega.BeEmpty())
-		}
+			if latebinding {
+				ginkgo.By("Validating that the PVC transitions to Bound state after the " +
+					"volume is attached to the VM using a late-binding storage policy")
+				pvs, err := fpv.WaitForPVClaimBoundPhase(ctx, client, []*v1.PersistentVolumeClaim{pvc, staticPvc}, pollTimeout)
+				gomega.Expect(err).NotTo(gomega.HaveOccurred())
+				pv := pvs[0]
+				volHandle = pv.Spec.CSI.VolumeHandle
+				gomega.Expect(volHandle).NotTo(gomega.BeEmpty())
+			}
 
-		isPrivateNetwork := GetBoolEnvVarOrDefault("IS_PRIVATE_NETWORK", false)
-		if !isPrivateNetwork {
 			ginkgo.By("Verify PVCs are accessible to the VM")
 			ginkgo.By("Write some IO to the CSI volumes and read it back from them and verify the data integrity")
 			vm, err = getVmsvcVM(ctx, vmopC, vm.Namespace, vm.Name) // refresh vm info