Handling of subscription merge and inclusion of RMR lib from xapp-framework

[ric-plt/rtmgr.git] / pkg / sbi / nngpush.go

diff --git a/pkg/sbi/nngpush.go b/pkg/sbi/nngpush.go
index ac61c0b..1404319 100644 (file)
--- a/pkg/sbi/nngpush.go
+++ b/pkg/sbi/nngpush.go
@@ -28,6 +28,20 @@
 
 package sbi
 
+/*
+#include <time.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <rmr/rmr.h>
+#include <rmr/RIC_message_types.h>
+
+
+#cgo CFLAGS: -I../
+#cgo LDFLAGS: -lrmr_nng -lnng
+*/
+import "C"
+
 import (
        "errors"
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
@@ -36,12 +50,14 @@ import (
        _ "nanomsg.org/go/mangos/v2/transport/all"
        "routing-manager/pkg/rtmgr"
        "strconv"
-       "time"
 )
 
+
+
 type NngPush struct {
        Sbi
        NewSocket CreateNewNngSocketHandler
+        rcChan      chan *xapp.RMRParams
 }
 
 func NewNngPush() *NngPush {
@@ -130,40 +146,14 @@ func (c *NngPush) dial(ep *rtmgr.Endpoint) error {
        return nil
 }
 
-/*
 func (c *NngPush) DistributeAll(policies *[]string) error {
        xapp.Logger.Debug("Invoked: sbi.DistributeAll")
        xapp.Logger.Debug("args: %v", *policies)
        for _, ep := range rtmgr.Eps {
-                       if ep.IsReady {
-                               go c.send(ep, policies)
-                       } else {
-                               xapp.Logger.Warn("Endpoint " + ep.Uuid + " is not ready")
-                       }
-               }
-       }
-       return nil
-}
-
-*/
-
-/*
-       Temporary solution for R3 - E2M -> E2T issue
-*/
-func (c *NngPush) DistributeAll(policies *[]string) error {
-       xapp.Logger.Debug("Invoked: sbi.DistributeAll")
-       xapp.Logger.Debug("args: %v", *policies)
-       for _, ep := range rtmgr.Eps {
-               i := 1
-               for i< 5 {
-                       if ep.IsReady {
-                               go c.send(ep, policies)
-                               break
-                       } else {
-                               xapp.Logger.Warn("Endpoint " + ep.Uuid + " is not ready" + " Retry count " + strconv.Itoa(i))
-                               time.Sleep(10 * time.Millisecond)
-                               i++
-                       }
+               if ep.IsReady {
+                       go c.send(ep, policies)
+               } else {
+                       xapp.Logger.Warn("Endpoint " + ep.Uuid + " is not ready")
                }
        }
        return nil