Update tests to use new default storage mapping

Signed-off-by: Sam Lucidi <slucidi@redhat.com>
kubev2v · Dec 12, 2024 · e6fcebf · e6fcebf
1 parent 6d857b1
commit e6fcebf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/tests/suit/framework/ova.go b/tests/suit/framework/ova.go
@@ -19,7 +19,7 @@ func (r *OvaClient) LoadSourceDetails() (vm *OvaVM, err error) {
 
 	r.vmData.testVMId = "c5686650854d1e69b4123f4bf2e70fe1ed2a"
 	r.vmData.testNetworkID = "ae1badc8c693926f492a01e2f357d6af321b"
-	r.vmData.testStorageName = "Dummy storage for source provider ova-provider"
+	r.vmData.testStorageID = "default"
 	return &r.vmData, nil
 }
 
@@ -39,7 +39,7 @@ func (r *OvaClient) GetNfsServerForOva(k8sClient *kubernetes.Clientset) (string,
 	}
 	nfsShare := server + ":" + share
 	if nfsShare == "" {
-		return "", errors.New("failed to fatch NFS settings")
+		return "", errors.New("failed to fetch NFS settings")
 	}
 
 	r.nfsPath = nfsShare
@@ -52,8 +52,8 @@ func (r *OvaVM) GetNetworkId() string {
 }
 
 // GetVolumeId - return storage domain IDs
-func (r *OvaVM) GetStorageName() string {
-	return r.testStorageName
+func (r *OvaVM) GetStorageID() string {
+	return r.testStorageID
 }
 
 // GetTestVMId - return the test VM ID
@@ -69,7 +69,7 @@ type OvaClient struct {
 }
 
 type OvaVM struct {
-	testVMId        string
-	testNetworkID   string
-	testStorageName string
+	testVMId      string
+	testNetworkID string
+	testStorageID string
 }
diff --git a/tests/suit/ova_test.go b/tests/suit/ova_test.go
@@ -60,7 +60,7 @@ var _ = Describe("[level:component]Migration tests for OVA provider", func() {
 		err = utils.WaitForNetworkMapReadyWithTimeout(f.CrClient, namespace, networkMapName, 30*time.Second)
 		Expect(err).ToNot(HaveOccurred())
 		By("Create Storage Map")
-		storageMapDef := utils.NewStorageMap(namespace, *provider, test_storage_map_name, []string{vmData.GetStorageName()}, ovaStorageClass)
+		storageMapDef := utils.NewStorageMap(namespace, *provider, test_storage_map_name, []string{vmData.GetStorageID()}, ovaStorageClass)
 		err = utils.CreateStorageMapFromDefinition(f.CrClient, storageMapDef)
 		Expect(err).ToNot(HaveOccurred())
 		err = utils.WaitForStorageMapReadyWithTimeout(f.CrClient, namespace, test_storage_map_name, 10*time.Second)

diff --git a/tests/suit/utils/storagemap.go b/tests/suit/utils/storagemap.go
@@ -34,15 +34,8 @@ func NewStorageMap(namespace string, providerIdentifier forkliftv1.Provider, sto
 			Destination: forkliftv1.DestinationStorage{
 				StorageClass: storageClass,
 			},
+			Source: ref.Ref{ID: sd},
 		}
-
-		switch providerIdentifier.Type() {
-		case forkliftv1.Ova:
-			pair.Source = ref.Ref{Name: sd}
-		default:
-			pair.Source = ref.Ref{ID: sd}
-		}
-
 		sdPairs = append(sdPairs, pair)
 	}