X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Frpe%2Frpe.go;h=9a963c7e9e6f60ef22d7d1414accd0a2e5ea6034;hb=749099bc00ec6cad5da19846e65bd5b4bd9b8de4;hp=a04133cf6e642ec0b5530937df4403ac65c646d0;hpb=57d8540765fc4d6e4b66cd9d100c564866d3f0f9;p=ric-plt%2Frtmgr.git diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go index a04133c..9a963c7 100644 --- a/pkg/rpe/rpe.go +++ b/pkg/rpe/rpe.go @@ -14,6 +14,11 @@ 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). + ================================================================================== */ /* @@ -26,10 +31,11 @@ package rpe import ( "errors" + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" "routing-manager/pkg/rtmgr" "routing-manager/pkg/sbi" - "strconv" "runtime" + "strconv" ) var ( @@ -59,94 +65,155 @@ type Rpe struct { func getEndpointByName(eps *rtmgr.Endpoints, name string) *rtmgr.Endpoint { for _, ep := range *eps { if ep.Name == name { - rtmgr.Logger.Debug("name: %s", ep.Name) - rtmgr.Logger.Debug("ep: %v", ep) + xapp.Logger.Debug("name: %s", ep.Name) + xapp.Logger.Debug("ep: %v", ep) return ep } } return nil } +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 +} + func getEndpointByUuid(uuid string) *rtmgr.Endpoint { endPoints := rtmgr.Eps for _, ep := range endPoints { if ep.Uuid == uuid { - rtmgr.Logger.Debug("name: %s", ep.Uuid) - rtmgr.Logger.Debug("ep: %v", ep) + xapp.Logger.Debug("name: %s", ep.Uuid) + xapp.Logger.Debug("ep: %v", ep) return ep } } return nil } -func (r *Rpe) addRoute(messageType string, tx *rtmgr.Endpoint, rx *rtmgr.Endpoint, routeTable *rtmgr.RouteTable, subId int32) { - if tx != nil && rx != nil { - txList := rtmgr.EndpointList{*tx} - rxList := []rtmgr.EndpointList{[]rtmgr.Endpoint{*rx}} - messageId := rtmgr.MessageTypes[messageType] - route := rtmgr.RouteTableEntry{ - MessageType: messageId, - TxList: txList, - RxGroups: rxList, - SubID: subId} - *routeTable = append(*routeTable, route) - rtmgr.Logger.Debug("Route added: MessageTyp: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx.Uuid, rx.Uuid, subId) - rtmgr.Logger.Trace("Route added: MessageTyp: %v, Tx: %v, Rx: %v, SubId: %v", messageId, tx, rx, subId) - } else { - pc,_,_,ok := runtime.Caller(1) - details := runtime.FuncForPC(pc) - if ok && details != nil { - rtmgr.Logger.Error("Route addition skipped: Either TX or RX endpoint not present. Caller function is %s", details.Name()) - } +func (r *Rpe) addRoute(messageType string, tx *rtmgr.Endpoint, rx *rtmgr.Endpoint, routeTable *rtmgr.RouteTable, subId int32, routeType string) { + txList := rtmgr.EndpointList{} + 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()) } + } 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) + } } +func (r *Rpe) addRoute_rx_list(messageType string, tx *rtmgr.Endpoint, rx []rtmgr.Endpoint, routeTable *rtmgr.RouteTable, subId int32, routeType string) { + txList := rtmgr.EndpointList{} + rxList := []rtmgr.EndpointList{} + + if (tx != nil) { + txList = rtmgr.EndpointList{*tx} + } + + if (rx != nil) { + rxList = []rtmgr.EndpointList{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) +} + + + func (r *Rpe) generateXappRoutes(xAppEp *rtmgr.Endpoint, e2TermEp *rtmgr.Endpoint, subManEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) { - rtmgr.Logger.Debug("rpe.generateXappRoutes invoked") - rtmgr.Logger.Debug("Endpoint: %v, xAppType: %v", xAppEp.Name, xAppEp.XAppType) - if xAppEp.XAppType != sbi.PlatformType && len(xAppEp.TxMessages) > 0 && len(xAppEp.RxMessages) > 0 { + 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 --- //xApp -> Subscription Manager - r.addRoute("RIC_SUB_REQ", xAppEp, subManEp, routeTable, -1) - r.addRoute("RIC_SUB_DEL_REQ", xAppEp, subManEp, routeTable, -1) + 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, "") //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, "") + } + //xApp->A1Mediator + if xAppEp.XAppType != sbi.PlatformType && len(xAppEp.Policies) > 0 { + xapp.Logger.Debug("rpe.generateXappRoutes found policies section") + for _, policy := range xAppEp.Policies { + r.addRoute("A1_POLICY_REQ", nil, xAppEp, routeTable, policy, "") + } } + } -func (r *Rpe) generateSubscriptionRoutes(e2TermEp *rtmgr.Endpoint, subManEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) { - rtmgr.Logger.Debug("rpe.addSubscriptionRoutes invoked") +func (r *Rpe) generateSubscriptionRoutes(selectedxAppEp *rtmgr.Endpoint, e2TermEp *rtmgr.Endpoint, subManEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) { + xapp.Logger.Debug("rpe.addSubscriptionRoutes invoked") subscriptionList := &rtmgr.Subs for _, subscription := range *subscriptionList { - rtmgr.Logger.Debug("Subscription: %v", subscription) + xapp.Logger.Debug("Subscription: %v", subscription) xAppUuid := subscription.Fqdn + ":" + strconv.Itoa(int(subscription.Port)) - rtmgr.Logger.Debug("xApp UUID: %v", xAppUuid) + xapp.Logger.Debug("xApp UUID: %v", xAppUuid) xAppEp := getEndpointByUuid(xAppUuid) - //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.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, "") + } } } -func (r *Rpe) generatePlatformRoutes(e2TermEp *rtmgr.Endpoint, subManEp *rtmgr.Endpoint, e2ManEp *rtmgr.Endpoint, ueManEp *rtmgr.Endpoint, routeTable *rtmgr.RouteTable) { - rtmgr.Logger.Debug("rpe.generatePlatformRoutes invoked") +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) { + xapp.Logger.Debug("rpe.generatePlatformRoutes invoked") //Platform Routes --- Subscription Routes //Subscription Manager -> E2 Termination - r.addRoute("RIC_SUB_REQ", subManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_SUB_DEL_REQ", subManEp, e2TermEp, routeTable, -1) + 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", e2TermEp, subManEp, routeTable, -1) - r.addRoute("RIC_SUB_DEL_RESP", e2TermEp, subManEp, routeTable, -1) - r.addRoute("RIC_SUB_FAILURE", e2TermEp, subManEp, routeTable, -1) - r.addRoute("RIC_SUB_DEL_FAILURE", e2TermEp, subManEp, routeTable, -1) + 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) @@ -156,61 +223,100 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp *rtmgr.Endpoint, subManEp *rtmgr.E //Platform Routes --- X2 Routes //E2 Manager -> E2 Termination - r.addRoute("RIC_X2_SETUP_REQ", e2ManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_X2_RESET_REQ", e2ManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_X2_RESET_RESP", e2ManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_ENDC_X2_SETUP_REQ", e2ManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_SCTP_CLEAR_ALL", e2ManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_ENB_CONF_UPDATE_ACK", e2ManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_ENB_CONF_UPDATE_FAILURE", e2ManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_ENDC_CONF_UPDATE_ACK", e2ManEp, e2TermEp, routeTable, -1) - r.addRoute("RIC_ENDC_CONF_UPDATE_FAILURE", e2ManEp, e2TermEp, routeTable, -1) + 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", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_X2_SETUP_RESP", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_X2_SETUP_FAILURE", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_X2_RESET_REQ", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_X2_RESET_RESP", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_ENDC_X2_SETUP_RESP", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_ENDC_X2_SETUP_FAILURE", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_ENDC_CONF_UPDATE", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_SCTP_CONNECTION_FAILURE", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_ERROR_INDICATION", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_ENB_CONF_UPDATE", e2TermEp, e2ManEp, routeTable, -1) - r.addRoute("RIC_ENB_LOAD_INFORMATION", e2TermEp, e2ManEp, routeTable, -1) + 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, "") } func (r *Rpe) generateRouteTable(endPointList rtmgr.Endpoints) *rtmgr.RouteTable { - rtmgr.Logger.Debug("rpe.generateRouteTable invoked") - rtmgr.Logger.Debug("Endpoint List: %v", endPointList) + xapp.Logger.Debug("rpe.generateRouteTable invoked") + xapp.Logger.Debug("Endpoint List: %v", endPointList) routeTable := &rtmgr.RouteTable{} e2TermEp := getEndpointByName(&endPointList, "E2TERM") if e2TermEp == nil { - rtmgr.Logger.Error("Platform component not found: %v", "E2 Termination") - rtmgr.Logger.Debug("Endpoints: %v", endPointList) + xapp.Logger.Error("Platform component not found: %v", "E2 Termination") + xapp.Logger.Debug("Endpoints: %v", endPointList) } subManEp := getEndpointByName(&endPointList, "SUBMAN") if subManEp == nil { - rtmgr.Logger.Error("Platform component not found: %v", "Subscription Manager") - rtmgr.Logger.Debug("Endpoints: %v", endPointList) + xapp.Logger.Error("Platform component not found: %v", "Subscription Manager") + xapp.Logger.Debug("Endpoints: %v", endPointList) } e2ManEp := getEndpointByName(&endPointList, "E2MAN") if e2ManEp == nil { - rtmgr.Logger.Error("Platform component not found: %v", "E2 Manager") - rtmgr.Logger.Debug("Endpoints: %v", endPointList) + xapp.Logger.Error("Platform component not found: %v", "E2 Manager") + xapp.Logger.Debug("Endpoints: %v", endPointList) } ueManEp := getEndpointByName(&endPointList, "UEMAN") if ueManEp == nil { - rtmgr.Logger.Error("Platform component not found: %v", "UE Manger") - rtmgr.Logger.Debug("Endpoints: %v", endPointList) + 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.Debug("Endpoints: %v", endPointList) + } + A1MediatorEp := getEndpointByName(&endPointList, "A1MEDIATOR") + if A1MediatorEp == nil { + xapp.Logger.Error("Platform component not found: %v", "A1Mediator") + 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) } - r.generatePlatformRoutes(e2TermEp, subManEp, e2ManEp, ueManEp, routeTable) + r.generatePlatformRoutes(e2TermListEp, subManEp, e2ManEp, ueManEp, rsmEp, A1MediatorEp, routeTable) for _, endPoint := range endPointList { - rtmgr.Logger.Debug("Endpoint: %v, xAppType: %v", endPoint.Name, endPoint.XAppType) - if endPoint.XAppType != sbi.PlatformType && len(endPoint.TxMessages) > 0 && len(endPoint.RxMessages) > 0 { + 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(e2TermEp, subManEp, routeTable) + r.generateSubscriptionRoutes(endPoint, e2TermEp, subManEp, routeTable) } } return routeTable