X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fsubscription_test.go;h=5772465c217864d2723fc06ec150ea41c3e91e10;hb=3fd54d11c9f548f1ebea30133e5198eb49511e55;hp=a5601cc11e2927b28950d970d37d1f6d2d8c05e2;hpb=5953f7e372df54c71f526e9519e8eb0ee7ee6f72;p=ric-plt%2Fxapp-frame.git diff --git a/pkg/xapp/subscription_test.go b/pkg/xapp/subscription_test.go index a5601cc..5772465 100755 --- a/pkg/xapp/subscription_test.go +++ b/pkg/xapp/subscription_test.go @@ -7,83 +7,177 @@ package xapp import ( + "fmt" + "testing" + "time" + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientmodel" "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models" "github.com/stretchr/testify/assert" - "testing" - "time" - "fmt" ) -var suite *testing.T - -var meid = "gnb123456" -var funId = int64(1) -var clientEndpoint = "localhost" -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" + xappEventInstanceId = int64(1) + eventInstanceId = int64(1) + funId = int64(1) + actionId = int64(1) + actionType = "report" + subsequestActioType = "continue" + timeToWait = "w10ms" + direction = int64(0) + procedureCode = int64(27) + typeOfMessage = int64(1) + subscriptionId = "" + hPort = int64(8080) + rPort = int64(4560) + clientEndpoint = clientmodel.SubscriptionParamsClientEndpoint{Host: "localhost", HTTPPort: &hPort, RMRPort: &rPort} +) + +// 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].ClientEndpoint, []string{"127.0.0.1:4056"}) +} + +func TestSubscriptionHandling(t *testing.T) { + subscriptionParams := clientmodel.SubscriptionParams{ + SubscriptionID: "", + Meid: &meid, + RANFunctionID: &funId, + ClientEndpoint: &clientEndpoint, + SubscriptionDetails: clientmodel.SubscriptionDetailsList{ + &clientmodel.SubscriptionDetail{ + XappEventInstanceID: &eventInstanceId, + EventTriggers: &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, + }, + }, + }, + }, }, - }, + } + + Subscription.SetResponseCB(func(resp *clientmodel.SubscriptionResponse) { + assert.Equal(t, len(resp.SubscriptionInstances), 1) + assert.Equal(t, *resp.SubscriptionInstances[0].XappEventInstanceID, int64(11)) + assert.Equal(t, *resp.SubscriptionInstances[0].E2EventInstanceID, int64(22)) + }) + + _, err := Subscription.Subscribe(&subscriptionParams) + assert.Equal(t, err, nil) } -var policyParams = clientmodel.PolicyParams{ - Meid: &meid, - RANFunctionID: &funId, - ClientEndpoint: &clientEndpoint, - EventTriggers: clientmodel.EventTriggerList{ - &clientmodel.EventTrigger{ - InterfaceDirection: direction, - ProcedureCode: procedureCode, - TypeOfMessage: typeOfMessage, +func TestSubscriptionWithClientProvidedIdHandling(t *testing.T) { + subscriptionParams := clientmodel.SubscriptionParams{ + SubscriptionID: "myxapp", + Meid: &meid, + RANFunctionID: &funId, + ClientEndpoint: &clientEndpoint, + SubscriptionDetails: clientmodel.SubscriptionDetailsList{ + &clientmodel.SubscriptionDetail{ + XappEventInstanceID: &eventInstanceId, + EventTriggers: &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].XappEventInstanceID, int64(11)) + assert.Equal(t, *resp.SubscriptionInstances[0].E2EventInstanceID, 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) - instanceId := int64(22) + xappInstanceId := int64(11) + e2InstanceId := int64(22) resp := &models.SubscriptionResponse{ SubscriptionID: &subscriptionId, SubscriptionInstances: []*models.SubscriptionInstance{ - &models.SubscriptionInstance{RequestorID: &reqId, InstanceID: &instanceId}, + { + XappEventInstanceID: &xappInstanceId, + E2EventInstanceID: &e2InstanceId, + }, }, } // Notify the client: don't worry about errors ... Notify() will handle retries, etc. - Subscription.Notify(resp, clientEndpoint) + Subscription.Notify(resp, models.SubscriptionParamsClientEndpoint{Host: "localhost", HTTPPort: &hPort, RMRPort: &rPort}) } -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.Host, p.ClientEndpoint.Host) + assert.Equal(suite, clientEndpoint.HTTPPort, p.ClientEndpoint.HTTPPort) + assert.Equal(suite, clientEndpoint.RMRPort, p.ClientEndpoint.RMRPort) + + assert.Equal(suite, xappEventInstanceId, *p.SubscriptionDetails[0].XappEventInstanceID) + assert.Equal(suite, "1234", p.SubscriptionDetails[0].EventTriggers.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.Host) // Process subscriptions on the background go processSubscriptions(subscriptionId) @@ -99,60 +193,13 @@ func queryHandler() (models.SubscriptionList, error) { &models.SubscriptionData{ SubscriptionID: 11, Meid: "Test-Gnb", - Endpoint: []string{"127.0.0.1:4056"}, + ClientEndpoint: []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) -}