X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fsubscription_test.go;fp=pkg%2Fxapp%2Fsubscription_test.go;h=39a5d93048feec6c5ebe7adbb9362b8626c4a950;hb=c79bd0e1a4fe855b06c8f8131f162d0ee4a5f9f5;hp=72c5bc73bd995c8ee997d04269280bb26d28c73d;hpb=9ea6c7860300c299b9fe68caaf8aff61b3ec71d2;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/subscription_test.go b/pkg/xapp/subscription_test.go
index 72c5bc7..39a5d93 100755
--- a/pkg/xapp/subscription_test.go
+++ b/pkg/xapp/subscription_test.go
@@ -8,8 +8,8 @@ package xapp
 
 import (
 	"fmt"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models"
 	"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"
@@ -18,21 +18,21 @@ import (
 var (
 	suite *testing.T
 
-	meid = "gnb123456"
-	reqId = int64(1)
-	seqId = int64(1)
-	funId = int64(1)
-	actionId = int64(1)
-	actionType = "report"
+	meid                = "gnb123456"
+	reqId               = int64(1)
+	seqId               = 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}
+	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
@@ -61,20 +61,60 @@ func TestSubscriptionHandling(t *testing.T) {
 		SubscriptionDetails: clientmodel.SubscriptionDetailsList{
 			&clientmodel.SubscriptionDetail{
 				RequestorID: &reqId,
-				InstanceID: &seqId,
+				InstanceID:  &seqId,
+				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].RequestorID, int64(11))
+		assert.Equal(t, *resp.SubscriptionInstances[0].InstanceID, int64(22))
+	})
+
+	_, err := Subscription.Subscribe(&subscriptionParams)
+	assert.Equal(t, err, nil)
+}
+
+func TestSubscriptionWithClientProvidedIdHandling(t *testing.T) {
+	subscriptionParams := clientmodel.SubscriptionParams{
+		Meid:           &meid,
+		RANFunctionID:  &funId,
+		ClientEndpoint: &clientEndpoint,
+		SubscriptionID: "myxapp",
+		SubscriptionDetails: clientmodel.SubscriptionDetailsList{
+			&clientmodel.SubscriptionDetail{
+				RequestorID: &reqId,
+				InstanceID:  &seqId,
 				EventTriggers: &clientmodel.EventTriggerDefinition{
 					OctetString: "1234",
 				},
 				ActionToBeSetupList: clientmodel.ActionsToBeSetup{
 					&clientmodel.ActionToBeSetup{
-						ActionID: &actionId,
+						ActionID:   &actionId,
 						ActionType: &actionType,
 						ActionDefinition: &clientmodel.ActionDefinition{
 							OctetString: "5678",
 						},
 						SubsequentAction: &clientmodel.SubsequentAction{
 							SubsequentActionType: &subsequestActioType,
-							TimeToWait: &timeToWait,
+							TimeToWait:           &timeToWait,
 						},
 					},
 				},
@@ -109,7 +149,7 @@ func processSubscriptions(subscriptionId string) {
 		SubscriptionInstances: []*models.SubscriptionInstance{
 			{
 				RequestorID: &reqId,
-				InstanceID: &instanceId,
+				InstanceID:  &instanceId,
 			},
 		},
 	}