From 1766b715f869ea090be5f71e82f949cfa196a36d Mon Sep 17 00:00:00 2001 From: idanshal Date: Mon, 22 Jun 2020 12:41:02 +0300 Subject: [PATCH] [RIC-475] Use SetAndPublish in RNIB writer Change-Id: I4a471287877f2eabb2ae77634026d9601b9ba02e Signed-off-by: idanshal --- E2Manager/container-tag.yaml | 2 +- E2Manager/rNibWriter/rNibWriter.go | 4 +--- E2Manager/rNibWriter/rNibWriter_test.go | 12 +++--------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/E2Manager/container-tag.yaml b/E2Manager/container-tag.yaml index c403cbe..e9c341b 100644 --- a/E2Manager/container-tag.yaml +++ b/E2Manager/container-tag.yaml @@ -1,4 +1,4 @@ # The Jenkins job requires a tag to build the Docker image. # Global-JJB script assumes this file is in the repo root. --- -tag: 5.2.4 +tag: 5.2.5 diff --git a/E2Manager/rNibWriter/rNibWriter.go b/E2Manager/rNibWriter/rNibWriter.go index 7322035..3186d70 100644 --- a/E2Manager/rNibWriter/rNibWriter.go +++ b/E2Manager/rNibWriter/rNibWriter.go @@ -359,9 +359,7 @@ func (w *rNibWriterInstance) UpdateNodebInfoOnConnectionStatusInversion(nodebInf return err } - //TODO: Handle "Redis deployment doesn't support MSETMPUB command" when executing SetAndPublish - //err = w.sdl.SetAndPublish([]string{stateChangeMessageChannel, event}, pairs) - err = w.sdl.Set(pairs) + err = w.sdl.SetAndPublish([]string{stateChangeMessageChannel, event}, pairs) if err != nil { return common.NewInternalError(err) diff --git a/E2Manager/rNibWriter/rNibWriter_test.go b/E2Manager/rNibWriter/rNibWriter_test.go index ab67b80..ec21c3f 100644 --- a/E2Manager/rNibWriter/rNibWriter_test.go +++ b/E2Manager/rNibWriter/rNibWriter_test.go @@ -762,9 +762,7 @@ func TestUpdateNodebInfoOnConnectionStatusInversionSuccess(t *testing.T) { setExpected = append(setExpected, nodebNameKey, data) setExpected = append(setExpected, nodebIdKey, data) - sdlInstanceMock.On("Set", []interface{}{setExpected}).Return(e) - // TODO: after SetAndPublish problem is solved, bring back this line - // sdlInstanceMock.On("SetAndPublish", []string{channelName, eventName}, []interface{}{setExpected}).Return(e) + sdlInstanceMock.On("SetAndPublish", []string{channelName, eventName}, []interface{}{setExpected}).Return(e) rNibErr := w.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, channelName, eventName) assert.Nil(t, rNibErr) @@ -790,9 +788,7 @@ func TestUpdateNodebInfoOnConnectionStatusInversionMissingInventoryNameFailure(t setExpected = append(setExpected, nodebNameKey, data) setExpected = append(setExpected, nodebIdKey, data) - sdlInstanceMock.On("Set", []interface{}{setExpected}).Return(e) - // TODO: after SetAndPublish problem is solved, bring back this line - //sdlInstanceMock.On("SetAndPublish", []string{channelName, eventName}, []interface{}{setExpected}).Return(e) + sdlInstanceMock.On("SetAndPublish", []string{channelName, eventName}, []interface{}{setExpected}).Return(e) rNibErr := w.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, channelName, eventName) @@ -816,9 +812,7 @@ func TestUpdateNodebInfoOnConnectionStatusInversionMissingGlobalNbId(t *testing. nodebNameKey := fmt.Sprintf("RAN:%s", inventoryName) setExpected = append(setExpected, nodebNameKey, data) - sdlInstanceMock.On("Set", []interface{}{setExpected}).Return(e) - // TODO: after SetAndPublish problem is solved, bring back this line - //sdlInstanceMock.On("SetAndPublish", []string{channelName, eventName}, []interface{}{setExpected}).Return(e) + sdlInstanceMock.On("SetAndPublish", []string{channelName, eventName}, []interface{}{setExpected}).Return(e) rNibErr := w.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, channelName, eventName) -- 2.16.6