From 6a9ce4976c1fbbcb8d4a068f81e76515c99a9d3f Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Sat, 15 Aug 2020 11:29:43 +0530
Subject: [PATCH 01/16] Removed Book Keeping of RMR CTL ports. Route
 Distribution only on demand

Change-Id: If017b52f9bd26d2bf7b13c32eb35b047595dd0ca
Signed-off-by: wahidw <abdulwahid.w@nokia.com>
---
 RELNOTES                |  3 +++
 cmd/rtmgr.go            |  1 -
 container-tag.yaml      |  2 +-
 pkg/nbi/control.go      | 12 ++++++------
 pkg/rtmgr/rtmgr.go      |  1 -
 pkg/sbi/nngpush.go      | 11 ++++-------
 pkg/sbi/nngpush_test.go |  2 +-
 pkg/sbi/sbi.go          |  7 ++++---
 pkg/sbi/types.go        |  4 ++--
 9 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/RELNOTES b/RELNOTES
index ab8b838..c09f8c0 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,6 @@
+### v0.6.5
+* Removed Book Keeping of RMR CTL ports. Route Distribution on demand.
+
 ### v0.6.4
 * Creating dymanic endpoints(Eps) and distributing routes to those endpoints on  upgrade route table request from xApp (this is fixed part MCxapp distribution issue for multiple route ports)
 
