Defer alarm sysrem init

Change-Id: I4c9f03fafb989aea5f6ff56a21fbf92decea545f
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>

diff --git a/config/config-file.yaml b/config/config-file.yaml
index 6f163c3..59656c8 100755 (executable)
--- a/config/config-file.yaml
+++ b/config/config-file.yaml
@@ -14,7 +14,7 @@
 #   limitations under the License.
 
 "local":
-  "host": ":8080"
+  "host": ":8086"
 "logger":
   "level": 4
 "rmr":

diff --git a/examples/build/build_example_xapp.sh b/examples/build/build_example_xapp.sh
index 297a33c..d81617e 100755 (executable)
--- a/examples/build/build_example_xapp.sh
+++ b/examples/build/build_example_xapp.sh
@@ -22,11 +22,11 @@ set -eux
 echo "--> build_example_xapp.sh starts"
 
 # Install RMR from deb packages at packagecloud.io
-rmr=rmr_3.2.4_amd64.deb
+rmr=rmr_3.7.2_amd64.deb
 wget --content-disposition  https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/$rmr/download.deb
 sudo dpkg -i $rmr
 rm $rmr
-rmrdev=rmr-dev_3.2.4_amd64.deb
+rmrdev=rmr-dev_3.7.2_amd64.deb
 wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/$rmrdev/download.deb
 sudo dpkg -i $rmrdev
 rm $rmrdev

diff --git a/go.mod b/go.mod
old mode 100644 (file)
new mode 100755 (executable)
index 7a8cca2..078e930
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.12
 
 require (
        gerrit.o-ran-sc.org/r/com/golog v0.0.1
-       gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.0
+       gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.2
        gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.21
        gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.21
        gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.21
@@ -36,4 +36,4 @@ replace gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities => gerrit.o-ran-sc
 
 replace gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader => gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader v1.0.21
 
-replace gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm => gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.0
+replace gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm => gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.2

diff --git a/go.sum b/go.sum
index a870516..bd298ca 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -3,6 +3,10 @@ gerrit.o-ran-sc.org/r/com/golog.git v0.0.0-20190604083303-aaffc8ebe3f1 h1:WAB8G/
 gerrit.o-ran-sc.org/r/com/golog.git v0.0.0-20190604083303-aaffc8ebe3f1/go.mod h1:b8YB31U8/4iRpABioeSzGi/YMzOQ/Zq7hrJmmXKqlJk=
 gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.0 h1:Uvyfuq2jyb1aosy2BEzH1g3pe2gy4sMgpsXlvjVeBzI=
 gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.0/go.mod h1:AdEWKtERGvOQy9ybLhyhrb9w9LLVn8i9xzTwoR5n4BY=
+gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.1 h1:Ajleaw328tXaKeaspD+g1VKZkDOSFjlextMtjnrV5GM=
+gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.1/go.mod h1:AdEWKtERGvOQy9ybLhyhrb9w9LLVn8i9xzTwoR5n4BY=
+gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.2 h1:XNfkp3PwZ7pfkPszX7NaX6DzToCGjcWTLbIHYqCFNu0=
+gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.4.2/go.mod h1:AdEWKtERGvOQy9ybLhyhrb9w9LLVn8i9xzTwoR5n4BY=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.21 h1:eK9nUZOTMJ/EnMpH9bkWtMgOvCn3u4+PNCb9gu10s6w=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common v1.0.21/go.mod h1:QJ1uPPZosGbhxUWpUpeM5fLqFHdnWTrVnvW2DgyOCes=
 gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities v1.0.21 h1:PQ/Mu2ol+8Oh/0BqCWWhPlVVoRCg5dQDEGm4+Opp5w4=

diff --git a/pkg/xapp/subscription.go b/pkg/xapp/subscription.go
index cf8dc04..27485dd 100755 (executable)
--- a/pkg/xapp/subscription.go
+++ b/pkg/xapp/subscription.go
@@ -29,8 +29,8 @@ import (
        "github.com/go-openapi/strfmt"
        "github.com/spf13/viper"
        "io/ioutil"
+       "net"
        "net/http"
-       "strings"
        "time"
 
        apiclient "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi"
@@ -66,7 +66,7 @@ type Subscriber struct {
 
 func NewSubscriber(host string, timo int) *Subscriber {
        if host == "" {
-               host = "service-ricplt-submgr-http:8088"
+               host = "service-ricplt-submgr-http.ricplt:8088"
        }
 
        if timo == 0 {
@@ -164,8 +164,9 @@ func (r *Subscriber) Notify(resp *models.SubscriptionResponse, clientEndpoint st
                return err
        }
 
-       port := strings.Split(viper.GetString("local.host"), ":")[1]
-       clientUrl := fmt.Sprintf("http://%s:%s%s", clientEndpoint, port, r.clientUrl)
+       ep, _, _ := net.SplitHostPort(clientEndpoint)
+       _, port, _ := net.SplitHostPort(viper.GetString("local.host"))
+       clientUrl := fmt.Sprintf("http://%s:%s%s", ep, port, r.clientUrl)
 
        retries := viper.GetInt("subscription.retryCount")
        if retries == 0 {

diff --git a/pkg/xapp/subscription_test.go b/pkg/xapp/subscription_test.go
index a5601cc..d1ea66f 100755 (executable)
--- a/pkg/xapp/subscription_test.go
+++ b/pkg/xapp/subscription_test.go
@@ -19,7 +19,7 @@ var suite *testing.T
 
 var meid = "gnb123456"
 var funId = int64(1)
-var clientEndpoint = "localhost"
+var clientEndpoint = "localhost:4560"
 var direction = int64(0)
 var procedureCode = int64(27)
 var typeOfMessage = int64(1)

diff --git a/pkg/xapp/xapp.go b/pkg/xapp/xapp.go
index b63c8aa..0ae9b02 100755 (executable)
--- a/pkg/xapp/xapp.go
+++ b/pkg/xapp/xapp.go
@@ -52,6 +52,8 @@ func SetReadyCB(cb ReadyCB, params interface{}) {
 }
 
 func xappReadyCb(params interface{}) {
+       Alarm = NewAlarmClient(viper.GetString("alarm.MOId"), viper.GetString("alarm.APPId"))
+
        if readyCb != nil {
                readyCb(readyCbParams)
        }
@@ -66,14 +68,13 @@ func init() {
        Config = Configurator{}
        Metric = NewMetrics(viper.GetString("metrics.url"), viper.GetString("metrics.namespace"), Resource.router)
        Subscription = NewSubscriber(viper.GetString("subscription.host"), viper.GetInt("subscription.timeout"))
-       Alarm = NewAlarmClient(viper.GetString("alarm.MOId"), viper.GetString("alarm.APPId"))
 
        if viper.IsSet("db.namespaces") {
                namespaces := viper.GetStringSlice("db.namespaces")
-               if namespaces[0] != "" {
+               if len(namespaces) > 0 && namespaces[0] != "" {
                        Sdl = NewSDLClient(viper.GetStringSlice("db.namespaces")[0])
                }
-               if namespaces[1] != "" {
+               if len(namespaces) > 1 && namespaces[1] != "" {
                        Rnib = NewRNIBClient(viper.GetStringSlice("db.namespaces")[1])
                }
        } else {