From: wahidw <abdulwahid.w@nokia.com>
Date: Thu, 9 Apr 2020 14:14:15 +0000 (+0000)
Subject: Removing references to nng mangos
X-Git-Tag: 0.6.0~12
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a55ae650c55c106183838f76fc9fd83b4056bfdf;p=ric-plt%2Frtmgr.git

Removing references to nng mangos

Change-Id: I07ad389a93917f2d2ebda9af39c2d17984d72a82
Signed-off-by: wahidw <abdulwahid.w@nokia.com>
---

diff --git a/Dockerfile b/Dockerfile
index 8042a97..f8fd194 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@
 FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:5-u18.04-nng as rtmgrbuild
 
 # Install RMr shared library
-ARG RMRVERSION=3.6.2
+ARG RMRVERSION=3.6.5
 RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 # Install RMr development header files
 RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
diff --git a/build-rtmgr-ubuntu.sh b/build-rtmgr-ubuntu.sh
index 7fdc25c..c17e64e 100755
--- a/build-rtmgr-ubuntu.sh
+++ b/build-rtmgr-ubuntu.sh
@@ -20,7 +20,7 @@ set -eux
 
 echo "--> rtmgr-build-ubuntu.sh"
 curdir=`pwd`
-RMRVERSION=3.6.2
+RMRVERSION=3.6.5
 wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr_${RMRVERSION}_amd64.deb && rm -rf rmr_${RMRVERSION}_amd64.deb
 wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && sudo dpkg -i rmr-dev_${RMRVERSION}_amd64.deb && rm -rf rmr-dev_${RMRVERSION}_amd64.deb
 
