X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fsubscription_test.go;h=72c5bc73bd995c8ee997d04269280bb26d28c73d;hb=refs%2Fchanges%2F65%2F5865%2F4;hp=dc0a171f6d1c0389d154d34fe059f3edb8250e05;hpb=3602bf801fef17e317cb35a4c710118ec80908b9;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/subscription_test.go b/pkg/xapp/subscription_test.go
index dc0a171..72c5bc7 100755
--- a/pkg/xapp/subscription_test.go
+++ b/pkg/xapp/subscription_test.go
@@ -26,12 +26,13 @@ var (
 	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 = ""
+	hPort = int64(8080)
+	rPort = int64(4560)
+	clientEndpoint = clientmodel.SubscriptionParamsClientEndpoint{Host: "localhost", HTTPPort: &hPort, RMRPort: &rPort}
 )
 
 // Test cases
@@ -49,7 +50,7 @@ func TestSubscriptionQueryHandling(t *testing.T) {
 	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"})
+	assert.Equal(t, resp[0].ClientEndpoint, []string{"127.0.0.1:4056"})
 }
 
 func TestSubscriptionHandling(t *testing.T) {
@@ -57,11 +58,11 @@ func TestSubscriptionHandling(t *testing.T) {
 		Meid:           &meid,
 		RANFunctionID:  &funId,
 		ClientEndpoint: &clientEndpoint,
-		RequestorID: &reqId,
-		InstanceID: &seqId,
 		SubscriptionDetails: clientmodel.SubscriptionDetailsList{
-			&clientmodel.SubscriptionDetails{
-				EventTriggerList: &clientmodel.EventTriggerDefinition{
+			&clientmodel.SubscriptionDetail{
+				RequestorID: &reqId,
+				InstanceID: &seqId,
+				EventTriggers: &clientmodel.EventTriggerDefinition{
 					OctetString: "1234",
 				},
 				ActionToBeSetupList: clientmodel.ActionsToBeSetup{
@@ -114,7 +115,7 @@ func processSubscriptions(subscriptionId string) {
 	}
 
 	// Notify the client: don't worry about errors ... Notify() will handle retries, etc.
-	Subscription.Notify(resp, models.SubscriptionParamsClientEndpoint{ServiceName: "localhost", Port: &port})
+	Subscription.Notify(resp, models.SubscriptionParamsClientEndpoint{Host: "localhost", HTTPPort: &hPort, RMRPort: &rPort})
 }
 
 func subscriptionHandler(params interface{}) (*models.SubscriptionResponse, error) {
@@ -122,12 +123,13 @@ func subscriptionHandler(params interface{}) (*models.SubscriptionResponse, erro
 
 	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, clientEndpoint.Host, p.ClientEndpoint.Host)
+	assert.Equal(suite, clientEndpoint.HTTPPort, p.ClientEndpoint.HTTPPort)
+	assert.Equal(suite, clientEndpoint.RMRPort, p.ClientEndpoint.RMRPort)
 
-	assert.Equal(suite, "1234", p.SubscriptionDetails[0].EventTriggerList.OctetString)
+	assert.Equal(suite, reqId, *p.SubscriptionDetails[0].RequestorID)
+	assert.Equal(suite, seqId, *p.SubscriptionDetails[0].InstanceID)
+	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)
 
@@ -136,7 +138,7 @@ func subscriptionHandler(params interface{}) (*models.SubscriptionResponse, erro
 	assert.Equal(suite, "5678", p.SubscriptionDetails[0].ActionToBeSetupList[0].ActionDefinition.OctetString)
 
 	// Generate a unique subscriptionId
-	subscriptionId = fmt.Sprintf("%s-%s", meid, clientEndpoint.ServiceName)
+	subscriptionId = fmt.Sprintf("%s-%s", meid, clientEndpoint.Host)
 
 	// Process subscriptions on the background
 	go processSubscriptions(subscriptionId)
@@ -152,7 +154,7 @@ 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