Added config and logger module from xapp-fwk. Added Routes related to A1Mediator...

[ric-plt/rtmgr.git] / pkg / rpe / rmr.go

diff --git a/pkg/rpe/rmr.go b/pkg/rpe/rmr.go
index a4bf776..8929c63 100644 (file)
--- a/pkg/rpe/rmr.go
+++ b/pkg/rpe/rmr.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.
    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).
+

 ==================================================================================
 */
 /*
 ==================================================================================
 */
 /*


@@ -25,31 +30,45 @@
 
 package rpe
 
 
 package rpe
 

-import "rtmgr"
+import (
+       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+       "routing-manager/pkg/rtmgr"
+       "strconv"
+)
+
+type Rmr struct {
+       Rpe
+}
+
+type RmrPush struct {
+       Rmr
+}
+
+func NewRmrPush() *RmrPush {
+       instance := new(RmrPush)
+       return instance
+}

 
 /*
 Produces the raw route message consumable by RMR
 */
 
 /*
 Produces the raw route message consumable by RMR
 */

-func generateRMRPolicies(xapps *[]rtmgr.XApp) *[]string {
-       rtmgr.Logger.Debug("Invoked rmr.generateRMRPolicies")
-       rtmgr.Logger.Debug("args: %v", (*xapps))
-       key := "00000           "
+func (r *Rmr) generateRMRPolicies(eps rtmgr.Endpoints, key string) *[]string {

        rawrt := []string{key + "newrt|start\n"}
        rawrt := []string{key + "newrt|start\n"}

-       rt := getRouteTable(xapps)
+       rt := r.generateRouteTable(eps)

        for _, rte := range *rt {
        for _, rte := range *rt {

-               rawrte := key + "rte|" + rte.MessageType
+               rawrte := key + "mse|" + rte.MessageType

                for _, tx := range rte.TxList {
                for _, tx := range rte.TxList {

-                       rawrte += "," + tx.IpSocket
+                       rawrte += "," + tx.Ip + ":" + strconv.Itoa(int(tx.Port))

                }
                }

-               rawrte += "|"
+               rawrte += "|" + strconv.Itoa(int(rte.SubID)) + "|"

                group := ""
                for _, rxg := range rte.RxGroups {
                        member := ""
                        for _, rx := range rxg {
                                if member == "" {
                group := ""
                for _, rxg := range rte.RxGroups {
                        member := ""
                        for _, rx := range rxg {
                                if member == "" {

-                                       member += rx.IpSocket
+                                       member += rx.Ip + ":" + strconv.Itoa(int(rx.Port))

                                } else {
                                } else {

-                                       member += "," + rx.IpSocket
+                                       member += "," + rx.Ip + ":" + strconv.Itoa(int(rx.Port))

                                }
                        }
                        if group == "" {
                                }
                        }
                        if group == "" {


@@ -62,6 +81,15 @@ func generateRMRPolicies(xapps *[]rtmgr.XApp) *[]string {
                rawrt = append(rawrt, rawrte+"\n")
        }
        rawrt = append(rawrt, key+"newrt|end\n")
                rawrt = append(rawrt, rawrte+"\n")
        }
        rawrt = append(rawrt, key+"newrt|end\n")

-       rtmgr.Logger.Debug("rmr.generateRMRPolicies returns: %v", rawrt)
+       xapp.Logger.Debug("rmr.GeneratePolicies returns: %v", rawrt)

        return &rawrt
 }
        return &rawrt
 }

+
+func (r *RmrPush) GeneratePolicies(eps rtmgr.Endpoints) *[]string {
+       xapp.Logger.Debug("Invoked rmr.GeneratePolicies, args: %v: ", eps)
+       return r.generateRMRPolicies(eps, "")
+}
+
+func (r *RmrPush) GenerateRouteTable(eps rtmgr.Endpoints) *rtmgr.RouteTable {
+       return r.generateRouteTable(eps)
+}