Unit tests

Author: kolluria

pkg/common/unittestcommon/types.go

@@ -24,6 +24,7 @@ import (
 	cnstypes "github.com/vmware/govmomi/cns/types"
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/types"
+	v1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/vsphere-csi-driver/v3/pkg/apis/migration"
 	cnsvolume "sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/cns-lib/volume"
 	"sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/cns-lib/vsphere"
@@ -47,6 +48,10 @@ type FakeK8SOrchestrator struct {
 	featureStates     map[string]string
 	// CSINodeTopology instances for topology testing
 	csiNodeTopologyInstances []interface{}
+	// PVCs for testing
+	pvcs []*v1.PersistentVolumeClaim
+	// RWMutex to synchronize access to 'pvcs' field from multiple callers
+	pvcsLock *sync.RWMutex
 }
 
 // volumeMigration holds mocked migrated volume information

pkg/common/unittestcommon/utils.go

@@ -544,8 +544,35 @@ func (c *FakeK8SOrchestrator) SetCSINodeTopologyInstances(instances []interface{
 }
 
 func (c *FakeK8SOrchestrator) ListPVCs(ctx context.Context, namespace string) []*v1.PersistentVolumeClaim {
-	//TODO implement me
-	panic("implement me")
+	if c.pvcsLock == nil {
+		c.pvcsLock = &sync.RWMutex{}
+	}
+	c.pvcsLock.RLock()
+	defer c.pvcsLock.RUnlock()
+
+	if namespace == "" {
+		// Return all PVCs
+		return c.pvcs
+	}
+
+	// Filter by namespace
+	var filteredPVCs []*v1.PersistentVolumeClaim
+	for _, pvc := range c.pvcs {
+		if pvc.Namespace == namespace {
+			filteredPVCs = append(filteredPVCs, pvc)
+		}
+	}
+	return filteredPVCs
+}
+
+// SetPVCs sets the PVCs for testing
+func (c *FakeK8SOrchestrator) SetPVCs(pvcs []*v1.PersistentVolumeClaim) {
+	if c.pvcsLock == nil {
+		c.pvcsLock = &sync.RWMutex{}
+	}
+	c.pvcsLock.Lock()
+	defer c.pvcsLock.Unlock()
+	c.pvcs = pvcs
 }
 
 // configFromVCSim starts a vcsim instance and returns config for use against the

pkg/syncer/cnsoperator/manager/cleanupcustomresources.go

@@ -115,6 +115,13 @@ func cleanUpCnsUnregisterVolumeInstances(ctx context.Context, restClientConfig *
 	}
 }
 
+var (
+	newClientForGroup = k8s.NewClientForGroup
+	newForConfig      = func(config *rest.Config) (kubernetes.Interface, error) {
+		return kubernetes.NewForConfig(config)
+	}
+)
+
 // cleanupPVCs removes the `CNSPvcFinalizer` from the PVCs in cases
 // where the CnsNodeVmBatchAttachment CR gets deleted before removing the finalizer.
 // This is EXTREMELY UNLIKELY to happen but still a possibility that has to be addressed.
@@ -142,7 +149,7 @@ func cleanupPVCs(ctx context.Context, config rest.Config) {
 		pvcMap[pvc.Namespace][pvc.Name] = struct{}{}
 	}
 
-	cnsClient, err := k8s.NewClientForGroup(ctx, &config, cnsoperatorv1alpha1.GroupName)
+	cnsClient, err := newClientForGroup(ctx, &config, cnsoperatorv1alpha1.GroupName)
 	if err != nil {
 		log.Error("failed to create cns operator client")
 		return
@@ -162,7 +169,7 @@ func cleanupPVCs(ctx context.Context, config rest.Config) {
 		}
 	}
 
-	c, err := kubernetes.NewForConfig(&config)
+	c, err := newForConfig(&config)
 	if err != nil {
 		log.Error("failed to create core API client")
 		return