X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fxapp_test.go;h=8b2a9524c54a95365ce41466ec2fbffb72d01d1a;hb=c2c130d71f20e44119f356f7ab4df92882f92c9d;hp=9696e6eec4b75e3b928665bbaefe872edfaa7e85;hpb=5953f7e372df54c71f526e9519e8eb0ee7ee6f72;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/xapp_test.go b/pkg/xapp/xapp_test.go
index 9696e6e..8b2a952 100755
--- a/pkg/xapp/xapp_test.go
+++ b/pkg/xapp/xapp_test.go
@@ -20,14 +20,18 @@
 package xapp
 
 import (
-	"github.com/gorilla/mux"
-	"github.com/spf13/viper"
+	"bytes"
+	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/gorilla/mux"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/assert"
 )
 
 //var _ = func() bool {
@@ -44,64 +48,72 @@ func (m Consumer) Consume(params *RMRParams) (err error) {
 
 // Test cases
 func TestMain(m *testing.M) {
-	go RunWithParams(Consumer{}, viper.GetBool("db.waitForSdl"))
+	os.Setenv("SERVICE_RICXAPP_UEEC_HTTP_PORT", "tcp://localhost:8080")
+	os.Setenv("SERVICE_RICXAPP_UEEC_RMR_PORT", "tcp://localhost:4561")
+	go RunWithParams(Consumer{}, viper.GetBool("controls.waitForSdl"))
 	time.Sleep(time.Duration(5) * time.Second)
 	code := m.Run()
 	os.Exit(code)
 }
 
 func TestGetHealthCheckRetursServiceUnavailableError(t *testing.T) {
+	Logger.Info("CASE: TestGetHealthCheckRetursServiceUnavailableError")
 	req, _ := http.NewRequest("GET", "/ric/v1/health/ready", nil)
-	/*response :=*/ executeRequest(req)
+	/*response :=*/ executeRequest(req, nil)
 
 	//checkResponseCode(t, http.StatusServiceUnavailable, response.Code)
 }
 
 func TestGetHealthCheckReturnsSuccess(t *testing.T) {
+	Logger.Info("CASE: TestGetHealthCheckReturnsSuccess")
 	for Rmr.IsReady() == false {
 		time.Sleep(time.Duration(2) * time.Second)
 	}
 
 	req, _ := http.NewRequest("GET", "/ric/v1/health/ready", nil)
-	response := executeRequest(req)
+	response := executeRequest(req, nil)
 
 	checkResponseCode(t, http.StatusOK, response.Code)
 }
 
 func TestInjectQuerySinglePath(t *testing.T) {
+	Logger.Info("CASE: TestInjectQuerySinglePath")
 	var handler = func(w http.ResponseWriter, r *http.Request) {
 	}
 
 	Resource.InjectQueryRoute("/ric/v1/user", handler, "GET", "foo", "bar")
 
 	req, _ := http.NewRequest("GET", "/ric/v1/user?foo=bar", nil)
-	response := executeRequest(req)
+	response := executeRequest(req, nil)
 	checkResponseCode(t, http.StatusOK, response.Code)
 }
 
 func TestInjectQueryMultiplePaths(t *testing.T) {
+	Logger.Info("CASE: TestInjectQueryMultiplePaths")
 	var handler = func(w http.ResponseWriter, r *http.Request) {
 	}
 
 	Resource.InjectQueryRoute("/ric/v1/user", handler, "GET", "foo", "bar", "id", "mykey")
 
 	req, _ := http.NewRequest("GET", "/ric/v1/user?foo=bar&id=mykey", nil)
-	response := executeRequest(req)
+	response := executeRequest(req, nil)
 	checkResponseCode(t, http.StatusOK, response.Code)
 }
 
 func TestInjectQueryFailures(t *testing.T) {
+	Logger.Info("CASE: TestInjectQueryFailures")
 	var handler = func(w http.ResponseWriter, r *http.Request) {
 	}
 
 	Resource.InjectQueryRoute("/ric/v1/user", handler, "GET", "foo", "bar", "id", "mykey")
 
 	req, _ := http.NewRequest("GET", "/ric/v1/user?invalid=bar&no=mykey", nil)
-	response := executeRequest(req)
+	response := executeRequest(req, nil)
 	checkResponseCode(t, http.StatusNotFound, response.Code)
 }
 
 func TestMessagesReceivedSuccessfully(t *testing.T) {
+	Logger.Info("CASE: TestMessagesReceivedSuccessfully")
 	time.Sleep(time.Duration(5) * time.Second)
 	for i := 0; i < 100; i++ {
 		params := &RMRParams{}
@@ -110,13 +122,19 @@ func TestMessagesReceivedSuccessfully(t *testing.T) {
 		params.Payload = []byte{1, 2, 3, 4, 5, 6}
 		params.Meid = &RMRMeid{PlmnID: "1234", EnbID: "7788", RanName: "RanName-1234"}
 		params.Xid = "TestXID"
-		Rmr.SendMsg(params)
+
+		if i%2 == 0 {
+			Rmr.SendMsg(params)
+		} else {
+			Rmr.SendWithRetry(params, false, 1)
+		}
 	}
+	Rmr.RegisterMetrics()
 
 	// Allow time to process the messages
-	time.Sleep(time.Duration(2) * time.Second)
+	time.Sleep(time.Duration(5) * time.Second)
 
-	waitForSdl := viper.GetBool("db.waitForSdl")
+	waitForSdl := viper.GetBool("controls.waitForSdl")
 	stats := getMetrics(t)
 	if !strings.Contains(stats, "ricxapp_RMR_Transmitted 100") {
 		t.Errorf("Error: ricxapp_RMR_Transmitted value incorrect: %v", stats)
@@ -144,6 +162,7 @@ func TestMessagesReceivedSuccessfully(t *testing.T) {
 }
 
 func TestMessagesReceivedSuccessfullyUsingWh(t *testing.T) {
+	Logger.Info("CASE: TestMessagesReceivedSuccessfullyUsingWh")
 	time.Sleep(time.Duration(5) * time.Second)
 	whid := Rmr.Openwh("localhost:4560")
 	time.Sleep(time.Duration(1) * time.Second)
@@ -155,13 +174,18 @@ func TestMessagesReceivedSuccessfullyUsingWh(t *testing.T) {
 		params.Meid = &RMRMeid{PlmnID: "1234", EnbID: "7788", RanName: "RanName-1234"}
 		params.Xid = "TestXID"
 		params.Whid = int(whid)
+
+		if i == 0 {
+			Logger.Info("%+v", params.String())
+		}
+
 		Rmr.SendMsg(params)
 	}
 
 	// Allow time to process the messages
-	time.Sleep(time.Duration(2) * time.Second)
+	time.Sleep(time.Duration(5) * time.Second)
 
-	waitForSdl := viper.GetBool("db.waitForSdl")
+	waitForSdl := viper.GetBool("controls.waitForSdl")
 	stats := getMetrics(t)
 	if !strings.Contains(stats, "ricxapp_RMR_Transmitted 200") {
 		t.Errorf("Error: ricxapp_RMR_Transmitted value incorrect: %v", stats)
@@ -190,6 +214,7 @@ func TestMessagesReceivedSuccessfullyUsingWh(t *testing.T) {
 }
 
 func TestMessagesReceivedSuccessfullyUsingWhCall(t *testing.T) {
+	Logger.Info("CASE: TestMessagesReceivedSuccessfullyUsingWhCall")
 	time.Sleep(time.Duration(5) * time.Second)
 	whid := Rmr.Openwh("localhost:4560")
 	params := &RMRParams{}
@@ -202,7 +227,7 @@ func TestMessagesReceivedSuccessfullyUsingWhCall(t *testing.T) {
 	// Allow time to process the messages
 	time.Sleep(time.Duration(2) * time.Second)
 
-	waitForSdl := viper.GetBool("db.waitForSdl")
+	waitForSdl := viper.GetBool("controls.waitForSdl")
 	stats := getMetrics(t)
 	if !strings.Contains(stats, "ricxapp_RMR_Transmitted 200") {
 		t.Errorf("Error: ricxapp_RMR_Transmitted value incorrect: %v", stats)
@@ -231,7 +256,8 @@ func TestMessagesReceivedSuccessfullyUsingWhCall(t *testing.T) {
 }
 
 func TestSubscribeChannels(t *testing.T) {
-	if !viper.GetBool("db.waitForSdl") {
+	Logger.Info("CASE: TestSubscribeChannels")
+	if !viper.GetBool("controls.waitForSdl") {
 		return
 	}
 
@@ -249,9 +275,13 @@ func TestSubscribeChannels(t *testing.T) {
 	if err := Sdl.StoreAndPublish("channel1", "event", "key1", "data1"); err != nil {
 		t.Errorf("Error: Publish failed: %v", err)
 	}
+
+	// Misc.
+	Sdl.MStoreAndPublish([]string{"channel1"}, "event", "key1", "data1")
 }
 
 func TestGetRicMessageSuccess(t *testing.T) {
+	Logger.Info("CASE: TestGetRicMessageSuccess")
 	id, ok := Rmr.GetRicMessageId("RIC_SUB_REQ")
 	if !ok || id != 12010 {
 		t.Errorf("Error: GetRicMessageId failed: id=%d", id)
@@ -264,6 +294,7 @@ func TestGetRicMessageSuccess(t *testing.T) {
 }
 
 func TestGetRicMessageFails(t *testing.T) {
+	Logger.Info("CASE: TestGetRicMessageFails")
 	ok := Rmr.IsRetryError(&RMRParams{status: 0})
 	if ok {
 		t.Errorf("Error: IsRetryError returned wrong value")
@@ -286,6 +317,7 @@ func TestGetRicMessageFails(t *testing.T) {
 }
 
 func TestIsErrorFunctions(t *testing.T) {
+	Logger.Info("CASE: TestIsErrorFunctions")
 	id, ok := Rmr.GetRicMessageId("RIC_SUB_REQ")
 	if !ok || id != 12010 {
 		t.Errorf("Error: GetRicMessageId failed: id=%d", id)
@@ -297,17 +329,178 @@ func TestIsErrorFunctions(t *testing.T) {
 	}
 }
 
+func TestAddConfigChangeListener(t *testing.T) {
+	Logger.Info("CASE: AddConfigChangeListener")
+	AddConfigChangeListener(func(f string) {})
+}
+
+func TestConfigAccess(t *testing.T) {
+	Logger.Info("CASE: AddConfigChangeListener")
+
+	assert.Equal(t, Config.GetString("name"), "xapp")
+	assert.Equal(t, Config.GetInt("controls.logger.level"), 3)
+	assert.Equal(t, Config.GetUint32("controls.logger.level"), uint32(3))
+	assert.Equal(t, Config.GetBool("controls.waitForSdl"), false)
+	Config.Get("controls")
+	Config.GetStringSlice("messaging.ports")
+	Config.GetStringMap("messaging.ports")
+	Config.IsSet("messaging")
+}
+
+func TestPublishConfigChange(t *testing.T) {
+	Logger.Info("CASE: AddConfigChangeListener")
+	PublishConfigChange("testApp", "values")
+}
+
+func TestNewSubscriber(t *testing.T) {
+	Logger.Info("CASE: TestNewSubscriber")
+	assert.NotNil(t, NewSubscriber("", 0), "NewSubscriber failed")
+}
+
+func TestNewRMRClient(t *testing.T) {
+	c := map[string]interface{}{"protPort": "tcp:4560"}
+	viper.Set("rmr", c)
+	assert.NotNil(t, NewRMRClient(), "NewRMRClient failed")
+
+	params := &RMRParams{}
+	params.Mtype = 1234
+	params.SubId = -1
+	params.Payload = []byte{1, 2, 3, 4, 5, 6}
+	Rmr.SendWithRetry(params, false, 1)
+}
+
+func TestInjectRoutePrefix(t *testing.T) {
+	Logger.Info("CASE: TestInjectRoutePrefix")
+	assert.NotNil(t, Resource.InjectRoutePrefix("test", nil), "InjectRoutePrefix failed")
+}
+
+func TestInjectStatusCb(t *testing.T) {
+	Logger.Info("CASE: TestInjectStatusCb")
+
+	var f = func() bool {
+		return true
+	}
+	Resource.InjectStatusCb(f)
+	Resource.CheckStatus()
+}
+
+func TestSdlInterfaces(t *testing.T) {
+	Sdl.Read("myKey")
+	Sdl.MRead([]string{"myKey"})
+	Sdl.ReadAllKeys("myKey")
+	Sdl.Store("myKey", "Values")
+	Sdl.MStore("myKey", "Values")
+	Sdl.RegisterMetrics()
+
+	// Misc.
+	var NotificationCb = func(ch string, events ...string) {}
+	Sdl.Subscribe(NotificationCb, "channel1")
+	Sdl.MSubscribe(NotificationCb, "channel1", "channel2")
+	Sdl.MStoreAndPublish([]string{"channel1"}, "event", "key1", "data1")
+}
+
+func TestRnibInterfaces(t *testing.T) {
+	Rnib.GetNodeb("test-gnb")
+	Rnib.GetCellList("test-gnb")
+	Rnib.GetListGnbIds()
+	Rnib.GetListEnbIds()
+	Rnib.GetCountGnbList()
+	Rnib.GetCell("test-gnb", 0)
+	Rnib.GetCell("test-gnb", 0)
+	Rnib.GetCellById(0, "cell-1")
+
+	// Misc.
+	var NotificationCb = func(ch string, events ...string) {}
+	Rnib.Subscribe(NotificationCb, "channel1")
+	Rnib.StoreAndPublish("channel1", "event", "key1", "data1")
+}
+
+func TestLogger(t *testing.T) {
+	Logger.Error("CASE: TestNewSubscriber")
+	Logger.Warn("CASE: TestNewSubscriber")
+	Logger.GetLevel()
+}
+
+func TestConfigHandler(t *testing.T) {
+	Logger.Error("CASE: TestConfigHandler")
+	req, _ := http.NewRequest("POST", "/ric/v1/cm/appname", bytes.NewBuffer([]byte{}))
+	handleFunc := http.HandlerFunc(configHandler)
+	executeRequest(req, handleFunc)
+}
+
+func TestappconfigHandler(t *testing.T) {
+	Logger.Error("CASE: TestappconfigHandler")
+	req, _ := http.NewRequest("POST", "/ric/v1/config", bytes.NewBuffer([]byte{}))
+	handleFunc := http.HandlerFunc(appconfigHandler)
+	executeRequest(req, handleFunc)
+}
+
+func TestConfigChange(t *testing.T) {
+	Logger.Error("CASE: TestConfigChange: %s", os.Getenv("CFG_FILE"))
+
+	input, err := ioutil.ReadFile(os.Getenv("CFG_FILE"))
+	assert.Equal(t, err, nil)
+
+	err = ioutil.WriteFile(os.Getenv("CFG_FILE"), input, 0644)
+	assert.Equal(t, err, nil)
+}
+
+func TestRegisterXapp(t *testing.T) {
+	Logger.Error("CASE: TestRegisterXapp")
+	doRegister()
+}
+
+func TestDeregisterXapp(t *testing.T) {
+	Logger.Error("CASE: TestDeregisterXapp")
+	doDeregister()
+}
+
+func TestMisc(t *testing.T) {
+	Logger.Info("CASE: TestMisc")
+	var cb = func() {}
+	IsReady()
+	SetReadyCB(func(interface{}) {}, "")
+	XappReadyCb("")
+	SetShutdownCB(cb)
+	XappShutdownCb()
+	getService("ueec", SERVICE_HTTP)
+
+	Logger.SetFormat(1)
+	Logger.SetLevel(0)
+	Logger.Error("...")
+	Logger.Warn("...")
+	Logger.Info("...")
+
+	mb := Rmr.Allocate(100)
+	Rmr.ReAllocate(mb, 200)
+
+	NewMetrics("", "", Resource.router)
+}
+
 func TestTeardown(t *testing.T) {
+	Logger.Info("CASE: TestTeardown")
+	Sdl.Delete([]string{"myKey"})
 	Sdl.Clear()
+	Sdl.IsReady()
+	Sdl.GetStat()
+	Rnib.GetNodebByGlobalNbId(1, &RNIBGlobalNbId{})
+	Rnib.SaveNodeb(&RNIBNbIdentity{}, &RNIBNodebInfo{})
+	go Sdl.TestConnection()
+	time.Sleep(time.Duration(2) * time.Second)
 }
 
 // Helper functions
-func executeRequest(req *http.Request) *httptest.ResponseRecorder {
+func executeRequest(req *http.Request, handleR http.HandlerFunc) *httptest.ResponseRecorder {
 	rr := httptest.NewRecorder()
-	vars := map[string]string{"id": "1"}
-	req = mux.SetURLVars(req, vars)
-	Resource.router.ServeHTTP(rr, req)
-
+	if handleR != nil {
+		vars := map[string]string{"name": "myxapp"}
+		req = mux.SetURLVars(req, vars)
+		handleR.ServeHTTP(rr, req)
+	} else {
+		vars := map[string]string{"id": "1"}
+		req = mux.SetURLVars(req, vars)
+		Resource.router.ServeHTTP(rr, req)
+	}
 	return rr
 }
 
@@ -319,7 +512,7 @@ func checkResponseCode(t *testing.T, expected, actual int) {
 
 func getMetrics(t *testing.T) string {
 	req, _ := http.NewRequest("GET", "/ric/v1/metrics", nil)
-	response := executeRequest(req)
+	response := executeRequest(req, nil)
 
 	return response.Body.String()
 }