Enhancements of REST-based E2 subscription interface
[ric-plt/xapp-frame.git] / pkg / xapp / subscription_test.go
index 430b0a2..dc0a171 100755 (executable)
@@ -8,49 +8,96 @@ package xapp
 
 import (
        "fmt"
-       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientmodel"
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models"
+       "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientmodel"
        "github.com/stretchr/testify/assert"
        "testing"
        "time"
 )
 
-var suite *testing.T
-
-var meid = "gnb123456"
-var funId = int64(1)
-var clientEndpoint = "localhost:4560"
-var direction = int64(0)
-var procedureCode = int64(27)
-var typeOfMessage = int64(1)
-
-var reportParams = clientmodel.ReportParams{
-       Meid:           meid,
-       RANFunctionID:  &funId,
-       ClientEndpoint: &clientEndpoint,
-       EventTriggers: clientmodel.EventTriggerList{
-               &clientmodel.EventTrigger{
-                       InterfaceDirection: direction,
-                       ProcedureCode:      procedureCode,
-                       TypeOfMessage:      typeOfMessage,
-               },
-       },
+var (
+       suite *testing.T
+
+       meid = "gnb123456"
+       reqId = int64(1)
+       seqId = int64(1)
+       funId = int64(1)
+       actionId = int64(1)
+       actionType = "report"
+       subsequestActioType = "continue"
+       timeToWait = "w10ms"
+       port = int64(4560)
+       clientEndpoint = clientmodel.SubscriptionParamsClientEndpoint{ServiceName: "localhost", Port: &port}
+       direction = int64(0)
+       procedureCode = int64(27)
+       typeOfMessage = int64(1)
+       subscriptionId = ""
+)
+
+// Test cases
+func TestSetup(t *testing.T) {
+       suite = t
+
+       // Start the server to simulate SubManager
+       go Subscription.Listen(subscriptionHandler, queryHandler, deleteHandler)
+       time.Sleep(time.Duration(2) * time.Second)
+}
+
+func TestSubscriptionQueryHandling(t *testing.T) {
+       resp, err := Subscription.QuerySubscriptions()
+
+       assert.Equal(t, err, nil)
+       assert.Equal(t, resp[0].SubscriptionID, int64(11))
+       assert.Equal(t, resp[0].Meid, "Test-Gnb")
+       assert.Equal(t, resp[0].Endpoint, []string{"127.0.0.1:4056"})
 }
 
-var policyParams = clientmodel.PolicyParams{
-       Meid:           &meid,
-       RANFunctionID:  &funId,
-       ClientEndpoint: &clientEndpoint,
-       EventTriggers: clientmodel.EventTriggerList{
-               &clientmodel.EventTrigger{
-                       InterfaceDirection: direction,
-                       ProcedureCode:      procedureCode,
-                       TypeOfMessage:      typeOfMessage,
+func TestSubscriptionHandling(t *testing.T) {
+       subscriptionParams := clientmodel.SubscriptionParams{
+               Meid:           &meid,
+               RANFunctionID:  &funId,
+               ClientEndpoint: &clientEndpoint,
+               RequestorID: &reqId,
+               InstanceID: &seqId,
+               SubscriptionDetails: clientmodel.SubscriptionDetailsList{
+                       &clientmodel.SubscriptionDetails{
+                               EventTriggerList: &clientmodel.EventTriggerDefinition{
+                                       OctetString: "1234",
+                               },
+                               ActionToBeSetupList: clientmodel.ActionsToBeSetup{
+                                       &clientmodel.ActionToBeSetup{
+                                               ActionID: &actionId,
+                                               ActionType: &actionType,
+                                               ActionDefinition: &clientmodel.ActionDefinition{
+                                                       OctetString: "5678",
+                                               },
+                                               SubsequentAction: &clientmodel.SubsequentAction{
+                                                       SubsequentActionType: &subsequestActioType,
+                                                       TimeToWait: &timeToWait,
+                                               },
+                                       },
+                               },
+                       },
                },
-       },
-       PolicyActionDefinitions: &clientmodel.PolicyActionDefinition{},
+       }
+
+       Subscription.SetResponseCB(func(resp *clientmodel.SubscriptionResponse) {
+               assert.Equal(t, len(resp.SubscriptionInstances), 1)
+               assert.Equal(t, *resp.SubscriptionInstances[0].RequestorID, int64(11))
+               assert.Equal(t, *resp.SubscriptionInstances[0].InstanceID, int64(22))
+       })
+
+       _, err := Subscription.Subscribe(&subscriptionParams)
+       assert.Equal(t, err, nil)
+}
+
+func TestSubscriptionDeleteHandling(t *testing.T) {
+       err := Subscription.Unsubscribe(subscriptionId)
+       fmt.Println(err)
+       assert.Equal(t, err, nil)
 }
 
+// Helper functions
 func processSubscriptions(subscriptionId string) {
        // Generate requestorId, instanceId
        reqId := int64(11)
@@ -59,31 +106,37 @@ func processSubscriptions(subscriptionId string) {
        resp := &models.SubscriptionResponse{
                SubscriptionID: &subscriptionId,
                SubscriptionInstances: []*models.SubscriptionInstance{
-                       {RequestorID: &reqId, InstanceID: &instanceId},
+                       {
+                               RequestorID: &reqId,
+                               InstanceID: &instanceId,
+                       },
                },
        }
 
        // Notify the client: don't worry about errors ... Notify() will handle retries, etc.
-       Subscription.Notify(resp, clientEndpoint)
+       Subscription.Notify(resp, models.SubscriptionParamsClientEndpoint{ServiceName: "localhost", Port: &port})
 }
 
-func subscriptionHandler(stype models.SubscriptionType, params interface{}) (*models.SubscriptionResponse, error) {
-       switch stype {
-       case models.SubscriptionTypeReport:
-               p := params.(*models.ReportParams)
-               assert.Equal(suite, meid, p.Meid)
-               assert.Equal(suite, funId, *p.RANFunctionID)
-               assert.Equal(suite, clientEndpoint, *p.ClientEndpoint)
-               assert.Equal(suite, direction, p.EventTriggers[0].InterfaceDirection)
-               assert.Equal(suite, procedureCode, p.EventTriggers[0].ProcedureCode)
-               assert.Equal(suite, typeOfMessage, p.EventTriggers[0].TypeOfMessage)
-       case models.SubscriptionTypePolicy:
-               p := params.(*models.PolicyParams)
-               assert.Equal(suite, clientEndpoint, *p.ClientEndpoint)
-       }
+func subscriptionHandler(params interface{}) (*models.SubscriptionResponse, error) {
+       p := params.(*models.SubscriptionParams)
+
+       assert.Equal(suite, meid, *p.Meid)
+       assert.Equal(suite, funId, *p.RANFunctionID)
+       assert.Equal(suite, clientEndpoint.ServiceName, p.ClientEndpoint.ServiceName)
+       assert.Equal(suite, clientEndpoint.Port, p.ClientEndpoint.Port)
+       assert.Equal(suite, reqId, *p.RequestorID)
+       assert.Equal(suite, seqId, *p.InstanceID)
+
+       assert.Equal(suite, "1234", p.SubscriptionDetails[0].EventTriggerList.OctetString)
+       assert.Equal(suite, actionId, *p.SubscriptionDetails[0].ActionToBeSetupList[0].ActionID)
+       assert.Equal(suite, actionType, *p.SubscriptionDetails[0].ActionToBeSetupList[0].ActionType)
+
+       assert.Equal(suite, subsequestActioType, *p.SubscriptionDetails[0].ActionToBeSetupList[0].SubsequentAction.SubsequentActionType)
+       assert.Equal(suite, timeToWait, *p.SubscriptionDetails[0].ActionToBeSetupList[0].SubsequentAction.TimeToWait)
+       assert.Equal(suite, "5678", p.SubscriptionDetails[0].ActionToBeSetupList[0].ActionDefinition.OctetString)
 
        // Generate a unique subscriptionId
-       subscriptionId := fmt.Sprintf("%s-%s", meid, clientEndpoint)
+       subscriptionId = fmt.Sprintf("%s-%s", meid, clientEndpoint.ServiceName)
 
        // Process subscriptions on the background
        go processSubscriptions(subscriptionId)
@@ -102,57 +155,10 @@ func queryHandler() (models.SubscriptionList, error) {
                        Endpoint:       []string{"127.0.0.1:4056"},
                },
        }
-
        return resp, nil
 }
 
 func deleteHandler(ep string) error {
-       assert.Equal(suite, clientEndpoint, ep)
-
+       assert.Equal(suite, subscriptionId, ep)
        return nil
 }
-
-func TestSetup(t *testing.T) {
-       suite = t
-
-       // Start the server to simulate SubManager
-       go Subscription.Listen(subscriptionHandler, queryHandler, deleteHandler)
-       time.Sleep(time.Duration(2) * time.Second)
-}
-
-func TestSubscriptionQueryHandling(t *testing.T) {
-       resp, err := Subscription.QuerySubscriptions()
-
-       assert.Equal(t, err, nil)
-       assert.Equal(t, resp[0].SubscriptionID, int64(11))
-       assert.Equal(t, resp[0].Meid, "Test-Gnb")
-       assert.Equal(t, resp[0].Endpoint, []string{"127.0.0.1:4056"})
-}
-
-func TestSubscriptionReportHandling(t *testing.T) {
-       Subscription.SetResponseCB(func(resp *clientmodel.SubscriptionResponse) {
-               assert.Equal(t, len(resp.SubscriptionInstances), 1)
-               assert.Equal(t, *resp.SubscriptionInstances[0].RequestorID, int64(11))
-               assert.Equal(t, *resp.SubscriptionInstances[0].InstanceID, int64(22))
-       })
-
-       _, err := Subscription.SubscribeReport(&reportParams)
-       assert.Equal(t, err, nil)
-}
-
-func TestSubscriptionPolicytHandling(t *testing.T) {
-       Subscription.SetResponseCB(func(resp *clientmodel.SubscriptionResponse) {
-               assert.Equal(t, len(resp.SubscriptionInstances), 1)
-               assert.Equal(t, *resp.SubscriptionInstances[0].RequestorID, int64(11))
-               assert.Equal(t, *resp.SubscriptionInstances[0].InstanceID, int64(22))
-       })
-
-       _, err := Subscription.SubscribePolicy(&policyParams)
-       assert.Equal(t, err, nil)
-}
-
-func TestSubscriptionDeleteHandling(t *testing.T) {
-       err := Subscription.UnSubscribe(clientEndpoint)
-
-       assert.Equal(t, err, nil)
-}