X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Frpe%2Frpe.go;h=b080bcbaf6bbbf27f25f9c31dc72753adfca3dc0;hb=refs%2Fchanges%2F35%2F3935%2F1;hp=1c006b4cf9fb34828c72005addfa261824107afa;hpb=cd7867c8f527f46fd8702b0b8d6b380a8e134bea;p=ric-plt%2Frtmgr.git

diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go
index 1c006b4..b080bcb 100644
--- a/pkg/rpe/rpe.go
+++ b/pkg/rpe/rpe.go
@@ -137,7 +137,10 @@ func (r *Rpe) addRoute_rx_list(messageType string, tx *rtmgr.Endpoint, rx []rtmg
 	}
 
 	if rx != nil {
-		rxList = []rtmgr.EndpointList{rx}
+		for _, item := range rx {
+			ep := []rtmgr.Endpoint{item}
+			rxList = append(rxList, ep)
+		}
 	}
 
 	messageId := strconv.Itoa(xapp.RICMessageTypes[messageType])
@@ -179,6 +182,34 @@ 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
+		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") {
+			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 src_present == false {
+				r.addRoute(rxmsg, nil, RecvxAppEp, routeTable, -1, "")
+			}
+		}
+
+	}
+}
+
 func (r *Rpe) generateSubscriptionRoutes(selectedxAppEp *rtmgr.Endpoint, subManEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) {
 	xapp.Logger.Debug("rpe.addSubscriptionRoutes invoked")
 	subscriptionList := &rtmgr.Subs
@@ -187,18 +218,22 @@ func (r *Rpe) generateSubscriptionRoutes(selectedxAppEp *rtmgr.Endpoint, subManE
 		xAppUuid := subscription.Fqdn + ":" + strconv.Itoa(int(subscription.Port))
 		xapp.Logger.Debug("xApp UUID: %v", xAppUuid)
 		xAppEp := getEndpointByUuid(xAppUuid)
-		if xAppEp.Uuid == selectedxAppEp.Uuid {
-			xapp.Logger.Debug("xApp UUID is matched for selected xApp.UUID: %v and xApp.Name: %v", selectedxAppEp.Uuid, selectedxAppEp.Name)
-			/// TODO
-			//Subscription Manager -> xApp
-			r.addRoute("RIC_SUB_RESP", subManEp, xAppEp, routeTable, subscription.SubID, "")
-			r.addRoute("RIC_SUB_FAILURE", subManEp, xAppEp, routeTable, subscription.SubID, "")
-			r.addRoute("RIC_SUB_DEL_RESP", subManEp, xAppEp, routeTable, subscription.SubID, "")
-			r.addRoute("RIC_SUB_DEL_FAILURE", subManEp, xAppEp, routeTable, subscription.SubID, "")
-			//E2 Termination -> xApp
-			r.addRoute("RIC_INDICATION", nil, xAppEp, routeTable, subscription.SubID, "")
-			r.addRoute("RIC_CONTROL_ACK", nil, xAppEp, routeTable, subscription.SubID, "")
-			r.addRoute("RIC_CONTROL_FAILURE", nil, xAppEp, routeTable, subscription.SubID, "")
+		if xAppEp != nil {
+			if xAppEp.Uuid == selectedxAppEp.Uuid {
+				xapp.Logger.Debug("xApp UUID is matched for selected xApp.UUID: %v and xApp.Name: %v", selectedxAppEp.Uuid, selectedxAppEp.Name)
+				/// TODO
+				//Subscription Manager -> xApp
+				r.addRoute("RIC_SUB_RESP", subManEp, xAppEp, routeTable, subscription.SubID, "")
+				r.addRoute("RIC_SUB_FAILURE", subManEp, xAppEp, routeTable, subscription.SubID, "")
+				r.addRoute("RIC_SUB_DEL_RESP", subManEp, xAppEp, routeTable, subscription.SubID, "")
+				r.addRoute("RIC_SUB_DEL_FAILURE", subManEp, xAppEp, routeTable, subscription.SubID, "")
+				//E2 Termination -> xApp
+				r.addRoute("RIC_INDICATION", nil, xAppEp, routeTable, subscription.SubID, "")
+				r.addRoute("RIC_CONTROL_ACK", nil, xAppEp, routeTable, subscription.SubID, "")
+				r.addRoute("RIC_CONTROL_FAILURE", nil, xAppEp, routeTable, subscription.SubID, "")
+			}
+		} else {
+				xapp.Logger.Error("generateSubscriptionRoutes xAppEp is nil, xApp UUID: %v", xAppUuid)
 		}
 	}
 }
@@ -241,6 +276,8 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp []rtmgr.Endpoint, subManEp *rtmgr.
 	if len(e2TermEp) > 0 {
 		r.addRoute_rx_list("RIC_SCTP_CLEAR_ALL", e2ManEp, e2TermEp, routeTable, -1, "")
 		r.addRoute_rx_list("E2_TERM_KEEP_ALIVE_REQ", e2ManEp, e2TermEp, routeTable, -1, "")
+		r.addRoute_rx_list("RIC_E2_SETUP_RESP", e2ManEp, e2TermEp, routeTable, -1, "")
+		r.addRoute_rx_list("RIC_E2_SETUP_FAILURE", e2ManEp, e2TermEp, routeTable, -1, "")
 	}
 }
 
@@ -291,6 +328,8 @@ func (r *Rpe) generateRouteTable(endPointList rtmgr.Endpoints) *rtmgr.RouteTable
 		if endPoint.XAppType != sbi.PlatformType && (len(endPoint.TxMessages) > 0 || len(endPoint.RxMessages) > 0) {
 			r.generateXappRoutes(endPoint, subManEp, routeTable)
 			r.generateSubscriptionRoutes(endPoint, subManEp, routeTable)
+			r.generateXappToXappRoutes(endPoint, endPointList, routeTable)
+
 		}
 	}
 	return routeTable