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 13a90ea..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)
@@ -141,7 +140,7 @@ func TestValidateXappSubscriptionsData(t *testing.T) {
        /*err = validateE2tData(&data2)*/
 
        //e2tchannel := make(chan *models.E2tData, 10)
-       _ = createNewE2tHandleHandlerImpl(&data2)
+       _ = CreateNewE2tHandleHandlerImpl(&data2)
        //defer close(e2tchannel)
 
        //test case for provideXappSubscriptionHandleImp
@@ -149,23 +148,23 @@ func TestValidateXappSubscriptionsData(t *testing.T) {
        sdlEngine, _ = sdl.GetSdl("file")
        sbiEngine, _ = sbi.GetSbi("rmrpush")
        rpeEngine, _ = rpe.GetRpe("rmrpush")
-       _ = provideXappSubscriptionHandleImpl(&data1)
+       _ = ProvideXappSubscriptionHandleImpl(&data1)
        //defer close(datachannel)
 
        //test case for deleteXappSubscriptionHandleImpl
-       _ = deleteXappSubscriptionHandleImpl(&data1)
+       _ = DeleteXappSubscriptionHandleImpl(&data1)
 
        data3 := models.XappSubscriptionData{
                Address:        swag.String("10.55.55.5"),
                Port:           &p,
                SubscriptionID: swag.Int32(123456)}
        //test case for deleteXappSubscriptionHandleImpl
-       _ = deleteXappSubscriptionHandleImpl(&data3)
+       _ = DeleteXappSubscriptionHandleImpl(&data3)
        data4 := models.XappSubscriptionData{
                Address:        swag.String("1.5.5.5"),
                Port:           &p,
                SubscriptionID: swag.Int32(1236)}
-       _ = deleteXappSubscriptionHandleImpl(&data4)
+       _ = DeleteXappSubscriptionHandleImpl(&data4)
 
 }
 
@@ -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"),
        }
@@ -204,12 +203,12 @@ func TestValidateE2tDatavalid(t *testing.T) {
        err, _ := validateE2tData(&data)
        t.Log(err)
 
-       _ = createNewE2tHandleHandlerImpl(&data)
+       _ = CreateNewE2tHandleHandlerImpl(&data)
 
 }
 
 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(""),
@@ -357,7 +356,7 @@ func TestAssociateRanToE2THandlerImpl(t *testing.T) {
                        E2TAddress: swag.String("10.101.01.1:8098"),
                },
        }
-       err := associateRanToE2THandlerImpl(data)
+       err := AssociateRanToE2THandlerImpl(data)
        if err != nil {
                t.Log(err)
        }
@@ -375,7 +374,7 @@ func TestAssociateRanToE2THandlerImpl(t *testing.T) {
                        E2TAddress: swag.String("10.101.01.1:8098"),
                },
        }
-       err = associateRanToE2THandlerImpl(data)
+       err = AssociateRanToE2THandlerImpl(data)
        if err != nil {
                t.Log(err)
        }
@@ -392,7 +391,7 @@ func TestDisassociateRanToE2THandlerImpl(t *testing.T) {
                        E2TAddress: swag.String("10.101.01.1:8098"),
                },
        }
-       err := disassociateRanToE2THandlerImpl(data)
+       err := DisassociateRanToE2THandlerImpl(data)
        if err != nil {
                t.Log(err)
        }
@@ -409,7 +408,7 @@ func TestDisassociateRanToE2THandlerImpl(t *testing.T) {
                        E2TAddress: swag.String("10.101.01.1:8098"),
                },
        }
-       err = disassociateRanToE2THandlerImpl(data)
+       err = DisassociateRanToE2THandlerImpl(data)
        if err != nil {
                t.Log(err)
        }
@@ -424,7 +423,7 @@ func TestDeleteE2tHandleHandlerImpl(t *testing.T) {
        data := models.E2tDeleteData{
                E2TAddress: swag.String(""),
        }
-       err := deleteE2tHandleHandlerImpl(&data)
+       err := DeleteE2tHandleHandlerImpl(&data)
        if err != nil {
                t.Log(err)
        }
@@ -440,7 +439,7 @@ func TestDeleteE2tHandleHandlerImpl(t *testing.T) {
        data = models.E2tDeleteData{
                E2TAddress: swag.String("10.101.01.1:8098"),
        }
-       err = deleteE2tHandleHandlerImpl(&data)
+       err = DeleteE2tHandleHandlerImpl(&data)
        if err != nil {
                t.Log(err)
        }
@@ -527,7 +526,7 @@ func TestProvideXappSubscriptionHandleImpl(t *testing.T) {
                Address:        swag.String("10.0.0.0"),
                Port:           &p,
                SubscriptionID: swag.Int32(1234)}
-       _ = provideXappSubscriptionHandleImpl(&data)
+       _ = ProvideXappSubscriptionHandleImpl(&data)
 }
 
 func createMockAppmgrWithData(url string, g []byte, p []byte, t []byte) *httptest.Server {
@@ -592,11 +591,11 @@ func TestProvideXappHandleHandlerImpl(t *testing.T) {
                Version: *swag.Int64(1),
                Event:   *swag.String("someevent"),
                ID:      *swag.String("123456")}
-       err := provideXappHandleHandlerImpl(&data)
+       err := ProvideXappHandleHandlerImpl(&data)
 
        //Empty XappCallbackdata
        data1 := models.XappCallbackData{}
-       err = provideXappHandleHandlerImpl(&data1)
+       err = ProvideXappHandleHandlerImpl(&data1)
        t.Log(err)
 }
 
@@ -723,7 +722,7 @@ func TestUpdateXappSubscription(t *testing.T) {
 
        var b models.XappList
        b = append(b, &xapp)
-       _ = updateXappSubscriptionHandleImpl(&b, 10)
+       _ = UpdateXappSubscriptionHandleImpl(&b, 10)
 
        //Test case when subscriptions already exist
        data := models.XappSubscriptionData{
@@ -735,12 +734,12 @@ func TestUpdateXappSubscription(t *testing.T) {
 
        subscriptionExists(&data)
        addSubscription(&rtmgr.Subs, &data)
-       _ = updateXappSubscriptionHandleImpl(&b, 10)
+       _ = UpdateXappSubscriptionHandleImpl(&b, 10)
 
 }
 
 func TestDumpDebugdata(t *testing.T) {
-       _, _ = dumpDebugData()
+       _, _ = DumpDebugData()
 }
 
 func TestManagerRequest(t *testing.T) {
@@ -798,22 +797,22 @@ func TestAddDelRmr(t *testing.T) {
        listofroutes := models.AddRmrRoute{SubscriptionID: 0, SenderEndPoint: "nokia.com", MessageType: &mtype, TargetEndPoint: &tendpoint}
        listofroutes2 := models.AddRmrRoute{SubscriptionID: 1, SenderEndPoint: "", MessageType: &mtype, TargetEndPoint: &tendpoint}
        listofroutes3 := models.AddRmrRoute{MessageType: &mtype, TargetEndPoint: &tendpoint}
-       adddelrmrroute(routelist, false)
+       Adddelrmrroute(routelist, false)
        routelist = append(routelist, &listofroutes)
        routelist = append(routelist, &listofroutes2)
        routelist = append(routelist, &listofroutes3)
        routelist = append(routelist, &listofroutes3)
-       adddelrmrroute(routelist, true)
+       Adddelrmrroute(routelist, true)
 
-       adddelrmrroute(routelist, false)
+       Adddelrmrroute(routelist, false)
 }
 
 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)