X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Frpe%2Frpe.go;h=3a3eac1e20b1fd870a0f469ea36be456aa983fd4;hb=bceb7d41dd5a7785982844faa9ea2171fe5b8dc4;hp=9a963c7e9e6f60ef22d7d1414accd0a2e5ea6034;hpb=749099bc00ec6cad5da19846e65bd5b4bd9b8de4;p=ric-plt%2Frtmgr.git diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go index 9a963c7..3a3eac1 100644 --- a/pkg/rpe/rpe.go +++ b/pkg/rpe/rpe.go @@ -74,16 +74,16 @@ func getEndpointByName(eps *rtmgr.Endpoints, name string) *rtmgr.Endpoint { } func getEndpointListByName(eps *rtmgr.Endpoints, name string) []rtmgr.Endpoint { - var eplist []rtmgr.Endpoint - - for _, ep := range *eps { - if ep.Name == name { - xapp.Logger.Debug("name: %s", ep.Name) - xapp.Logger.Debug("ep: %v", ep) - eplist = append(eplist, *ep) - } - } - return eplist + var eplist []rtmgr.Endpoint + + for _, ep := range *eps { + if ep.Name == name { + xapp.Logger.Debug("name: %s", ep.Name) + xapp.Logger.Debug("ep: %v", ep) + eplist = append(eplist, *ep) + } + } + return eplist } func getEndpointByUuid(uuid string) *rtmgr.Endpoint { @@ -103,28 +103,29 @@ func (r *Rpe) addRoute(messageType string, tx *rtmgr.Endpoint, rx *rtmgr.Endpoin rxList := []rtmgr.EndpointList{} if tx == nil && rx == nil { - pc, _, _, ok := runtime.Caller(1) - details := runtime.FuncForPC(pc) - if ok && details != nil { - xapp.Logger.Error("Route addition skipped: Either TX or RX endpoint not present. Caller function is %s", details.Name()) + pc, _, _, ok := runtime.Caller(1) + details := runtime.FuncForPC(pc) + if ok && details != nil { + xapp.Logger.Error("Route addition skipped: Either TX or RX endpoint not present. Caller function is %s", details.Name()) } } else { - if (tx != nil) { - txList = rtmgr.EndpointList{*tx} - } - if (rx != nil) { - rxList = []rtmgr.EndpointList{[]rtmgr.Endpoint{*rx}} - } - messageId := rtmgr.MessageTypes[messageType] - route := rtmgr.RouteTableEntry{ - MessageType: messageId, - TxList: txList, - RxGroups: rxList, - SubID: subId, - RouteType: routeType} - *routeTable = append(*routeTable, route) -// xapp.Logger.Debug("Route added: MessageTyp: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx.Uuid, rx.Uuid, subId) -// xapp.Logger.Trace("Route added: MessageTyp: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx, rx, subId) + if tx != nil { + txList = rtmgr.EndpointList{*tx} + } + if rx != nil { + rxList = []rtmgr.EndpointList{[]rtmgr.Endpoint{*rx}} + } + //messageId := strconv.Itoa(xapp.RICMessageTypes[messageType]) + messageId := rtmgr.Mtype[messageType] + route := rtmgr.RouteTableEntry{ + MessageType: messageId, + TxList: txList, + RxGroups: rxList, + SubID: subId, + RouteType: routeType} + *routeTable = append(*routeTable, route) + // xapp.Logger.Debug("Route added: MessageTyp: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx.Uuid, rx.Uuid, subId) + // xapp.Logger.Trace("Route added: MessageTyp: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx, rx, subId) } } @@ -132,41 +133,46 @@ func (r *Rpe) addRoute_rx_list(messageType string, tx *rtmgr.Endpoint, rx []rtmg txList := rtmgr.EndpointList{} rxList := []rtmgr.EndpointList{} - if (tx != nil) { - txList = rtmgr.EndpointList{*tx} + if tx != nil { + txList = rtmgr.EndpointList{*tx} } - if (rx != nil) { - rxList = []rtmgr.EndpointList{rx} + if rx != nil { + for _, item := range rx { + ep := []rtmgr.Endpoint{item} + rxList = append(rxList, ep) + } } - messageId := rtmgr.MessageTypes[messageType] + //messageId := strconv.Itoa(xapp.RICMessageTypes[messageType]) + messageId := rtmgr.Mtype[messageType] route := rtmgr.RouteTableEntry{ - MessageType: messageId, - TxList: txList, - RxGroups: rxList, - SubID: subId, - RouteType: routeType} + MessageType: messageId, + TxList: txList, + RxGroups: rxList, + SubID: subId, + RouteType: routeType} *routeTable = append(*routeTable, route) -// xapp.Logger.Debug("Route added: MessageTyp: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx.Uuid, rx.Uuid, subId) -// xapp.Logger.Trace("Route added: MessageTyp: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx, rx, subId) + // xapp.Logger.Debug("Route added: MessageTyp: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx.Uuid, rx.Uuid, subId) + // 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) { - /// TODO --- + /// TODO --- //xApp -> Subscription Manager r.addRoute("RIC_SUB_REQ", xAppEp, subManEp, routeTable, -1, "") r.addRoute("RIC_SUB_DEL_REQ", xAppEp, subManEp, routeTable, -1, "") //xApp -> E2 Termination - r.addRoute("RIC_CONTROL_REQ", xAppEp, e2TermEp, routeTable, -1, "") + // r.addRoute("RIC_CONTROL_REQ", xAppEp, e2TermEp, routeTable, -1, "") + r.addRoute("RIC_CONTROL_REQ", xAppEp, nil, routeTable, -1, "%meid") //E2 Termination -> xApp - r.addRoute("RIC_CONTROL_ACK", e2TermEp, xAppEp, routeTable, -1, "") - r.addRoute("RIC_CONTROL_FAILURE", e2TermEp, xAppEp, routeTable, -1, "") + /// r.addRoute("RIC_CONTROL_ACK", e2TermEp, xAppEp, routeTable, -1, "") + /// r.addRoute("RIC_CONTROL_FAILURE", e2TermEp, xAppEp, routeTable, -1, "") + r.addRoute("RIC_CONTROL_ACK", nil, xAppEp, routeTable, -1, "") + r.addRoute("RIC_CONTROL_FAILURE", nil, xAppEp, routeTable, -1, "") } //xApp->A1Mediator if xAppEp.XAppType != sbi.PlatformType && len(xAppEp.Policies) > 0 { @@ -178,7 +184,53 @@ func (r *Rpe) generateXappRoutes(xAppEp *rtmgr.Endpoint, e2TermEp *rtmgr.Endpoin } -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 + 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" { + 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 + } + } + } + } + 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 && 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 + } + } + } +} + +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 { @@ -186,99 +238,80 @@ func (r *Rpe) generateSubscriptionRoutes(selectedxAppEp *rtmgr.Endpoint, e2TermE 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 - r.addRoute("RIC_SUB_REQ", subManEp, nil, routeTable, -1, "%meid") - r.addRoute("RIC_SUB_DEL_REQ", subManEp, nil, routeTable, -1, "%meid") - //E2 Termination -> Subscription Manager - r.addRoute("RIC_SUB_RESP", nil, subManEp, routeTable, -1, "") - r.addRoute("RIC_SUB_DEL_RESP", nil, subManEp, routeTable, -1, "") - r.addRoute("RIC_SUB_FAILURE", nil, subManEp, routeTable, -1, "") - r.addRoute("RIC_SUB_DEL_FAILURE", nil, subManEp, routeTable, -1, "") - - //TODO: UE Man Routes removed (since it is not existing) - //UE Manager -> Subscription Manager - //r.addRoute("RIC_SUB_REQ", ueManEp, subManEp, routeTable) - //r.addRoute("RIC_SUB_DEL_REQ", ueManEp, subManEp, routeTable) - ////UE Manager -> E2 Termination - //r.addRoute("RIC_CONTROL_REQ", ueManEp, e2TermEp, routeTable) - - //Platform Routes --- X2 Routes - //E2 Manager -> E2 Termination - r.addRoute("RIC_X2_SETUP_REQ", e2ManEp, nil, routeTable, -1, "%meid") - r.addRoute("RIC_X2_RESET_REQ", e2ManEp, nil, routeTable, -1, "%meid") - r.addRoute("RIC_X2_RESET_RESP", e2ManEp, nil, routeTable, -1, "%meid") - r.addRoute("RIC_ENDC_X2_SETUP_REQ", e2ManEp, nil, routeTable, -1, "%meid") - r.addRoute("RIC_ENB_CONF_UPDATE_ACK", e2ManEp, nil, routeTable, -1, "%meid") - r.addRoute("RIC_ENB_CONF_UPDATE_FAILURE", e2ManEp, nil, routeTable, -1, "%meid") - r.addRoute("RIC_ENDC_CONF_UPDATE_ACK", e2ManEp, nil, routeTable, -1, "%meid") - r.addRoute("RIC_ENDC_CONF_UPDATE_FAILURE", e2ManEp, nil, routeTable, -1, "%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, "") - } - - //E2 Termination -> E2 Manager - r.addRoute("E2_TERM_INIT", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_X2_SETUP_RESP", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_X2_SETUP_FAILURE", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_X2_RESET_REQ", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_X2_RESET_RESP", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_ENDC_X2_SETUP_RESP", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_ENDC_X2_SETUP_FAILURE", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_ENDC_CONF_UPDATE", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_SCTP_CONNECTION_FAILURE", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_ERROR_INDICATION", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_ENB_CONF_UPDATE", nil, e2ManEp, routeTable, -1, "") - r.addRoute("RIC_ENB_LOAD_INFORMATION", nil, e2ManEp, routeTable, -1, "") - r.addRoute("E2_TERM_KEEP_ALIVE_RESP", nil, e2ManEp, routeTable, -1, "") - - - - //E2 Manager -> Resource Status Manager - r.addRoute("RAN_CONNECTED", e2ManEp, rsmEp, routeTable, -1, "") - r.addRoute("RAN_RESTARTED", e2ManEp, rsmEp, routeTable, -1, "") - r.addRoute("RAN_RECONFIGURED", e2ManEp, rsmEp, routeTable, -1, "") - - //Resource Status Manager -> E2 Termination - r.addRoute("RIC_RES_STATUS_REQ", rsmEp, nil, routeTable, -1, "%meid") - //E2 Termination -> Resource Status Manager - r.addRoute("RIC_RES_STATUS_RESP", nil, rsmEp, routeTable, -1, "") - r.addRoute("RIC_RES_STATUS_FAILURE", nil, rsmEp, routeTable, -1, "") - - //ACxapp -> A1 Mediator - r.addRoute("A1_POLICY_QUERY", nil, a1mediatorEp, routeTable, -1, "") - r.addRoute("A1_POLICY_RESPONSE", nil, a1mediatorEp, routeTable, -1, "") + 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 + switch routes.SenderEndPoint { + case "SUBMAN": + sendEp = subManEp + case "E2MAN": + sendEp = e2ManEp + case "RSM": + sendEp = rsmEp + case "A1MEDIATOR": + sendEp = a1mediatorEp + } + switch routes.EndPoint { + case "SUBMAN": + Ep = subManEp + case "E2MAN": + Ep = e2ManEp + //case "UEMAN": + // Ep = ueManEp + case "RSM": + Ep = rsmEp + case "A1MEDIATOR": + Ep = a1mediatorEp + } + + 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") @@ -289,11 +322,6 @@ func (r *Rpe) generateRouteTable(endPointList rtmgr.Endpoints) *rtmgr.RouteTable 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") @@ -310,13 +338,15 @@ func (r *Rpe) generateRouteTable(endPointList rtmgr.Endpoints) *rtmgr.RouteTable 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