X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Fdiscoverservice%2Fdiscoverservice_test.go;h=fdb9c59e62f16ee7d06d4a072119111985308e28;hb=0725130f13eba6aff175da8a7873e3f92f5be06a;hp=5ac00417d2bfe61511b7675402619b2c572f6043;hpb=7cc7b0ba212f2ef2ebc7a4c92e935037a9ff505b;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/discoverservice/discoverservice_test.go b/capifcore/internal/discoverservice/discoverservice_test.go
index 5ac0041..fdb9c59 100644
--- a/capifcore/internal/discoverservice/discoverservice_test.go
+++ b/capifcore/internal/discoverservice/discoverservice_test.go
@@ -42,12 +42,15 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+var protocolHTTP11 = publishapi.ProtocolHTTP11
+var dataFormatJSON = publishapi.DataFormatJSON
+
 func TestGetAllServiceAPIs(t *testing.T) {
 	var err error
 
 	apiList := []publishapi.ServiceAPIDescription{
-		getAPI("apiName1", "v1"),
-		getAPI("apiName2", "v1"),
+		getAPI("apiName1", "aefId", "apiCategory", "v1", nil, nil, ""),
+		getAPI("apiName2", "aefId", "apiCategory", "v1", nil, nil, ""),
 	}
 	apiRegisterMock := mocks.APIRegister{}
 	apiRegisterMock.On("GetAPIs").Return(&apiList)
@@ -64,16 +67,186 @@ func TestGetAllServiceAPIs(t *testing.T) {
 	assert.Equal(t, "apiName1", (*resultInvoker.ServiceAPIDescriptions)[0].ApiName)
 	assert.Equal(t, "apiName2", (*resultInvoker.ServiceAPIDescriptions)[1].ApiName)
 	apiRegisterMock.AssertCalled(t, "GetAPIs")
+	assert.Equal(t, 2, len(*resultInvoker.ServiceAPIDescriptions))
+}
+
+func TestFilterApiName(t *testing.T) {
+	var err error
+
+	apiList := []publishapi.ServiceAPIDescription{
+		getAPI("apiName1", "", "", "", nil, nil, ""),
+		getAPI("apiName2", "", "", "", nil, nil, ""),
+	}
+	apiRegisterMock := mocks.APIRegister{}
+	apiRegisterMock.On("GetAPIs").Return(&apiList)
+	requestHandler := getEcho(&apiRegisterMock)
 
 	// Get APIs with filter
-	result = testutil.NewRequest().Get("/allServiceAPIs?api-name=apiName1&api-version=v1&api-invoker-id=api_invoker_id").Go(t, requestHandler)
+	result := testutil.NewRequest().Get("/allServiceAPIs?api-name=apiName1&api-invoker-id=api_invoker_id").Go(t, requestHandler)
 
 	assert.Equal(t, http.StatusOK, result.Code())
+	var resultInvoker discoverserviceapi.DiscoveredAPIs
+	err = result.UnmarshalBodyToObject(&resultInvoker)
+	assert.NoError(t, err, "error unmarshaling response")
+	assert.Equal(t, 1, len(*resultInvoker.ServiceAPIDescriptions))
+	assert.Equal(t, "apiName1", (*resultInvoker.ServiceAPIDescriptions)[0].ApiName)
+}
+
+func TestFilterAefId(t *testing.T) {
+	var err error
+
+	apiList := []publishapi.ServiceAPIDescription{
+		getAPI("apiName1", "aefId", "", "", nil, nil, ""),
+		getAPI("apiName2", "otherAefId", "", "", nil, nil, ""),
+	}
+	apiRegisterMock := mocks.APIRegister{}
+	apiRegisterMock.On("GetAPIs").Return(&apiList)
+	requestHandler := getEcho(&apiRegisterMock)
+
+	// Get APIs with filter
+	result := testutil.NewRequest().Get("/allServiceAPIs?api-invoker-id=api_invoker_id&aef-id=aefId").Go(t, requestHandler)
+
+	assert.Equal(t, http.StatusOK, result.Code())
+	var resultInvoker discoverserviceapi.DiscoveredAPIs
+	err = result.UnmarshalBodyToObject(&resultInvoker)
+	assert.NoError(t, err, "error unmarshaling response")
+	assert.Equal(t, 1, len(*resultInvoker.ServiceAPIDescriptions))
+	assert.Equal(t, "apiName1", (*resultInvoker.ServiceAPIDescriptions)[0].ApiName)
+}
+
+func TestFilterVersion(t *testing.T) {
+	var err error
+
+	apiList := []publishapi.ServiceAPIDescription{
+		getAPI("apiName1", "", "", "v1", nil, nil, ""),
+		getAPI("apiName2", "", "", "v2", nil, nil, ""),
+	}
+	apiRegisterMock := mocks.APIRegister{}
+	apiRegisterMock.On("GetAPIs").Return(&apiList)
+	requestHandler := getEcho(&apiRegisterMock)
+
+	// Get APIs with filter
+	result := testutil.NewRequest().Get("/allServiceAPIs?api-version=v1&api-invoker-id=api_invoker_id").Go(t, requestHandler)
+
+	assert.Equal(t, http.StatusOK, result.Code())
+	var resultInvoker discoverserviceapi.DiscoveredAPIs
+	err = result.UnmarshalBodyToObject(&resultInvoker)
+	assert.NoError(t, err, "error unmarshaling response")
+	assert.Equal(t, 1, len(*resultInvoker.ServiceAPIDescriptions))
+	assert.Equal(t, "apiName1", (*resultInvoker.ServiceAPIDescriptions)[0].ApiName)
+}
+
+func TestFilterCommType(t *testing.T) {
+	var err error
+
+	apiList := []publishapi.ServiceAPIDescription{
+		getAPI("apiName1", "", "", "", nil, nil, publishapi.CommunicationTypeREQUESTRESPONSE),
+		getAPI("apiName2", "", "", "", nil, nil, publishapi.CommunicationTypeSUBSCRIBENOTIFY),
+	}
+	apiRegisterMock := mocks.APIRegister{}
+	apiRegisterMock.On("GetAPIs").Return(&apiList)
+	requestHandler := getEcho(&apiRegisterMock)
+
+	// Get APIs with filter
+	result := testutil.NewRequest().Get("/allServiceAPIs?api-invoker-id=api_invoker_id&comm-type=REQUEST_RESPONSE").Go(t, requestHandler)
+
+	assert.Equal(t, http.StatusOK, result.Code())
+	var resultInvoker discoverserviceapi.DiscoveredAPIs
+	err = result.UnmarshalBodyToObject(&resultInvoker)
+	assert.NoError(t, err, "error unmarshaling response")
+	assert.Equal(t, 1, len(*resultInvoker.ServiceAPIDescriptions))
+	assert.Equal(t, "apiName1", (*resultInvoker.ServiceAPIDescriptions)[0].ApiName)
+}
+
+func TestFilterVersionAndCommType(t *testing.T) {
+	var err error
+
+	apiList := []publishapi.ServiceAPIDescription{
+		getAPI("apiName1", "", "", "v1", nil, nil, publishapi.CommunicationTypeREQUESTRESPONSE),
+		getAPI("apiName2", "", "", "v1", nil, nil, publishapi.CommunicationTypeSUBSCRIBENOTIFY),
+		getAPI("apiName3", "", "", "v2", nil, nil, publishapi.CommunicationTypeSUBSCRIBENOTIFY),
+	}
+	apiRegisterMock := mocks.APIRegister{}
+	apiRegisterMock.On("GetAPIs").Return(&apiList)
+	requestHandler := getEcho(&apiRegisterMock)
+
+	// Get APIs with filter
+	result := testutil.NewRequest().Get("/allServiceAPIs?api-invoker-id=api_invoker_id&api-version=v1&comm-type=SUBSCRIBE_NOTIFY").Go(t, requestHandler)
+
+	assert.Equal(t, http.StatusOK, result.Code())
+	var resultInvoker discoverserviceapi.DiscoveredAPIs
+	err = result.UnmarshalBodyToObject(&resultInvoker)
+	assert.NoError(t, err, "error unmarshaling response")
+	assert.Equal(t, 1, len(*resultInvoker.ServiceAPIDescriptions))
+	assert.Equal(t, "apiName2", (*resultInvoker.ServiceAPIDescriptions)[0].ApiName)
+}
+
+func TestFilterAPICategory(t *testing.T) {
+	var err error
+
+	apiList := []publishapi.ServiceAPIDescription{
+		getAPI("apiName1", "", "apiCategory", "", nil, nil, ""),
+		getAPI("apiName2", "", "", "", nil, nil, ""),
+	}
+	apiRegisterMock := mocks.APIRegister{}
+	apiRegisterMock.On("GetAPIs").Return(&apiList)
+	requestHandler := getEcho(&apiRegisterMock)
+
+	// Get APIs with filter
+	result := testutil.NewRequest().Get("/allServiceAPIs?api-invoker-id=api_invoker_id&api-cat=apiCategory").Go(t, requestHandler)
+
+	assert.Equal(t, http.StatusOK, result.Code())
+	var resultInvoker discoverserviceapi.DiscoveredAPIs
+	err = result.UnmarshalBodyToObject(&resultInvoker)
+	assert.NoError(t, err, "error unmarshaling response")
+	assert.Equal(t, 1, len(*resultInvoker.ServiceAPIDescriptions))
+	assert.Equal(t, "apiName1", (*resultInvoker.ServiceAPIDescriptions)[0].ApiName)
+}
+
+func TestFilterProtocol(t *testing.T) {
+	var err error
+
+	apiList := []publishapi.ServiceAPIDescription{
+		getAPI("apiName1", "", "", "", &protocolHTTP11, nil, ""),
+		getAPI("apiName2", "", "", "", nil, nil, ""),
+	}
+	apiRegisterMock := mocks.APIRegister{}
+	apiRegisterMock.On("GetAPIs").Return(&apiList)
+	requestHandler := getEcho(&apiRegisterMock)
+
+	// Get APIs with filter
+	result := testutil.NewRequest().Get("/allServiceAPIs?api-invoker-id=api_invoker_id&protocol=HTTP_1_1").Go(t, requestHandler)
+
+	assert.Equal(t, http.StatusOK, result.Code())
+	var resultInvoker discoverserviceapi.DiscoveredAPIs
+	err = result.UnmarshalBodyToObject(&resultInvoker)
+	assert.NoError(t, err, "error unmarshaling response")
+	assert.Equal(t, 1, len(*resultInvoker.ServiceAPIDescriptions))
+	assert.Equal(t, "apiName1", (*resultInvoker.ServiceAPIDescriptions)[0].ApiName)
+}
+
+var DataFormatOther publishapi.DataFormat = "OTHER"
+
+func TestFilterDataFormat(t *testing.T) {
+	var err error
+
+	apiList := []publishapi.ServiceAPIDescription{
+		getAPI("apiName1", "", "", "", nil, &dataFormatJSON, ""),
+		getAPI("apiName2", "", "", "", nil, nil, ""),
+	}
+	apiRegisterMock := mocks.APIRegister{}
+	apiRegisterMock.On("GetAPIs").Return(&apiList)
+	requestHandler := getEcho(&apiRegisterMock)
+
+	// Get APIs with filter
+	result := testutil.NewRequest().Get("/allServiceAPIs?api-invoker-id=api_invoker_id&data-format=JSON").Go(t, requestHandler)
+
+	assert.Equal(t, http.StatusOK, result.Code())
+	var resultInvoker discoverserviceapi.DiscoveredAPIs
 	err = result.UnmarshalBodyToObject(&resultInvoker)
 	assert.NoError(t, err, "error unmarshaling response")
 	assert.Equal(t, 1, len(*resultInvoker.ServiceAPIDescriptions))
 	assert.Equal(t, "apiName1", (*resultInvoker.ServiceAPIDescriptions)[0].ApiName)
-	apiRegisterMock.AssertCalled(t, "GetAPIs")
 }
 
 func getEcho(apiRegister publishservice.APIRegister) *echo.Echo {
@@ -95,28 +268,34 @@ func getEcho(apiRegister publishservice.APIRegister) *echo.Echo {
 	return e
 }
 
-func getAPI(apiName, apiVersion string) publishapi.ServiceAPIDescription {
+func getAPI(apiName, aefId, apiCategory, apiVersion string, protocol *publishapi.Protocol, dataFormat *publishapi.DataFormat, commType publishapi.CommunicationType) publishapi.ServiceAPIDescription {
 	apiId := "apiId_" + apiName
-	aefId := "aefId"
 	description := "description"
 	domainName := "domain"
-	var protocol publishapi.Protocol = "HTTP_1_1"
+	otherDomainName := "otherDomain"
+	var otherProtocol publishapi.Protocol = "HTTP_2"
+	categoryPointer := &apiCategory
+	if apiCategory == "" {
+		categoryPointer = nil
+	}
 	return publishapi.ServiceAPIDescription{
-		ApiId:       &apiId,
-		ApiName:     apiName,
-		Description: &description,
+		ApiId:              &apiId,
+		ApiName:            apiName,
+		Description:        &description,
+		ServiceAPICategory: categoryPointer,
 		AefProfiles: &[]publishapi.AefProfile{
 			{
 				AefId:      aefId,
 				DomainName: &domainName,
-				Protocol:   &protocol,
+				Protocol:   protocol,
+				DataFormat: dataFormat,
 				Versions: []publishapi.Version{
 					{
 						ApiVersion: apiVersion,
 						Resources: &[]publishapi.Resource{
 							{
 								ResourceName: "app",
-								CommType:     "REQUEST_RESPONSE",
+								CommType:     commType,
 								Uri:          "uri",
 								Operations: &[]publishapi.Operation{
 									"POST",
@@ -129,7 +308,28 @@ func getAPI(apiName, apiVersion string) publishapi.ServiceAPIDescription {
 						Resources: &[]publishapi.Resource{
 							{
 								ResourceName: "app",
-								CommType:     "REQUEST_RESPONSE",
+								CommType:     publishapi.CommunicationTypeSUBSCRIBENOTIFY,
+								Uri:          "uri",
+								Operations: &[]publishapi.Operation{
+									"POST",
+								},
+							},
+						},
+					},
+				},
+			},
+			{
+				AefId:      "otherAefId",
+				DomainName: &otherDomainName,
+				Protocol:   &otherProtocol,
+				DataFormat: &DataFormatOther,
+				Versions: []publishapi.Version{
+					{
+						ApiVersion: "v3",
+						Resources: &[]publishapi.Resource{
+							{
+								ResourceName: "app",
+								CommType:     commType,
 								Uri:          "uri",
 								Operations: &[]publishapi.Operation{
 									"POST",