X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fsbi%2Fsbi.go;h=be415f36d04b5725e0357dbdc1a276520224f41f;hb=be36e96ae55cb008328edeb6c45125fed12bce0a;hp=0d13bb99a7095413ae2c377fc87017222dfa5ceb;hpb=aaf8d396257a455247b24716a32b05fc3fd145c2;p=ric-plt%2Frtmgr.git

diff --git a/pkg/sbi/sbi.go b/pkg/sbi/sbi.go
index 0d13bb9..be415f3 100644
--- a/pkg/sbi/sbi.go
+++ b/pkg/sbi/sbi.go
@@ -15,6 +15,10 @@ w
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+   This source code is part of the near-RT RIC (RAN Intelligent Controller)
+   platform project (RICP).
+
 ==================================================================================
 */
 /*
@@ -27,8 +31,12 @@ package sbi
 
 import (
 	"errors"
+	"fmt"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	"net"
 	"routing-manager/pkg/rtmgr"
 	"strconv"
+	"strings"
 )
 
 const DefaultNngPipelineSocketPrefix = "tcp://"
@@ -60,9 +68,10 @@ type Sbi struct {
 }
 
 func (s *Sbi) pruneEndpointList(sbi Engine) {
+	xapp.Logger.Debug("pruneEndpointList invoked.")
 	for _, ep := range rtmgr.Eps {
 		if !ep.Keepalive {
-			rtmgr.Logger.Debug("deleting %v", ep)
+			xapp.Logger.Debug("deleting %v", ep)
 			sbi.DeleteEndpoint(ep)
 			delete(rtmgr.Eps, ep.Uuid)
 		} else {
@@ -72,8 +81,8 @@ func (s *Sbi) pruneEndpointList(sbi Engine) {
 }
 
 func (s *Sbi) updateEndpoints(rcs *rtmgr.RicComponents, sbi Engine) {
-	for _, xapp := range (*rcs).XApps {
-		for _, instance := range xapp.Instances {
+	for _, xapps := range (*rcs).XApps {
+		for _, instance := range xapps.Instances {
 			uuid := instance.Ip + ":" + strconv.Itoa(int(instance.Port))
 			if _, ok := rtmgr.Eps[uuid]; ok {
 				rtmgr.Eps[uuid].Keepalive = true
@@ -81,17 +90,18 @@ func (s *Sbi) updateEndpoints(rcs *rtmgr.RicComponents, sbi Engine) {
 				ep := &rtmgr.Endpoint{
 					Uuid:       uuid,
 					Name:       instance.Name,
-					XAppType:   xapp.Name,
+					XAppType:   xapps.Name,
 					Ip:         instance.Ip,
 					Port:       instance.Port,
 					TxMessages: instance.TxMessages,
 					RxMessages: instance.RxMessages,
+					Policies:   instance.Policies,
 					Socket:     nil,
 					IsReady:    false,
 					Keepalive:  true,
 				}
 				if err := sbi.AddEndpoint(ep); err != nil {
-					rtmgr.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
+					xapp.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
 					continue
 				}
 				rtmgr.Eps[uuid] = ep
@@ -99,11 +109,12 @@ func (s *Sbi) updateEndpoints(rcs *rtmgr.RicComponents, sbi Engine) {
 		}
 	}
 	s.updatePlatformEndpoints(&((*rcs).Pcs), sbi)
+	s.updateE2TEndpoints(&((*rcs).E2Ts), sbi)
 	s.pruneEndpointList(sbi)
 }
 
 func (s *Sbi) updatePlatformEndpoints(pcs *rtmgr.PlatformComponents, sbi Engine) {
-	rtmgr.Logger.Debug("updatePlatformEndpoints invoked. PCS: %v", *pcs)
+	xapp.Logger.Debug("updatePlatformEndpoints invoked. PCS: %v", *pcs)
 	for _, pc := range *pcs {
 		uuid := pc.Fqdn + ":" + strconv.Itoa(int(pc.Port))
 		if _, ok := rtmgr.Eps[uuid]; ok {
@@ -121,12 +132,70 @@ func (s *Sbi) updatePlatformEndpoints(pcs *rtmgr.PlatformComponents, sbi Engine)
 				IsReady:    false,
 				Keepalive:  true,
 			}
-			rtmgr.Logger.Debug("ep created: %v", ep)
+			xapp.Logger.Debug("ep created: %v", ep)
+			if err := sbi.AddEndpoint(ep); err != nil {
+				xapp.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
+				continue
+			}
+			rtmgr.Eps[uuid] = ep
+		}
+	}
+}
+
+func (s *Sbi) updateE2TEndpoints(E2Ts *map[string]rtmgr.E2TInstance, sbi Engine) {
+	xapp.Logger.Debug("updateE2TEndpoints invoked. E2T: %v", *E2Ts)
+	for _, e2t := range *E2Ts {
+		uuid := e2t.Fqdn
+		stringSlice := strings.Split(e2t.Fqdn, ":")
+		ipaddress := stringSlice[0]
+		port, _ := strconv.Atoi(stringSlice[1])
+		if _, ok := rtmgr.Eps[uuid]; ok {
+			rtmgr.Eps[uuid].Keepalive = true
+		} else {
+			ep := &rtmgr.Endpoint{
+				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,
+			}
+			xapp.Logger.Debug("ep created: %v", ep)
 			if err := sbi.AddEndpoint(ep); err != nil {
-				rtmgr.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
+				xapp.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
 				continue
 			}
 			rtmgr.Eps[uuid] = ep
 		}
 	}
 }
+
+func (s *Sbi) createEndpoint(payload string, sbi Engine) *rtmgr.Endpoint {
+	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
+	}
+
+	/* 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
+		}
+	}
+
+	return nil
+}