rebasing

Signed-off-by: Valentin Daviot <valentin.daviot@scality.com>

Author: vdaviot

internal/controller/discovery_ticker_test.go

@@ -46,7 +46,14 @@ var _ = Describe("DiscoveryTicker", func() {
 				NodeName:  "test-node",
 				Interval:  100 * time.Millisecond,
 				EventChan: eventChan,
-				UseCase:   usecase.NewDiscoverPhysicalDrives(logr.Discard(), nil, nil, &noopCacheWriter{}, "test-node"),
+				UseCase: usecase.NewDiscoverPhysicalDrives(
+					logr.Discard(),
+					[]service.PhysicalDriveDiscoverer{},
+					[]service.LogicalVolumeDiscoverer{},
+					nil,
+					&noopCacheWriter{},
+					"test-node",
+				),
 			}
 
 			done := make(chan error, 1)
@@ -70,7 +77,14 @@ var _ = Describe("DiscoveryTicker", func() {
 				NodeName:  "test-node",
 				Interval:  50 * time.Millisecond,
 				EventChan: eventChan,
-				UseCase:   usecase.NewDiscoverPhysicalDrives(logr.Discard(), nil, nil, &noopCacheWriter{}, "test-node"),
+				UseCase: usecase.NewDiscoverPhysicalDrives(
+					logr.Discard(),
+					[]service.PhysicalDriveDiscoverer{},
+					[]service.LogicalVolumeDiscoverer{},
+					nil,
+					&noopCacheWriter{},
+					"test-node",
+				),
 			}
 
 			tickCount := 0
@@ -110,7 +124,14 @@ var _ = Describe("DiscoveryTicker", func() {
 				NodeName:  "test-node",
 				Interval:  time.Hour, // Long interval; should not matter.
 				EventChan: eventChan,
-				UseCase:   usecase.NewDiscoverPhysicalDrives(logr.Discard(), nil, nil, &noopCacheWriter{}, "test-node"),
+				UseCase: usecase.NewDiscoverPhysicalDrives(
+					logr.Discard(),
+					[]service.PhysicalDriveDiscoverer{},
+					[]service.LogicalVolumeDiscoverer{},
+					nil,
+					&noopCacheWriter{},
+					"test-node",
+				),
 			}
 
 			done := make(chan error, 1)

pkg/usecase/discover_physical_drives.go

@@ -34,11 +34,12 @@ import (
 // It also populates the drive cache so that the reconciler can read the
 // latest discovered state.
 type DiscoverPhysicalDrives struct {
-	logger      logr.Logger
-	discoverers []service.PhysicalDriveDiscoverer
-	store       service.DiscoveredPhysicalDiskStore
-	cacheWriter service.DiscoveredDriveCacheWriter
-	nodeName    string
+	logger        logr.Logger
+	pdDiscoverers []service.PhysicalDriveDiscoverer
+	lvDiscoverers []service.LogicalVolumeDiscoverer
+	store         service.DiscoveredPhysicalDiskStore
+	cacheWriter   service.DiscoveredDriveCacheWriter
+	nodeName      string
 }
 
 // NewDiscoverPhysicalDrives creates a new DiscoverPhysicalDrives use case.
@@ -51,11 +52,12 @@ func NewDiscoverPhysicalDrives(
 	nodeName string,
 ) *DiscoverPhysicalDrives {
 	return &DiscoverPhysicalDrives{
-		logger:      logger.WithName("discover-physical-drives"),
-		discoverers: discoverers,
-		store:       store,
-		cacheWriter: cacheWriter,
-		nodeName:    nodeName,
+		logger:        logger.WithName("discover-physical-drives"),
+		pdDiscoverers: pdDiscoverers,
+		lvDiscoverers: lvDiscoverers,
+		store:         store,
+		cacheWriter:   cacheWriter,
+		nodeName:      nodeName,
 	}
 }
 

pkg/usecase/discover_physical_drives_test.go

@@ -132,7 +132,7 @@ func newTestSSD(ctrlType string, ctrlID int, slotID string) *domain.DiscoveredPh
 func TestExecute_NoDiscoverers(t *testing.T) {
 	store := &mockStore{}
 	cacheWriter := &mockCacheWriter{}
-	uc := NewDiscoverPhysicalDrives(logr.Discard(), nil, store, cacheWriter, "node-1")
+	uc := NewDiscoverPhysicalDrives(logr.Discard(), nil, nil, store, cacheWriter, "node-1")
 
 	existing, err := uc.Execute(context.Background())
 
@@ -156,7 +156,7 @@ func TestExecute_SSDDrivesOnly(t *testing.T) {
 	uc := NewDiscoverPhysicalDrives(
 		logr.Discard(),
 		[]service.PhysicalDriveDiscoverer{discoverer},
-		nil,
+		[]service.LogicalVolumeDiscoverer{},
 		store,
 		cache,
 		"node-1",
@@ -184,7 +184,7 @@ func TestExecute_MixOfHDDAndSSD(t *testing.T) {
 	uc := NewDiscoverPhysicalDrives(
 		logr.Discard(),
 		[]service.PhysicalDriveDiscoverer{discoverer},
-		nil,
+		[]service.LogicalVolumeDiscoverer{},
 		store,
 		cache,
 		"node-1",