unit tests: Use libdv

Instead reimplmentation of DataVolume defining, we can use libdv. Add WithName decorator, as we need a predefined name. Also drop the functions and just inline it, because it is used just once. Signed-off-by: Or Shoval <oshoval@redhat.com>
pkenchap · Jan 25, 2024 · 9469e76 · 9469e76
1 parent 61d4a97
commit 9469e76
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/pkg/virtctl/vm/BUILD.bazel b/pkg/virtctl/vm/BUILD.bazel
@@ -53,6 +53,7 @@ go_test(
         "//staging/src/kubevirt.io/client-go/kubecli:go_default_library",
         "//staging/src/kubevirt.io/client-go/testutils:go_default_library",
         "//tests/clientcmd:go_default_library",
+        "//tests/libdv:go_default_library",
         "//vendor/github.com/golang/mock/gomock:go_default_library",
         "//vendor/github.com/onsi/ginkgo/v2:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
@@ -61,6 +62,5 @@ go_test(
         "//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
         "//vendor/k8s.io/utils/pointer:go_default_library",
-        "//vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1:go_default_library",
     ],
 )
diff --git a/pkg/virtctl/vm/add_volume_test.go b/pkg/virtctl/vm/add_volume_test.go
@@ -34,9 +34,9 @@ import (
 	v1 "kubevirt.io/api/core/v1"
 	cdifake "kubevirt.io/client-go/generated/containerized-data-importer/clientset/versioned/fake"
 	"kubevirt.io/client-go/kubecli"
-	"kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
 
 	"kubevirt.io/kubevirt/tests/clientcmd"
+	"kubevirt.io/kubevirt/tests/libdv"
 )
 
 var _ = Describe("Add volume command", func() {
@@ -133,10 +133,16 @@ var _ = Describe("Add volume command", func() {
 		if commandName == "addvolume" {
 			kubecli.MockKubevirtClientInstance.EXPECT().CdiClient().Return(cdiClient)
 			if useDv {
-				cdiClient.CdiV1beta1().DataVolumes(k8smetav1.NamespaceDefault).Create(context.Background(), createTestDataVolume(), k8smetav1.CreateOptions{})
+				cdiClient.CdiV1beta1().DataVolumes(k8smetav1.NamespaceDefault).Create(
+					context.Background(),
+					libdv.NewDataVolume(libdv.WithName("testvolume")),
+					k8smetav1.CreateOptions{})
 			} else {
 				kubecli.MockKubevirtClientInstance.EXPECT().CoreV1().Return(coreClient.CoreV1())
-				coreClient.CoreV1().PersistentVolumeClaims(k8smetav1.NamespaceDefault).Create(context.Background(), createTestPVC(), k8smetav1.CreateOptions{})
+				coreClient.CoreV1().PersistentVolumeClaims(k8smetav1.NamespaceDefault).Create(
+					context.Background(),
+					createTestPVC(),
+					k8smetav1.CreateOptions{})
 			}
 		}
 		expectFunc(vmiName, volumeName, useDv)
@@ -162,14 +168,6 @@ var _ = Describe("Add volume command", func() {
 	)
 })
 
-func createTestDataVolume() *v1beta1.DataVolume {
-	return &v1beta1.DataVolume{
-		ObjectMeta: k8smetav1.ObjectMeta{
-			Name: "testvolume",
-		},
-	}
-}
-
 func createTestPVC() *k8sv1.PersistentVolumeClaim {
 	return &k8sv1.PersistentVolumeClaim{
 		ObjectMeta: k8smetav1.ObjectMeta{

diff --git a/tests/libdv/dv.go b/tests/libdv/dv.go
@@ -62,6 +62,12 @@ func WithNamespace(namespace string) dvOption {
 	}
 }
 
+func WithName(name string) dvOption {
+	return func(dv *v1beta1.DataVolume) {
+		dv.ObjectMeta.Name = name
+	}
+}
+
 type pvcOption func(*corev1.PersistentVolumeClaimSpec)
 
 // WithPVC is a dvOption to add a PVCOption spec to the DataVolume