X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Fpublishservice%2Fpublishservice_test.go;h=db23ce1894aafb8227c54f99e4d8fca32247358d;hb=f083d47095bf223383a4e6c17d895655b900f9de;hp=9262b112d4e6255e9413f3c59a3a60bb9cc5599a;hpb=c9e08b2a2f647f9f870040570c5e71305f0fb5d2;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/publishservice/publishservice_test.go b/capifcore/internal/publishservice/publishservice_test.go
index 9262b11..db23ce1 100644
--- a/capifcore/internal/publishservice/publishservice_test.go
+++ b/capifcore/internal/publishservice/publishservice_test.go
@@ -26,6 +26,7 @@ import (
 	"os"
 	"testing"
 
+	"oransc.org/nonrtric/capifcore/internal/common29122"
 	"oransc.org/nonrtric/capifcore/internal/providermanagement"
 
 	"github.com/labstack/echo/v4"
@@ -44,10 +45,11 @@ import (
 )
 
 func TestPublishUnpublishService(t *testing.T) {
+	apfId := "apfId"
 	aefId := "aefId"
 	newApiId := "api_id_app-management"
 	serviceRegisterMock := serviceMocks.ServiceRegister{}
-	serviceRegisterMock.On("IsFunctionRegistered", aefId).Return(true)
+	serviceRegisterMock.On("GetAefsForPublisher", apfId).Return([]string{aefId, "otherAefId"})
 	helmManagerMock := helmMocks.HelmManager{}
 	helmManagerMock.On("InstallHelmChart", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 	serviceUnderTest, requestHandler := getEcho(&serviceRegisterMock, &helmManagerMock)
@@ -60,52 +62,27 @@ func TestPublishUnpublishService(t *testing.T) {
 	domainName := "domain"
 	var protocol publishapi.Protocol = "HTTP_1_1"
 	description := "Description,namespace,repoName,chartName,releaseName"
-	newServiceDescription := publishapi.ServiceAPIDescription{
-		AefProfiles: &[]publishapi.AefProfile{
-			{
-				AefId:      aefId,
-				DomainName: &domainName,
-				Protocol:   &protocol,
-				Versions: []publishapi.Version{
-					{
-						ApiVersion: "v1",
-						Resources: &[]publishapi.Resource{
-							{
-								CommType: "REQUEST_RESPONSE",
-								Operations: &[]publishapi.Operation{
-									"POST",
-								},
-								ResourceName: "app",
-								Uri:          "app",
-							},
-						},
-					},
-				},
-			},
-		},
-		ApiName:     "app-management",
-		Description: &description,
-	}
+	newServiceDescription := getServiceAPIDescription(aefId, domainName, description, protocol)
 
 	// Publish a service
-	result = testutil.NewRequest().Post("/aefId/service-apis").WithJsonBody(newServiceDescription).Go(t, requestHandler)
+	result = testutil.NewRequest().Post("/"+apfId+"/service-apis").WithJsonBody(newServiceDescription).Go(t, requestHandler)
 
 	assert.Equal(t, http.StatusCreated, result.Code())
 	var resultService publishapi.ServiceAPIDescription
 	err := result.UnmarshalBodyToObject(&resultService)
 	assert.NoError(t, err, "error unmarshaling response")
 	assert.Equal(t, *resultService.ApiId, newApiId)
-	assert.Equal(t, "http://example.com/"+aefId+"/service-apis/"+*resultService.ApiId, result.Recorder.Header().Get(echo.HeaderLocation))
+	assert.Equal(t, "http://example.com/"+apfId+"/service-apis/"+*resultService.ApiId, result.Recorder.Header().Get(echo.HeaderLocation))
 	newServiceDescription.ApiId = &newApiId
 	wantedAPILIst := []publishapi.ServiceAPIDescription{newServiceDescription}
 	assert.True(t, serviceUnderTest.AreAPIsRegistered(&wantedAPILIst))
 	assert.True(t, serviceUnderTest.IsAPIRegistered("aefId", "app-management"))
-	serviceRegisterMock.AssertCalled(t, "IsFunctionRegistered", aefId)
+	serviceRegisterMock.AssertCalled(t, "GetAefsForPublisher", apfId)
 	helmManagerMock.AssertCalled(t, "InstallHelmChart", "namespace", "repoName", "chartName", "releaseName")
-	assert.ElementsMatch(t, wantedAPILIst, *serviceUnderTest.GetAPIs())
+	assert.ElementsMatch(t, []string{aefId}, serviceUnderTest.getAllAefIds())
 
 	// Check that service is published
-	result = testutil.NewRequest().Get("/aefId/service-apis/"+newApiId).Go(t, requestHandler)
+	result = testutil.NewRequest().Get("/"+apfId+"/service-apis/"+newApiId).Go(t, requestHandler)
 
 	assert.Equal(t, http.StatusOK, result.Code())
 	err = result.UnmarshalBodyToObject(&resultService)
@@ -114,16 +91,41 @@ func TestPublishUnpublishService(t *testing.T) {
 
 	// Delete a service
 	helmManagerMock.On("UninstallHelmChart", mock.Anything, mock.Anything).Return(nil)
-	result = testutil.NewRequest().Delete("/aefId/service-apis/"+newApiId).Go(t, requestHandler)
+	result = testutil.NewRequest().Delete("/"+apfId+"/service-apis/"+newApiId).Go(t, requestHandler)
 
 	assert.Equal(t, http.StatusNoContent, result.Code())
 	helmManagerMock.AssertCalled(t, "UninstallHelmChart", "namespace", "chartName")
-	assert.Empty(t, *serviceUnderTest.GetAPIs())
+	assert.Empty(t, serviceUnderTest.getAllAefIds())
 
 	// Check no services published
-	result = testutil.NewRequest().Get("/aefId/service-apis/"+newApiId).Go(t, requestHandler)
+	result = testutil.NewRequest().Get("/"+apfId+"/service-apis/"+newApiId).Go(t, requestHandler)
+
+	assert.Equal(t, http.StatusNotFound, result.Code())
+}
+
+func TestPostUnpublishedServiceWithUnregisteredFunction(t *testing.T) {
+	apfId := "apfId"
+	aefId := "aefId"
+	serviceRegisterMock := serviceMocks.ServiceRegister{}
+	serviceRegisterMock.On("GetAefsForPublisher", apfId).Return([]string{"otherAefId"})
+	_, requestHandler := getEcho(&serviceRegisterMock, nil)
+
+	domainName := "domain"
+	var protocol publishapi.Protocol = "HTTP_1_1"
+	description := "Description"
+	newServiceDescription := getServiceAPIDescription(aefId, domainName, description, protocol)
+
+	// Publish a service
+	result := testutil.NewRequest().Post("/"+apfId+"/service-apis").WithJsonBody(newServiceDescription).Go(t, requestHandler)
 
 	assert.Equal(t, http.StatusNotFound, result.Code())
+	var resultError common29122.ProblemDetails
+	err := result.UnmarshalBodyToObject(&resultError)
+	assert.NoError(t, err, "error unmarshaling response")
+	errMsg := "Function not registered, aefId"
+	assert.Equal(t, &errMsg, resultError.Cause)
+	notFound := http.StatusNotFound
+	assert.Equal(t, &notFound, resultError.Status)
 }
 
 func getEcho(serviceRegister providermanagement.ServiceRegister, helmManager helmmanagement.HelmManager) (*PublishService, *echo.Echo) {
@@ -144,3 +146,32 @@ func getEcho(serviceRegister providermanagement.ServiceRegister, helmManager hel
 	publishapi.RegisterHandlers(e, ps)
 	return ps, e
 }
+
+func getServiceAPIDescription(aefId, domainName, description string, protocol publishapi.Protocol) publishapi.ServiceAPIDescription {
+	return publishapi.ServiceAPIDescription{
+		AefProfiles: &[]publishapi.AefProfile{
+			{
+				AefId:      aefId,
+				DomainName: &domainName,
+				Protocol:   &protocol,
+				Versions: []publishapi.Version{
+					{
+						ApiVersion: "v1",
+						Resources: &[]publishapi.Resource{
+							{
+								CommType: "REQUEST_RESPONSE",
+								Operations: &[]publishapi.Operation{
+									"POST",
+								},
+								ResourceName: "app",
+								Uri:          "app",
+							},
+						},
+					},
+				},
+			},
+		},
+		ApiName:     "app-management",
+		Description: &description,
+	}
+}