Fix zero record checks in ONTAP REST layer

Author: clintonk

storage_drivers/ontap/api/ontap_rest.go

@@ -2633,15 +2633,15 @@ func (c *RestClient) LunGet(ctx context.Context, uuid string) (*san.LunGetOK, er
 // LunGetByName gets the LUN with the specified name
 func (c *RestClient) LunGetByName(ctx context.Context, name string, fields []string) (*models.Lun, error) {
 	result, err := c.LunList(ctx, name, fields)
-	if err != nil || result.Payload == nil {
+	if err != nil {
 		return nil, err
 	}
 
-	if result == nil || result.Payload == nil || result.Payload.NumRecords == nil {
-		return nil, errors.NotFoundError(fmt.Sprintf("could not get LUN by name %v, error: %v", name, err))
+	if result == nil || result.Payload == nil || result.Payload.NumRecords == nil || *result.Payload.NumRecords == 0 {
+		return nil, errors.NotFoundError(fmt.Sprintf("could not get LUN by name %v", name))
 	}
 
-	if result.Payload.NumRecords != nil && *result.Payload.NumRecords == 1 && result.Payload.LunResponseInlineRecords != nil {
+	if *result.Payload.NumRecords == 1 && result.Payload.LunResponseInlineRecords != nil {
 		return result.Payload.LunResponseInlineRecords[0], nil
 	}
 	return nil, err
@@ -6101,14 +6101,10 @@ func (c *RestClient) JobScheduleExists(ctx context.Context, jobName string) (boo
 	if err != nil {
 		return false, err
 	}
-	if result == nil {
+	if result == nil || result.Payload == nil {
 		return false, fmt.Errorf("nil result finding job with name: %v", jobName)
 	}
-
-	if result.Payload.ScheduleResponseInlineRecords == nil {
-		return false, fmt.Errorf("could not find job with name: %v", jobName)
-	}
-	if result.Payload.NumRecords == nil {
+	if result.Payload.ScheduleResponseInlineRecords == nil || result.Payload.NumRecords == nil || *result.Payload.NumRecords == 0 {
 		return false, fmt.Errorf("could not find job with name: %v", jobName)
 	}
 	if result.Payload.NumRecords != nil && *result.Payload.NumRecords != 1 {

storage_drivers/ontap/api/ontap_rest_test.go

@@ -1091,6 +1091,27 @@ func mockLunResponseNumRecordsNil(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func mockLunResponseNumRecordsZero(w http.ResponseWriter, r *http.Request) {
+	numRecords := int64(0)
+	lunResponse := models.LunResponse{
+		LunResponseInlineRecords: []*models.Lun{},
+		NumRecords:               &numRecords,
+	}
+	if r.Method == "GET" {
+		if r.URL.Path == "/api/protocols/san/lun-maps" {
+			mockLunMapResponse(w, r)
+		} else {
+			setHTTPResponseHeader(w, http.StatusOK)
+			if r.URL.Path == "/api/storage/luns/fake-lunName" {
+				// LunGetByName calls LunList
+				json.NewEncoder(w).Encode(lunResponse)
+			} else {
+				json.NewEncoder(w).Encode(lunResponse)
+			}
+		}
+	}
+}
+
 func TestOntapREST_LunGetByName(t *testing.T) {
 	tests := []struct {
 		name            string
@@ -1100,6 +1121,7 @@ func TestOntapREST_LunGetByName(t *testing.T) {
 	}{
 		{"PositiveTest", mockLunResponse, false, false},
 		{"NumRecordsNilInResponse", mockLunResponseNumRecordsNil, true, true},
+		{"NumRecordsZeroInResponse", mockLunResponseNumRecordsZero, false, true},
 		{"BackendReturnError", mockResourceNotFound, true, true},
 	}
 	for _, test := range tests {
@@ -4259,6 +4281,17 @@ func mockJobScheduleResponseNumRecordsNil(w http.ResponseWriter, r *http.Request
 	json.NewEncoder(w).Encode(scheduleResponse)
 }
 
+func mockJobScheduleResponseNumRecordsZero(w http.ResponseWriter, r *http.Request) {
+	numRecords := int64(0)
+	scheduleResponse := &models.ScheduleResponse{
+		ScheduleResponseInlineRecords: []*models.Schedule{{}},
+		NumRecords:                    &numRecords,
+	}
+
+	setHTTPResponseHeader(w, http.StatusOK)
+	json.NewEncoder(w).Encode(scheduleResponse)
+}
+
 func mockJobScheduleResponseNumRecordsGrt1(w http.ResponseWriter, r *http.Request) {
 	numRecords := int64(2)
 	scheduleResponse := &models.ScheduleResponse{
@@ -4279,6 +4312,7 @@ func TestOntapRest_JobScheduleExists(t *testing.T) {
 		{"PositiveTest", mockJobScheduleResponse, false},
 		{"JobIsNilInResponse", mockJobScheduleResponseRecordNil, true},
 		{"NumRecordFieldNil", mockJobScheduleResponseNumRecordsNil, true},
+		{"NumRecordFieldZero", mockJobScheduleResponseNumRecordsZero, true},
 		{"NumRecordMoreThanOne", mockJobScheduleResponseNumRecordsGrt1, true},
 		{"BackendReturnError", mockResourceNotFound, true},
 	}