X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fsubscription_test.go;h=b9713afdb3f36f22f22676f96a4ac1689a9b2804;hb=refs%2Fchanges%2F20%2F2920%2F1;hp=5ebb9c2ba56fb70cfbf1e91d754191fcbd1bb5e2;hpb=9568a2d73b96516b27f54650e309f0d157fb97d9;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/subscription_test.go b/pkg/xapp/subscription_test.go
index 5ebb9c2..b9713af 100755
--- a/pkg/xapp/subscription_test.go
+++ b/pkg/xapp/subscription_test.go
@@ -7,75 +7,99 @@
 package xapp
 
 import (
+	apimodel "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"
-	"github.com/stretchr/testify/assert"
-	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models"
-    apimodel "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientmodel"
 )
 
 var suite *testing.T
 
-var requestorId = int64(0x4EEC)
+var meid = "gnb123456"
+var funId = int64(1)
+var clientEndpoint = "localhost:4561"
 var direction = int64(0)
 var procedureCode = int64(27)
 var typeOfMessage = int64(1)
 
 var reportParams = apimodel.ReportParams{
-	RequestorID: &requestorId,
+	Meid: meid,
+	RANFunctionID: &funId,
+	ClientEndpoint: &clientEndpoint,
 	EventTriggers: apimodel.EventTriggerList{
 		&apimodel.EventTrigger{
-			InterfaceDirection: &direction,
-			ProcedureCode: &procedureCode,
-			TypeOfMessage: &typeOfMessage,
+			InterfaceDirection: direction,
+			ProcedureCode:      procedureCode,
+			TypeOfMessage:      typeOfMessage,
 		},
 	},
 }
 
-var controlParams = apimodel.ControlParams{
-	RequestorID: requestorId,
-}
-
 var policyParams = apimodel.PolicyParams{
-	RequestorID: requestorId,
+	Meid: &meid,
+	RANFunctionID: &funId,
+	ClientEndpoint: &clientEndpoint,
+	EventTriggers: apimodel.EventTriggerList{
+		&apimodel.EventTrigger{
+			InterfaceDirection: direction,
+			ProcedureCode:      procedureCode,
+			TypeOfMessage:      typeOfMessage,
+		},
+	},
+	PolicyActionDefinitions: &apimodel.PolicyActionDefinition{},
 }
 
-func subscriptionHandler(stype models.SubscriptionType, params interface{}) (models.SubscriptionResult, error) {
+func subscriptionHandler(stype models.SubscriptionType, params interface{}) (*models.SubscriptionResponse, error) {
 	switch stype {
 	case models.SubscriptionTypeReport:
 		p := params.(*models.ReportParams)
-		assert.Equal(suite, requestorId, *p.RequestorID)
-		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.SubscriptionTypeControl:
-		p := params.(*models.ControlParams)
-		assert.Equal(suite, requestorId, p.RequestorID)
+		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, requestorId, p.RequestorID)
+		assert.Equal(suite, clientEndpoint, *p.ClientEndpoint)
 	}
 
-	return models.SubscriptionResult{11, 22, 33}, nil
+	subId := "xapp-11"
+	reqId := int64(11)
+	instanceId := int64(22)
+	return &models.SubscriptionResponse{
+		SubscriptionID: &subId,
+		SubscriptionInstances: []*models.SubscriptionInstance{
+			&models.SubscriptionInstance{RequestorID: &reqId, InstanceID: &instanceId}, 
+			&models.SubscriptionInstance{RequestorID: &reqId, InstanceID: &instanceId},
+		},
+	}, nil
 }
 
 func queryHandler() (models.SubscriptionList, error) {
 	resp := models.SubscriptionList{
 		&models.SubscriptionData{
 			SubscriptionID: 11,
-			Meid: "Test-Gnb",
-			Endpoint: []string{"127.0.0.1:4056"},
+			Meid:           "Test-Gnb",
+			Endpoint:       []string{"127.0.0.1:4056"},
 		},
 	}
 
 	return resp, nil
 }
 
+func deleteHandler(ep string) error {
+	assert.Equal(suite, clientEndpoint, ep)
+
+	return nil
+}
+
 func TestSetup(t *testing.T) {
 	suite = t
 
 	// Start the server to simulate SubManager
-	go Subscription.Listen(subscriptionHandler, queryHandler)
+	go Subscription.Listen(subscriptionHandler, queryHandler, deleteHandler)
 	time.Sleep(time.Duration(2) * time.Second)
 }
 
@@ -89,27 +113,27 @@ func TestSubscriptionQueryHandling(t *testing.T) {
 }
 
 func TestSubscriptionReportHandling(t *testing.T) {
-	result, err := Subscription.SubscribeReport(&reportParams)
+	resp, err := Subscription.SubscribeReport(&reportParams)
 
 	assert.Equal(t, err, nil)
-	assert.Equal(t, len(result), 3)
-	assert.Equal(t, result[0], int64(11))
-	assert.Equal(t, result[1], int64(22))
-	assert.Equal(t, result[2], int64(33))
+	assert.Equal(t, len(resp.SubscriptionInstances), 2)
+	assert.Equal(t, *resp.SubscriptionInstances[0].RequestorID, int64(11))
+	assert.Equal(t, *resp.SubscriptionInstances[0].InstanceID, int64(22))
+	assert.Equal(t, *resp.SubscriptionInstances[1].RequestorID, int64(11))
+	assert.Equal(t, *resp.SubscriptionInstances[1].InstanceID, int64(22))
 }
 
-func TestSubscriptionControltHandling(t *testing.T) {
-	result, err := Subscription.SubscribeControl(&controlParams)
+func TestSubscriptionPolicytHandling(t *testing.T) {
+	resp, err := Subscription.SubscribePolicy(&policyParams)
 
 	assert.Equal(t, err, nil)
-	assert.Equal(t, len(result), 3)
-	assert.Equal(t, result[0], int64(11))
+	assert.Equal(t, len(resp.SubscriptionInstances), 2)
+	assert.Equal(t, *resp.SubscriptionInstances[0].RequestorID, int64(11))
+	assert.Equal(t, *resp.SubscriptionInstances[0].InstanceID, int64(22))
 }
 
-func TestSubscriptionPolicytHandling(t *testing.T) {
-	result, err := Subscription.SubscribePolicy(&policyParams)
+func TestSubscriptionDeleteHandling(t *testing.T) {
+	err := Subscription.UnSubscribe(clientEndpoint)
 
 	assert.Equal(t, err, nil)
-	assert.Equal(t, len(result), 3)
-	assert.Equal(t, result[0], int64(11))
 }
\ No newline at end of file