From 565a58f44b5a99f4088b5f0c7ef3f7b0498f2ced Mon Sep 17 00:00:00 2001 From: ss412g Date: Thu, 4 Jun 2020 16:34:37 +0300 Subject: [PATCH] [RIC-306] Fix globalRicId properties type Change-Id: I14b4da5e523741d19c38f200ea6dde7d4b38a814 Signed-off-by: ss412g --- E2Manager/Dockerfile | 2 +- E2Manager/configuration/configuration.go | 6 +++--- E2Manager/configuration/configuration_test.go | 16 ++++++++-------- .../e2_setup_request_notification_handler.go | 16 ++++++++++------ E2Manager/resources/configuration.yaml | 4 ++-- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/E2Manager/Dockerfile b/E2Manager/Dockerfile index b56f011..89c23af 100755 --- a/E2Manager/Dockerfile +++ b/E2Manager/Dockerfile @@ -20,7 +20,7 @@ # platform project (RICP). # -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:7-u18.04 as ubuntu +FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 as ubuntu WORKDIR /opt/E2Manager COPY . . diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go index 89515e4..791360a 100644 --- a/E2Manager/configuration/configuration.go +++ b/E2Manager/configuration/configuration.go @@ -152,7 +152,7 @@ func validateGlobalRicIdConfig(globalRicIdConfig *viper.Viper) error { func validateMcc(mcc string) error { if len(mcc) == 0{ - return errors.New("#configuration.validateMcc - mcc is emtpy or missing\n") + return errors.New("#configuration.validateMcc - mcc is missing or empty\n") } if len(mcc) != 3{ @@ -174,7 +174,7 @@ func validateMcc(mcc string) error { func validateMnc(mnc string) error { if len(mnc) == 0{ - return errors.New("#configuration.validateMnc - mnc is emtpy or missing\n") + return errors.New("#configuration.validateMnc - mnc is missing or empty\n") } if len(mnc) < 2 || len(mnc) >3 { @@ -197,7 +197,7 @@ func validateMnc(mnc string) error { func validateRicId(ricId string) error{ if len(ricId) == 0{ - return errors.New("#configuration.validateRicId - ricId is emtpy or missing\n") + return errors.New("#configuration.validateRicId - ricId is missing or empty\n") } if len(ricId) != 5 { diff --git a/E2Manager/configuration/configuration_test.go b/E2Manager/configuration/configuration_test.go index 9a1a9fb..4a3dff3 100644 --- a/E2Manager/configuration/configuration_test.go +++ b/E2Manager/configuration/configuration_test.go @@ -41,8 +41,8 @@ func TestParseConfigurationSuccess(t *testing.T) { assert.Equal(t, 15000, config.E2TInstanceDeletionTimeoutMs) assert.NotNil(t, config.GlobalRicId) assert.Equal(t, "AACCE", config.GlobalRicId.RicId) - assert.Equal(t, "026", config.GlobalRicId.Mcc) - assert.Equal(t, "09", config.GlobalRicId.Mnc) + assert.Equal(t, "310", config.GlobalRicId.Mcc) + assert.Equal(t, "411", config.GlobalRicId.Mnc) } func TestStringer(t *testing.T) { @@ -248,7 +248,7 @@ err = ioutil.WriteFile("../resources/configuration.yaml", buf, 0644) if err != nil { t.Errorf("#TestEmptyRicIdFailure - failed to write configuration file: %s\n", configPath) } -assert.PanicsWithValue(t, "#configuration.validateRicId - ricId is emtpy or missing\n", +assert.PanicsWithValue(t, "#configuration.validateRicId - ricId is missing or empty\n", func() { ParseConfiguration() }) } @@ -280,7 +280,7 @@ func TestMissingRicIdFailure(t *testing.T) { if err != nil { t.Errorf("#TestEmptyRicIdFailure - failed to write configuration file: %s\n", configPath) } - assert.PanicsWithValue(t, "#configuration.validateRicId - ricId is emtpy or missing\n", + assert.PanicsWithValue(t, "#configuration.validateRicId - ricId is missing or empty\n", func() { ParseConfiguration() }) } @@ -600,7 +600,7 @@ func TestMissingMmcFailure(t *testing.T) { if err != nil { t.Errorf("#TestMissingMmcFailure - failed to write configuration file: %s\n", configPath) } - assert.PanicsWithValue(t, "#configuration.validateMcc - mcc is emtpy or missing\n", + assert.PanicsWithValue(t, "#configuration.validateMcc - mcc is missing or empty\n", func() { ParseConfiguration() }) } @@ -633,7 +633,7 @@ func TestEmptyMmcFailure(t *testing.T) { if err != nil { t.Errorf("#TestEmptyMmcFailure - failed to write configuration file: %s\n", configPath) } - assert.PanicsWithValue(t, "#configuration.validateMcc - mcc is emtpy or missing\n", + assert.PanicsWithValue(t, "#configuration.validateMcc - mcc is missing or empty\n", func() { ParseConfiguration() }) } @@ -665,7 +665,7 @@ func TestEmptyMncFailure(t *testing.T) { if err != nil { t.Errorf("#TestEmptyMncFailure - failed to write configuration file: %s\n", configPath) } - assert.PanicsWithValue(t, "#configuration.validateMnc - mnc is emtpy or missing\n", + assert.PanicsWithValue(t, "#configuration.validateMnc - mnc is missing or empty\n", func() { ParseConfiguration() }) } @@ -697,6 +697,6 @@ func TestMissingMncFailure(t *testing.T) { if err != nil { t.Errorf("#TestMissingMncFailure - failed to write configuration file: %s\n", configPath) } - assert.PanicsWithValue(t, "#configuration.validateMnc - mnc is emtpy or missing\n", + assert.PanicsWithValue(t, "#configuration.validateMnc - mnc is missing or empty\n", func() { ParseConfiguration() }) } diff --git a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler.go index 2a39b73..d65516c 100644 --- a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler.go +++ b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler.go @@ -163,6 +163,8 @@ func (h E2SetupRequestNotificationHandler) handleUnsuccessfulResponse(nodebInfo responsePayload = replaceEmptyTagsWithSelfClosing(responsePayload) + h.logger.Infof("#E2SetupRequestNotificationHandler.handleUnsuccessfulResponse - payload: %s", responsePayload) + msg := models.NewRmrMessage(rmrCgo.RIC_E2_SETUP_FAILURE, nodebInfo.RanName, responsePayload, req.TransactionId, req.GetMsgSrc()) h.logger.Infof("#E2SetupRequestNotificationHandler.handleUnsuccessfulResponse - RAN name: %s - RIC_E2_SETUP_RESP message has been built successfully. Message: %x", nodebInfo.RanName, msg) _ = h.rmrSender.WhSend(msg) @@ -187,6 +189,8 @@ func (h E2SetupRequestNotificationHandler) handleSuccessfulResponse(ranName stri responsePayload = replaceEmptyTagsWithSelfClosing(responsePayload) + h.logger.Infof("#E2SetupRequestNotificationHandler.handleSuccessfulResponse - payload: %s", responsePayload) + msg := models.NewRmrMessage(rmrCgo.RIC_E2_SETUP_RESP, ranName, responsePayload, req.TransactionId, req.GetMsgSrc()) h.logger.Infof("#E2SetupRequestNotificationHandler.handleSuccessfulResponse - RAN name: %s - RIC_E2_SETUP_RESP message has been built successfully. Message: %x", ranName, msg) _ = h.rmrSender.Send(msg) @@ -195,16 +199,16 @@ func (h E2SetupRequestNotificationHandler) handleSuccessfulResponse(ranName stri func buildPlmnId(mmc string, mnc string) string{ var b strings.Builder - b.WriteString(string (mmc[1])) - b.WriteString(string (mmc[0])) + b.WriteByte(mmc[1]) + b.WriteByte(mmc[0]) if len(mnc) == 2 { b.WriteString("F") } else { - b.WriteString(string (mnc[2])) + b.WriteByte(mnc[2]) } - b.WriteString(string (mmc[2])) - b.WriteString(string (mnc[1])) - b.WriteString(string (mnc[0])) + b.WriteByte(mmc[2]) + b.WriteByte(mnc[1]) + b.WriteByte(mnc[0]) return b.String() } diff --git a/E2Manager/resources/configuration.yaml b/E2Manager/resources/configuration.yaml index f2875d4..fc77022 100644 --- a/E2Manager/resources/configuration.yaml +++ b/E2Manager/resources/configuration.yaml @@ -16,5 +16,5 @@ keepAliveDelayMs: 1500 e2tInstanceDeletionTimeoutMs: 15000 globalRicId: ricId: "AACCE" - mcc: "026" - mnc: "09" \ No newline at end of file + mcc: "310" + mnc: "411" \ No newline at end of file -- 2.16.6