numberOfFails := 0
for _, nbIdentity := range nbIdentityList {
- nodeb, err := h.rNibDataService.GetNodeb((*nbIdentity).GetInventoryName())
+ ranName := (*nbIdentity).GetInventoryName()
+
+ nodeb, err := h.rNibDataService.GetNodeb(ranName)
if err != nil {
+ h.logger.Errorf("#ResourceStatusRequestHandler.Handle - Couldn't find RAN %s in RSM DB", ranName)
numberOfFails++
continue
}
if nodeb.ConnectionStatus != entities.ConnectionStatus_CONNECTED {
h.logger.Infof("#ResourceStatusRequestHandler.Handle - RAN name: %s - connection status not CONNECTED, ignore", nodeb.RanName)
h.logger.Infof("#ResourceStatusRequestHandler.Handle - handle RAN: %s completed", nodeb.RanName)
- numberOfFails++
continue
}
}
if rsmRanInfo.Enb2MeasurementId == 0 {
+ h.logger.Errorf("#ResourceStatusRequestHandler.handleNotStoppedRsmRanInfo - RAN: %s Enb2MeasurementId is zero", nodebInfo.RanName)
return rsmerrors.NewInternalError()
}
rsmRanInfo.Action = enums.Start
rsmRanInfo.ActionStatus = false
rsmRanInfo.Enb2MeasurementId = 0
+ rsmRanInfo.Enb1MeasurementId = enums.Enb1MeasurementId
return h.rNibDataService.SaveRsmRanInfo(rsmRanInfo)
}
assert.Equal(t, actualErr, nil)
}
-func TestResourceStatusRequestHandlerTrueNumberOfFails2(t *testing.T) {
+func TestResourceStatusRequestHandlerTrueNumberOfFails1(t *testing.T) {
handler, readerMock, rsmReaderMock, rsmWriterMock, resourceStatusServiceMock := initTest(t)
rsmWriterMock.AssertNumberOfCalls(t, "SaveRsmRanInfo", 1)
resourceStatusServiceMock.AssertNumberOfCalls(t, "BuildAndSendInitiateRequest", 1)
- rsmError := rsmerrors.NewRsmError(2)
+ rsmError := rsmerrors.NewRsmError(1)
assert.Equal(t, actualErr, rsmError)
assert.Equal(t, actualErr.Error(), rsmError.Error())
}
assert.Equal(t, actualErr, nil)
}
-func TestResourceStatusRequestHandlerFalseNumberOfFails2(t *testing.T) {
+func TestResourceStatusRequestHandlerFalseNumberOfFails1(t *testing.T) {
handler, readerMock, rsmReaderMock, rsmWriterMock, resourceStatusServiceMock := initTest(t)
rsmWriterMock.AssertNumberOfCalls(t, "SaveRsmRanInfo", 1)
resourceStatusServiceMock.AssertNumberOfCalls(t, "BuildAndSendStopRequest", 1)
- rsmError := rsmerrors.NewRsmError(2)
+ rsmError := rsmerrors.NewRsmError(1)
assert.Equal(t, actualErr, rsmError)
assert.Equal(t, actualErr.Error(), rsmError.Error())
}