X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fxapp.go;h=96aa0577d47dc2b905897821e3595c6032fe5030;hb=refs%2Ftags%2Fv0.9.1;hp=a9a130eda8b2c1b0348d00b0204aa429cacc6ec8;hpb=827a6410631045b503ce098de6683c6916c09842;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/xapp.go b/pkg/xapp/xapp.go
index a9a130e..96aa057 100755
--- a/pkg/xapp/xapp.go
+++ b/pkg/xapp/xapp.go
@@ -20,16 +20,27 @@
 package xapp
 
 import (
+	"bytes"
+	"encoding/json"
 	"fmt"
-	"github.com/spf13/viper"
 	"net/http"
 	"os"
 	"os/signal"
+	"strings"
 	"sync/atomic"
 	"syscall"
+	"testing"
 	"time"
+
+	"github.com/spf13/viper"
 )
 
+// For testing purpose go version 1.13 ->
+var _ = func() bool {
+	testing.Init()
+	return true
+}()
+
 type ReadyCB func(interface{})
 type ShutdownCB func()
 
@@ -37,6 +48,7 @@ var (
 	// XApp is an application instance
 	Rmr           *RMRClient
 	Sdl           *SDLClient
+	SdlStorage    *SDLStorage
 	Rnib          *RNIBClient
 	Resource      *Router
 	Metric        *Metrics
@@ -44,6 +56,7 @@ var (
 	Config        Configurator
 	Subscription  *Subscriber
 	Alarm         *AlarmClient
+	Util          *Utils
 	readyCb       ReadyCB
 	readyCbParams interface{}
 	shutdownCb    ShutdownCB
@@ -52,7 +65,7 @@ var (
 )
 
 func IsReady() bool {
-	return Rmr != nil && Rmr.IsReady() && Sdl != nil && Sdl.IsReady()
+	return Rmr != nil && Rmr.IsReady() && SdlStorage != nil && SdlStorage.IsReady()
 }
 
 func SetReadyCB(cb ReadyCB, params interface{}) {
@@ -71,6 +84,121 @@ func SetShutdownCB(cb ShutdownCB) {
 	shutdownCb = cb
 }
 
+func XappShutdownCb() {
+	if err := doDeregister(); err != nil {
+		Logger.Info("xApp deregistration failed: %v, terminating ungracefully!", err)
+	} else {
+		Logger.Info("xApp deregistration successfull!")
+	}
+
+	if shutdownCb != nil {
+		shutdownCb()
+	}
+}
+
+func registerXapp() {
+	for {
+		time.Sleep(5 * time.Second)
+		if !IsHealthProbeReady() {
+			Logger.Info("Application='%s' is not ready yet, waiting ...", viper.GetString("name"))
+			continue
+		}
+
+		Logger.Debug("Application='%s' is now up and ready, continue with registration ...", viper.GetString("name"))
+		if err := doRegister(); err == nil {
+			Logger.Info("Registration done, proceeding with startup ...")
+			break
+		}
+	}
+}
+
+func getService(host, service string) string {
+	appnamespace := os.Getenv("APP_NAMESPACE")
+	if appnamespace == "" {
+		appnamespace = DEFAULT_XAPP_NS
+	}
+
+	svc := fmt.Sprintf(service, strings.ToUpper(appnamespace), strings.ToUpper(host))
+	url := strings.Split(os.Getenv(strings.Replace(svc, "-", "_", -1)), "//")
+
+	Logger.Info("getService: %+v %+v", svc, url)
+	if len(url) > 1 {
+		return url[1]
+	}
+	return ""
+}
+
+func getPltNamespace(envName, defVal string) string {
+	pltnamespace := os.Getenv("PLT_NAMESPACE")
+	if pltnamespace == "" {
+		pltnamespace = defVal
+	}
+
+	return pltnamespace
+}
+
+func doPost(pltNs, url string, msg []byte, status int) error {
+	resp, err := http.Post(fmt.Sprintf(url, pltNs, pltNs), "application/json", bytes.NewBuffer(msg))
+	if err != nil || resp == nil || resp.StatusCode != status {
+		Logger.Info("http.Post to '%s' failed with error: %v", fmt.Sprintf(url, pltNs, pltNs), err)
+		return err
+	}
+	Logger.Info("Post to '%s' done, status:%v", fmt.Sprintf(url, pltNs, pltNs), resp.Status)
+
+	return err
+}
+
+func doRegister() error {
+	host, _ := os.Hostname()
+	xappname := viper.GetString("name")
+	xappversion := viper.GetString("version")
+	pltNs := getPltNamespace("PLT_NAMESPACE", DEFAULT_PLT_NS)
+
+	httpEp, rmrEp := getService(host, SERVICE_HTTP), getService(host, SERVICE_RMR)
+	if httpEp == "" || rmrEp == "" {
+		Logger.Warn("Couldn't resolve service endpoints: httpEp=%s rmrEp=%s", httpEp, rmrEp)
+		return nil
+	}
+
+	requestBody, err := json.Marshal(map[string]string{
+		"appName":         host,
+		"httpEndpoint":    httpEp,
+		"rmrEndpoint":     rmrEp,
+		"appInstanceName": xappname,
+		"appVersion":      xappversion,
+		"configPath":      CONFIG_PATH,
+	})
+
+	if err != nil {
+		Logger.Error("json.Marshal failed with error: %v", err)
+		return err
+	}
+
+	return doPost(pltNs, REGISTER_PATH, requestBody, http.StatusCreated)
+}
+
+func doDeregister() error {
+	if !IsHealthProbeReady() {
+		return nil
+	}
+
+	name, _ := os.Hostname()
+	xappname := viper.GetString("name")
+	pltNs := getPltNamespace("PLT_NAMESPACE", DEFAULT_PLT_NS)
+
+	requestBody, err := json.Marshal(map[string]string{
+		"appName":         name,
+		"appInstanceName": xappname,
+	})
+
+	if err != nil {
+		Logger.Error("json.Marshal failed with error: %v", err)
+		return err
+	}
+
+	return doPost(pltNs, DEREGISTER_PATH, requestBody, http.StatusNoContent)
+}
+
 func InstallSignalHandler() {
 	//
 	// Signal handlers to really exit program.
@@ -92,9 +220,7 @@ func InstallSignalHandler() {
 
 					// close callback
 					go func() {
-						if shutdownCb != nil {
-							shutdownCb()
-						}
+						XappShutdownCb()
 						sentry <- struct{}{}
 					}()
 					select {
@@ -128,26 +254,37 @@ func init() {
 	} else {
 		Logger.SetLevel(viper.GetInt("logger.level"))
 	}
+
+	if !viper.IsSet("controls.logger.noFormat") || !viper.GetBool("controls.logger.noFormat") {
+		Logger.SetFormat(0)
+	}
+
 	Resource = NewRouter()
 	Config = Configurator{}
 	Metric = NewMetrics(viper.GetString("metrics.url"), viper.GetString("metrics.namespace"), Resource.router)
-	Subscription = NewSubscriber(viper.GetString("subscription.host"), viper.GetInt("subscription.timeout"))
+	Subscription = NewSubscriber(viper.GetString("controls.subscription.host"), viper.GetInt("controls.subscription.timeout"))
+	SdlStorage = NewSdlStorage()
 	Sdl = NewSDLClient(viper.GetString("controls.db.namespace"))
-	Rnib = NewRNIBClient()
+	Rnib = GetNewRnibClient(SdlStorage.db)
+	Util = NewUtils()
 
 	InstallSignalHandler()
 }
 
 func RunWithParams(c MessageConsumer, sdlcheck bool) {
 	Rmr = NewRMRClient()
+
 	Rmr.SetReadyCB(XappReadyCb, nil)
 
 	host := fmt.Sprintf(":%d", GetPortData("http").Port)
 	go http.ListenAndServe(host, Resource.router)
 	Logger.Info(fmt.Sprintf("Xapp started, listening on: %s", host))
+
 	if sdlcheck {
-		Sdl.TestConnection()
+		SdlStorage.TestConnection(viper.GetString("controls.db.namespace"))
 	}
+	go registerXapp()
+
 	Rmr.Start(c)
 }