From db8554f9534d8e5237c109129468115855830a6c Mon Sep 17 00:00:00 2001 From: Malte Bauch <malte.bauch@extern.h-da.de> Date: Wed, 20 Apr 2022 15:22:09 +0200 Subject: [PATCH] Fix failed test: AddDevice of api --- controller/api/initialise_test.go | 2 +- controller/northbound/server/pnd.go | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/controller/api/initialise_test.go b/controller/api/initialise_test.go index c9363a7f4..8a7395f0f 100644 --- a/controller/api/initialise_test.go +++ b/controller/api/initialise_test.go @@ -90,7 +90,7 @@ func bootstrapUnitTest() { mockPnd.On("PendingChanges").Return([]uuid.UUID{changeUUID}) mockPnd.On("CommittedChanges").Return([]uuid.UUID{changeUUID}) mockPnd.On("GetChange", mock.Anything).Return(mockChange, nil) - mockPnd.On("AddDevice", mock.Anything, mock.Anything, mock.Anything).Return(nil) + mockPnd.On("AddDevice", mock.Anything, mock.Anything, mock.Anything).Return(nil, nil) mockPnd.On("GetDevice", mock.Anything).Return(&nucleus.CommonDevice{ UUID: deviceUUID, Model: &openconfig.Device{}, diff --git a/controller/northbound/server/pnd.go b/controller/northbound/server/pnd.go index fc009d5e5..52eb90828 100644 --- a/controller/northbound/server/pnd.go +++ b/controller/northbound/server/pnd.go @@ -506,15 +506,16 @@ func (p pndServer) SetOndList(ctx context.Context, request *ppb.SetOndListReques } deviceIDs = append(deviceIDs, did) } + + r := make([]*ppb.SetResponse, len(deviceIDs)) + for i, did := range deviceIDs { + r[i] = &ppb.SetResponse{Id: did.String(), Status: ppb.Status_STATUS_OK} + } + return &ppb.SetOndListResponse{ Timestamp: time.Now().UnixNano(), Status: ppb.Status_STATUS_OK, - Responses: []*ppb.SetResponse{ - { - Id: "", - Status: ppb.Status_STATUS_OK, - }, - }, + Responses: r, }, nil } -- GitLab