From: Anssi Mannila <anssi.mannila@nokia.com>
Date: Mon, 15 Feb 2021 10:06:08 +0000 (+0200)
Subject: Xapp-frame updted to v0.6.8. Golog updated to v0.0.2
X-Git-Tag: 0.7.1~35
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=ric-plt%2Fsubmgr.git;a=commitdiff_plain;h=6eb6b06089363569b5fd6eec48c608bc4624d66b

Xapp-frame updted to v0.6.8. Golog updated to v0.0.2

Change-Id: I876a90fd636a4bec5cc84e21057e45da26c71220
Signed-off-by: Anssi Mannila <anssi.mannila@nokia.com>
---

diff --git a/container-tag.yaml b/container-tag.yaml
index 48635a9..52f2861 100644
--- a/container-tag.yaml
+++ b/container-tag.yaml
@@ -2,4 +2,4 @@
 # By default this file is in the docker build directory,
 # but the location can configured in the JJB template.
 ---
-tag: "0.6.4"
+tag: "0.6.5"
diff --git a/go.mod b/go.mod
index 41951fc..0188db9 100644
--- a/go.mod
+++ b/go.mod
@@ -4,13 +4,9 @@ go 1.12
 
 replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2
 
-replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.5.12
+replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.6.8
 
-//replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.6.7
-
-replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.1
-
-//replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.2
+replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.2
 
 replace gerrit.o-ran-sc.org/r/ric-plt/e2ap => ./e2ap/
 
diff --git a/pkg/teststub/controlRmrStub.go b/pkg/teststub/controlRmrStub.go
index ceccf44..d710dca 100644
--- a/pkg/teststub/controlRmrStub.go
+++ b/pkg/teststub/controlRmrStub.go
@@ -20,7 +20,6 @@ package teststub
 
 import (
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -67,19 +66,24 @@ func (tc *RmrStubControl) TestMsgChanEmpty(t *testing.T) {
 	}
 }
 
-func (tc *RmrStubControl) Init(desc string, srcId RmrSrcId, rtgSvc RmrRtgSvc, stat string, initMsg int) {
+func (tc *RmrStubControl) Init(desc string, srcId RmrSrcId, rtgSvc RmrRtgSvc, statDesc string, initMsg int) {
 	tc.InitMsg = initMsg
 	tc.Active = false
 	tc.RecvChan = make(chan *xapp.RMRParams)
 	tc.RmrControl.Init(desc, srcId, rtgSvc)
 
 	tc.RMRClient = xapp.NewRMRClientWithParams(&xapp.RMRClientParams{
-		ProtPort:   "tcp:" + strconv.FormatUint(uint64(srcId.Port), 10),
-		MaxSize:    65534,
-		ThreadType: 0,
-		StatDesc:   stat,
-		LowLatency: false,
-		FastAck:    false,
+		StatDesc: statDesc,
+		RmrData: xapp.PortData{
+			Name:       "", // Not used currently
+			Port:       int(srcId.Port),
+			MaxSize:    65534,
+			ThreadType: 0,
+			LowLatency: false,
+			FastAck:    false,
+			//Policies:				// Not used currently
+			MaxRetryOnFailure: 1,
+		},
 	})
 
 	tc.RMRClient.SetReadyCB(tc.ReadyCB, nil)