From d9ff71cf313086a71c417273a20b378a98c681fc Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Tue, 29 Dec 2020 06:52:39 +0000
Subject: [PATCH] Changing rmr-data to rmrdata

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: I6f182c64f957b0a602bdb25956545a002df5cbd4
---
 ci/Dockerfile                    | 2 +-
 config/config-file.json          | 4 ++--
 examples/config/config-file.json | 4 ++--
 pkg/xapp/config.go               | 2 +-
 pkg/xapp/rmr.go                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 2189c99..1e2d663 100755
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -17,7 +17,7 @@
 #
 #----------------------------------------------------------
 
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as xapp-base
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as xapp-base
 RUN apt-get update -y \
     &&apt-get install -y \
     apt-utils \
diff --git a/config/config-file.json b/config/config-file.json
index 437b526..e644caf 100755
--- a/config/config-file.json
+++ b/config/config-file.json
@@ -38,13 +38,13 @@
                 "description": "http service"
             },
             {
-                "name": "rmr-route",
+                "name": "rmrroute",
                 "container": "ueec",
                 "port": 4561,
                 "description": "rmr route port for ueec"
             },
             {
-                "name": "rmr-data",
+                "name": "rmrdata",
                 "container": "ueec",
                 "port": 4560,
                 "maxSize": 2072,
diff --git a/examples/config/config-file.json b/examples/config/config-file.json
index 8caecdb..28db4d7 100755
--- a/examples/config/config-file.json
+++ b/examples/config/config-file.json
@@ -48,13 +48,13 @@
                 "description": "http service"
             },
             {
-                "name": "rmr-route",
+                "name": "rmrroute",
                 "container": "example",
                 "port": 4561,
                 "description": "rmr route port for example"
             },
             {
-                "name": "rmr-data",
+                "name": "rmrdata",
                 "container": "example",
                 "port": 4560,
                 "maxSize": 65536,
diff --git a/pkg/xapp/config.go b/pkg/xapp/config.go
index 11daf4f..ac60ac5 100755
--- a/pkg/xapp/config.go
+++ b/pkg/xapp/config.go
@@ -143,7 +143,7 @@ func GetPortData(pname string) (d PortData) {
 		if pname == "http" {
 			d.Port = 8080
 		}
-		if pname == "rmr-data" {
+		if pname == "rmrdata" {
 			d.Port = 4560
 		}
 		return
diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go
index ef8aea5..eeadfd9 100755
--- a/pkg/xapp/rmr.go
+++ b/pkg/xapp/rmr.go
@@ -169,7 +169,7 @@ func NewRMRClientWithParams(params *RMRClientParams) *RMRClient {
 }
 
 func NewRMRClient() *RMRClient {
-	p := GetPortData("rmr-data")
+	p := GetPortData("rmrdata")
 	if p.Port == 0 || viper.IsSet("rmr.protPort") {
 		// Old xApp descriptor used, fallback to rmr section
 		fmt.Sscanf(viper.GetString("rmr.protPort"), "tcp:%d", &p.Port)
-- 
2.16.6