if rx != nil {
rxList = []rtmgr.EndpointList{[]rtmgr.Endpoint{*rx}}
}
- messageId := strconv.Itoa(xapp.RICMessageTypes[messageType])
+ //messageId := strconv.Itoa(xapp.RICMessageTypes[messageType])
+ messageId := rtmgr.Mtype[messageType]
route := rtmgr.RouteTableEntry{
MessageType: messageId,
TxList: txList,
}
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])
+ //messageId := strconv.Itoa(xapp.RICMessageTypes[messageType])
+ messageId := rtmgr.Mtype[messageType]
route := rtmgr.RouteTableEntry{
MessageType: messageId,
TxList: txList,
// xapp.Logger.Trace("Route added: MessageTyp: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx, rx, subId)
}
-func (r *Rpe) generateXappRoutes(xAppEp *rtmgr.Endpoint, e2TermEp *rtmgr.Endpoint, subManEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) {
+func (r *Rpe) generateXappRoutes(xAppEp *rtmgr.Endpoint, subManEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) {
xapp.Logger.Debug("rpe.generateXappRoutes invoked")
xapp.Logger.Debug("Endpoint: %v, xAppType: %v", xAppEp.Name, xAppEp.XAppType)
if xAppEp.XAppType != sbi.PlatformType && (len(xAppEp.TxMessages) > 0 || len(xAppEp.RxMessages) > 0) {
}
-func (r *Rpe) generateSubscriptionRoutes(selectedxAppEp *rtmgr.Endpoint, e2TermEp *rtmgr.Endpoint, subManEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) {
+
+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
for _, subscription := range *subscriptionList {
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", e2TermEp, xAppEp, routeTable, subscription.SubID, "")
- r.addRoute("RIC_CONTROL_ACK", e2TermEp, xAppEp, routeTable, subscription.SubID, "")
- r.addRoute("RIC_CONTROL_FAILURE", e2TermEp, 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)
}
}
}
-func (r *Rpe) generatePlatformRoutes(e2TermEp []rtmgr.Endpoint, subManEp *rtmgr.Endpoint, e2ManEp *rtmgr.Endpoint, ueManEp *rtmgr.Endpoint, rsmEp *rtmgr.Endpoint, a1mediatorEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) {
+func (r *Rpe) generatePlatformRoutes(e2TermEp []rtmgr.Endpoint, subManEp *rtmgr.Endpoint, e2ManEp *rtmgr.Endpoint, rsmEp *rtmgr.Endpoint, a1mediatorEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) {
xapp.Logger.Debug("rpe.generatePlatformRoutes invoked")
//Platform Routes --- Subscription Routes
//Subscription Manager -> E2 Termination
+ if rtmgr.PrsCfg == nil {
+ xapp.Logger.Info("No static routes configuration")
+ return
+ }
for _, routes := range *rtmgr.PrsCfg {
var sendEp *rtmgr.Endpoint
var Ep *rtmgr.Endpoint
sendEp = subManEp
case "E2MAN":
sendEp = e2ManEp
- case "UEMAN":
- sendEp = ueManEp
case "RSM":
sendEp = rsmEp
case "A1MEDIATOR":
Ep = subManEp
case "E2MAN":
Ep = e2ManEp
- case "UEMAN":
- Ep = ueManEp
+ //case "UEMAN":
+ // Ep = ueManEp
case "RSM":
Ep = rsmEp
case "A1MEDIATOR":
Ep = a1mediatorEp
}
- if routes.EndPoint == "E2TERMINST" && len(e2TermEp) > 0 {
- r.addRoute_rx_list(routes.MessageType, sendEp, e2TermEp, routeTable, routes.SubscriptionId, routes.Meid)
- continue
- }
+
r.addRoute(routes.MessageType, sendEp, Ep, routeTable, routes.SubscriptionId, routes.Meid)
}
+
+ 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, "")
+ }
}
func (r *Rpe) generateRouteTable(endPointList rtmgr.Endpoints) *rtmgr.RouteTable {
xapp.Logger.Debug("rpe.generateRouteTable invoked")
xapp.Logger.Debug("Endpoint List: %v", endPointList)
routeTable := &rtmgr.RouteTable{}
- e2TermEp := getEndpointByName(&endPointList, "E2TERM")
+ /*e2TermEp := getEndpointByName(&endPointList, "E2TERM")
if e2TermEp == nil {
xapp.Logger.Error("Platform component not found: %v", "E2 Termination")
xapp.Logger.Debug("Endpoints: %v", endPointList)
- }
+ }*/
subManEp := getEndpointByName(&endPointList, "SUBMAN")
if subManEp == nil {
xapp.Logger.Error("Platform component not found: %v", "Subscription Manager")
xapp.Logger.Error("Platform component not found: %v", "E2 Manager")
xapp.Logger.Debug("Endpoints: %v", endPointList)
}
- ueManEp := getEndpointByName(&endPointList, "UEMAN")
- if ueManEp == nil {
- xapp.Logger.Error("Platform component not found: %v", "UE Manger")
- xapp.Logger.Debug("Endpoints: %v", endPointList)
- }
rsmEp := getEndpointByName(&endPointList, "RSM")
if rsmEp == nil {
xapp.Logger.Error("Platform component not found: %v", "Resource Status Manager")
xapp.Logger.Error("Platform component not found: %v", "E2 Termination List")
xapp.Logger.Debug("Endpoints: %v", endPointList)
}
- r.generatePlatformRoutes(e2TermListEp, subManEp, e2ManEp, ueManEp, rsmEp, A1MediatorEp, routeTable)
+ r.generatePlatformRoutes(e2TermListEp, subManEp, e2ManEp, rsmEp, A1MediatorEp, routeTable)
for _, endPoint := range endPointList {
xapp.Logger.Debug("Endpoint: %v, xAppType: %v", endPoint.Name, endPoint.XAppType)
if endPoint.XAppType != sbi.PlatformType && (len(endPoint.TxMessages) > 0 || len(endPoint.RxMessages) > 0) {
- r.generateXappRoutes(endPoint, e2TermEp, subManEp, routeTable)
- r.generateSubscriptionRoutes(endPoint, e2TermEp, subManEp, routeTable)
+ r.generateXappRoutes(endPoint, subManEp, routeTable)
+ r.generateSubscriptionRoutes(endPoint, subManEp, routeTable)
+ r.generateXappToXappRoutes(endPoint, endPointList, routeTable)
+
}
}
return routeTable
Code Review / ric-plt / rtmgr.git / blobdiff