[issue-1198] removing fakeattach check for online drive

dell · Jul 10, 2024 · c2a229b · c2a229b
1 parent f0bbf0e
commit c2a229b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 28 deletions.
diff --git a/pkg/crcontrollers/drive/drivecontroller.go b/pkg/crcontrollers/drive/drivecontroller.go
@@ -292,7 +292,7 @@ func (c *Controller) handleDriveStatus(ctx context.Context, drive *drivecrd.Driv
 	case apiV1.DriveStatusOnline:
 		// move MISSING volumes to OPERATIVE status
 		for _, volume := range volumes {
-			if volume.Spec.OperationalStatus == apiV1.OperationalStatusMissing && !c.isFakeAttach(volume) {
+			if volume.Spec.OperationalStatus == apiV1.OperationalStatusMissing {
 				if err := c.crHelper.UpdateVolumeOpStatus(ctx, volume, apiV1.OperationalStatusOperative); err != nil {
 					return err
 				}

diff --git a/pkg/crcontrollers/drive/drivecontroller_test.go b/pkg/crcontrollers/drive/drivecontroller_test.go
@@ -752,33 +752,6 @@ func TestDriveController_handleDriveStatus(t *testing.T) {
 		assert.NotNil(t, resultVolume[0].Spec)
 		assert.Equal(t, resultVolume[0].Spec.OperationalStatus, apiV1.OperationalStatusOperative)
 
-		assert.Nil(t, dc.client.DeleteCR(testCtx, expectedD))
-		assert.Nil(t, dc.client.DeleteCR(testCtx, expectedV))
-	})
-	t.Run("Missing volume status for fake attach", func(t *testing.T) {
-		expectedD := testBadCRDrive.DeepCopy()
-		assert.NotNil(t, expectedD)
-		assert.Nil(t, dc.client.CreateCR(testCtx, expectedD.Name, expectedD))
-
-		expectedV := failedVolCR.DeepCopy()
-		expectedV.Annotations = map[string]string{fakeAttachVolumeAnnotation: fakeAttachVolumeKey}
-		assert.NotNil(t, expectedV)
-		expectedV.Spec.OperationalStatus = apiV1.OperationalStatusMissing
-		assert.Nil(t, dc.client.CreateCR(testCtx, expectedV.Name, expectedV))
-
-		err := dc.handleDriveStatus(testCtx, expectedD)
-		assert.Nil(t, err)
-		assert.Equal(t, expectedD.Spec.UUID, driveUUID)
-		assert.Equal(t, expectedD.Spec.Status, apiV1.DriveStatusOnline)
-		assert.Equal(t, expectedD.Spec.Health, apiV1.HealthBad)
-		assert.Empty(t, expectedD.Spec.Usage)
-
-		resultVolume, err := dc.crHelper.GetVolumesByLocation(testCtx, driveUUID)
-		assert.Nil(t, err)
-		assert.NotNil(t, resultVolume)
-		assert.NotNil(t, resultVolume[0].Spec)
-		assert.Equal(t, resultVolume[0].Spec.OperationalStatus, apiV1.OperationalStatusMissing)
-
 		assert.Nil(t, dc.client.DeleteCR(testCtx, expectedD))
 		assert.Nil(t, dc.client.DeleteCR(testCtx, expectedV))
 	})