"net/http"
"os"
"testing"
+ "time"
"oransc.org/nonrtric/capifcore/internal/common29122"
+ "oransc.org/nonrtric/capifcore/internal/eventsapi"
"oransc.org/nonrtric/capifcore/internal/providermanagement"
"github.com/labstack/echo/v4"
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)
+ serviceUnderTest, eventChannel, requestHandler := getEcho(&serviceRegisterMock, &helmManagerMock)
// Check no services published for provider
result := testutil.NewRequest().Get("/"+apfId+"/service-apis").Go(t, requestHandler)
serviceRegisterMock.AssertCalled(t, "GetAefsForPublisher", apfId)
helmManagerMock.AssertCalled(t, "InstallHelmChart", namespace, repoName, chartName, releaseName)
assert.ElementsMatch(t, []string{aefId}, serviceUnderTest.getAllAefIds())
+ if publishEvent, ok := waitForEvent(eventChannel, 1*time.Second); ok {
+ assert.Fail(t, "No event sent")
+ } else {
+ assert.Equal(t, *resultService.ApiId, (*publishEvent.EventDetail.ApiIds)[0])
+ assert.Equal(t, eventsapi.CAPIFEventSERVICEAPIAVAILABLE, publishEvent.Events)
+ }
// Check that the service is published for the provider
result = testutil.NewRequest().Get("/"+apfId+"/service-apis/"+newApiId).Go(t, requestHandler)
// Check no services published
result = testutil.NewRequest().Get("/"+apfId+"/service-apis/"+newApiId).Go(t, requestHandler)
+ if publishEvent, ok := waitForEvent(eventChannel, 1*time.Second); ok {
+ assert.Fail(t, "No event sent")
+ } else {
+ assert.Equal(t, *resultService.ApiId, (*publishEvent.EventDetail.ApiIds)[0])
+ assert.Equal(t, eventsapi.CAPIFEventSERVICEAPIUNAVAILABLE, publishEvent.Events)
+ }
+
assert.Equal(t, http.StatusNotFound, result.Code())
}
aefId := "aefId"
serviceRegisterMock := serviceMocks.ServiceRegister{}
serviceRegisterMock.On("GetAefsForPublisher", apfId).Return([]string{"otherAefId"})
- _, requestHandler := getEcho(&serviceRegisterMock, nil)
+ _, _, requestHandler := getEcho(&serviceRegisterMock, nil)
- newServiceDescription := getServiceAPIDescription(aefId, "apiname", "description")
+ newServiceDescription := getServiceAPIDescription(aefId, "apiName", "description")
// Publish a service
result := testutil.NewRequest().Post("/"+apfId+"/service-apis").WithJsonBody(newServiceDescription).Go(t, requestHandler)
aefId := "aefId"
serviceRegisterMock := serviceMocks.ServiceRegister{}
serviceRegisterMock.On("GetAefsForPublisher", apfId).Return([]string{aefId})
- _, requestHandler := getEcho(&serviceRegisterMock, nil)
+ _, _, requestHandler := getEcho(&serviceRegisterMock, nil)
// Check no services published for provider
result := testutil.NewRequest().Get("/"+apfId+"/service-apis").Go(t, requestHandler)
assert.Contains(t, resultServices, serviceDescription2)
}
-func getEcho(serviceRegister providermanagement.ServiceRegister, helmManager helmmanagement.HelmManager) (*PublishService, *echo.Echo) {
+func TestGetPublishedServices(t *testing.T) {
+ serviceUnderTest := NewPublishService(nil, nil, nil)
+
+ profiles := make([]publishapi.AefProfile, 1)
+ serviceDescription := publishapi.ServiceAPIDescription{
+ AefProfiles: &profiles,
+ }
+ serviceUnderTest.publishedServices["publisher1"] = []publishapi.ServiceAPIDescription{
+ serviceDescription,
+ }
+ serviceUnderTest.publishedServices["publisher2"] = []publishapi.ServiceAPIDescription{
+ serviceDescription,
+ }
+ result := serviceUnderTest.GetAllPublishedServices()
+ assert.Len(t, result, 2)
+}
+
+func TestUpdateDescription(t *testing.T) {
+ apfId := "apfId"
+ serviceApiId := "serviceApiId"
+ aefId := "aefId"
+ apiName := "apiName"
+ description := "description"
+ serviceRegisterMock := serviceMocks.ServiceRegister{}
+ 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, eventChannel, requestHandler := getEcho(&serviceRegisterMock, &helmManagerMock)
+
+ serviceDescription := getServiceAPIDescription(aefId, apiName, description)
+ serviceDescription.ApiId = &serviceApiId
+ serviceUnderTest.publishedServices[apfId] = []publishapi.ServiceAPIDescription{serviceDescription}
+
+ //Modify the service
+ updatedServiceDescription := getServiceAPIDescription(aefId, apiName, description)
+ updatedServiceDescription.ApiId = &description
+ newDescription := "new description"
+ updatedServiceDescription.Description = &newDescription
+ result := testutil.NewRequest().Put("/"+apfId+"/service-apis/"+serviceApiId).WithJsonBody(updatedServiceDescription).Go(t, requestHandler)
+
+ var resultService publishapi.ServiceAPIDescription
+ assert.Equal(t, http.StatusOK, result.Code())
+ err := result.UnmarshalBodyToObject(&resultService)
+ assert.NoError(t, err, "error unmarshaling response")
+ assert.Equal(t, resultService.Description, &newDescription)
+
+ if publishEvent, ok := waitForEvent(eventChannel, 1*time.Second); ok {
+ assert.Fail(t, "No event sent")
+ } else {
+ assert.Equal(t, *resultService.ApiId, (*publishEvent.EventDetail.ApiIds)[0])
+ assert.Equal(t, eventsapi.CAPIFEventSERVICEAPIUPDATE, publishEvent.Events)
+ }
+}
+
+func getEcho(serviceRegister providermanagement.ServiceRegister, helmManager helmmanagement.HelmManager) (*PublishService, chan eventsapi.EventNotification, *echo.Echo) {
swagger, err := publishapi.GetSwagger()
if err != nil {
fmt.Fprintf(os.Stderr, "Error loading swagger spec\n: %s", err)
swagger.Servers = nil
- ps := NewPublishService(serviceRegister, helmManager)
+ eventChannel := make(chan eventsapi.EventNotification)
+ ps := NewPublishService(serviceRegister, helmManager, eventChannel)
e := echo.New()
e.Use(echomiddleware.Logger())
e.Use(middleware.OapiRequestValidator(swagger))
publishapi.RegisterHandlers(e, ps)
- return ps, e
+ return ps, eventChannel, e
}
func getServiceAPIDescription(aefId, apiName, description string) publishapi.ServiceAPIDescription {
Description: &description,
}
}
+
+// waitForEvent waits for the channel to receive an event for the specified max timeout.
+// Returns true if waiting timed out.
+func waitForEvent(ch chan eventsapi.EventNotification, timeout time.Duration) (*eventsapi.EventNotification, bool) {
+ select {
+ case event := <-ch:
+ return &event, false // completed normally
+ case <-time.After(timeout):
+ return nil, true // timed out
+ }
+}