X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Frpe%2Frpe.go;h=8ee9b521f1413aad859cdf88ec8eb38eeffffabb;hb=6d20904a90698db2578b6af09e4bc52241f0a1d5;hp=9a963c7e9e6f60ef22d7d1414accd0a2e5ea6034;hpb=749099bc00ec6cad5da19846e65bd5b4bd9b8de4;p=ric-plt%2Frtmgr.git

diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go
index 9a963c7..8ee9b52 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
+	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
+	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,28 @@ 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])
+		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 +132,42 @@ 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 {
+		rxList = []rtmgr.EndpointList{rx}
 	}
 
-	messageId := rtmgr.MessageTypes[messageType]
+	messageId := strconv.Itoa(xapp.RICMessageTypes[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) {
 	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 {
@@ -188,7 +189,7 @@ func (r *Rpe) generateSubscriptionRoutes(selectedxAppEp *rtmgr.Endpoint, e2TermE
 		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
+			/// TODO
 			//Subscription Manager -> xApp
 			r.addRoute("RIC_SUB_RESP", subManEp, xAppEp, routeTable, subscription.SubID, "")
 			r.addRoute("RIC_SUB_FAILURE", subManEp, xAppEp, routeTable, subscription.SubID, "")
@@ -206,68 +207,41 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp []rtmgr.Endpoint, subManEp *rtmgr.
 	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, "")
+	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 "UEMAN":
+			sendEp = ueManEp
+		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
+		}
 
-	//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, "")
+		r.addRoute(routes.MessageType, sendEp, Ep, routeTable, routes.SubscriptionId, routes.Meid)
+	}
 
-	//ACxapp -> A1 Mediator
-	r.addRoute("A1_POLICY_QUERY", nil, a1mediatorEp, routeTable, -1, "")
-	r.addRoute("A1_POLICY_RESPONSE", nil, a1mediatorEp, routeTable, -1, "")
+	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, "")
+	}
 }
 
 func (r *Rpe) generateRouteTable(endPointList rtmgr.Endpoints) *rtmgr.RouteTable {