X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Frpe%2Frpe.go;h=f68a74816c9ca4ff89a85bbcd93857f23699b1d9;hb=refs%2Fchanges%2F86%2F10286%2F14;hp=b080bcbaf6bbbf27f25f9c31dc72753adfca3dc0;hpb=d14518e192178f0df3dc52bd804a9d0cc600bac7;p=ric-plt%2Frtmgr.git diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go index b080bcb..f68a748 100644 --- a/pkg/rpe/rpe.go +++ b/pkg/rpe/rpe.go @@ -31,11 +31,13 @@ package rpe import ( "errors" - "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" + "routing-manager/pkg/models" "routing-manager/pkg/rtmgr" "routing-manager/pkg/sbi" "runtime" "strconv" + + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" ) var ( @@ -106,7 +108,7 @@ func (r *Rpe) addRoute(messageType string, tx *rtmgr.Endpoint, rx *rtmgr.Endpoin 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()) + xapp.Logger.Error("Addition of route skipped due to either TX or RX endpoint not present. Caller function is %s", details.Name()) } } else { if tx != nil { @@ -115,7 +117,8 @@ func (r *Rpe) addRoute(messageType string, tx *rtmgr.Endpoint, rx *rtmgr.Endpoin 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, @@ -123,8 +126,8 @@ func (r *Rpe) addRoute(messageType string, tx *rtmgr.Endpoint, rx *rtmgr.Endpoin 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: MessageType: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx.Uuid, rx.Uuid, subId) + // xapp.Logger.Trace("Route added: MessageType: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx, rx, subId) } } @@ -143,7 +146,8 @@ func (r *Rpe) addRoute_rx_list(messageType string, tx *rtmgr.Endpoint, rx []rtmg } } - messageId := strconv.Itoa(xapp.RICMessageTypes[messageType]) + //messageId := strconv.Itoa(xapp.RICMessageTypes[messageType]) + messageId := rtmgr.Mtype[messageType] route := rtmgr.RouteTableEntry{ MessageType: messageId, TxList: txList, @@ -151,8 +155,8 @@ func (r *Rpe) addRoute_rx_list(messageType string, tx *rtmgr.Endpoint, rx []rtmg 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: MessageType: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx.Uuid, rx.Uuid, SubId) + // xapp.Logger.Trace("Route added: MessageType: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx, rx, SubId) } func (r *Rpe) generateXappRoutes(xAppEp *rtmgr.Endpoint, subManEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) { @@ -182,31 +186,49 @@ 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 + 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") { + 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" && rxmsg != "RIC_SUB_DEL_REQUIRED" { 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 rxmsg == txmsg { + r.addRoute(rxmsg, SrcxAppEp, RecvxAppEp, routeTable, -1, "") + src_present = true + break + } } } } - if src_present == false { + 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 + } } - } } @@ -227,21 +249,47 @@ func (r *Rpe) generateSubscriptionRoutes(selectedxAppEp *rtmgr.Endpoint, subManE 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) + xapp.Logger.Error("generateSubscriptionRoutes xAppEp is nil, xApp UUID: %v", xAppUuid) } } } -func (r *Rpe) generatePlatformRoutes(e2TermEp []rtmgr.Endpoint, subManEp *rtmgr.Endpoint, e2ManEp *rtmgr.Endpoint, rsmEp *rtmgr.Endpoint, a1mediatorEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) { +func (r *Rpe) generatePartialSubscriptionTable(xappSubData *models.XappSubscriptionData, subManEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) { + xapp.Logger.Debug("rpe.addSingleSubscriptionRoutes invoked") + xAppUuid := *xappSubData.Address + ":" + strconv.Itoa(int(*xappSubData.Port)) + xapp.Logger.Debug("xApp UUID: %v", xAppUuid) + xAppEp := getEndpointByUuid(xAppUuid) + if xAppEp != nil { + //Subscription Manager -> xApp + r.addRoute("RIC_SUB_RESP", subManEp, xAppEp, routeTable, *xappSubData.SubscriptionID, "") + r.addRoute("RIC_SUB_FAILURE", subManEp, xAppEp, routeTable, *xappSubData.SubscriptionID, "") + r.addRoute("RIC_SUB_DEL_RESP", subManEp, xAppEp, routeTable, *xappSubData.SubscriptionID, "") + r.addRoute("RIC_SUB_DEL_FAILURE", subManEp, xAppEp, routeTable, *xappSubData.SubscriptionID, "") + + //E2 Termination -> xApp + r.addRoute("RIC_INDICATION", nil, xAppEp, routeTable, *xappSubData.SubscriptionID, "") + r.addRoute("RIC_CONTROL_ACK", nil, xAppEp, routeTable, *xappSubData.SubscriptionID, "") + r.addRoute("RIC_CONTROL_FAILURE", nil, xAppEp, routeTable, *xappSubData.SubscriptionID, "") + } 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, 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 @@ -250,10 +298,8 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp []rtmgr.Endpoint, subManEp *rtmgr. sendEp = subManEp case "E2MAN": sendEp = e2ManEp - //case "UEMAN": - // sendEp = ueManEp - case "RSM": - sendEp = rsmEp + //case "RSM":, + // sendEp = rsmEp case "A1MEDIATOR": sendEp = a1mediatorEp } @@ -264,8 +310,8 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp []rtmgr.Endpoint, subManEp *rtmgr. Ep = e2ManEp //case "UEMAN": // Ep = ueManEp - case "RSM": - Ep = rsmEp + //case "RSM": + // Ep = rsmEp case "A1MEDIATOR": Ep = a1mediatorEp } @@ -278,7 +324,60 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp []rtmgr.Endpoint, subManEp *rtmgr. 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, "") + r.addRoute_rx_list("RIC_SERVICE_UPDATE_ACK", e2ManEp, e2TermEp, routeTable, -1, "") + r.addRoute_rx_list("RIC_SERVICE_UPDATE_FAILURE", e2ManEp, e2TermEp, routeTable, -1, "") + r.addRoute_rx_list("RIC_E2NODE_CONFIG_UPDATE_ACK", e2ManEp, e2TermEp, routeTable, -1, "") + r.addRoute_rx_list("RIC_E2NODE_CONFIG_UPDATE_FAILURE", e2ManEp, e2TermEp, routeTable, -1, "") + r.addRoute_rx_list("RIC_E2_RESET_RESP", e2ManEp, e2TermEp, routeTable, -1, "") + } +} + +func (r *Rpe) generatePartialRouteTable(endPointList rtmgr.Endpoints, xappSubData *models.XappSubscriptionData, updatetype rtmgr.RMRUpdateType) *rtmgr.RouteTable { + xapp.Logger.Debug("rpe.generatePartialRouteTable invoked") + xapp.Logger.Debug("Endpoint List: %v", endPointList) + routeTable := &rtmgr.RouteTable{} + subManEp := getEndpointByName(&endPointList, "SUBMAN") + if subManEp == nil { + xapp.Logger.Error("Platform component not found: %v", "Subscription Manager") + xapp.Logger.Debug("Endpoints: %v", endPointList) + } + /*e2TermListEp := getEndpointListByName(&endPointList, "E2TERMINST") + if len(e2TermListEp) == 0 { + xapp.Logger.Error("Platform component not found: %v", "E2 Termination List") + xapp.Logger.Debug("Endpoints: %v", endPointList) + } + e2ManEp := getEndpointByName(&endPointList, "E2MAN") + if e2ManEp == nil { + xapp.Logger.Error("Platform component not found: %v", "E2 Manager") + xapp.Logger.Debug("Endpoints: %v", endPointList) + }*/ + + if xappSubData != nil && updatetype == rtmgr.SubsType { + xapp.Logger.Info("Updating partial subscription routes") + r.generatePartialSubscriptionTable(xappSubData, subManEp, routeTable) + } + /*if updatetype == rtmgr.XappType { + xapp.Logger.Info("Updating partial xapp routes") + 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, subManEp, routeTable) + r.generateXappToXappRoutes(endPoint, endPointList, routeTable) + } + } } + if updatetype == rtmgr.E2Type { + xapp.Logger.Info("Updating partial E2 routes") + if len(e2TermListEp) > 0 { + r.addRoute_rx_list("RIC_SCTP_CLEAR_ALL", e2ManEp, e2TermListEp, routeTable, -1, "") + r.addRoute_rx_list("E2_TERM_KEEP_ALIVE_REQ", e2ManEp, e2TermListEp, routeTable, -1, "") + r.addRoute_rx_list("RIC_E2_SETUP_RESP", e2ManEp, e2TermListEp, routeTable, -1, "") + r.addRoute_rx_list("RIC_E2_SETUP_FAILURE", e2ManEp, e2TermListEp, routeTable, -1, "") + } + }*/ + + return routeTable + } func (r *Rpe) generateRouteTable(endPointList rtmgr.Endpoints) *rtmgr.RouteTable { @@ -300,16 +399,11 @@ 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") + /*rsmEp := getEndpointByName(&endPointList, "RSM") if rsmEp == nil { xapp.Logger.Error("Platform component not found: %v", "Resource Status Manager") xapp.Logger.Debug("Endpoints: %v", endPointList) - } + }*/ A1MediatorEp := getEndpointByName(&endPointList, "A1MEDIATOR") if A1MediatorEp == nil { xapp.Logger.Error("Platform component not found: %v", "A1Mediator") @@ -321,7 +415,7 @@ 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, rsmEp, A1MediatorEp, routeTable) + r.generatePlatformRoutes(e2TermListEp, subManEp, e2ManEp, A1MediatorEp, routeTable) for _, endPoint := range endPointList { xapp.Logger.Debug("Endpoint: %v, xAppType: %v", endPoint.Name, endPoint.XAppType)