diff --git a/go.mod b/go.mod
index a6e285e..7fbb010 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module routing-manager
 go 1.12.1
 
 require (
-	gerrit.o-ran-sc.org/r/ric-plt/xapp-frame v0.4.4
+	gerrit.o-ran-sc.org/r/ric-plt/xapp-frame v0.4.6
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-openapi/errors v0.19.3
 	github.com/go-openapi/loads v0.19.4
@@ -14,13 +14,10 @@ require (
 	github.com/go-openapi/validate v0.19.6
 	github.com/jessevdk/go-flags v1.4.0
 	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
-	nanomsg.org/go/mangos/v2 v2.0.5
 )
 
 replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2
 
-replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.4.4
+replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.4.6
 
 replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.1
-
-replace nanomsg.org/go/mangos/v2 => nanomsg.org/go/mangos/v2 v2.0.5
diff --git a/go.sum b/go.sum
index fc79036..b889919 100644
--- a/go.sum
+++ b/go.sum
@@ -246,5 +246,3 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-nanomsg.org/go/mangos/v2 v2.0.5 h1:sTLNMqmOlJrVgcz8PXRBEBXUJ4A+Edl36z5SOjU2FXY=
-nanomsg.org/go/mangos/v2 v2.0.5/go.mod h1:8ElpgCPFwZ84FzIBlcEg+BUCNWpx9vTc2vtUwopGjqA=
diff --git a/pkg/sbi/nngpush_test.go b/pkg/sbi/nngpush_test.go
index de11e74..f3bc6e4 100644
--- a/pkg/sbi/nngpush_test.go
+++ b/pkg/sbi/nngpush_test.go
@@ -34,9 +34,6 @@ import (
 	"time"
 	"os"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	//"nanomsg.org/go/mangos/v2"
-	//_ "nanomsg.org/go/mangos/v2/transport/all"
-	//"nanomsg.org/go/mangos/v2/protocol/push"
 	"testing"
 )
 
diff --git a/pkg/stub/mangos.go b/pkg/stub/mangos.go
deleted file mode 100644
index e795c9f..0000000
--- a/pkg/stub/mangos.go
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
-==================================================================================
-  Copyright (c) 2019 AT&T Intellectual Property.
-  Copyright (c) 2019 Nokia
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   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).
-
-==================================================================================
-*/
-/*
-  Mnemonic:	mangos.go
-  Abstract:
-  Date:		3 May 2019
-*/
-
-package stub
-
-import "errors"
-
-type MangosMessage struct {
-	Header []byte
-	Body   []byte
-	Pipe   MangosPipe
-	bbuf   []byte
-	hbuf   []byte
-	bsize  int
-	pool   interface{}
-}
-
-type MangosProtocolInfo struct {
-	Self     uint16
-	Peer     uint16
-	SelfName string
-	PeerName string
-}
-
-// Mangos Listener Stub
-
-type MangosListener struct {
-}
-
-func (l MangosListener) Listen() error {
-	return nil
-}
-
-func (l MangosListener) Close() error {
-	return nil
-}
-
-func (l MangosListener) Address() string {
-	return ""
-}
-
-func (l MangosListener) SetOption(s string, i interface{}) error {
-	return nil
-}
-
-func (l MangosListener) GetOption(s string) (interface{}, error) {
-	return nil, nil
-}
-
-// Mangos Dialer Stub
-
-type MangosDialer struct {
-}
-
-func (d MangosDialer) Open() error {
-	return nil
-}
-
-func (d MangosDialer) Close() error {
-	return nil
-}
-
-func (d MangosDialer) Address() string {
-	return ""
-}
-
-func (d MangosDialer) SetOption(s string, i interface{}) error {
-	return nil
-}
-
-func (d MangosDialer) GetOption(s string) (interface{}, error) {
-	return nil, nil
-}
-
-// Mangos Context Stub
-
-type MangosContext struct {
-}
-
-func (c MangosContext) Close() error {
-	return nil
-}
-
-func (c MangosContext) SetOption(s string, i interface{}) error {
-	return nil
-}
-
-func (c MangosContext) GetOption(s string) (interface{}, error) {
-	return nil, nil
-}
-
-func (c MangosContext) Send(b []byte) error {
-	return nil
-}
-
-func (c MangosContext) Recv() ([]byte, error) {
-	return make([]byte, 0), nil
-}
-
-func (c MangosContext) SendMsg(*MangosMessage) error {
-	return nil
-}
-
-func (c MangosContext) RecvMsg() (*MangosMessage, error) {
-	return nil, nil
-}
-
-// Mangos Pipe Stub
-
-type MangosPipe struct {
-}
-
-func (p MangosPipe) ID() uint32 {
-	return 0
-}
-
-func (p MangosPipe) Listener() MangosListener {
-	return MangosListener{}
-}
-
-func (p MangosPipe) Dialer() MangosDialer {
-	return MangosDialer{}
-}
-
-func (p MangosPipe) Close() error {
-	return nil
-}
-
-func (p MangosPipe) Address() string {
-	return ""
-}
-
-func (p MangosPipe) GetOption(s string) (interface{}, error) {
-	return nil, nil
-}
-
-// Mangos PipeEventHook Stub
-
-type PipeEventHook func(int, MangosPipe)
-
-// Mangos Socket Stub
-
-type MangosSocket struct {
-	GenerateSocketCloseError  bool
-	GenerateSocketSendError   bool
-	GenerateSocketDialError   bool
-	GenerateSocketListenError bool
-}
-
-func (s MangosSocket) Info() MangosProtocolInfo {
-	return MangosProtocolInfo{}
-}
-
-func (s MangosSocket) Close() error {
-	if s.GenerateSocketCloseError {
-		return errors.New("stub generated Socket Close error")
-	}
-	return nil
-}
-
-func (s MangosSocket) Send(b []byte) error {
-	if s.GenerateSocketSendError {
-		return errors.New("stub generated Socket Send error")
-	}
-	return nil
-}
-
-func (s MangosSocket) Recv() ([]byte, error) {
-	return make([]byte, 0), nil
-}
-
-func (s MangosSocket) SendMsg(*MangosMessage) error {
-	return nil
-}
-
-func (s MangosSocket) RecvMsg() (*MangosMessage, error) {
-	return nil, nil
-}
-
-func (s MangosSocket) Dial(t string) error {
-	if s.GenerateSocketDialError {
-		return errors.New("stub generated Socket Dial error")
-	}
-	return nil
-}
-
-func (s MangosSocket) DialOptions(t string, m map[string]interface{}) error {
-	if err := s.Dial(t); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s MangosSocket) NewDialer(t string, m map[string]interface{}) (MangosDialer, error) {
-	return MangosDialer{}, nil
-}
-
-func (s MangosSocket) Listen(t string) error {
-	if s.GenerateSocketListenError {
-		return errors.New("stub generated Socket Listen error")
-	}
-	return nil
-}
-
-func (s MangosSocket) ListenOptions(t string, m map[string]interface{}) error {
-	return nil
-}
-
-func (s MangosSocket) NewListener(t string, m map[string]interface{}) (MangosListener, error) {
-	return MangosListener{}, nil
-}
-
-func (s MangosSocket) SetOption(t string, i interface{}) error {
-	return nil
-}
-
-func (s MangosSocket) GetOption(t string) (interface{}, error) {
-	return nil, nil
-}
-
-func (s MangosSocket) OpenContext() (MangosContext, error) {
-	return MangosContext{}, nil
-}
-
-func (s MangosSocket) SetPipeEventHook(p PipeEventHook) PipeEventHook {
-	return nil
-}
-
-// Mangos ProtocolPipe Stub
-
-type MangosProtocolPipe struct {
-}
-
-func (p MangosProtocolPipe) ID() uint32 {
-	return 0
-}
-
-func (p MangosProtocolPipe) Close() error {
-	return nil
-}
-
-func (p MangosProtocolPipe) SendMsg(m *MangosMessage) error {
-	return nil
-}
-
-func (p MangosProtocolPipe) RecvMsg() *MangosMessage {
-	return nil
-}
-
-// Mangos ProtocolContext Stub
-
-type MangosProtocolContext struct {
-}
-
-func (p MangosProtocolContext) Close() error {
-	return nil
-}
-
-func (p MangosProtocolContext) SendMsg(m *MangosMessage) error {
-	return nil
-}
-
-func (p MangosProtocolContext) RecvMsg() (*MangosMessage, error) {
-	return nil, nil
-}
-
-func (p MangosProtocolContext) GetOption(s string) (interface{}, error) {
-	return nil, nil
-}
-
-func (p MangosProtocolContext) SetOption(s string, i interface{}) error {
-	return nil
-}
-
-// Mangos ProtocolBase Stub
-
-type MangosProtocolBase struct {
-	MangosProtocolContext
-}
-
-func (p MangosProtocolBase) Info() MangosProtocolInfo {
-	return MangosProtocolInfo{}
-}
-
-func (p MangosProtocolBase) AddPipe(t MangosProtocolPipe) error {
-	return nil
-}
-
-func (p MangosProtocolBase) RemovePipe(MangosProtocolPipe) {
-
-}
-
-func (p MangosProtocolBase) OpenContext() (MangosProtocolContext, error) {
-	return MangosProtocolContext{}, nil
-}