X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fsbi%2Fnngpush.go;h=843806452050cb7e8340233fa38f5c69055056ba;hb=a8596ec6db91b8a45a1a21421a726b9b05ce7d48;hp=bb39be43ce142b083f2dfad51ffee46be345cb1e;hpb=eb2ff0d217caf158dd15424bf70f8aa79c3742b1;p=ric-plt%2Frtmgr.git

diff --git a/pkg/sbi/nngpush.go b/pkg/sbi/nngpush.go
index bb39be4..8438064 100644
--- a/pkg/sbi/nngpush.go
+++ b/pkg/sbi/nngpush.go
@@ -14,6 +14,10 @@
    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,6 +30,7 @@ package sbi
 
 import (
 	"errors"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"nanomsg.org/go/mangos/v2"
 	"nanomsg.org/go/mangos/v2/protocol/push"
 	_ "nanomsg.org/go/mangos/v2/transport/all"
@@ -45,7 +50,7 @@ func NewNngPush() *NngPush {
 }
 
 func createNewPushSocket() (NngSocket, error) {
-	rtmgr.Logger.Debug("Invoked: createNewPushSocket()")
+	xapp.Logger.Debug("Invoked: createNewPushSocket()")
 	socket, err := push.NewSocket()
 	if err != nil {
 		return nil, errors.New("can't create new push socket due to:" + err.Error())
@@ -55,17 +60,18 @@ func createNewPushSocket() (NngSocket, error) {
 }
 
 func pipeEventHandler(event mangos.PipeEvent, pipe mangos.Pipe) {
-	rtmgr.Logger.Debug("Invoked: pipeEventHandler()")
+	xapp.Logger.Debug("Invoked: pipeEventHandler()")
+	xapp.Logger.Debug("Received pipe event for " + pipe.Address() + " address")
 	for _, ep := range rtmgr.Eps {
-		uri := DEFAULT_NNG_PIPELINE_SOCKET_PREFIX + ep.Ip + ":" + strconv.Itoa(DEFAULT_NNG_PIPELINE_SOCKET_NUMBER)
+		uri := DefaultNngPipelineSocketPrefix + ep.Ip + ":" + strconv.Itoa(DefaultNngPipelineSocketNumber)
 		if uri == pipe.Address() {
 			switch event {
 			case 1:
 				ep.IsReady = true
-				rtmgr.Logger.Debug("Endpoint " + uri + " successfully attached")
+				xapp.Logger.Debug("Endpoint " + uri + " successfully attached")
 			default:
 				ep.IsReady = false
-				rtmgr.Logger.Debug("Endpoint " + uri + " has been detached")
+				xapp.Logger.Debug("Endpoint " + uri + " has been detached")
 			}
 		}
 	}
@@ -82,8 +88,8 @@ func (c *NngPush) Terminate() error {
 func (c *NngPush) AddEndpoint(ep *rtmgr.Endpoint) error {
 	var err error
 	var socket NngSocket
-	rtmgr.Logger.Debug("Invoked sbi.AddEndpoint")
-	rtmgr.Logger.Debug("args: %v", (*ep))
+	xapp.Logger.Debug("Invoked sbi.AddEndpoint")
+	xapp.Logger.Debug("args: %v", *ep)
 	socket, err = c.NewSocket()
 	if err != nil {
 		return errors.New("can't add new socket to endpoint:" + ep.Uuid + " due to: " + err.Error())
@@ -97,8 +103,8 @@ func (c *NngPush) AddEndpoint(ep *rtmgr.Endpoint) error {
 }
 
 func (c *NngPush) DeleteEndpoint(ep *rtmgr.Endpoint) error {
-	rtmgr.Logger.Debug("Invoked sbi. DeleteEndpoint")
-	rtmgr.Logger.Debug("args: %v", (*ep))
+	xapp.Logger.Debug("Invoked sbi. DeleteEndpoint")
+	xapp.Logger.Debug("args: %v", *ep)
 	if err := ep.Socket.(NngSocket).Close(); err != nil {
 		return errors.New("can't close push socket of endpoint:" + ep.Uuid + " due to: " + err.Error())
 	}
@@ -113,8 +119,8 @@ func (c *NngPush) UpdateEndpoints(rcs *rtmgr.RicComponents) {
 NOTE: Asynchronous dial starts a goroutine which keep maintains the connection to the given endpoint
 */
 func (c *NngPush) dial(ep *rtmgr.Endpoint) error {
-	rtmgr.Logger.Debug("Dialing to endpoint: " + ep.Uuid)
-	uri := DEFAULT_NNG_PIPELINE_SOCKET_PREFIX + ep.Ip + ":" + strconv.Itoa(DEFAULT_NNG_PIPELINE_SOCKET_NUMBER)
+	xapp.Logger.Debug("Dialing to endpoint: " + ep.Uuid)
+	uri := DefaultNngPipelineSocketPrefix + ep.Ip + ":" + strconv.Itoa(DefaultNngPipelineSocketNumber)
 	options := make(map[string]interface{})
 	options[mangos.OptionDialAsynch] = true
 	if err := ep.Socket.(NngSocket).DialOptions(uri, options); err != nil {
@@ -124,24 +130,24 @@ func (c *NngPush) dial(ep *rtmgr.Endpoint) error {
 }
 
 func (c *NngPush) DistributeAll(policies *[]string) error {
-	rtmgr.Logger.Debug("Invoked: sbi.DistributeAll")
-	rtmgr.Logger.Debug("args: %v", (*policies))
+	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 {
-			rtmgr.Logger.Warn("Endpoint " + ep.Uuid + " is not ready")
+			xapp.Logger.Warn("Endpoint " + ep.Uuid + " is not ready")
 		}
 	}
 	return nil
 }
 
 func (c *NngPush) send(ep *rtmgr.Endpoint, policies *[]string) {
-	rtmgr.Logger.Debug("Push policy to endpoint: " + ep.Uuid)
+	xapp.Logger.Debug("Push policy to endpoint: " + ep.Uuid)
 	for _, pe := range *policies {
 		if err := ep.Socket.(NngSocket).Send([]byte(pe)); err != nil {
-			rtmgr.Logger.Error("Unable to send policy entry due to: " + err.Error())
+			xapp.Logger.Error("Unable to send policy entry due to: " + err.Error())
 		}
 	}
-	rtmgr.Logger.Info("NNG PUSH to endpoint " + ep.Uuid + ": OK (# of Entries:" + strconv.Itoa(len((*policies))) + ")")
+	xapp.Logger.Info("NNG PUSH to endpoint " + ep.Uuid + ": OK (# of Entries:" + strconv.Itoa(len(*policies)) + ")")
 }