X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Frpe%2Frpe.go;h=4097ae0dc803ba17b987aa0f367857e9b7a40d64;hb=2037469c7f636b15cc069694b5e7a63cb230ec9a;hp=b080bcbaf6bbbf27f25f9c31dc72753adfca3dc0;hpb=d14518e192178f0df3dc52bd804a9d0cc600bac7;p=ric-plt%2Frtmgr.git diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go index b080bcb..4097ae0 100644 --- a/pkg/rpe/rpe.go +++ b/pkg/rpe/rpe.go @@ -115,7 +115,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, @@ -143,7 +144,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, @@ -242,6 +244,10 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp []rtmgr.Endpoint, subManEp *rtmgr. 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,8 +256,6 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp []rtmgr.Endpoint, subManEp *rtmgr. sendEp = subManEp case "E2MAN": sendEp = e2ManEp - //case "UEMAN": - // sendEp = ueManEp case "RSM": sendEp = rsmEp case "A1MEDIATOR": @@ -300,11 +304,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")