X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fxapp.go;h=0ae9b02c0e51a8c017bda4f0d1124b0e5818bdb7;hb=47faec8c255f19f51e22c2fec203e6ed513c791f;hp=124fbcfa34aa1b5b973168d7d898837b02050a1a;hpb=5120ec103eead26427b977f4b2456c2ce57b36ac;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/xapp.go b/pkg/xapp/xapp.go
index 124fbcf..0ae9b02 100755
--- a/pkg/xapp/xapp.go
+++ b/pkg/xapp/xapp.go
@@ -37,6 +37,7 @@ var (
 	Logger        *Log
 	Config        Configurator
 	Subscription  *Subscriber
+	Alarm         *AlarmClient
 	readyCb       ReadyCB
 	readyCbParams interface{}
 )
@@ -51,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)
 	}
@@ -68,10 +71,10 @@ func init() {
 
 	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 {