Taking xapp-frame v0.8.2 and the adaptation for subscription query

[ric-plt/rtmgr.git] / pkg / nbi / httprestful_test.go

diff --git a/pkg/nbi/httprestful_test.go b/pkg/nbi/httprestful_test.go
index 16ffb38..aece2b0 100644 (file)
--- 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(""),
@@ -811,9 +810,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)