X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fhttprestful_test.go;h=1de62935c388bdbf85df8b0189d5601ea3dadbfa;hb=cb1842259a5fb7049e7c1480191617706885091d;hp=16ffb38d0c5786637e1b8b158e53ebd8ca3fcbd9;hpb=bfeca7737cc003f149ca8b01d1aaf484dcb762d7;p=ric-plt%2Frtmgr.git

diff --git a/pkg/nbi/httprestful_test.go b/pkg/nbi/httprestful_test.go
index 16ffb38..1de6293 100644
--- a/pkg/nbi/httprestful_test.go
+++ b/pkg/nbi/httprestful_test.go
@@ -78,7 +78,6 @@ var InvalidSubResp = []byte(`{"Version":0, "EventType":all}`)
 
 type Consumer struct{}
 
-
 func (m Consumer) Consume(params *xapp.RMRParams) (err error) {
 	xapp.Sdl.Store("myKey", params.Payload)
 	return nil
@@ -113,7 +112,7 @@ func TestValidateXappCallbackDataInvalid(t *testing.T) {
 
 func TestValidateXappSubscriptionsData(t *testing.T) {
 
-    rtmgr.RMRConnStatus = make(map[string]bool)
+	rtmgr.RMRConnStatus = make(map[string]bool)
 	ep := make(map[string]*rtmgr.Endpoint)
 	ep["dummy"] = &rtmgr.Endpoint{Uuid: "10.0.0.1:0", Name: "E2TERM", XAppType: "app1", Ip: "", Port: 0, TxMessages: []string{"", ""}, RxMessages: []string{"", ""}, Socket: nil, IsReady: true, Keepalive: true}
 	p := uint16(1234)
@@ -178,7 +177,7 @@ func TestValidateE2tDataEmpty(t *testing.T) {
 }
 
 func TestValidateE2tDataDNSLookUPfails(t *testing.T) {
-    rtmgr.RMRConnStatus = make(map[string]bool)
+	rtmgr.RMRConnStatus = make(map[string]bool)
 	data := models.E2tData{
 		E2TAddress: swag.String("e2t.1com:1234"),
 	}
@@ -187,7 +186,7 @@ func TestValidateE2tDataDNSLookUPfails(t *testing.T) {
 }
 
 func TestValidateE2tDataInvalid(t *testing.T) {
-    rtmgr.RMRConnStatus = make(map[string]bool)
+	rtmgr.RMRConnStatus = make(map[string]bool)
 	data := models.E2tData{
 		E2TAddress: swag.String("10.101.01.1"),
 	}
@@ -196,7 +195,7 @@ func TestValidateE2tDataInvalid(t *testing.T) {
 }
 
 func TestValidateE2tDatavalid(t *testing.T) {
-    rtmgr.RMRConnStatus = make(map[string]bool)
+	rtmgr.RMRConnStatus = make(map[string]bool)
 	data := models.E2tData{
 		E2TAddress: swag.String("10.101.01.1:8098"),
 	}
@@ -209,7 +208,7 @@ func TestValidateE2tDatavalid(t *testing.T) {
 }
 
 func TestValidateE2tDatavalidEndpointPresent(t *testing.T) {
-    rtmgr.RMRConnStatus = make(map[string]bool)
+	rtmgr.RMRConnStatus = make(map[string]bool)
 	data := models.E2tData{
 		E2TAddress: swag.String("10.101.01.1:8098"),
 	}
@@ -231,7 +230,7 @@ func TestValidateE2tDatavalidEndpointPresent(t *testing.T) {
 
 func TestValidateDeleteE2tData(t *testing.T) {
 
-    rtmgr.RMRConnStatus = make(map[string]bool)
+	rtmgr.RMRConnStatus = make(map[string]bool)
 	// test-1
 	data := models.E2tDeleteData{
 		E2TAddress: swag.String(""),
@@ -577,6 +576,7 @@ func createMockSubmgrWithData(url string, t []byte) *httptest.Server {
 	return ts
 }
 
+
 func createMockPlatformComponents() {
 	var filename = "config.json"
 	file, _ := json.MarshalIndent(stub.ValidPlatformComponents, "", "")
@@ -685,6 +685,29 @@ func TestRetrieveStartupData(t *testing.T) {
 	os.Remove("config.json")
 }
 
+func TestRetrieveStartupDatawithInvalidE2MUrl(t *testing.T) {
+	ts := createMockAppmgrWithData("127.0.0.1:3000", BasicXAppLists, SubscriptionResp, nil)
+	ts.Start()
+	defer ts.Close()
+
+	ts1 := createMockAppmgrWithData("127.0.0.1:8085", nil, nil, E2TListResp)
+	ts1.Start()
+	defer ts1.Close()
+
+	ts2 := createMockSubmgrWithData("127.0.0.1:8089", SubscriptionList)
+	ts2.Start()
+	defer ts2.Close()
+
+
+	sdlEngine, _ := sdl.GetSdl("file")
+	var httpRestful, _ = GetNbi("httpRESTful")
+	createMockPlatformComponents()
+
+	E2MURL1 := "http://127.0.0.1:8080/ric/v1/e2t/list"
+	httpRestful.(*HttpRestful).RetrieveStartupData(XMURL, "httpgetter", "rt.json", "config.json", E2MURL1, sdlEngine)
+	os.Remove("rt.json")
+	os.Remove("config.json")
+}
 func TestRetrieveStartupDataWithInvalidSubResp(t *testing.T) {
 	ts := createMockAppmgrWithData("127.0.0.1:3000", BasicXAppLists, InvalidSubResp, nil)
 	ts.Start()
@@ -743,6 +766,10 @@ func TestDumpDebugdata(t *testing.T) {
 	_, _ = DumpDebugData()
 }
 
+func TestDumpDebugdata1(t *testing.T) {
+	_, _ = DumpDebugData()
+}
+
 func TestManagerRequest(t *testing.T) {
 	var params xapp.RMRParams
 	var rmrmeid xapp.RMRMeid
@@ -757,6 +784,7 @@ func TestManagerRequest(t *testing.T) {
 	params.Meid = &rmrmeid
 	params.Src = "sender"
 	params.PayloadLen = 4
+
 	c.handleUpdateToRoutingManagerRequest(&params)
 }
 
@@ -811,9 +839,9 @@ func TestAddDelRmr(t *testing.T) {
 func TestPopulateSubscription(t *testing.T) {
 	var sublist xfmodel.SubscriptionList
 
-	subdata := xfmodel.SubscriptionData{Endpoint: []string{"xapp1.com:3800"}, SubscriptionID: -1, Meid: ""}
-	subdata2 := xfmodel.SubscriptionData{Endpoint: []string{"xapp2.com:3800"}, SubscriptionID: 11, Meid: ""}
-	subdata3 := xfmodel.SubscriptionData{Endpoint: []string{"xapp3.com:3800"}, SubscriptionID: 221, Meid: ""}
+	subdata := xfmodel.SubscriptionData{ClientEndpoint: []string{"xapp1.com:3800"}, SubscriptionID: -1, Meid: ""}
+	subdata2 := xfmodel.SubscriptionData{ClientEndpoint: []string{"xapp2.com:3800"}, SubscriptionID: 11, Meid: ""}
+	subdata3 := xfmodel.SubscriptionData{ClientEndpoint: []string{"xapp3.com:3800"}, SubscriptionID: 221, Meid: ""}
 	sublist = append(sublist, &subdata)
 	sublist = append(sublist, &subdata2)
 	sublist = append(sublist, &subdata3)