X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fsbi%2Fsbi.go;h=21ff78eb1d0382083d8258a74de50db1496d7fe4;hb=6a9ce4976c1fbbcb8d4a068f81e76515c99a9d3f;hp=6a878bba95310e22423b90987c91b9f213cc8968;hpb=8f7ca65ce6b2691e08bb3496c14fae88e32ad973;p=ric-plt%2Frtmgr.git

diff --git a/pkg/sbi/sbi.go b/pkg/sbi/sbi.go
index 6a878bb..21ff78e 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"
@@ -128,8 +128,8 @@ func (s *Sbi) updatePlatformEndpoints(pcs *rtmgr.PlatformComponents, sbi Engine)
 				XAppType:   PlatformType,
 				Ip:         pc.Fqdn,
 				Port:       pc.Port,
-				TxMessages: rtmgr.PLATFORMMESSAGETYPES[pc.Name]["tx"],
-				RxMessages: rtmgr.PLATFORMMESSAGETYPES[pc.Name]["rx"],
+				//TxMessages: rtmgr.PLATFORMMESSAGETYPES[pc.Name]["tx"],
+				//RxMessages: rtmgr.PLATFORMMESSAGETYPES[pc.Name]["rx"],
 				Socket:     nil,
 				IsReady:    false,
 				Keepalive:  true,
@@ -160,8 +160,8 @@ func (s *Sbi) updateE2TEndpoints(E2Ts *map[string]rtmgr.E2TInstance, sbi Engine)
 				XAppType:   PlatformType,
 				Ip:         ipaddress,
 				Port:       uint16(port),
-				TxMessages: rtmgr.PLATFORMMESSAGETYPES[e2t.Name]["tx"],
-				RxMessages: rtmgr.PLATFORMMESSAGETYPES[e2t.Name]["rx"],
+				//TxMessages: rtmgr.PLATFORMMESSAGETYPES[e2t.Name]["tx"],
+				//RxMessages: rtmgr.PLATFORMMESSAGETYPES[e2t.Name]["rx"],
 				Socket:     nil,
 				IsReady:    false,
 				Keepalive:  true,
@@ -176,19 +176,19 @@ func (s *Sbi) updateE2TEndpoints(E2Ts *map[string]rtmgr.E2TInstance, sbi Engine)
 	}
 }
 
-func (s *Sbi) createEndpoint(payload 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]
-	xapp.Logger.Debug(">>> uuid %v", stringSlice[0])
+//	stringSlice := strings.Split(payload, " ")
+//	uuid := stringSlice[0]
+//	xapp.Logger.Debug(">>> uuid %v", stringSlice[0])
 
-	if _, ok := rtmgr.Eps[uuid]; ok {
+/*	if _, ok := rtmgr.Eps[uuid]; ok {
 		ep := rtmgr.Eps[uuid]
 		return ep
-	}
+	}*/
 
 	/* incase the stored Endpoint list is in the form of IP:port*/
-	stringsubsplit := strings.Split(uuid, ":")
+/*	stringsubsplit := strings.Split(uuid, ":")
 	addr, err := net.LookupIP(stringsubsplit[0])
 	if err == nil {
 		convertedUuid := fmt.Sprintf("%s:%s", addr[0], stringsubsplit[1])
@@ -197,7 +197,19 @@ func (s *Sbi) createEndpoint(payload string, sbi Engine) *rtmgr.Endpoint {
 			ep := rtmgr.Eps[convertedUuid]
 			return ep
 		}
+	}*/
+
+	/* 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],"=")
+	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
-}
+	return nil,Whid
+ }