diff --git a/cmd/rtmgr.go b/cmd/rtmgr.go
index 37934ad..af0aba1 100644
--- a/cmd/rtmgr.go
+++ b/cmd/rtmgr.go
@@ -66,7 +66,6 @@ func main() {
 	xapp.Logger.Info("Start " + SERVICENAME + " service")
 	rtmgr.Eps = make(rtmgr.Endpoints)
 	rtmgr.Mtype = make(rtmgr.MessageTypeList)
-	rtmgr.RmrEp = make(rtmgr.ProcessMultipleRMR)
 	rtmgr.Rtmgr_ready = false
 
 // RMR thread is starting port: 4560
diff --git a/container-tag.yaml b/container-tag.yaml
index 2ff9714..1bbe2d3 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.5
+tag: 0.6.6
diff --git a/pkg/nbi/control.go b/pkg/nbi/control.go
index 0ab3f06..e31379d 100644
--- a/pkg/nbi/control.go
+++ b/pkg/nbi/control.go
@@ -136,26 +136,26 @@ func (c *Control) handleUpdateToRoutingManagerRequest(params *xapp.RMRParams) {
 	xapp.Logger.Info("Update Route Table Request, msg.String() : %s", msg.String())
 	xapp.Logger.Info("Update Route Table Request, params.Payload : %s", string(params.Payload))
 
-	/*m.Lock()
+	m.Lock()
 	data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile"))
 	m.Unlock()
 	if err != nil || data == nil {
 		xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
 		return
-	}*/
+	}
 
-	sbiEngine.CreateEndpoint(string(params.Payload),msg.String())
-	/*if ep == nil {
+	 ep,whid := sbiEngine.CreateEndpoint(string(params.Payload),msg.String())
+	if ep == nil || whid < 0 {
 		xapp.Logger.Error("Update Routing Table Request can't handle due to end point %s is not avail in complete ep list: ", string(params.Payload))
 		return
 	}
 
 	policies := rpeEngine.GeneratePolicies(rtmgr.Eps, data)
-	err = sbiEngine.DistributeToEp(policies, ep)
+	err = sbiEngine.DistributeToEp(policies, *ep, whid)
 	if err != nil {
 		xapp.Logger.Error("Routing table cannot be published due to: " + err.Error())
 		return
-	}*/
+	}
 }
 
 func sendRoutesToAll() (err error) {
diff --git a/pkg/rtmgr/rtmgr.go b/pkg/rtmgr/rtmgr.go
index 7276bc8..de7db00 100644
--- a/pkg/rtmgr/rtmgr.go
+++ b/pkg/rtmgr/rtmgr.go
@@ -43,7 +43,6 @@ var (
 	Subs SubscriptionList
 	PrsCfg  *PlatformRoutes
 	Mtype MessageTypeList
-	RmrEp ProcessMultipleRMR
 	DynamicRouteList []string
 )
 
diff --git a/pkg/sbi/nngpush.go b/pkg/sbi/nngpush.go
index dbd5d59..1b0bed0 100644
--- a/pkg/sbi/nngpush.go
+++ b/pkg/sbi/nngpush.go
@@ -123,9 +123,6 @@ func (c *RmrPush) DistributeAll(policies *[]string) error {
         for _, ep := range rtmgr.Eps {
                 go c.send_sync(ep,  policies, channel, rmrcallid)
         }
-	for rEp, id := range rtmgr.RmrEp {
-                go c.send_rt_process(rEp,id,policies,rmrcallid)
-        }
 
 	rmrcallid++
 
@@ -192,11 +189,11 @@ func (c *RmrPush) send_data(ep *rtmgr.Endpoint, policies *[]string, call_id int)
         return false
 }
 
-func (c *RmrPush) CreateEndpoint(payload string,rmrsrc string)*rtmgr.Endpoint  {
+func (c *RmrPush) CreateEndpoint(payload string,rmrsrc string)(ep *string,whid int)  {
 	return c.createEndpoint(payload,rmrsrc, c)
 }
 
-func (c *RmrPush) DistributeToEp(policies *[]string, ep *rtmgr.Endpoint) error {
+func (c *RmrPush) DistributeToEp(policies *[]string, ep string, whid int) error {
 	xapp.Logger.Debug("Invoked: sbi.DistributeToEp")
 	xapp.Logger.Debug("args: %v", *policies)
 
@@ -204,13 +201,13 @@ func (c *RmrPush) DistributeToEp(policies *[]string, ep *rtmgr.Endpoint) error {
                 rmrdynamiccallid = 201
         }
 
-	go c.send_data(ep, policies,rmrdynamiccallid)
+	go c.sendDynamicRoutes(ep, whid, policies,rmrdynamiccallid)
 	rmrdynamiccallid++
 
 	return nil
 }
 
-func (c *RmrPush) send_rt_process(ep string,whid int, policies *[]string, call_id int) bool {
+func (c *RmrPush) sendDynamicRoutes(ep string,whid int, policies *[]string, call_id int) bool {
         xapp.Logger.Debug("Invoked send_rt_process to endpoint: " + ep + " call_id: " + strconv.Itoa(call_id) + "whid: " + strconv.Itoa(whid))
         var state int
         var retstr string
diff --git a/pkg/sbi/nngpush_test.go b/pkg/sbi/nngpush_test.go
index 3acc56b..79821eb 100644
--- a/pkg/sbi/nngpush_test.go
+++ b/pkg/sbi/nngpush_test.go
@@ -131,7 +131,7 @@ func TestDistributeToEp(t *testing.T) {
 	var rmrpush = RmrPush{}
 	resetTestPushDataset(rmrpush, stub.ValidEndpoints)
 
-	err = rmrpush.DistributeToEp(stub.ValidPolicies,rtmgr.Eps["localhost"])
+	err = rmrpush.DistributeToEp(stub.ValidPolicies,"localhost:4561",100)
 	if err != nil {
 		t.Errorf("rmrpush.DistributetoEp(policies) was incorrect, got: %v, want: %v.", err, "nil")
 	}
diff --git a/pkg/sbi/sbi.go b/pkg/sbi/sbi.go
index c576c34..21ff78e 100644
--- a/pkg/sbi/sbi.go
+++ b/pkg/sbi/sbi.go
@@ -176,7 +176,7 @@ func (s *Sbi) updateE2TEndpoints(E2Ts *map[string]rtmgr.E2TInstance, sbi Engine)
 	}
 }
 
-func (s *Sbi) createEndpoint(payload string,rmrsrc string, sbi Engine) *rtmgr.Endpoint {
+func (s *Sbi) createEndpoint(payload string,rmrsrc string, sbi Engine) (*string,int) {
 	xapp.Logger.Debug("CreateEndPoint %v", payload)
 //	stringSlice := strings.Split(payload, " ")
 //	uuid := stringSlice[0]
@@ -206,9 +206,10 @@ func (s *Sbi) createEndpoint(payload string,rmrsrc string, sbi Engine) *rtmgr.En
 
 	xapp.Logger.Info("Wormhole Id created is %d for EndPoint %s",Whid,srcStringSlice[1])
 	if Whid > 0 {
-		rtmgr.RmrEp[srcStringSlice[1]] = Whid
+//		rtmgr.RmrEp[srcStringSlice[1]] = Whid
 		xapp.Logger.Info("received %s and mapped to Whid = %d",srcStringSlice[1],Whid)
+		return &srcStringSlice[1],Whid
 	}
 
-	return nil
+	return nil,Whid
  }
diff --git a/pkg/sbi/types.go b/pkg/sbi/types.go
index 9e6fe02..e2f14ed 100644
--- a/pkg/sbi/types.go
+++ b/pkg/sbi/types.go
@@ -45,8 +45,8 @@ type Engine interface {
 	AddEndpoint(*rtmgr.Endpoint) error
 	DeleteEndpoint(*rtmgr.Endpoint) error
 	UpdateEndpoints(*rtmgr.RicComponents)
-	CreateEndpoint(string,string)*rtmgr.Endpoint
-	DistributeToEp(*[]string, *rtmgr.Endpoint) error
+	CreateEndpoint(string,string)(*string,int)
+	DistributeToEp(*[]string, string, int ) error
 }
 
 /*type NngSocket interface {
-- 
2.16.6


From 4984522994d50af32fe8f0d1b0fbc7339bdf077f Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Sat, 22 Aug 2020 20:34:59 +0530
Subject: [PATCH 02/16] Publish Route only once to the endpoint that requests
 it. Periodic/Event based distribution will be done only for the process with
 RMR Control Port 4561

Change-Id: Ieae5db99d62e580a2bc8d9e5ae3a00963b0618a5
Signed-off-by: wahidw <abdulwahid.w@nokia.com>
---
 RELNOTES                |  3 ++
 container-tag.yaml      |  2 +-
 pkg/nbi/control.go      | 14 ++++++--
 pkg/sbi/nngpush.go      | 18 +++++-----
 pkg/sbi/nngpush_test.go | 37 +++++++++++++++++--
 pkg/sbi/sbi.go          | 95 ++++++++++++++++++++++++++-----------------------
 pkg/sbi/types.go        |  3 +-
 pkg/stub/stub.go        |  1 +
 8 files changed, 112 insertions(+), 61 deletions(-)

diff --git a/RELNOTES b/RELNOTES
index c09f8c0..8a1ed82 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,6 @@
+### v0.6.7
+* Publish Route only once to the endpoint that requests it. Periodic/Event based distribution will be done only for the process with RMR Control Port 4561.
+
 ### v0.6.5
 * Removed Book Keeping of RMR CTL ports. Route Distribution on demand.
 
diff --git a/container-tag.yaml b/container-tag.yaml
index 1bbe2d3..041cba7 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.6
+tag: 0.6.7
diff --git a/pkg/nbi/control.go b/pkg/nbi/control.go
index e31379d..db6c405 100644
--- a/pkg/nbi/control.go
+++ b/pkg/nbi/control.go
@@ -144,14 +144,22 @@ func (c *Control) handleUpdateToRoutingManagerRequest(params *xapp.RMRParams) {
 		return
 	}
 
-	 ep,whid := sbiEngine.CreateEndpoint(string(params.Payload),msg.String())
-	if ep == nil || whid < 0 {
+	ep := sbiEngine.CheckEndpoint(string(params.Payload))
+	if ep == nil {
 		xapp.Logger.Error("Update Routing Table Request can't handle due to end point %s is not avail in complete ep list: ", string(params.Payload))
 		return
 	}
+	epstr,whid := sbiEngine.CreateEndpoint(msg.String())
+	if epstr == nil || whid < 0 {
+		xapp.Logger.Error("Wormhole Id creation failed %d for %s",whid,msg.String() )
+		return
+	}
 
+	/*This is to ensure the latest routes are sent.
+	Assumption is that in this time interval the routes are built for this endpoint */
+        time.Sleep(100 * time.Millisecond)
 	policies := rpeEngine.GeneratePolicies(rtmgr.Eps, data)
-	err = sbiEngine.DistributeToEp(policies, *ep, whid)
+	err = sbiEngine.DistributeToEp(policies, *epstr, whid)
 	if err != nil {
 		xapp.Logger.Error("Routing table cannot be published due to: " + err.Error())
 		return
diff --git a/pkg/sbi/nngpush.go b/pkg/sbi/nngpush.go
index 1b0bed0..4b7f871 100644
--- a/pkg/sbi/nngpush.go
+++ b/pkg/sbi/nngpush.go
@@ -177,20 +177,21 @@ func (c *RmrPush) send_data(ep *rtmgr.Endpoint, policies *[]string, call_id int)
         params.Timeout = 200
         state, retstr = xapp.Rmr.SendCallMsg(params.RMRParams)
 	routestatus := strings.Split(retstr," ")
-        if state != C.RMR_OK && routestatus[0] == "OK" {
+        if state != C.RMR_OK && routestatus[0] != "OK" {
               xapp.Logger.Error("Updating Routes to Endpoint: " + ep.Uuid + " failed, call_id: " + strconv.Itoa(call_id) + " for xapp.Rmr.SendCallMsg " + " Route Update Status: " + routestatus[0])
               return false
         } else {
 		xapp.Logger.Info("Update Routes to Endpoint: " + ep.Uuid + " successful, call_id: " + strconv.Itoa(call_id) + ", Payload length: " + strconv.Itoa(params.PayloadLen) + ", Route Update Status: " + routestatus[0] + "(# of Entries:" + strconv.Itoa(len(*policies)))
               return true
         }
+}
 
-        xapp.Logger.Error("Route Update to endpoint: " + ep.Uuid + " failed, call_id: " + strconv.Itoa(call_id) + " xapp.Rmr.SendCallMsg not called")
-        return false
+func (c *RmrPush) CheckEndpoint(payload string)(ep *rtmgr.Endpoint)  {
+	return c.checkEndpoint(payload)
 }
 
-func (c *RmrPush) CreateEndpoint(payload string,rmrsrc string)(ep *string,whid int)  {
-	return c.createEndpoint(payload,rmrsrc, c)
+func (c *RmrPush) CreateEndpoint(rmrsrc string)(ep *string,whid int)  {
+	return c.createEndpoint(rmrsrc)
 }
 
 func (c *RmrPush) DistributeToEp(policies *[]string, ep string, whid int) error {
@@ -230,15 +231,12 @@ func (c *RmrPush) sendDynamicRoutes(ep string,whid int, policies *[]string, call
         params.Timeout = 200
         state, retstr = xapp.Rmr.SendCallMsg(params.RMRParams)
         routestatus := strings.Split(retstr," ")
-        if state != C.RMR_OK && routestatus[0] == "OK" {
+        if state != C.RMR_OK && routestatus[0] != "OK" {
                 xapp.Logger.Error("Updating Routes to Endpoint: " + ep + " failed, call_id: " + strconv.Itoa(call_id) + ",whi_id: " + strconv.Itoa(whid) + " for xapp.Rmr.SendCallMsg " + " Route Update Status: " + routestatus[0])
               return false
         } else {
-                xapp.Logger.Info("Update Routes to Endpoint: " + ep + " successful, call_id: " + strconv.Itoa(call_id) + ", Payload length: " + strconv.Itoa(params.PayloadLen) + ",whi_id: " + strconv.Itoa(whid) + ", Route Update Status: " + routestatus[0] + "(# of Entries:" + strconv.Itoa(len(*policies)))
+                xapp.Logger.Info("Update Routes to Endpoint: " + ep + " successful, call_id: " + strconv.Itoa(call_id) + ", Payload length: " + strconv.Itoa(params.PayloadLen) + ",whid: " + strconv.Itoa(whid) + ", Route Update Status: " + routestatus[0] + "(# of Entries:" + strconv.Itoa(len(*policies)))
       return true
         }
-
-        xapp.Logger.Error("Route Update to endpoint: " + ep + " failed, call_id: " + strconv.Itoa(call_id) + ",whi_id: " + strconv.Itoa(whid) + " xapp.Rmr.SendCallMsg not called")
-        return false
 }
 
diff --git a/pkg/sbi/nngpush_test.go b/pkg/sbi/nngpush_test.go
index 79821eb..aae9121 100644
--- a/pkg/sbi/nngpush_test.go
+++ b/pkg/sbi/nngpush_test.go
@@ -27,6 +27,7 @@
 */
 package sbi
 
+
 import (
 	//"errors"
 	"routing-manager/pkg/rtmgr"
@@ -117,6 +118,7 @@ func TestRmrPushDistributeAll(t *testing.T) {
 	var rmrpush = RmrPush{}
 	resetTestPushDataset(rmrpush, stub.ValidEndpoints)
 
+	rmrcallid = 200
 	err = rmrpush.DistributeAll(stub.ValidPolicies)
 	if err != nil {
 		t.Errorf("rmrpush.DistributeAll(policies) was incorrect, got: %v, want: %v.", err, "nil")
@@ -131,6 +133,7 @@ func TestDistributeToEp(t *testing.T) {
 	var rmrpush = RmrPush{}
 	resetTestPushDataset(rmrpush, stub.ValidEndpoints)
 
+	rmrdynamiccallid = 255
 	err = rmrpush.DistributeToEp(stub.ValidPolicies,"localhost:4561",100)
 	if err != nil {
 		t.Errorf("rmrpush.DistributetoEp(policies) was incorrect, got: %v, want: %v.", err, "nil")
@@ -148,11 +151,18 @@ func TestDeleteEndpoint(t *testing.T) {
 	}
 }
 
+func TestCheckEndpoint(t *testing.T) {
+	var rmrpush = RmrPush{}
+	resetTestPushDataset(rmrpush, stub.ValidEndpoints1)
+	rmrpush.CheckEndpoint("192.168.0.1:0")
+	rmrpush.CheckEndpoint("10.2.2.1:0")
+	rmrpush.CheckEndpoint("localhost:0")
+}
+
 func TestCreateEndpoint(t *testing.T) {
 	var rmrpush = RmrPush{}
 	resetTestPushDataset(rmrpush, stub.ValidEndpoints1)
-	rmrpush.CreateEndpoint("192.168.0.1:0","Src=192.168.0.1:4561")
-	rmrpush.CreateEndpoint("localhost:4560","Src=192.168.11.1:4444")
+	rmrpush.CreateEndpoint("Src=127.0.0.1:4561 hello")
 }
 /*
 Initialize and send policies
@@ -163,3 +173,26 @@ func TestRmrPushInitializeandsendPolicies(t *testing.T) {
         policies := []string{"hello","welcome"}
 	rmrpush.send_data(rtmgr.Eps["localhost"],&policies,1)
 }
+
+func TestString( t *testing.T) {
+	var params xapp.RMRParams
+	params.Payload = []byte("abcdefgh")
+	params.Meid = &xapp.RMRMeid{}
+	msg := RMRParams{&params}
+	msg.String()
+
+}
+
+func TestSenddata(t *testing.T) {
+	var rmrpush = RmrPush{}
+	ep := rtmgr.Endpoint{Whid:-1, Ip:"1.1.1.1"}
+	policies := []string{"mse|12345|-1|local.com"}
+	rmrpush.send_data(&ep, &policies,300)
+}
+
+func TestSendDynamicdata(t *testing.T) {
+	var rmrpush = RmrPush{}
+	ep := "1.1.1.1"
+	policies := []string{"mse|12345|-1|local.com"}
+	rmrpush.sendDynamicRoutes(ep,1, &policies,300)
+}
diff --git a/pkg/sbi/sbi.go b/pkg/sbi/sbi.go
index 21ff78e..8833987 100644
--- a/pkg/sbi/sbi.go
+++ b/pkg/sbi/sbi.go
@@ -31,9 +31,9 @@ package sbi
 
 import (
 	"errors"
-	//"fmt"
+	"fmt"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	//"net"
+	"net"
 	"routing-manager/pkg/rtmgr"
 	"strconv"
 	"strings"
@@ -123,16 +123,16 @@ func (s *Sbi) updatePlatformEndpoints(pcs *rtmgr.PlatformComponents, sbi Engine)
 			rtmgr.Eps[uuid].Keepalive = true
 		} else {
 			ep := &rtmgr.Endpoint{
-				Uuid:       uuid,
-				Name:       pc.Name,
-				XAppType:   PlatformType,
-				Ip:         pc.Fqdn,
-				Port:       pc.Port,
+				Uuid:     uuid,
+				Name:     pc.Name,
+				XAppType: PlatformType,
+				Ip:       pc.Fqdn,
+				Port:     pc.Port,
 				//TxMessages: rtmgr.PLATFORMMESSAGETYPES[pc.Name]["tx"],
 				//RxMessages: rtmgr.PLATFORMMESSAGETYPES[pc.Name]["rx"],
-				Socket:     nil,
-				IsReady:    false,
-				Keepalive:  true,
+				Socket:    nil,
+				IsReady:   false,
+				Keepalive: true,
 			}
 			xapp.Logger.Debug("ep created: %v", ep)
 			if err := sbi.AddEndpoint(ep); err != nil {
@@ -155,16 +155,16 @@ func (s *Sbi) updateE2TEndpoints(E2Ts *map[string]rtmgr.E2TInstance, sbi Engine)
 			rtmgr.Eps[uuid].Keepalive = true
 		} else {
 			ep := &rtmgr.Endpoint{
-				Uuid:       uuid,
-				Name:       e2t.Name,
-				XAppType:   PlatformType,
-				Ip:         ipaddress,
-				Port:       uint16(port),
+				Uuid:     uuid,
+				Name:     e2t.Name,
+				XAppType: PlatformType,
+				Ip:       ipaddress,
+				Port:     uint16(port),
 				//TxMessages: rtmgr.PLATFORMMESSAGETYPES[e2t.Name]["tx"],
 				//RxMessages: rtmgr.PLATFORMMESSAGETYPES[e2t.Name]["rx"],
-				Socket:     nil,
-				IsReady:    false,
-				Keepalive:  true,
+				Socket:    nil,
+				IsReady:   false,
+				Keepalive: true,
 			}
 			xapp.Logger.Debug("ep created: %v", ep)
 			if err := sbi.AddEndpoint(ep); err != nil {
@@ -176,40 +176,47 @@ func (s *Sbi) updateE2TEndpoints(E2Ts *map[string]rtmgr.E2TInstance, sbi Engine)
 	}
 }
 
-func (s *Sbi) createEndpoint(payload string,rmrsrc string, sbi Engine) (*string,int) {
-	xapp.Logger.Debug("CreateEndPoint %v", payload)
-//	stringSlice := strings.Split(payload, " ")
-//	uuid := stringSlice[0]
-//	xapp.Logger.Debug(">>> uuid %v", stringSlice[0])
-
-/*	if _, ok := rtmgr.Eps[uuid]; ok {
-		ep := rtmgr.Eps[uuid]
-		return ep
-	}*/
+func (s *Sbi) checkEndpoint(payload string) *rtmgr.Endpoint {
+	/* Payload contains endpoint in the form of IP<domain name>:Port.
+	Port is data port of sender endpoint.
+	Eps contains the UUID in the form of IP<domain name>:Port.
+	Port is the Application Port(http) */
+
+	xapp.Logger.Debug("Invoked checkEndPoint %v", payload)
+	stringSlice := strings.Split(payload, " ")
+	uuid := stringSlice[0]
+	stringsubsplit := strings.Split(uuid, ":")
+	xapp.Logger.Debug(">>> uuid %v", stringSlice[0])
+	for _, ep := range rtmgr.Eps {
+		if strings.Contains(ep.Uuid, stringsubsplit[0]) == true {
+			endpoint := rtmgr.Eps[ep.Uuid]
+			return endpoint
+		}
+	}
 
 	/* incase the stored Endpoint list is in the form of IP:port*/
-/*	stringsubsplit := strings.Split(uuid, ":")
 	addr, err := net.LookupIP(stringsubsplit[0])
 	if err == nil {
 		convertedUuid := fmt.Sprintf("%s:%s", addr[0], stringsubsplit[1])
 		xapp.Logger.Info(" IP:Port received is %s", convertedUuid)
-		if _, ok := rtmgr.Eps[convertedUuid]; ok {
-			ep := rtmgr.Eps[convertedUuid]
-			return ep
+		IP := fmt.Sprintf("%s", addr[0])
+		for _, ep := range rtmgr.Eps {
+			res := strings.Contains(ep.Uuid, IP)
+			if res == true {
+				endpoint := rtmgr.Eps[ep.Uuid]
+				return endpoint
+			}
 		}
-	}*/
+	}
+	return nil
+}
 
+func (s *Sbi) createEndpoint(rmrsrc string) (*string, int) {
 	/* Create a new mapping, this case is assumed for multiple process sending RMR request from a container */
-	srcString := strings.Split(rmrsrc," ")
-	srcStringSlice := strings.Split(srcString[0],"=")
+	srcString := strings.Split(rmrsrc, " ")
+	srcStringSlice := strings.Split(srcString[0], "=")
 	Whid := int(xapp.Rmr.Openwh(srcStringSlice[1]))
 
-	xapp.Logger.Info("Wormhole Id created is %d for EndPoint %s",Whid,srcStringSlice[1])
-	if Whid > 0 {
-//		rtmgr.RmrEp[srcStringSlice[1]] = Whid
-		xapp.Logger.Info("received %s and mapped to Whid = %d",srcStringSlice[1],Whid)
-		return &srcStringSlice[1],Whid
-	}
-
-	return nil,Whid
- }
+	xapp.Logger.Info("Wormhole Id created is %d for EndPoint %s", Whid, srcStringSlice[1])
+	return &srcStringSlice[1], Whid
+}
diff --git a/pkg/sbi/types.go b/pkg/sbi/types.go
index e2f14ed..b52dcfa 100644
--- a/pkg/sbi/types.go
+++ b/pkg/sbi/types.go
@@ -45,7 +45,8 @@ type Engine interface {
 	AddEndpoint(*rtmgr.Endpoint) error
 	DeleteEndpoint(*rtmgr.Endpoint) error
 	UpdateEndpoints(*rtmgr.RicComponents)
-	CreateEndpoint(string,string)(*string,int)
+	CreateEndpoint(string)(*string,int)
+	CheckEndpoint(string)*rtmgr.Endpoint
 	DistributeToEp(*[]string, string, int ) error
 }
 
diff --git a/pkg/stub/stub.go b/pkg/stub/stub.go
index b3e5f3d..f5f3b72 100644
--- a/pkg/stub/stub.go
+++ b/pkg/stub/stub.go
@@ -71,6 +71,7 @@ var ValidEndpoints1 = []rtmgr.Endpoint{
         {Uuid: "192.168.0.1:0", Name: "SUBMAN", XAppType: "app2", Ip: "", Port: 0, TxMessages: []string{"", ""}, RxMessages: []string{"", ""}, Socket: nil, IsReady: false, Keepalive: false},
         {Uuid: "10.1.1.1:0", Name: "E2MAN", XAppType: "app3", Ip: "", Port: 0, TxMessages: []string{"", ""}, RxMessages: []string{"", ""}, Socket: nil, IsReady: true, Keepalive: false},
         {Uuid: "10.2.2.1:0", Name: "UEMAN", XAppType: "app4", Ip: "", Port: 0, TxMessages: []string{"", ""}, RxMessages: []string{"", ""}, Policies: []int32{1, 2}, Socket: nil, IsReady: false, Keepalive: true},
+        {Uuid: "127.0.0.1:0", Name: "UEMAN1", XAppType: "app4", Ip: "", Port: 0, TxMessages: []string{"", ""}, RxMessages: []string{"", ""}, Policies: []int32{1, 2}, Socket: nil, IsReady: false, Keepalive: true},
 }
 
 var ValidSubscriptions = &[]rtmgr.Subscription{
-- 
2.16.6


From bceb7d41dd5a7785982844faa9ea2171fe5b8dc4 Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Tue, 20 Oct 2020 16:21:52 +0000
Subject: [PATCH 03/16] Appending Receiver endpoint in routes if RX message
 type is same

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: I51c6f9b2be95c1bc3a3b6ebca602c611b3d8e33f
---
 RELNOTES           |  3 +++
 cmd/rtmgr.go       |  8 ++++----
 container-tag.yaml |  2 +-
 pkg/rpe/rpe.go     | 38 ++++++++++++++++++++++++++++----------
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/RELNOTES b/RELNOTES
index 8a1ed82..96deaaa 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,6 @@
+### v0.6.8
+* Appending Receiver endpoint in routes if RX message type is same
+
 ### v0.6.7
 * Publish Route only once to the endpoint that requests it. Periodic/Event based distribution will be done only for the process with RMR Control Port 4561.
 
diff --git a/cmd/rtmgr.go b/cmd/rtmgr.go
index af0aba1..1234622 100644
--- a/cmd/rtmgr.go
+++ b/cmd/rtmgr.go
@@ -68,17 +68,17 @@ func main() {
 	rtmgr.Mtype = make(rtmgr.MessageTypeList)
 	rtmgr.Rtmgr_ready = false
 
-// RMR thread is starting port: 4560
+	// RMR thread is starting port: 4560
 	c := nbi.NewControl()
 	go c.Run()
 
-// Waiting for RMR to be ready
+	// Waiting for RMR to be ready
 	time.Sleep(time.Duration(2) * time.Second)
 	for xapp.Rmr.IsReady() == false {
-	        time.Sleep(time.Duration(2) * time.Second)
+		time.Sleep(time.Duration(2) * time.Second)
 	}
 
-	dummy_whid := int(xapp.Rmr.Openwh("localhost:4560"))
+	dummy_whid := int(xapp.Rmr.Openwh("rtmgr:4560"))
 	xapp.Logger.Info("created dummy Wormhole ID for routingmanager and dummy_whid :%d", dummy_whid)
 
 	nbi.Serve()
diff --git a/container-tag.yaml b/container-tag.yaml
index 041cba7..5bb3ab8 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.7
+tag: 0.6.8
diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go
index 4097ae0..3a3eac1 100644
--- a/pkg/rpe/rpe.go
+++ b/pkg/rpe/rpe.go
@@ -184,31 +184,49 @@ func (r *Rpe) generateXappRoutes(xAppEp *rtmgr.Endpoint, subManEp *rtmgr.Endpoin
 
 }
 
-
 func (r *Rpe) generateXappToXappRoutes(RecvxAppEp *rtmgr.Endpoint, endPointList rtmgr.Endpoints, routeTable *rtmgr.RouteTable) {
 	xapp.Logger.Debug("rpe.generateXappToXappRoutes invoked")
 
 	for _, rxmsg := range RecvxAppEp.RxMessages {
 
 		var src_present bool
+		identicalMsg := false
+		var RxGrp []rtmgr.Endpoint
 		xapp.Logger.Debug("RecvxAppEp.RxMessages Endpoint: %v, xAppType: %v and rxmsg: %v ", RecvxAppEp.Name, RecvxAppEp.XAppType, rxmsg)
-		if (rxmsg != "RIC_SUB_RESP" && rxmsg != "RIC_SUB_FAILURE" && rxmsg != "RIC_SUB_DEL_RESP" && rxmsg != "RIC_SUB_DEL_FAILURE" && rxmsg != "RIC_INDICATION" && rxmsg != "RIC_CONTROL_ACK" && rxmsg != "RIC_CONTROL_FAILURE" && rxmsg != "A1_POLICY_REQ") {
+		if rxmsg != "RIC_SUB_RESP" && rxmsg != "RIC_SUB_FAILURE" && rxmsg != "RIC_SUB_DEL_RESP" && rxmsg != "RIC_SUB_DEL_FAILURE" && rxmsg != "RIC_INDICATION" && rxmsg != "RIC_CONTROL_ACK" && rxmsg != "RIC_CONTROL_FAILURE" && rxmsg != "A1_POLICY_REQ" {
 			for _, SrcxAppEp := range endPointList {
 				if SrcxAppEp.XAppType != sbi.PlatformType && (len(SrcxAppEp.TxMessages) > 0) && SrcxAppEp.Name != RecvxAppEp.Name {
 					for _, txmsg := range SrcxAppEp.TxMessages {
-							if (rxmsg == txmsg) {
-								r.addRoute(rxmsg, SrcxAppEp, RecvxAppEp, routeTable, -1, "")
-								src_present = true
-								break
-							}
+						if rxmsg == txmsg {
+							r.addRoute(rxmsg, SrcxAppEp, RecvxAppEp, routeTable, -1, "")
+							src_present = true
+							break
+						}
+					}
+				}
+			}
+			for _, SrcxAppEp := range endPointList {
+
+				if SrcxAppEp.XAppType != sbi.PlatformType && (len(SrcxAppEp.RxMessages) > 0) && SrcxAppEp.Name != RecvxAppEp.Name {
+					for _, newrxmsg := range SrcxAppEp.RxMessages {
+						if newrxmsg == rxmsg {
+							RxGrp = append(RxGrp, *SrcxAppEp)
+							identicalMsg = true
+						}
 					}
 				}
 			}
-			if src_present == false {
+			if src_present == false && identicalMsg == false {
+				xapp.Logger.Debug("Message type %v,for SrcxAppEp.Name %v", rxmsg, RecvxAppEp)
 				r.addRoute(rxmsg, nil, RecvxAppEp, routeTable, -1, "")
 			}
+			if identicalMsg == true {
+				xapp.Logger.Debug("Appending Message type %v,for SrcxAppEp.Name %v", rxmsg, RecvxAppEp)
+				RxGrp = append(RxGrp, *RecvxAppEp)
+				r.addRoute_rx_list(rxmsg, nil, RxGrp, routeTable, -1, "")
+				return
+			}
 		}
-
 	}
 }
 
@@ -235,7 +253,7 @@ func (r *Rpe) generateSubscriptionRoutes(selectedxAppEp *rtmgr.Endpoint, subManE
 				r.addRoute("RIC_CONTROL_FAILURE", nil, xAppEp, routeTable, subscription.SubID, "")
 			}
 		} else {
-				xapp.Logger.Error("generateSubscriptionRoutes xAppEp is nil, xApp UUID: %v", xAppUuid)
+			xapp.Logger.Error("generateSubscriptionRoutes xAppEp is nil, xApp UUID: %v", xAppUuid)
 		}
 	}
 }
-- 
2.16.6


From acd34be97587803dbd1547bbf02e48bffd9fd973 Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Wed, 28 Oct 2020 17:47:30 +0000
Subject: [PATCH 04/16] Unit test case correction

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: Ide0114071bead86720f7a005ea7ead0a2f0324f5
---
 pkg/nbi/httprestful_test.go | 292 +++++++++++++++++++++-----------------------
 pkg/sbi/nngpush_test.go     |  46 +++----
 2 files changed, 164 insertions(+), 174 deletions(-)

diff --git a/pkg/nbi/httprestful_test.go b/pkg/nbi/httprestful_test.go
index 2bece66..3c78c68 100644
--- a/pkg/nbi/httprestful_test.go
+++ b/pkg/nbi/httprestful_test.go
@@ -32,23 +32,23 @@ package nbi
 import (
 	"encoding/json"
 	"fmt"
+	xfmodel "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	"github.com/go-openapi/swag"
+	"github.com/spf13/viper"
 	"io/ioutil"
 	"net"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	xfmodel "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"routing-manager/pkg/models"
 	"routing-manager/pkg/rpe"
 	"routing-manager/pkg/rtmgr"
-	"routing-manager/pkg/sdl"
 	"routing-manager/pkg/sbi"
+	"routing-manager/pkg/sdl"
 	"routing-manager/pkg/stub"
-	"testing"
 	"sync"
-	"github.com/go-openapi/swag"
-	"github.com/spf13/viper"
+	"testing"
 	"time"
 )
 
@@ -79,19 +79,18 @@ var InvalidSubResp = []byte(`{"Version":0, "EventType":all}`)
 type Consumer struct{}
 
 func (m Consumer) Consume(params *xapp.RMRParams) (err error) {
-        xapp.Sdl.Store("myKey", params.Payload)
-        return nil
+	xapp.Sdl.Store("myKey", params.Payload)
+	return nil
 }
 
 // Test cases
 func TestMain(m *testing.M) {
-        go xapp.RunWithParams(Consumer{}, viper.GetBool("db.waitForSdl"))
-        time.Sleep(time.Duration(5) * time.Second)
-        code := m.Run()
-        os.Exit(code)
+	go xapp.RunWithParams(Consumer{}, viper.GetBool("db.waitForSdl"))
+	time.Sleep(time.Duration(5) * time.Second)
+	code := m.Run()
+	os.Exit(code)
 }
 
-
 func TestValidateXappCallbackData_1(t *testing.T) {
 	data := models.XappCallbackData{
 		XApps:   *swag.String("[]"),
@@ -105,13 +104,12 @@ func TestValidateXappCallbackData_1(t *testing.T) {
 	}
 }
 
-func TestValidateXappCallbackDataInvalid (t *testing.T) {
+func TestValidateXappCallbackDataInvalid(t *testing.T) {
 	data := models.XappCallbackData{}
 	err := validateXappCallbackData(&data)
 	t.Log(err)
 }
 
-
 func TestValidateXappSubscriptionsData(t *testing.T) {
 
 	ep := make(map[string]*rtmgr.Endpoint)
@@ -147,9 +145,9 @@ func TestValidateXappSubscriptionsData(t *testing.T) {
 	//test case for provideXappSubscriptionHandleImp
 	//datachannel := make(chan *models.XappSubscriptionData, 10)
 	sdlEngine, _ = sdl.GetSdl("file")
-	sbiEngine, _ =  sbi.GetSbi("rmrpush")
-	rpeEngine, _ = rpe.GetRpe ("rmrpush")
-	_ = provideXappSubscriptionHandleImpl( &data1)
+	sbiEngine, _ = sbi.GetSbi("rmrpush")
+	rpeEngine, _ = rpe.GetRpe("rmrpush")
+	_ = provideXappSubscriptionHandleImpl(&data1)
 	//defer close(datachannel)
 
 	//test case for deleteXappSubscriptionHandleImpl
@@ -198,7 +196,6 @@ func TestValidateE2tDatavalid(t *testing.T) {
 		E2TAddress: swag.String("10.101.01.1:8098"),
 	}
 
-
 	err := validateE2tData(&data)
 	t.Log(err)
 
@@ -214,50 +211,48 @@ func TestValidateE2tDatavalidEndpointPresent(t *testing.T) {
 	// insert endpoint for testing purpose
 	uuid := "10.101.01.1:8098"
 	ep := &rtmgr.Endpoint{
-		Uuid:       uuid,
+		Uuid: uuid,
 	}
 	rtmgr.Eps[uuid] = ep
 
 	err := validateE2tData(&data)
 	t.Log(err)
 
-	// delete endpoint for at end of test case 
-    delete(rtmgr.Eps, uuid);
+	// delete endpoint for at end of test case
+	delete(rtmgr.Eps, uuid)
 
 }
 
-
 func TestValidateDeleteE2tData(t *testing.T) {
 
-// test-1		
+	// test-1
 	data := models.E2tDeleteData{
 		E2TAddress: swag.String(""),
 	}
 
 	err := validateDeleteE2tData(&data)
-	if (err.Error() != "E2TAddress is empty!!!") {
+	if err.Error() != "E2TAddress is empty!!!" {
 		t.Log(err)
 	}
 
-
-// test-2
+	// test-2
 	data = models.E2tDeleteData{
 		E2TAddress: swag.String("10.101.01.1:8098"),
 	}
 
 	err = validateDeleteE2tData(&data)
-	if (err != nil ) {
+	if err != nil {
 		t.Log(err)
 	}
 
-// test-3
-//################ Create End Point dummy entry  
+	// test-3
+	//################ Create End Point dummy entry
 	uuid := "10.101.01.1:8098"
 	ep := &rtmgr.Endpoint{
-		Uuid:       uuid,
+		Uuid: uuid,
 	}
 	rtmgr.Eps[uuid] = ep
-//#####################
+	//#####################
 
 	data = models.E2tDeleteData{
 		E2TAddress: swag.String("10.101.01.1:8098"),
@@ -267,30 +262,30 @@ func TestValidateDeleteE2tData(t *testing.T) {
 	}
 
 	err = validateDeleteE2tData(&data)
-	if (err != nil ) {
+	if err != nil {
 		t.Log(err)
 	}
 
-	// delete endpoint for at end of test case 
-//################ Delete End Point dummy entry  
-    delete(rtmgr.Eps, uuid);
-//#####################
+	// delete endpoint for at end of test case
+	//################ Delete End Point dummy entry
+	delete(rtmgr.Eps, uuid)
+	//#####################
 
-// test-4
+	// test-4
 
-//################ Create End Point dummy entry  
+	//################ Create End Point dummy entry
 	uuid = "10.101.01.1:9991"
 	ep = &rtmgr.Endpoint{
-		Uuid:       uuid,
+		Uuid: uuid,
 	}
 	rtmgr.Eps[uuid] = ep
 
 	uuid = "10.101.01.1:9992"
 	ep = &rtmgr.Endpoint{
-		Uuid:       uuid,
+		Uuid: uuid,
 	}
 	rtmgr.Eps[uuid] = ep
-//#####################
+	//#####################
 
 	data = models.E2tDeleteData{
 		E2TAddress: swag.String("10.101.01:8098"),
@@ -301,15 +296,15 @@ func TestValidateDeleteE2tData(t *testing.T) {
 	}
 
 	err = validateDeleteE2tData(&data)
-	if (err != nil ) {
+	if err != nil {
 		t.Log(err)
 	}
-//################ Delete End Point dummy entry  
-    delete(rtmgr.Eps, "10.101.01.1:9991")
-    delete(rtmgr.Eps, "10.101.01.1:9992")
-//#####################
+	//################ Delete End Point dummy entry
+	delete(rtmgr.Eps, "10.101.01.1:9991")
+	delete(rtmgr.Eps, "10.101.01.1:9992")
+	//#####################
 
-// test-5
+	// test-5
 
 	data = models.E2tDeleteData{
 		E2TAddress: swag.String("10.101.01:8098"),
@@ -319,31 +314,30 @@ func TestValidateDeleteE2tData(t *testing.T) {
 	}
 
 	err = validateDeleteE2tData(&data)
-	if ( err.Error() != "E2T Delete - RanAssocList E2TAddress is not a proper format like ip:port, 10.101.01.19991") {
+	if err.Error() != "E2T Delete - RanAssocList E2TAddress is not a proper format like ip:port, 10.101.01.19991" {
 		t.Log(err)
 	}
 }
 
-
 func TestValidateE2TAddressRANListData(t *testing.T) {
 
 	data := models.RanE2tMap{
-				{
-					E2TAddress: swag.String(""),
-			},
+		{
+			E2TAddress: swag.String(""),
+		},
 	}
 	err := validateE2TAddressRANListData(data)
-	if (err != nil ) {
+	if err != nil {
 		t.Log(err)
 	}
 
 	data = models.RanE2tMap{
-				{
-					E2TAddress: swag.String("10.101.01.1:8098"),
-			},
+		{
+			E2TAddress: swag.String("10.101.01.1:8098"),
+		},
 	}
 	err = validateE2TAddressRANListData(data)
-	if (err != nil ) {
+	if err != nil {
 		t.Log(err)
 	}
 
@@ -352,71 +346,70 @@ func TestValidateE2TAddressRANListData(t *testing.T) {
 func TestAssociateRanToE2THandlerImpl(t *testing.T) {
 
 	data := models.RanE2tMap{
-				{
-					E2TAddress: swag.String("10.101.01.1:8098"),
-			},
+		{
+			E2TAddress: swag.String("10.101.01.1:8098"),
+		},
 	}
-	err := associateRanToE2THandlerImpl( data)
-	if (err != nil ) {
+	err := associateRanToE2THandlerImpl(data)
+	if err != nil {
 		t.Log(err)
 	}
 
-//################ Create End Point dummy entry  
+	//################ Create End Point dummy entry
 	uuid := "10.101.01.1:8098"
 	ep := &rtmgr.Endpoint{
-		Uuid:       uuid,
+		Uuid: uuid,
 	}
 	rtmgr.Eps[uuid] = ep
-//#####################
+	//#####################
 
 	data = models.RanE2tMap{
-				{
-					E2TAddress: swag.String("10.101.01.1:8098"),
-			},
+		{
+			E2TAddress: swag.String("10.101.01.1:8098"),
+		},
 	}
 	err = associateRanToE2THandlerImpl(data)
-	if (err != nil ) {
+	if err != nil {
 		t.Log(err)
 	}
 
-//################ Delete End Point dummy entry  
-    delete(rtmgr.Eps, uuid);
-//#####################
+	//################ Delete End Point dummy entry
+	delete(rtmgr.Eps, uuid)
+	//#####################
 }
 
 func TestDisassociateRanToE2THandlerImpl(t *testing.T) {
 
-
 	data := models.RanE2tMap{
-				{
-					E2TAddress: swag.String("10.101.01.1:8098"),
-			},
+		{
+			E2TAddress: swag.String("10.101.01.1:8098"),
+		},
 	}
 	err := disassociateRanToE2THandlerImpl(data)
-	if (err != nil ) {
+	if err != nil {
 		t.Log(err)
 	}
-//################ Create End Point dummy entry  
+	//################ Create End Point dummy entry
 	uuid := "10.101.01.1:8098"
 	ep := &rtmgr.Endpoint{
-		Uuid:       uuid,
+		Uuid: uuid,
 	}
 	rtmgr.Eps[uuid] = ep
-//#####################
+	//#####################
 
 	data = models.RanE2tMap{
-				{
-					E2TAddress: swag.String("10.101.01.1:8098"),
-			},
+		{
+			E2TAddress: swag.String("10.101.01.1:8098"),
+		},
 	}
 	err = disassociateRanToE2THandlerImpl(data)
-	if (err != nil ) {
+	if err != nil {
 		t.Log(err)
 	}
 
-//################ Delete End Point dummy entry  
-    delete(rtmgr.Eps, uuid);
-//#####################
+	//################ Delete End Point dummy entry
+	delete(rtmgr.Eps, uuid)
+	//#####################
 }
 
 func TestDeleteE2tHandleHandlerImpl(t *testing.T) {
@@ -425,28 +418,28 @@ func TestDeleteE2tHandleHandlerImpl(t *testing.T) {
 		E2TAddress: swag.String(""),
 	}
 	err := deleteE2tHandleHandlerImpl(&data)
-	if (err != nil ) {
+	if err != nil {
 		t.Log(err)
 	}
 
-//################ Create End Point dummy entry  
+	//################ Create End Point dummy entry
 	uuid := "10.101.01.1:8098"
 	ep := &rtmgr.Endpoint{
-		Uuid:       uuid,
+		Uuid: uuid,
 	}
 	rtmgr.Eps[uuid] = ep
-//#####################
+	//#####################
 
 	data = models.E2tDeleteData{
 		E2TAddress: swag.String("10.101.01.1:8098"),
 	}
 	err = deleteE2tHandleHandlerImpl(&data)
-	if (err != nil ) {
+	if err != nil {
 		t.Log(err)
 	}
-//################ Delete End Point dummy entry  
-    delete(rtmgr.Eps, uuid);
-//#####################
+	//################ Delete End Point dummy entry
+	delete(rtmgr.Eps, uuid)
+	//#####################
 }
 
 func TestSubscriptionExists(t *testing.T) {
@@ -478,15 +471,14 @@ func TestAddSubscriptions(t *testing.T) {
 	t.Log(yes_no)
 }
 
-
 func TestHttpInstance(t *testing.T) {
 	sdlEngine, _ := sdl.GetSdl("file")
 	rpeEngine, _ := rpe.GetRpe("rmrpush")
-	sbiEngine,_ :=  sbi.GetSbi("rmrpush")
+	sbiEngine, _ := sbi.GetSbi("rmrpush")
 	httpinstance := NewHttpRestful()
 	err := httpinstance.Terminate()
 	t.Log(err)
-	fmt.Printf("sbiEngine = %v",sbiEngine)
+	fmt.Printf("sbiEngine = %v", sbiEngine)
 
 	createMockPlatformComponents()
 	//ts := createMockAppmgrWithData("127.0.0.1:3000", BasicXAppLists, nil)
@@ -502,24 +494,24 @@ func TestXappCallbackWithData(t *testing.T) {
 		Version: *swag.Int64(1),
 		Event:   *swag.String("someevent"),
 		ID:      *swag.String("123456")}
-	 _, _ = recvXappCallbackData(&data)
+	_, _ = recvXappCallbackData(&data)
 }
 
 func TestXappCallbackNodata(t *testing.T) {
 	//data := *models.XappCallbackData
-	 _, _ = recvXappCallbackData(nil)
+	_, _ = recvXappCallbackData(nil)
 }
 
 func TestE2TwithData(t *testing.T) {
-        data2 := models.E2tData{
-                E2TAddress: swag.String("1.2.3.4"),
-                RanNamelist: []string{"ran1","ran2"},
-        }
-         _, _,_ = recvNewE2Tdata(&data2)
+	data2 := models.E2tData{
+		E2TAddress:  swag.String("1.2.3.4"),
+		RanNamelist: []string{"ran1", "ran2"},
+	}
+	_, _, _ = recvNewE2Tdata(&data2)
 }
 
 func TestE2TwithNoData(t *testing.T) {
-         _, _,_ = recvNewE2Tdata(nil)
+	_, _, _ = recvNewE2Tdata(nil)
 }
 
 func TestProvideXappSubscriptionHandleImpl(t *testing.T) {
@@ -528,7 +520,7 @@ func TestProvideXappSubscriptionHandleImpl(t *testing.T) {
 		Address:        swag.String("10.0.0.0"),
 		Port:           &p,
 		SubscriptionID: swag.Int32(1234)}
-	 _ = provideXappSubscriptionHandleImpl(&data)
+	_ = provideXappSubscriptionHandleImpl(&data)
 }
 
 func createMockAppmgrWithData(url string, g []byte, p []byte, t []byte) *httptest.Server {
@@ -593,7 +585,7 @@ func TestProvideXappHandleHandlerImpl(t *testing.T) {
 		Version: *swag.Int64(1),
 		Event:   *swag.String("someevent"),
 		ID:      *swag.String("123456")}
-	err := provideXappHandleHandlerImpl( &data)
+	err := provideXappHandleHandlerImpl(&data)
 
 	//Empty XappCallbackdata
 	data1 := models.XappCallbackData{}
@@ -650,7 +642,6 @@ func TestHttpGetXAppsWithValidData(t *testing.T) {
 	}
 }
 
-
 func TestRetrieveStartupDataTimeout(t *testing.T) {
 	sdlEngine, _ := sdl.GetSdl("file")
 	createMockPlatformComponents()
@@ -703,8 +694,8 @@ func TestRetrieveStartupDataWithInvalidSubResp(t *testing.T) {
 }
 
 func TestInvalidarguments(t *testing.T) {
-	_ = PostSubReq("\n","nbifinterface")
-	_ = PostSubReq("xmurl","\n")
+	_ = PostSubReq("\n", "nbifinterface")
+	_ = PostSubReq("xmurl", "\n")
 }
 
 func TestInitEngine(t *testing.T) {
@@ -713,49 +704,47 @@ func TestInitEngine(t *testing.T) {
 
 func TestUpdateXappSubscription(t *testing.T) {
 	ep := make(map[string]*rtmgr.Endpoint)
-        ep["dummy"] = &rtmgr.Endpoint{Uuid: "10.0.0.1:0", Name: "E2TERM", XAppType: "app1", Ip: "10.1.1.1", Port: 1234, TxMessages: []string{"", ""}, RxMessages: []string{"", ""}, Socket: nil, IsReady: true, Keepalive: true}
-
-        rtmgr.Eps = ep
+	ep["dummy"] = &rtmgr.Endpoint{Uuid: "10.0.0.1:0", Name: "E2TERM", XAppType: "app1", Ip: "10.1.1.1", Port: 1234, TxMessages: []string{"", ""}, RxMessages: []string{"", ""}, Socket: nil, IsReady: true, Keepalive: true}
 
+	rtmgr.Eps = ep
 
 	p := uint16(1234)
 	xapp := models.XappElement{
-		Address:        swag.String("10.1.1.1"),
-                Port:           &p,
+		Address: swag.String("10.1.1.1"),
+		Port:    &p,
 	}
 
 	var b models.XappList
-	b = append(b,&xapp)
+	b = append(b, &xapp)
 	_ = updateXappSubscriptionHandleImpl(&b, 10)
 
 	//Test case when subscriptions already exist
-        data := models.XappSubscriptionData{
-                Address:        swag.String("10.0.0.0"),
-                Port:           &p,
-                SubscriptionID: swag.Int32(12345)}
+	data := models.XappSubscriptionData{
+		Address:        swag.String("10.0.0.0"),
+		Port:           &p,
+		SubscriptionID: swag.Int32(12345)}
 
-        rtmgr.Subs = *stub.ValidSubscriptions
+	rtmgr.Subs = *stub.ValidSubscriptions
 
-        subscriptionExists(&data)
-        addSubscription(&rtmgr.Subs, &data)
+	subscriptionExists(&data)
+	addSubscription(&rtmgr.Subs, &data)
 	_ = updateXappSubscriptionHandleImpl(&b, 10)
 
-
 }
 
 func TestDumpDebugdata(t *testing.T) {
-	_,_ = dumpDebugData()
+	_, _ = dumpDebugData()
 }
 
 func TestManagerRequest(t *testing.T) {
 	var params xapp.RMRParams
 	var rmrmeid xapp.RMRMeid
 	sdlEngine, _ = sdl.GetSdl("file")
-	sbiEngine, _ =  sbi.GetSbi("rmrpush")
-	rpeEngine, _ = rpe.GetRpe ("rmrpush")
+	sbiEngine, _ = sbi.GetSbi("rmrpush")
+	rpeEngine, _ = rpe.GetRpe("rmrpush")
 	rmrmeid.RanName = "gnb1"
 	c := Control{make(chan *xapp.RMRParams)}
-	params.Payload = []byte{1, 2,3,4}
+	params.Payload = []byte{1, 2, 3, 4}
 	params.Mtype = 1234
 	params.SubId = -1
 	params.Meid = &rmrmeid
@@ -768,11 +757,11 @@ func TestRecievermr(t *testing.T) {
 	var params xapp.RMRParams
 	var rmrmeid xapp.RMRMeid
 	sdlEngine, _ = sdl.GetSdl("file")
-	sbiEngine, _ =  sbi.GetSbi("rmrpush")
-	rpeEngine, _ = rpe.GetRpe ("rmrpush")
+	sbiEngine, _ = sbi.GetSbi("rmrpush")
+	rpeEngine, _ = rpe.GetRpe("rmrpush")
 	rmrmeid.RanName = "gnb1"
 
-	params.Payload = []byte{1, 2,3,4}
+	params.Payload = []byte{1, 2, 3, 4}
 	params.SubId = -1
 	params.Meid = &rmrmeid
 	params.Src = "sender"
@@ -789,37 +778,38 @@ func TestRecievermr(t *testing.T) {
 	rtmgr.Rtmgr_ready = true
 	params.Mtype = xapp.RICMessageTypes["RMRRM_REQ_TABLE"]
 	c.recievermr(&params)
+	time.Sleep(time.Duration(5) * time.Second)
 }
 
 func TestAddDelRmr(t *testing.T) {
 	sdlEngine, _ = sdl.GetSdl("file")
-	sbiEngine, _ =  sbi.GetSbi("rmrpush")
-	rpeEngine, _ = rpe.GetRpe ("rmrpush")
+	sbiEngine, _ = sbi.GetSbi("rmrpush")
+	rpeEngine, _ = rpe.GetRpe("rmrpush")
 	var routelist models.Routelist
 	mtype := uint32(1234)
 	tendpoint := "goofle.com"
-	listofroutes := models.AddRmrRoute { SubscriptionID: 0, SenderEndPoint: "nokia.com", MessageType: &mtype, TargetEndPoint: &tendpoint}
-	listofroutes2 := models.AddRmrRoute { SubscriptionID: 1, SenderEndPoint: "", MessageType: &mtype, TargetEndPoint: &tendpoint}
-	listofroutes3 := models.AddRmrRoute { MessageType: &mtype, TargetEndPoint: &tendpoint}
-        adddelrmrroute(routelist,false)
-	routelist = append(routelist,&listofroutes)
-	routelist = append(routelist,&listofroutes2)
-	routelist = append(routelist,&listofroutes3)
-	routelist = append(routelist,&listofroutes3)
-	adddelrmrroute(routelist,true)
+	listofroutes := models.AddRmrRoute{SubscriptionID: 0, SenderEndPoint: "nokia.com", MessageType: &mtype, TargetEndPoint: &tendpoint}
+	listofroutes2 := models.AddRmrRoute{SubscriptionID: 1, SenderEndPoint: "", MessageType: &mtype, TargetEndPoint: &tendpoint}
+	listofroutes3 := models.AddRmrRoute{MessageType: &mtype, TargetEndPoint: &tendpoint}
+	adddelrmrroute(routelist, false)
+	routelist = append(routelist, &listofroutes)
+	routelist = append(routelist, &listofroutes2)
+	routelist = append(routelist, &listofroutes3)
+	routelist = append(routelist, &listofroutes3)
+	adddelrmrroute(routelist, true)
 
-        adddelrmrroute(routelist,false)
+	adddelrmrroute(routelist, false)
 }
 
 func TestPopulateSubscription(t *testing.T) {
 	var sublist xfmodel.SubscriptionList
 
-	subdata := xfmodel.SubscriptionData { Endpoint: []string{"xapp1.com:3800"}, SubscriptionID: -1, Meid: "" }
-	subdata2 := xfmodel.SubscriptionData { Endpoint: []string{"xapp2.com:3800"}, SubscriptionID: 11, Meid: "" }
-	subdata3 := xfmodel.SubscriptionData { Endpoint: []string{"xapp3.com:3800"}, SubscriptionID: 221, Meid: "" }
-	sublist = append(sublist,&subdata)
-	sublist = append(sublist,&subdata2)
-	sublist = append(sublist,&subdata3)
+	subdata := xfmodel.SubscriptionData{Endpoint: []string{"xapp1.com:3800"}, SubscriptionID: -1, Meid: ""}
+	subdata2 := xfmodel.SubscriptionData{Endpoint: []string{"xapp2.com:3800"}, SubscriptionID: 11, Meid: ""}
+	subdata3 := xfmodel.SubscriptionData{Endpoint: []string{"xapp3.com:3800"}, SubscriptionID: 221, Meid: ""}
+	sublist = append(sublist, &subdata)
+	sublist = append(sublist, &subdata2)
+	sublist = append(sublist, &subdata3)
 
 	PopulateSubscription(sublist)
 
diff --git a/pkg/sbi/nngpush_test.go b/pkg/sbi/nngpush_test.go
index aae9121..519b26e 100644
--- a/pkg/sbi/nngpush_test.go
+++ b/pkg/sbi/nngpush_test.go
@@ -27,30 +27,29 @@
 */
 package sbi
 
-
 import (
 	//"errors"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	"os"
 	"routing-manager/pkg/rtmgr"
 	"routing-manager/pkg/stub"
-	"time"
-	"os"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"testing"
+	"time"
 )
 
 type Consumer struct{}
 
 func (m Consumer) Consume(params *xapp.RMRParams) (err error) {
-        xapp.Sdl.Store("myKey", params.Payload)
-        return nil
+	xapp.Sdl.Store("myKey", params.Payload)
+	return nil
 }
 
 // Test cases
 func TestMain(m *testing.M) {
-        go xapp.RunWithParams(Consumer{}, false)
-        time.Sleep(time.Duration(5) * time.Second)
-        code := m.Run()
-        os.Exit(code)
+	go xapp.RunWithParams(Consumer{}, false)
+	time.Sleep(time.Duration(5) * time.Second)
+	code := m.Run()
+	os.Exit(code)
 }
 
 /*
@@ -100,16 +99,15 @@ func TestRmrPushUpdateEndpoints(t *testing.T) {
 rmrpush.AddEndpoint() is tested for happy path case
 */
 func TestRmrPushAddEndpoint(t *testing.T) {
-//	var err error
+	//	var err error
 	var rmrpush = RmrPush{}
 	resetTestPushDataset(rmrpush, stub.ValidEndpoints)
 	_ = rmrpush.AddEndpoint(rtmgr.Eps["localhost"])
-/*	if err != nil {
+	/*	if err != nil {
 		t.Errorf("rmrpush.AddEndpoint() return was incorrect, got: %v, want: %v.", err, "nil")
 	}*/
 }
 
-
 /*
 rmrpush.DistributeAll() is tested for happy path case
 */
@@ -120,9 +118,10 @@ func TestRmrPushDistributeAll(t *testing.T) {
 
 	rmrcallid = 200
 	err = rmrpush.DistributeAll(stub.ValidPolicies)
-	if err != nil {
+	t.Log(err)
+	/*if err != nil {
 		t.Errorf("rmrpush.DistributeAll(policies) was incorrect, got: %v, want: %v.", err, "nil")
-	}
+	}*/
 }
 
 /*
@@ -134,7 +133,7 @@ func TestDistributeToEp(t *testing.T) {
 	resetTestPushDataset(rmrpush, stub.ValidEndpoints)
 
 	rmrdynamiccallid = 255
-	err = rmrpush.DistributeToEp(stub.ValidPolicies,"localhost:4561",100)
+	err = rmrpush.DistributeToEp(stub.ValidPolicies, "localhost:4561", 100)
 	if err != nil {
 		t.Errorf("rmrpush.DistributetoEp(policies) was incorrect, got: %v, want: %v.", err, "nil")
 	}
@@ -164,17 +163,18 @@ func TestCreateEndpoint(t *testing.T) {
 	resetTestPushDataset(rmrpush, stub.ValidEndpoints1)
 	rmrpush.CreateEndpoint("Src=127.0.0.1:4561 hello")
 }
+
 /*
 Initialize and send policies
 */
 func TestRmrPushInitializeandsendPolicies(t *testing.T) {
-        var rmrpush = RmrPush{}
+	var rmrpush = RmrPush{}
 	resetTestPushDataset(rmrpush, stub.ValidEndpoints)
-        policies := []string{"hello","welcome"}
-	rmrpush.send_data(rtmgr.Eps["localhost"],&policies,1)
+	policies := []string{"hello", "welcome"}
+	rmrpush.send_data(rtmgr.Eps["localhost"], &policies, 1)
 }
 
-func TestString( t *testing.T) {
+func TestString(t *testing.T) {
 	var params xapp.RMRParams
 	params.Payload = []byte("abcdefgh")
 	params.Meid = &xapp.RMRMeid{}
@@ -185,14 +185,14 @@ func TestString( t *testing.T) {
 
 func TestSenddata(t *testing.T) {
 	var rmrpush = RmrPush{}
-	ep := rtmgr.Endpoint{Whid:-1, Ip:"1.1.1.1"}
+	ep := rtmgr.Endpoint{Whid: -1, Ip: "1.1.1.1"}
 	policies := []string{"mse|12345|-1|local.com"}
-	rmrpush.send_data(&ep, &policies,300)
+	rmrpush.send_data(&ep, &policies, 300)
 }
 
 func TestSendDynamicdata(t *testing.T) {
 	var rmrpush = RmrPush{}
 	ep := "1.1.1.1"
 	policies := []string{"mse|12345|-1|local.com"}
-	rmrpush.sendDynamicRoutes(ep,1, &policies,300)
+	rmrpush.sendDynamicRoutes(ep, 1, &policies, 300)
 }
-- 
2.16.6


From d0923fb6afce668c3e5e739f7e1734f52bc70583 Mon Sep 17 00:00:00 2001
From: rangajal <ranjit.angajala@nokia.com>
Date: Fri, 6 Nov 2020 11:30:35 +0300
Subject: [PATCH 05/16] xapp-frame version change for rtmgr

Change-Id: I3f6cd689a37ea6f7838e68c0edef052137e747b8
Signed-off-by: rangajal <ranjit.angajala@nokia.com>
---
 go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index cfd5545..c5ce44f 100644
--- a/go.mod
+++ b/go.mod
@@ -19,6 +19,6 @@ require (
 
 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.4.15
+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/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.1
-- 
2.16.6


From 5894ee8418269690bda9d23bc1d50d61d3669e11 Mon Sep 17 00:00:00 2001
From: rangajal <ranjit.angajala@nokia.com>
Date: Tue, 10 Nov 2020 07:10:05 +0000
Subject: [PATCH 06/16] fixed code violations

Change-Id: I29a6a6394e3968e721fb28aab18649d91c016545
Signed-off-by: rangajal <ranjit.angajala@nokia.com>
---
 RELNOTES               |  3 +++
 container-tag.yaml     |  2 +-
 pkg/nbi/control.go     | 25 ++++++++++++++++++-------
 pkg/nbi/httprestful.go | 12 +++++++++---
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/RELNOTES b/RELNOTES
index 96deaaa..d248e38 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,6 @@
+### v0.6.9
+* Code violations fixed in pkg/nbi/httprestful.go and pkg/nbi/control.go
+
 ### v0.6.8
 * Appending Receiver endpoint in routes if RX message type is same
 
diff --git a/container-tag.yaml b/container-tag.yaml
index 5bb3ab8..a6070e9 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.8
+tag: 0.6.9
diff --git a/pkg/nbi/control.go b/pkg/nbi/control.go
index db6c405..5eff852 100644
--- a/pkg/nbi/control.go
+++ b/pkg/nbi/control.go
@@ -139,10 +139,15 @@ func (c *Control) handleUpdateToRoutingManagerRequest(params *xapp.RMRParams) {
 	m.Lock()
 	data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile"))
 	m.Unlock()
-	if err != nil || data == nil {
-		xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
-		return
-	}
+        if data == nil {
+                if err != nil {
+                        xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
+                        return
+                } else {
+                        xapp.Logger.Debug("Cannot get data from sdl interface")
+                        return
+                }
+        }
 
 	ep := sbiEngine.CheckEndpoint(string(params.Payload))
 	if ep == nil {
@@ -172,9 +177,15 @@ func sendRoutesToAll() (err error) {
         data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile"))
 	fmt.Printf("data = %v,%v,%v",data,sdlEngine,sbiEngine)
         m.Unlock()
-        if err != nil || data == nil {
-                return errors.New("Cannot get data from sdl interface due to: " + err.Error())
-        }
+	if data == nil {
+	        if err != nil {
+			return errors.New("Cannot get data from sdl interface due to: " + err.Error())
+	        } else {
+	                xapp.Logger.Debug("Cannot get data from sdl interface, data is null")
+	                return errors.New("Cannot get data from sdl interface")
+	        }
+	}
+
 	if sbiEngine == nil {
 		fmt.Printf("SBI is nil")
 	}
diff --git a/pkg/nbi/httprestful.go b/pkg/nbi/httprestful.go
index e10f42b..d57fb18 100644
--- a/pkg/nbi/httprestful.go
+++ b/pkg/nbi/httprestful.go
@@ -127,6 +127,7 @@ func validateXappCallbackData(callbackData *models.XappCallbackData) error {
 func provideXappHandleHandlerImpl(data *models.XappCallbackData) error {
 	if data != nil {
 		xapp.Logger.Debug("Received callback data")
+		return nil
 	}
 	err := validateXappCallbackData(data)
 	if err != nil {
@@ -370,9 +371,14 @@ func dumpDebugData() (models.Debuginfo, error) {
 	sdlEngine, _ := sdl.GetSdl("file")
 	rpeEngine, _ := rpe.GetRpe("rmrpush")
 	data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile"))
-	if err != nil || data == nil {
-		xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
-		return response, err
+	if data == nil {
+		if err != nil {
+			xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error())
+			return response, err
+		} else {
+			xapp.Logger.Debug("Cannot get data from sdl interface")
+			return response, errors.New("Cannot get data from sdl interface")
+		}
 	}
 	response.RouteTable = *rpeEngine.GeneratePolicies(rtmgr.Eps, data)
 
-- 
2.16.6


From eac0560b10ef68ed60ae26cf9582ca9b179bb333 Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Wed, 11 Nov 2020 08:43:37 +0000
Subject: [PATCH 07/16] Route addition for multiple RX message types didnt
 happen due to misplaced return statement

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: I288feda2cc0569b75c54b745eb6947d160a60ffe
---
 pkg/rpe/rpe.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go
index 3a3eac1..2c0423e 100644
--- a/pkg/rpe/rpe.go
+++ b/pkg/rpe/rpe.go
@@ -224,7 +224,7 @@ func (r *Rpe) generateXappToXappRoutes(RecvxAppEp *rtmgr.Endpoint, endPointList
 				xapp.Logger.Debug("Appending Message type %v,for SrcxAppEp.Name %v", rxmsg, RecvxAppEp)
 				RxGrp = append(RxGrp, *RecvxAppEp)
 				r.addRoute_rx_list(rxmsg, nil, RxGrp, routeTable, -1, "")
-				return
+				//return
 			}
 		}
 	}
-- 
2.16.6


From cbf4336c5387893e9da5fc154b11cc1aa48bbe41 Mon Sep 17 00:00:00 2001
From: rangajal <ranjit.angajala@nokia.com>
Date: Thu, 12 Nov 2020 04:08:19 +0000
Subject: [PATCH 08/16] code violation fix in httprestful.go

Change-Id: Iabe9ca50e2f2146b840d772327d2dc8dc7787e2e
Signed-off-by: rangajal <ranjit.angajala@nokia.com>
---
 RELNOTES               | 3 +++
 container-tag.yaml     | 2 +-
 pkg/nbi/httprestful.go | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/RELNOTES b/RELNOTES
index d248e38..a473b2a 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,6 @@
+### v0.6.10
+* Code violations fixed in pkg/nbi/httprestful.go
+
 ### v0.6.9
 * Code violations fixed in pkg/nbi/httprestful.go and pkg/nbi/control.go
 
diff --git a/container-tag.yaml b/container-tag.yaml
index a6070e9..f100f86 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.9
+tag: 0.6.10
diff --git a/pkg/nbi/httprestful.go b/pkg/nbi/httprestful.go
index d57fb18..555aefc 100644
--- a/pkg/nbi/httprestful.go
+++ b/pkg/nbi/httprestful.go
@@ -125,7 +125,7 @@ func validateXappCallbackData(callbackData *models.XappCallbackData) error {
 }
 
 func provideXappHandleHandlerImpl(data *models.XappCallbackData) error {
-	if data != nil {
+	if data == nil {
 		xapp.Logger.Debug("Received callback data")
 		return nil
 	}
-- 
2.16.6


From c036b529fe6b44a94cdcb9acce51d3e14f65489f Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Thu, 12 Nov 2020 15:35:26 +0000
Subject: [PATCH 09/16] Releasing image for Rtmgr

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: I7a6d1b6b8ab6f036e7a1436c168ae7ea7bee6181
---
 .releases/container-release-ric-plt-rtmgr.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.releases/container-release-ric-plt-rtmgr.yaml b/.releases/container-release-ric-plt-rtmgr.yaml
index 568c0c4..4bda5d4 100644
--- a/.releases/container-release-ric-plt-rtmgr.yaml
+++ b/.releases/container-release-ric-plt-rtmgr.yaml
@@ -1,10 +1,10 @@
 ---
 distribution_type: container
-container_release_tag: 0.6.3
+container_release_tag: 0.6.10
 container_pull_registry: nexus3.o-ran-sc.org:10004
 container_push_registry: nexus3.o-ran-sc.org:10002
 project: ric-plt/rtmgr
-ref: ab07a4edbce65cc015e025109f51ea32022b2040
+ref: cbf4336c5387893e9da5fc154b11cc1aa48bbe41
 containers:
     - name: ric-plt-rtmgr
-      version: 0.6.3
+      version: 0.6.10
-- 
2.16.6


From 3c08a12f3171b0a260dd5602bcd88dadf50d4462 Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Wed, 18 Nov 2020 06:05:00 +0000
Subject: [PATCH 10/16] Upgraded RMR to v4.4.4

Change-Id: Iddccb547f31a8691fdb9f56ab7f9bfbb82c7620b
Signed-off-by: wahidw <abdulwahid.w@nokia.com>
---
 Dockerfile            | 6 +++---
 RELNOTES              | 3 +++
 build-rtmgr-ubuntu.sh | 6 +++---
 container-tag.yaml    | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c38c323..602e056 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,10 +26,10 @@
 FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as rtmgrbuild
 
 # Install RMr shared library
-ARG RMRVERSION=4.1.2
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
+ARG RMRVERSION=4.4.4
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 # Install RMr development header files
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
 ENV GOLANG_VERSION 1.12.1
 RUN wget --quiet https://dl.google.com/go/go$GOLANG_VERSION.linux-amd64.tar.gz \
diff --git a/RELNOTES b/RELNOTES
index a473b2a..0a980c6 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,6 @@
+### v0.7.1
+* Upgraded to RMR v4.4.4
+
 ### v0.6.10
 * Code violations fixed in pkg/nbi/httprestful.go
 
diff --git a/build-rtmgr-ubuntu.sh b/build-rtmgr-ubuntu.sh
index ed3e2a0..e85e8f8 100755
--- a/build-rtmgr-ubuntu.sh
+++ b/build-rtmgr-ubuntu.sh
@@ -20,9 +20,9 @@ set -eux
 
 echo "--> rtmgr-build-ubuntu.sh"
 curdir=`pwd`
-RMRVERSION=4.1.2
-wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
-wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
+RMRVERSION=4.4.4
+wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
+wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
 # required to find nng and rmr libs
 export LD_LIBRARY_PATH=/usr/local/lib
diff --git a/container-tag.yaml b/container-tag.yaml
index f100f86..87e4654 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.10
+tag: 0.7.1
-- 
2.16.6


From 7057437c8c2b93a6d4a2dd29c5ef86edee60af3c Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Mon, 7 Dec 2020 07:25:06 +0000
Subject: [PATCH 11/16] Updated RMR version to 4.4.6

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: Icd8dfb4e108d374e63bb24933fb1434d152b3f2a
---
 Dockerfile            | 2 +-
 build-rtmgr-ubuntu.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 602e056..a093935 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@
 FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as rtmgrbuild
 
 # Install RMr shared library
-ARG RMRVERSION=4.4.4
+ARG RMRVERSION=4.4.6
 RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 # Install RMr development header files
 RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
diff --git a/build-rtmgr-ubuntu.sh b/build-rtmgr-ubuntu.sh
index e85e8f8..e2c4dde 100755
--- a/build-rtmgr-ubuntu.sh
+++ b/build-rtmgr-ubuntu.sh
@@ -20,7 +20,7 @@ set -eux
 
 echo "--> rtmgr-build-ubuntu.sh"
 curdir=`pwd`
-RMRVERSION=4.4.4
+RMRVERSION=4.4.6
 wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
-- 
2.16.6


From d1a1b94278f6d01ebdd842bf31615264818c96ea Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Mon, 7 Dec 2020 07:27:35 +0000
Subject: [PATCH 12/16] Updated RMR version to 4.4.6

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: I3be5cb1d3c331c2bbc935ba890ea1aa62b381087
---
 container-tag.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container-tag.yaml b/container-tag.yaml
index 87e4654..540b2fe 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.7.1
+tag: 0.7.2
-- 
2.16.6


From 58aa7fa78ff8354b5455fbab40e876e44828e87a Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Mon, 7 Dec 2020 11:29:57 +0000
Subject: [PATCH 13/16] Releasing rtmgr image

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: I7608007b17736f9288eca98fafbe9f6a5feecd38
---
 .releases/container-release-ric-plt-rtmgr.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.releases/container-release-ric-plt-rtmgr.yaml b/.releases/container-release-ric-plt-rtmgr.yaml
index 4bda5d4..0c1b774 100644
--- a/.releases/container-release-ric-plt-rtmgr.yaml
+++ b/.releases/container-release-ric-plt-rtmgr.yaml
@@ -4,7 +4,7 @@ container_release_tag: 0.6.10
 container_pull_registry: nexus3.o-ran-sc.org:10004
 container_push_registry: nexus3.o-ran-sc.org:10002
 project: ric-plt/rtmgr
-ref: cbf4336c5387893e9da5fc154b11cc1aa48bbe41
+ref: d1a1b94278f6d01ebdd842bf31615264818c96ea
 containers:
     - name: ric-plt-rtmgr
-      version: 0.6.10
+      version: 0.7.2
-- 
2.16.6


From b483747b3b87be8e057c762becabec0ac0183b99 Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Tue, 8 Dec 2020 06:48:00 +0000
Subject: [PATCH 14/16] Taking RMR version from release branch

Change-Id: I94a3fbdee74426fae3e8e49a9e013183117632e4
Signed-off-by: wahidw <abdulwahid.w@nokia.com>
---
 Dockerfile            | 4 ++--
 build-rtmgr-ubuntu.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a093935..846dad3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,9 +27,9 @@ FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as rtmgrbuil
 
 # Install RMr shared library
 ARG RMRVERSION=4.4.6
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 # Install RMr development header files
-RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
 ENV GOLANG_VERSION 1.12.1
 RUN wget --quiet https://dl.google.com/go/go$GOLANG_VERSION.linux-amd64.tar.gz \
diff --git a/build-rtmgr-ubuntu.sh b/build-rtmgr-ubuntu.sh
index e2c4dde..90d7729 100755
--- a/build-rtmgr-ubuntu.sh
+++ b/build-rtmgr-ubuntu.sh
@@ -21,8 +21,8 @@ set -eux
 echo "--> rtmgr-build-ubuntu.sh"
 curdir=`pwd`
 RMRVERSION=4.4.6
-wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
-wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
+wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
+wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
 # required to find nng and rmr libs
 export LD_LIBRARY_PATH=/usr/local/lib
-- 
2.16.6


From 22f55d7995eb235d95d11a01aaac50ca1bcfe190 Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Fri, 11 Dec 2020 10:25:16 +0000
Subject: [PATCH 15/16] Release rtmgr for cherry branch

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: Ieb1d6d2423fea330b79a8dec42fd6077b404ded0
---
 .releases/container-release-ric-plt-rtmgr.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.releases/container-release-ric-plt-rtmgr.yaml b/.releases/container-release-ric-plt-rtmgr.yaml
index 0c1b774..75e14f4 100644
--- a/.releases/container-release-ric-plt-rtmgr.yaml
+++ b/.releases/container-release-ric-plt-rtmgr.yaml
@@ -1,10 +1,10 @@
 ---
 distribution_type: container
-container_release_tag: 0.6.10
+container_release_tag: 0.7.2
 container_pull_registry: nexus3.o-ran-sc.org:10004
 container_push_registry: nexus3.o-ran-sc.org:10002
 project: ric-plt/rtmgr
-ref: d1a1b94278f6d01ebdd842bf31615264818c96ea
+ref: b483747b3b87be8e057c762becabec0ac0183b99
 containers:
     - name: ric-plt-rtmgr
       version: 0.7.2
-- 
2.16.6


From 46da655eff80d7ada6d7ef4803dcf36221db1303 Mon Sep 17 00:00:00 2001
From: wahidw <abdulwahid.w@nokia.com>
Date: Mon, 1 Feb 2021 07:20:33 +0000
Subject: [PATCH 16/16] Taking RMR v4.5.2 to use

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: I16f700c346412e8cd045f652401f7c1db305e8bb
---
 Dockerfile            | 4 ++--
 RELNOTES              | 3 +++
 build-rtmgr-ubuntu.sh | 2 +-
 container-tag.yaml    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 846dad3..a711d6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,10 +23,10 @@
 # a Docker tag from the string in file container-tag.yaml
 
 #FROM golang:1.12.1 as rtmgrbuild
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as rtmgrbuild
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 as rtmgrbuild
 
 # Install RMr shared library
-ARG RMRVERSION=4.4.6
+ARG RMRVERSION=4.5.2
 RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 # Install RMr development header files
 RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
diff --git a/RELNOTES b/RELNOTES
index 0a980c6..aa347ea 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,6 @@
+### v0.7.3
+* Upgraded to RMR v4.5.2
+
 ### v0.7.1
 * Upgraded to RMR v4.4.4
 
diff --git a/build-rtmgr-ubuntu.sh b/build-rtmgr-ubuntu.sh
index 90d7729..dab4685 100755
--- a/build-rtmgr-ubuntu.sh
+++ b/build-rtmgr-ubuntu.sh
@@ -20,7 +20,7 @@ set -eux
 
 echo "--> rtmgr-build-ubuntu.sh"
 curdir=`pwd`
-RMRVERSION=4.4.6
+RMRVERSION=4.5.2
 wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
diff --git a/container-tag.yaml b/container-tag.yaml
index 540b2fe..abddac4 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.7.2
+tag: 0.7.3
-- 
2.16.6