[ISSUE-1096] - Put back code from previous PR and removed invalid tes…

…t case

Signed-off-by: Eddie Pavkovic <[email protected]>

pkg/base/linuxutils/lsblk/lsblk.go

@@ -161,13 +161,7 @@ func (l *LSBLK) GetBlockDevices(device string) ([]BlockDevice, error) {
 // Receives an instance of drivecrd.Drive struct
 // Returns drive's path based on provided drivecrd.Drive or error if something went wrong
 func (l *LSBLK) SearchDrivePath(drive *api.Drive) (string, error) {
-	// device path might be already set by hwmgr
-	device := drive.Path
-	if device != "" {
-		return device, nil
-	}
-
-	device = ""
+	device := ""
 	// try to find it with lsblk
 	lsblkOut, err := l.GetBlockDevices("")
 	if err != nil {

pkg/base/linuxutils/lsblk/lsblk_test.go

@@ -84,14 +84,6 @@ func TestLSBLK_SearchDrivePath_Success(t *testing.T) {
 	e := &mocks.GoMockExecutor{}
 	l := NewLSBLK(testLogger)
 	l.e = e
-	// path is in drive spec
-	dCR := testDriveCR
-	path := "/dev/sda"
-	dCR.Spec.Path = path
-
-	res, err := l.SearchDrivePath(&dCR.Spec)
-	assert.Nil(t, err)
-	assert.Equal(t, path, res)
 
 	// got from lsblk output
 	e.On("RunCmd", allDevicesCmd).Return(mocks.LsblkTwoDevicesStr, "", nil)
@@ -100,7 +92,7 @@ func TestLSBLK_SearchDrivePath_Success(t *testing.T) {
 	d2CR := testDriveCR
 	d2CR.Spec.SerialNumber = sn
 
-	res, err = l.SearchDrivePath(&d2CR.Spec)
+	res, err := l.SearchDrivePath(&d2CR.Spec)
 	assert.Nil(t, err)
 	assert.Equal(t, expectedDevice, res)
 }