RIC-244 - Eliminate Setup/Reset request from dashboard & connectionAttempts

Change-Id: Ibb4b9920d862e33316701a4dab9d1c090a28e089
Signed-off-by: Irina <ib565x@intl.att.com>

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 2169f6a..43beee0 100644 (file)
--- a/E2Manager/configuration/configuration.go
+++ b/E2Manager/configuration/configuration.go
@@ -44,7 +44,6 @@ type Configuration struct {
        }*/
        NotificationResponseBuffer   int
        BigRedButtonTimeoutSec       int
-       MaxConnectionAttempts        int
        MaxRnibConnectionAttempts    int
        RnibRetryIntervalMs          int
        KeepAliveResponseTimeoutMs   int
@@ -76,7 +75,6 @@ func ParseConfiguration() *Configuration {
        //config.populateKubernetesConfig(viper.Sub("kubernetes"))
        config.NotificationResponseBuffer = viper.GetInt("notificationResponseBuffer")
        config.BigRedButtonTimeoutSec = viper.GetInt("bigRedButtonTimeoutSec")
-       config.MaxConnectionAttempts = viper.GetInt("maxConnectionAttempts")
        config.MaxRnibConnectionAttempts = viper.GetInt("maxRnibConnectionAttempts")
        config.RnibRetryIntervalMs = viper.GetInt("rnibRetryIntervalMs")
        config.KeepAliveResponseTimeoutMs = viper.GetInt("keepAliveResponseTimeoutMs")
@@ -133,7 +131,7 @@ func (c *Configuration) populateGlobalRicIdConfig(globalRicIdConfig *viper.Viper
 
 func (c *Configuration) String() string {
        return fmt.Sprintf("{logging.logLevel: %s, http.port: %d, rmr: { port: %d, maxMsgSize: %d}, routingManager.baseUrl: %s, "+
-               "notificationResponseBuffer: %d, bigRedButtonTimeoutSec: %d, maxConnectionAttempts: %d, maxRnibConnectionAttempts: %d, "+
+               "notificationResponseBuffer: %d, bigRedButtonTimeoutSec: %d, maxRnibConnectionAttempts: %d, "+
                "rnibRetryIntervalMs: %d, keepAliveResponseTimeoutMs: %d, keepAliveDelayMs: %d, e2tInstanceDeletionTimeoutMs: %d, "+
                "globalRicId: { plmnId: %s, ricNearRtId: %s}}",//, kubernetes: {configPath: %s, namespace: %s}}",
                c.Logging.LogLevel,
@@ -143,7 +141,6 @@ func (c *Configuration) String() string {
                c.RoutingManager.BaseUrl,
                c.NotificationResponseBuffer,
                c.BigRedButtonTimeoutSec,
-               c.MaxConnectionAttempts,
                c.MaxRnibConnectionAttempts,
                c.RnibRetryIntervalMs,
                c.KeepAliveResponseTimeoutMs,

diff --git a/E2Manager/container-tag.yaml b/E2Manager/container-tag.yaml
index 98f242e..85beee9 100644 (file)
--- 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: 4.4.5
+tag: 4.4.6

diff --git a/E2Manager/controllers/nodeb_controller_test.go b/E2Manager/controllers/nodeb_controller_test.go
index 4d5e829..4bdfd2c 100644 (file)
--- a/E2Manager/controllers/nodeb_controller_test.go
+++ b/E2Manager/controllers/nodeb_controller_test.go
@@ -182,10 +182,9 @@ func TestX2SetupSuccess(t *testing.T) {
        nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, AssociatedE2TInstanceAddress: "10.0.2.15:8989"}
        readerMock.On("GetNodeb", ranName).Return(nb, nil)
        var nbUpdated = *nb
-       nbUpdated.ConnectionAttempts = 0
        writerMock.On("UpdateNodebInfo", &nbUpdated).Return(nil)
 
-       var nbUpdated2 = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1, AssociatedE2TInstanceAddress: "10.0.2.15:8989"}
+       var nbUpdated2 = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, AssociatedE2TInstanceAddress: "10.0.2.15:8989"}
        writerMock.On("UpdateNodebInfo", nbUpdated2).Return(nil)
 
        payload := e2pdus.PackedX2setupRequest
@@ -214,10 +213,9 @@ func TestEndcSetupSuccess(t *testing.T) {
        nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, AssociatedE2TInstanceAddress: "10.0.2.15:8989"}
        readerMock.On("GetNodeb", ranName).Return(nb, nil)
        var nbUpdated = *nb
-       nbUpdated.ConnectionAttempts = 0
        writerMock.On("UpdateNodebInfo", &nbUpdated).Return(nil)
 
-       var nbUpdated2 = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, ConnectionAttempts: 1, AssociatedE2TInstanceAddress: "10.0.2.15:8989"}
+       var nbUpdated2 = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, AssociatedE2TInstanceAddress: "10.0.2.15:8989"}
        writerMock.On("UpdateNodebInfo", nbUpdated2).Return(nil)
 
        payload := e2pdus.PackedEndcX2setupRequest

diff --git a/E2Manager/go.mod b/E2Manager/go.mod
index 52ed763..3fd0b4c 100644 (file)
--- a/E2Manager/go.mod
+++ b/E2Manager/go.mod
@@ -1,9 +1,9 @@
 module e2mgr
 
 require (
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.34
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.34
-       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.34
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.35
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.35
+       gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35
        gerrit.o-ran-sc.org/r/ric-plt/sdlgo v0.5.2
        github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
        github.com/go-ozzo/ozzo-validation v3.5.0+incompatible

diff --git a/E2Manager/go.sum b/E2Manager/go.sum
index fbd6e77..4dd7bc0 100644 (file)
--- a/E2Manager/go.sum
+++ b/E2Manager/go.sum
@@ -3,10 +3,16 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.34 h1:d53dCN59dZftx847pzyo/zIKk0XJjOqMAx4VwxJHO10=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.34/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.35 h1:TGXHb4DNY8on+ej4S9VUnk2HibIC/5chDy64OE+bQBQ=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.35/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.34 h1:7jxKtb+VPgwHKxQuWne1mG09rsi330erwb1u4OsWEaA=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.34/go.mod h1:G+4sUBMbLfQ+RrGS65U15tKmbnP+/1b5oLTPmMfyfT4=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.35 h1:tkM3yE8UzmuH4nf9TqAmiNBSuIZ2CtcMRH2eBIYIzpQ=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.35/go.mod h1:G+4sUBMbLfQ+RrGS65U15tKmbnP+/1b5oLTPmMfyfT4=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.34 h1:niBDUlmhq+8dhXt7z8KW+ZBq/0XlnM4FzvrLYlub1co=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.34/go.mod h1:tcc2L3Fb7hTvxK+QVTCbWjBX//078qOgPMwA9ZyCxY4=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35 h1:LcxnUUDwsCzYEISKmkjkyYfg/lnLt8ofkPiGK69vNIA=
+gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.35/go.mod h1:2bSaXTpECbZieB8bMnubTqMwF3n+mMBxlTaAXvcduNg=
 gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2 h1:UK7awyRKIkVdokWvvkYvazlg3EWIfMnIqCcJxTnLlDA=
 gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2/go.mod h1:y2WhrCvdLkAKdH+ySdHSOSehACJkTMyZghCGVcqoZzc=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=

diff --git a/E2Manager/handlers/httpmsghandlers/setup_request_handler.go b/E2Manager/handlers/httpmsghandlers/setup_request_handler.go
index 51e579b..dae75a9 100644 (file)
--- a/E2Manager/handlers/httpmsghandlers/setup_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/setup_request_handler.go
@@ -102,7 +102,6 @@ func createInitialNodeInfo(requestDetails *models.SetupRequest, protocol entitie
                ConnectionStatus:      entities.ConnectionStatus_CONNECTING,
                E2ApplicationProtocol: protocol,
                RanName:               requestDetails.RanName,
-               ConnectionAttempts:    0,
        }
 
        nbIdentity := &entities.NbIdentity{
@@ -118,12 +117,11 @@ func (h *SetupRequestHandler) connectExistingRanWithoutAssociatedE2TAddress(node
        if err != nil {
                h.logger.Errorf("#SetupRequestHandler.connectExistingRanWithoutAssociatedE2TAddress - RAN name: %s - failed selecting E2T instance", nodebInfo.RanName)
 
-               if nodebInfo.ConnectionStatus == entities.ConnectionStatus_DISCONNECTED && nodebInfo.ConnectionAttempts == 0 {
+               if nodebInfo.ConnectionStatus == entities.ConnectionStatus_DISCONNECTED{
                        return err
                }
 
                nodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
-               nodebInfo.ConnectionAttempts = 0
                updateError := h.rNibDataService.UpdateNodebInfo(nodebInfo)
 
                if updateError != nil {
@@ -151,7 +149,6 @@ func (h *SetupRequestHandler) connectExistingRanWithAssociatedE2TAddress(nodebIn
        if nodebInfo.ConnectionStatus == entities.ConnectionStatus_CONNECTED {
                status = nodebInfo.ConnectionStatus
        }
-       nodebInfo.ConnectionAttempts = 0
        err := h.rNibDataService.UpdateNodebInfo(nodebInfo)
 
        if err != nil {

diff --git a/E2Manager/handlers/httpmsghandlers/setup_request_handler_test.go b/E2Manager/handlers/httpmsghandlers/setup_request_handler_test.go
index bbc5dff..9b9880d 100644 (file)
--- a/E2Manager/handlers/httpmsghandlers/setup_request_handler_test.go
+++ b/E2Manager/handlers/httpmsghandlers/setup_request_handler_test.go
@@ -164,7 +164,6 @@ func TestSetupNewRanSelectE2TInstancesNoInstances(t *testing.T) {
        nodebInfo, _ := createInitialNodeInfo(&setupRequest, entities.E2ApplicationProtocol_X2_SETUP_REQUEST)
        writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(nil)
        updatedNb := *nodebInfo
-       updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
        updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
@@ -188,10 +187,8 @@ func TestSetupNewRanAssociateRanFailure(t *testing.T) {
        writerMock.On("SaveNodeb", nbIdentity, mock.Anything).Return(nil)
        writerMock.On("UpdateNodebInfo", nb).Return(nil)
        nb.AssociatedE2TInstanceAddress = E2TAddress
-       nb.ConnectionAttempts = 0
        mockHttpClientAssociateRan(httpClientMock)
        updatedNb := *nb
-       updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
 
        _, err := handler.Handle(*setupRequest)
@@ -226,7 +223,6 @@ func TestSetupNewRanSetupDbError(t *testing.T) {
        nodebInfo, nbIdentity := createInitialNodeInfo(&setupRequest, entities.E2ApplicationProtocol_X2_SETUP_REQUEST)
        writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(nil)
        updatedNb := *nodebInfo
-       updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
        updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
@@ -247,7 +243,6 @@ func TestSetupNewRanSetupRmrError(t *testing.T) {
        nodebInfo, nbIdentity := createInitialNodeInfo(&setupRequest, entities.E2ApplicationProtocol_X2_SETUP_REQUEST)
        writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(nil)
        updatedNb := *nodebInfo
-       updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
        updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
@@ -265,7 +260,6 @@ func TestSetupNewRanSetupSuccess(t *testing.T) {
        nodebInfo, nbIdentity := createInitialNodeInfo(&setupRequest, entities.E2ApplicationProtocol_X2_SETUP_REQUEST)
        writerMock.On("SaveNodeb", nbIdentity, nodebInfo).Return(nil)
        updatedNb := *nodebInfo
-       updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
        updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
@@ -371,7 +365,6 @@ func TestSetupExistingRanWithoutAssocE2TInstanceSelectErrorAlreadyDisconnected(t
 //     e2tInstancesManagerMock.On("AddRansToInstance", E2TAddress, []string{RanName}).Return(nil)
 //     updatedNb := *nb
 //     updatedNb.AssociatedE2TInstanceAddress = E2TAddress
-//     updatedNb.ConnectionAttempts = 0
 //     writerMock.On("UpdateNodebInfo", &updatedNb).Return(common.NewInternalError(fmt.Errorf("")))
 //     _, err := handler.Handle(models.SetupRequest{"127.0.0.1", 8080, RanName,})
 //     assert.IsType(t, /* &e2managererrors.RnibDbError{} */&common.InternalError{}, err)
@@ -386,7 +379,6 @@ func TestSetupExistingRanWithoutAssocE2TInstanceSelectErrorAlreadyDisconnected(t
 //     e2tInstancesManagerMock.On("AddRansToInstance", E2TAddress, []string{RanName}).Return(nil)
 //     updatedNb := *nb
 //     updatedNb.AssociatedE2TInstanceAddress = E2TAddress
-//     updatedNb.ConnectionAttempts = 0
 //     writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
 //     ranSetupManagerMock.On("ExecuteSetup", &updatedNb, entities.ConnectionStatus_CONNECTING).Return(e2managererrors.NewRnibDbError())
 //     _, err := handler.Handle(models.SetupRequest{"127.0.0.1", 8080, RanName,})
@@ -401,7 +393,6 @@ func TestSetupExistingRanWithoutAssocE2TInstanceSelectErrorAlreadyDisconnected(t
 //     e2tInstancesManagerMock.On("AddRansToInstance", E2TAddress, []string{RanName}).Return(nil)
 //     updatedNb := *nb
 //     updatedNb.AssociatedE2TInstanceAddress = E2TAddress
-//     updatedNb.ConnectionAttempts = 0
 //     writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
 //     ranSetupManagerMock.On("ExecuteSetup", &updatedNb, entities.ConnectionStatus_CONNECTING).Return(nil)
 //     _, err := handler.Handle(models.SetupRequest{"127.0.0.1", 8080, RanName,})
@@ -413,7 +404,6 @@ func TestSetupExistingRanWithAssocE2TInstanceUpdateNodebFailure(t *testing.T) {
        nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
        readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
-       updatedNb.ConnectionAttempts = 0
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(common.NewInternalError(fmt.Errorf("")))
        _, err := handler.Handle(models.SetupRequest{"127.0.0.1", 8080, RanName,})
        assert.IsType(t, &e2managererrors.RnibDbError{}, err)
@@ -427,14 +417,9 @@ func TestSetupExistingRanWithAssocE2TInstanceExecuteSetupRmrError(t *testing.T)
        nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol:entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
-       updatedNb.ConnectionAttempts = 0
-       updatedNb2 := updatedNb
-       updatedNb2.ConnectionAttempts++
-       updatedNb3 := updatedNb2
+       updatedNb3 := updatedNb
        updatedNb3.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
-       updatedNb3.ConnectionAttempts--
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
-       writerMock.On("UpdateNodebInfo", &updatedNb2).Return(nil)
        payload := e2pdus.PackedX2setupRequest
        xaction := []byte(RanName)
        msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), RanName, &payload, &xaction, nil)
@@ -450,7 +435,6 @@ func TestSetupExistingRanWithAssocE2TInstanceConnectedSuccess(t *testing.T) {
        nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionStatus: entities.ConnectionStatus_CONNECTED}
        readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
-       updatedNb.ConnectionAttempts = 0
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
        ranSetupManagerMock.On("ExecuteSetup", &updatedNb, entities.ConnectionStatus_CONNECTED).Return(nil)
        _, err := handler.Handle(models.SetupRequest{"127.0.0.1", 8080, RanName,})

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
index bcdbbd6..8a74eff 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_term_init_notification_handler_test.go
@@ -248,7 +248,7 @@ func TestE2TermInitHandlerSuccessOneRanShuttingdown(t *testing.T) {
        var initialNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr)
 
-       var argNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 0}
+       var argNodeb = &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_SHUT_DOWN, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
 
        e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)
@@ -268,7 +268,7 @@ func TestE2TermInitHandlerSuccessOneRan_ToBeDeleted(t *testing.T) {
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        readerMock.On("GetNodeb", RanName).Return(initialNodeb, rnibErr)
 
-       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1}
+       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
 
        e2tInstance := entities.NewE2TInstance(e2tInstanceAddress, podName)

diff --git a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
index 535d24f..695a09f 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler.go
@@ -73,7 +73,6 @@ func (h SetupResponseNotificationHandler) Handle(request *models.NotificationReq
                return
        }
 
-       nodebInfo.ConnectionAttempts = 0
        nbIdentity := &entities.NbIdentity{InventoryName: inventoryName}
        err := h.setupResponseManager.PopulateNodebByPdu(h.logger, nbIdentity, nodebInfo, request.Payload)
 

diff --git a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go
index d52181c..4d3a0ee 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go
@@ -143,7 +143,6 @@ func executeHandleSetupSuccessResponse(t *testing.T, tc setupSuccessResponseTest
 
        nodebInfo := &entities.NodebInfo{
                ConnectionStatus:   entities.ConnectionStatus_CONNECTING,
-               ConnectionAttempts: 1,
                RanName:            RanName,
                Ip:                 "10.0.2.2",
                Port:               1231,
@@ -181,7 +180,6 @@ func executeHandleSetupFailureResponse(t *testing.T, tc setupFailureResponseTest
 
        nodebInfo := &entities.NodebInfo{
                ConnectionStatus:   entities.ConnectionStatus_CONNECTING,
-               ConnectionAttempts: 1,
                RanName:            RanName,
                Ip:                 "10.0.2.2",
                Port:               1231,
@@ -211,7 +209,6 @@ func TestX2SetupResponse(t *testing.T) {
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
        testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
        assert.EqualValues(t, entities.ConnectionStatus_CONNECTED, nodebInfo.ConnectionStatus)
-       assert.EqualValues(t, 0, nodebInfo.ConnectionAttempts)
        assert.EqualValues(t, entities.Node_ENB, nodebInfo.NodeType)
 
        assert.IsType(t, &entities.NodebInfo_Enb{}, nodebInfo.Configuration)
@@ -234,7 +231,6 @@ func TestX2SetupFailureResponse(t *testing.T) {
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
        testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
        assert.EqualValues(t, entities.ConnectionStatus_CONNECTED_SETUP_FAILED, nodebInfo.ConnectionStatus)
-       assert.EqualValues(t, 0, nodebInfo.ConnectionAttempts)
        assert.EqualValues(t, entities.Failure_X2_SETUP_FAILURE, nodebInfo.FailureType)
        assert.NotNil(t, nodebInfo.SetupFailure)
        testContext.rmrMessengerMock.AssertNotCalled(t, "SendMsg")
@@ -257,7 +253,6 @@ func TestEndcSetupResponse(t *testing.T) {
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
        testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
        assert.EqualValues(t, entities.ConnectionStatus_CONNECTED, nodebInfo.ConnectionStatus)
-       assert.EqualValues(t, 0, nodebInfo.ConnectionAttempts)
        assert.EqualValues(t, entities.Node_GNB, nodebInfo.NodeType)
        assert.IsType(t, &entities.NodebInfo_Gnb{}, nodebInfo.Configuration)
 
@@ -280,7 +275,6 @@ func TestEndcSetupFailureResponse(t *testing.T) {
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
        testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
        assert.EqualValues(t, entities.ConnectionStatus_CONNECTED_SETUP_FAILED, nodebInfo.ConnectionStatus)
-       assert.EqualValues(t, 0, nodebInfo.ConnectionAttempts)
        assert.EqualValues(t, entities.Failure_ENDC_X2_SETUP_FAILURE, nodebInfo.FailureType)
        assert.NotNil(t, nodebInfo.SetupFailure)
        testContext.rmrMessengerMock.AssertNotCalled(t, "SendMsg")
@@ -293,7 +287,7 @@ func TestSetupResponseInvalidPayload(t *testing.T) {
        testContext := NewSetupResponseTestContext(nil)
        handler := NewSetupResponseNotificationHandler(testContext.logger, testContext.rnibDataService, managers.NewX2SetupResponseManager(converters.NewX2SetupResponseConverter(logger)), testContext.ranStatusChangeManager, rmrCgo.RIC_X2_SETUP_RESP)
        var rnibErr error
-       testContext.readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, ConnectionAttempts: 1}, rnibErr)
+       testContext.readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING}, rnibErr)
        handler.Handle(&notificationRequest)
        testContext.readerMock.AssertCalled(t, "GetNodeb", ranName)
        testContext.writerMock.AssertNotCalled(t, "SaveNodeb")
@@ -336,7 +330,6 @@ func TestSetupResponseStatusChangeSendFailure(t *testing.T) {
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
        testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
        assert.EqualValues(t, entities.ConnectionStatus_CONNECTED, nodebInfo.ConnectionStatus)
-       assert.EqualValues(t, 0, nodebInfo.ConnectionAttempts)
        assert.EqualValues(t, entities.Node_ENB, nodebInfo.NodeType)
 
        assert.IsType(t, &entities.NodebInfo_Enb{}, nodebInfo.Configuration)

diff --git a/E2Manager/httpserver/http_server.go b/E2Manager/httpserver/http_server.go
index 2c140eb..a022ecb 100644 (file)
--- a/E2Manager/httpserver/http_server.go
+++ b/E2Manager/httpserver/http_server.go
@@ -49,9 +49,6 @@ func initializeRoutes(router *mux.Router, rootController controllers.IRootContro
        rr.HandleFunc("/{ranName}", nodebController.GetNodeb).Methods(http.MethodGet)
        rr.HandleFunc("/{ranName}/update", nodebController.UpdateGnb).Methods(http.MethodPut)
        rr.HandleFunc("/shutdown", nodebController.Shutdown).Methods(http.MethodPut)
-       rr.HandleFunc("/{ranName}/reset", nodebController.X2Reset).Methods(http.MethodPut)
-       rr.HandleFunc("/x2-setup", nodebController.X2Setup).Methods(http.MethodPost)
-       rr.HandleFunc("/endc-setup", nodebController.EndcSetup).Methods(http.MethodPost)
        rrr := r.PathPrefix("/e2t").Subrouter()
        rrr.HandleFunc("/list", e2tController.GetE2TInstances).Methods(http.MethodGet)
 }

diff --git a/E2Manager/httpserver/http_server_test.go b/E2Manager/httpserver/http_server_test.go
index e6e1ef5..3c0620b 100644 (file)
--- a/E2Manager/httpserver/http_server_test.go
+++ b/E2Manager/httpserver/http_server_test.go
@@ -37,9 +37,6 @@ func setupRouterAndMocks() (*mux.Router, *mocks.RootControllerMock, *mocks.Nodeb
 
        nodebControllerMock := &mocks.NodebControllerMock{}
        nodebControllerMock.On("Shutdown").Return(nil)
-       nodebControllerMock.On("X2Reset").Return(nil)
-       nodebControllerMock.On("X2Setup").Return(nil)
-       nodebControllerMock.On("EndcSetup").Return(nil)
        nodebControllerMock.On("GetNodeb").Return(nil)
        nodebControllerMock.On("GetNodebIdList").Return(nil)
 
@@ -52,32 +49,6 @@ func setupRouterAndMocks() (*mux.Router, *mocks.RootControllerMock, *mocks.Nodeb
        return router, rootControllerMock, nodebControllerMock, e2tControllerMock
 }
 
-func TestRoutePostEndcSetup(t *testing.T) {
-       router, _, nodebControllerMock, _ := setupRouterAndMocks()
-
-       req, err := http.NewRequest("POST", "/v1/nodeb/endc-setup", nil)
-       if err != nil {
-               t.Fatal(err)
-       }
-       rr := httptest.NewRecorder()
-       router.ServeHTTP(rr, req)
-
-       nodebControllerMock.AssertNumberOfCalls(t, "EndcSetup", 1)
-}
-
-func TestRoutePostX2Setup(t *testing.T) {
-       router, _, nodebControllerMock, _ := setupRouterAndMocks()
-
-       req, err := http.NewRequest("POST", "/v1/nodeb/x2-setup", nil)
-       if err != nil {
-               t.Fatal(err)
-       }
-       rr := httptest.NewRecorder()
-       router.ServeHTTP(rr, req)
-
-       nodebControllerMock.AssertNumberOfCalls(t, "X2Setup", 1)
-}
-
 func TestRouteGetNodebIds(t *testing.T) {
        router, _, nodebControllerMock, _ := setupRouterAndMocks()
 
@@ -132,21 +103,6 @@ func TestRoutePutNodebShutdown(t *testing.T) {
        nodebControllerMock.AssertNumberOfCalls(t, "Shutdown", 1)
 }
 
-func TestRoutePutNodebResetRanName(t *testing.T) {
-       router, _, nodebControllerMock, _ := setupRouterAndMocks()
-
-       req, err := http.NewRequest("PUT", "/v1/nodeb/ran1/reset", nil)
-       if err != nil {
-               t.Fatal(err)
-       }
-       rr := httptest.NewRecorder()
-       router.ServeHTTP(rr, req)
-
-       assert.Equal(t, http.StatusOK, rr.Code, "handler returned wrong status code")
-       assert.Equal(t, "ran1", rr.Body.String(), "handler returned wrong body")
-       nodebControllerMock.AssertNumberOfCalls(t, "X2Reset", 1)
-}
-
 func TestRouteNotFound(t *testing.T) {
        router, _, _,_ := setupRouterAndMocks()
 

diff --git a/E2Manager/managers/e2t_association_manager.go b/E2Manager/managers/e2t_association_manager.go
index 3afba25..8958241 100644 (file)
--- a/E2Manager/managers/e2t_association_manager.go
+++ b/E2Manager/managers/e2t_association_manager.go
@@ -69,7 +69,6 @@ func (m *E2TAssociationManager) associateRanAndUpdateNodeb(e2tAddress string, no
        } else {
                nodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED
                nodebInfo.AssociatedE2TInstanceAddress = e2tAddress
-               nodebInfo.ConnectionAttempts = 0
        }
        rNibErr := m.rnibDataService.UpdateNodebInfo(nodebInfo)
        if rNibErr != nil {

diff --git a/E2Manager/managers/e2t_association_manager_test.go b/E2Manager/managers/e2t_association_manager_test.go
index 7b412d4..d515cd5 100644 (file)
--- a/E2Manager/managers/e2t_association_manager_test.go
+++ b/E2Manager/managers/e2t_association_manager_test.go
@@ -71,9 +71,8 @@ func mockHttpClient(httpClientMock *mocks.HttpClientMock, apiSuffix string, isSu
 func TestAssociateRanSuccess(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
-       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
        updatedNb := *nb
-       updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
        updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
@@ -94,7 +93,7 @@ func TestAssociateRanSuccess(t *testing.T) {
 func TestAssociateRanRoutingManagerError(t *testing.T) {
        manager, _, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, false)
-       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
        writerMock.On("UpdateNodebInfo", nb).Return(nil)
 
        err := manager.AssociateRan(E2TAddress, nb)
@@ -108,9 +107,8 @@ func TestAssociateRanRoutingManagerError(t *testing.T) {
 func TestAssociateRanUpdateNodebError(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
-       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
        updatedNb := *nb
-       updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
        updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(e2managererrors.NewRnibDbError())
@@ -127,9 +125,8 @@ func TestAssociateRanUpdateNodebError(t *testing.T) {
 func TestAssociateRanGetE2tInstanceError(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
-       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
        updatedNb := *nb
-       updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
        updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
@@ -148,9 +145,8 @@ func TestAssociateRanGetE2tInstanceError(t *testing.T) {
 func TestAssociateRanSaveE2tInstanceError(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.AssociateRanToE2TInstanceApiSuffix, true)
-       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: "", ConnectionAttempts: 1}
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: ""}
        updatedNb := *nb
-       updatedNb.ConnectionAttempts = 0
        updatedNb.AssociatedE2TInstanceAddress = E2TAddress
        updatedNb.ConnectionStatus = entities.ConnectionStatus_CONNECTED
        writerMock.On("UpdateNodebInfo", &updatedNb).Return(nil)
@@ -172,7 +168,7 @@ func TestAssociateRanSaveE2tInstanceError(t *testing.T) {
 func TestDissociateRanSuccess(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.DissociateRanE2TInstanceApiSuffix, true)
-       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1}
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
        readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
        updatedNb.AssociatedE2TInstanceAddress = ""
@@ -208,7 +204,7 @@ func TestDissociateRanGetNodebError(t *testing.T) {
 
 func TestDissociateRanUpdateNodebError(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
-       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1}
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
        readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
        updatedNb.AssociatedE2TInstanceAddress = ""
@@ -225,7 +221,7 @@ func TestDissociateRanUpdateNodebError(t *testing.T) {
 
 func TestDissociateRanGetE2tInstanceError(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
-       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1}
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
        readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
        updatedNb.AssociatedE2TInstanceAddress = ""
@@ -244,7 +240,7 @@ func TestDissociateRanGetE2tInstanceError(t *testing.T) {
 
 func TestDissociateRanSaveE2tInstanceError(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
-       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1}
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
        readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
        updatedNb.AssociatedE2TInstanceAddress = ""
@@ -268,7 +264,7 @@ func TestDissociateRanSaveE2tInstanceError(t *testing.T) {
 func TestDissociateRanRoutingManagerError(t *testing.T) {
        manager, readerMock, writerMock, httpClientMock := initE2TAssociationManagerTest(t)
        mockHttpClient(httpClientMock, clients.DissociateRanE2TInstanceApiSuffix, false)
-       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress, ConnectionAttempts: 1}
+       nb := &entities.NodebInfo{RanName: RanName, AssociatedE2TInstanceAddress: E2TAddress}
        readerMock.On("GetNodeb", RanName).Return(nb, nil)
        updatedNb := *nb
        updatedNb.AssociatedE2TInstanceAddress = ""

diff --git a/E2Manager/managers/ran_disconnection_manager.go b/E2Manager/managers/ran_disconnection_manager.go
index c34e528..ce6d62e 100644 (file)
--- a/E2Manager/managers/ran_disconnection_manager.go
+++ b/E2Manager/managers/ran_disconnection_manager.go
@@ -64,8 +64,6 @@ func (m *RanDisconnectionManager) DisconnectRan(inventoryName string) error {
                return nil
        }
 
-       nodebInfo.ConnectionAttempts = 0;
-
        if connectionStatus == entities.ConnectionStatus_SHUTTING_DOWN {
                return m.updateNodebInfo(nodebInfo, entities.ConnectionStatus_SHUT_DOWN)
        }

diff --git a/E2Manager/managers/ran_setup_manager.go b/E2Manager/managers/ran_setup_manager.go
index ac24e05..f855df4 100644 (file)
--- a/E2Manager/managers/ran_setup_manager.go
+++ b/E2Manager/managers/ran_setup_manager.go
@@ -54,12 +54,11 @@ func NewRanSetupManager(logger *logger.Logger, rmrSender *rmrsender.RmrSender, r
 func (m *RanSetupManager) updateConnectionStatus(nodebInfo *entities.NodebInfo, status entities.ConnectionStatus) error {
        // Update retries and connection status
        nodebInfo.ConnectionStatus = status
-       nodebInfo.ConnectionAttempts++
        err := m.rnibDataService.UpdateNodebInfo(nodebInfo)
        if err != nil {
                m.logger.Errorf("#RanSetupManager.updateConnectionStatus - Ran name: %s - Failed updating RAN's connection status to %v : %s", nodebInfo.RanName, status, err)
        } else {
-               m.logger.Infof("#RanSetupManager.updateConnectionStatus - Ran name: %s - Successfully updated rNib. RAN's current connection status: %v, RAN's current connection attempts: %d", nodebInfo.RanName, status, nodebInfo.ConnectionAttempts)
+               m.logger.Infof("#RanSetupManager.updateConnectionStatus - Ran name: %s - Successfully updated rNib. RAN's current connection status: %v", nodebInfo.RanName, status)
        }
        return err
 }
@@ -68,12 +67,11 @@ func (m *RanSetupManager) updateConnectionStatus(nodebInfo *entities.NodebInfo,
 func (m *RanSetupManager) updateConnectionStatusDisconnected(nodebInfo *entities.NodebInfo) error {
        // Update retries and connection status
        nodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
-       nodebInfo.ConnectionAttempts--
        err := m.rnibDataService.UpdateNodebInfo(nodebInfo)
        if err != nil {
                m.logger.Errorf("#RanSetupManager.updateConnectionStatusDisconnected - Ran name: %s - Failed updating RAN's connection status to DISCONNECTED : %s", nodebInfo.RanName, err)
        } else {
-               m.logger.Infof("#RanSetupManager.updateConnectionStatusDisconnected - Ran name: %s - Successfully updated rNib. RAN's current connection status: DISCONNECTED, RAN's current connection attempts: %d", nodebInfo.RanName, nodebInfo.ConnectionAttempts)
+               m.logger.Infof("#RanSetupManager.updateConnectionStatusDisconnected - Ran name: %s - Successfully updated rNib. RAN's current connection status: DISCONNECTED", nodebInfo.RanName)
        }
        return err
 }

diff --git a/E2Manager/managers/ran_setup_manager_test.go b/E2Manager/managers/ran_setup_manager_test.go
index 7f40131..c2dbb35 100644 (file)
--- a/E2Manager/managers/ran_setup_manager_test.go
+++ b/E2Manager/managers/ran_setup_manager_test.go
@@ -62,7 +62,7 @@ func TestExecuteSetupConnectingX2Setup(t *testing.T) {
        ranName := "test1"
 
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
-       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1}
+       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        var rnibErr error
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
 
@@ -86,7 +86,7 @@ func TestExecuteSetupConnectingEndcX2Setup(t *testing.T) {
        ranName := "test1"
 
                var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST}
-       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, ConnectionAttempts: 1}
+       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST}
        var rnibErr error
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
 
@@ -110,8 +110,8 @@ func TestExecuteSetupDisconnected(t *testing.T) {
        ranName := "test1"
 
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
-       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1}
-       var argNodebDisconnected = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 0}
+       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
+       var argNodebDisconnected = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        var rnibErr error
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
        writerMock.On("UpdateNodebInfo", argNodebDisconnected).Return(rnibErr)
@@ -136,8 +136,8 @@ func TestExecuteSetupConnectingRnibError(t *testing.T) {
        ranName := "test1"
 
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
-       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1}
-       var argNodebDisconnected = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 0}
+       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
+       var argNodebDisconnected = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        var rnibErr = common.NewInternalError(fmt.Errorf("DB error"))
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
        writerMock.On("UpdateNodebInfo", argNodebDisconnected).Return(rnibErr)
@@ -164,8 +164,8 @@ func TestExecuteSetupDisconnectedRnibError(t *testing.T) {
        ranName := "test1"
 
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
-       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1}
-       var argNodebDisconnected = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 0}
+       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
+       var argNodebDisconnected = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST}
        var rnibErr error
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
        writerMock.On("UpdateNodebInfo", argNodebDisconnected).Return(common.NewInternalError(fmt.Errorf("DB error")))
@@ -192,7 +192,7 @@ func TestExecuteSetupUnsupportedProtocol(t *testing.T) {
        ranName := "test1"
 
        var initialNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_UNKNOWN_E2_APPLICATION_PROTOCOL}
-       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_UNKNOWN_E2_APPLICATION_PROTOCOL, ConnectionAttempts: 1}
+       var argNodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_UNKNOWN_E2_APPLICATION_PROTOCOL}
        var rnibErr error
        writerMock.On("UpdateNodebInfo", argNodeb).Return(rnibErr)
 

diff --git a/E2Manager/resources/configuration.yaml b/E2Manager/resources/configuration.yaml
index 434994b..d79565b 100644 (file)
--- a/E2Manager/resources/configuration.yaml
+++ b/E2Manager/resources/configuration.yaml
@@ -9,7 +9,6 @@ routingManager:
   baseUrl: http://10.0.2.15:12020/ric/v1/handles/
 notificationResponseBuffer: 100
 bigRedButtonTimeoutSec: 5
-maxConnectionAttempts: 3
 maxRnibConnectionAttempts: 3
 rnibRetryIntervalMs: 10
 keepAliveResponseTimeoutMs: 4500