Handling NotFoundError in LunExists

Author: aparna0508

storage_drivers/ontap/api/abstraction_rest.go

@@ -2346,6 +2346,11 @@ func (d OntapAPIREST) LunExists(ctx context.Context, name string) (bool, error)
 
 	lunResponse, err := d.api.LunGetByName(ctx, name, make([]string, 0))
 	if err != nil {
+		if errors.IsNotFoundError(err) {
+			Logc(ctx).WithField("LUN", name).Debug("LUN does not exist.")
+			return false, nil
+		}
+
 		return false, err
 	}
 

storage_drivers/ontap/api/abstraction_rest_test.go

@@ -3846,6 +3846,49 @@ func TestLunGetByName(t *testing.T) {
 	assert.Error(t, err, "no error returned while getting a LUN by name")
 }
 
+func TestOntapAPIREST_LunExists(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	mockAPI := mockapi.NewMockRestClientInterface(ctrl)
+	oapi, err := api.NewOntapAPIRESTFromRestClientInterface(mockAPI)
+	assert.NoError(t, err)
+
+	ctx := context.Background()
+	lunPath := "/vol/vol1/lun0"
+
+	// Mock ClientConfig to avoid unexpected call
+	clientConfig := api.ClientConfig{
+		DebugTraceFlags: map[string]bool{"method": true},
+	}
+	mockAPI.EXPECT().ClientConfig().Return(clientConfig).AnyTimes()
+
+	// Case 1: LUN exists
+	mockAPI.EXPECT().LunGetByName(ctx, lunPath, gomock.Any()).Return(&models.Lun{}, nil).Times(1)
+	exists, err := oapi.LunExists(ctx, lunPath)
+	assert.NoError(t, err, "expected no error when LUN exists")
+	assert.True(t, exists, "expected LUN to exist")
+
+	// Case 2: LUN does not exist
+	mockAPI.EXPECT().LunGetByName(ctx, lunPath, gomock.Any()).Return(nil, nil).Times(1)
+	exists, err = oapi.LunExists(ctx, lunPath)
+	assert.NoError(t, err, "expected no error when LUN does not exist")
+	assert.False(t, exists, "expected LUN to not exist")
+
+	// Case 3: NotFoundError from REST client
+	mockAPI.EXPECT().LunGetByName(ctx, lunPath, gomock.Any()).Return(
+		nil, errors.NotFoundError("LUN not found")).Times(1)
+	exists, err = oapi.LunExists(ctx, lunPath)
+	assert.NoError(t, err, "expected no error when NotFoundError is returned")
+	assert.False(t, exists, "expected LUN to not exist")
+
+	// Case 4: Unexpected error
+	mockAPI.EXPECT().LunGetByName(ctx, lunPath, gomock.Any()).Return(nil, fmt.Errorf("unexpected error")).Times(1)
+	exists, err = oapi.LunExists(ctx, lunPath)
+	assert.Error(t, err, "expected error when unexpected error is returned")
+	assert.False(t, exists, "expected LUN to not exist")
+}
+
 func TestLunRename(t *testing.T) {
 	oapi, rsi := newMockOntapAPIREST(t)
 

storage_drivers/ontap/api/abstraction_zapi.go

@@ -627,6 +627,11 @@ func (d OntapAPIZAPI) LunExists(ctx context.Context, name string) (bool, error)
 
 	lunResponse, err := d.api.LunGet(name)
 	if err != nil {
+		if errors.IsNotFoundError(err) {
+			Logc(ctx).WithField("LUN", name).Debug("LUN does not exist.")
+			return false, nil
+		}
+
 		return false, err
 	}
 

storage_drivers/ontap/api/abstraction_zapi_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/netapp/trident/pkg/convert"
 	"github.com/netapp/trident/storage_drivers/ontap/api"
 	"github.com/netapp/trident/storage_drivers/ontap/api/azgo"
+	"github.com/netapp/trident/utils/errors"
 )
 
 func TestOntapAPIZAPI_LunGetFSType(t *testing.T) {
@@ -292,6 +293,47 @@ func TestExportRuleList_Zapi_NilPayload(t *testing.T) {
 	assert.Empty(t, rules)
 }
 
+func TestOntapAPIZAPI_LunExists(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	mock := mockapi.NewMockZapiClientInterface(ctrl)
+	oapi, err := api.NewOntapAPIZAPIFromZapiClientInterface(mock)
+	assert.NoError(t, err)
+
+	tempLunPath := "/vol/vol1/lun0"
+
+	// Mock ClientConfig to avoid unexpected call
+	clientConfig := api.ClientConfig{
+		DebugTraceFlags: map[string]bool{"method": true},
+	}
+	mock.EXPECT().ClientConfig().Return(clientConfig).AnyTimes()
+
+	// Case 1: LUN exists
+	mock.EXPECT().LunGet(tempLunPath).Return(&azgo.LunInfoType{}, nil).Times(1)
+	exists, err := oapi.LunExists(ctx, tempLunPath)
+	assert.NoError(t, err, "expected no error when LUN exists")
+	assert.True(t, exists, "expected LUN to exist")
+
+	// Case 2: LUN does not exist
+	mock.EXPECT().LunGet(tempLunPath).Return(nil, nil).Times(1)
+	exists, err = oapi.LunExists(ctx, tempLunPath)
+	assert.NoError(t, err, "expected no error when LUN does not exist")
+	assert.False(t, exists, "expected LUN to not exist")
+
+	// Case 3: NotFoundError from ZAPI client
+	mock.EXPECT().LunGet(tempLunPath).Return(nil, errors.NotFoundError("LUN not found")).Times(1)
+	exists, err = oapi.LunExists(ctx, tempLunPath)
+	assert.NoError(t, err, "expected no error when NotFoundError occurs")
+	assert.False(t, exists, "expected LUN to not exist")
+
+	// Case 4: Error from ZAPI client
+	mock.EXPECT().LunGet(tempLunPath).Return(nil, fmt.Errorf("error fetching LUN")).Times(1)
+	exists, err = oapi.LunExists(ctx, tempLunPath)
+	assert.Error(t, err, "expected error when ZAPI client returns an error")
+	assert.False(t, exists, "expected LUN to not exist")
+}
+
 func intPtr(i int) *int {
 	return &i
 }