Improve locking/unlocking

[nonrtric/plt/sme.git] / capifcore / internal / invokermanagement / invokermanagement.go

diff --git a/capifcore/internal/invokermanagement/invokermanagement.go b/capifcore/internal/invokermanagement/invokermanagement.go
index 7f5782e..52b86cd 100644 (file)
--- a/capifcore/internal/invokermanagement/invokermanagement.go
+++ b/capifcore/internal/invokermanagement/invokermanagement.go
@@ -27,6 +27,7 @@ import (
        "strings"
        "sync"
 
+       "oransc.org/nonrtric/capifcore/internal/eventsapi"
        publishapi "oransc.org/nonrtric/capifcore/internal/publishserviceapi"
 
        "oransc.org/nonrtric/capifcore/internal/common29122"
@@ -39,8 +40,14 @@ import (
 
 //go:generate mockery --name InvokerRegister
 type InvokerRegister interface {
+       // Checks if the invoker is registered.
+       // Returns true of the provided invoker is registered, false otherwise.
        IsInvokerRegistered(invokerId string) bool
+       // Verifies that the provided secret is the invoker's registered secret.
+       // Returns true if the provided secret is the registered invoker's secret, false otherwise.
        VerifyInvokerSecret(invokerId, secret string) bool
+       // Gets the provided invoker's registered APIs.
+       // Returns a list of all the invoker's registered APIs.
        GetInvokerApiList(invokerId string) *invokerapi.APIList
 }
 
@@ -48,14 +55,17 @@ type InvokerManager struct {
        onboardedInvokers map[string]invokerapi.APIInvokerEnrolmentDetails
        publishRegister   publishservice.PublishRegister
        nextId            int64
+       eventChannel      chan<- eventsapi.EventNotification
        lock              sync.Mutex
 }
 
-func NewInvokerManager(publishRegister publishservice.PublishRegister) *InvokerManager {
+// Creates a manager that implements both the InvokerRegister and the invokermanagementapi.ServerInterface interfaces.
+func NewInvokerManager(publishRegister publishservice.PublishRegister, eventChannel chan<- eventsapi.EventNotification) *InvokerManager {
        return &InvokerManager{
                onboardedInvokers: make(map[string]invokerapi.APIInvokerEnrolmentDetails),
                publishRegister:   publishRegister,
                nextId:            1000,
+               eventChannel:      eventChannel,
        }
 }
 
@@ -81,11 +91,16 @@ func (im *InvokerManager) VerifyInvokerSecret(invokerId, secret string) bool {
 func (im *InvokerManager) GetInvokerApiList(invokerId string) *invokerapi.APIList {
        invoker, ok := im.onboardedInvokers[invokerId]
        if ok {
-               return invoker.ApiList
+               var apiList invokerapi.APIList = im.publishRegister.GetAllPublishedServices()
+               im.lock.Lock()
+               defer im.lock.Unlock()
+               invoker.ApiList = &apiList
+               return &apiList
        }
        return nil
 }
 
+// Creates a new individual API Invoker profile.
 func (im *InvokerManager) PostOnboardedInvokers(ctx echo.Context) error {
        var newInvoker invokerapi.APIInvokerEnrolmentDetails
        err := ctx.Bind(&newInvoker)
@@ -98,19 +113,9 @@ func (im *InvokerManager) PostOnboardedInvokers(ctx echo.Context) error {
                return coreError
        }
 
-       im.lock.Lock()
-       defer im.lock.Unlock()
+       im.prepareNewInvoker(&newInvoker)
 
-       newInvoker.ApiInvokerId = im.getId(newInvoker.ApiInvokerInformation)
-       onboardingSecret := "onboarding_secret_"
-       if newInvoker.ApiInvokerInformation != nil {
-               onboardingSecret = onboardingSecret + strings.ReplaceAll(*newInvoker.ApiInvokerInformation, " ", "_")
-       } else {
-               onboardingSecret = onboardingSecret + *newInvoker.ApiInvokerId
-       }
-       newInvoker.OnboardingInformation.OnboardingSecret = &onboardingSecret
-
-       im.onboardedInvokers[*newInvoker.ApiInvokerId] = newInvoker
+       go im.sendEvent(*newInvoker.ApiInvokerId, eventsapi.CAPIFEventAPIINVOKERONBOARDED)
 
        uri := ctx.Request().Host + ctx.Request().URL.String()
        ctx.Response().Header().Set(echo.HeaderLocation, ctx.Scheme()+`://`+path.Join(uri, *newInvoker.ApiInvokerId))
@@ -123,15 +128,41 @@ func (im *InvokerManager) PostOnboardedInvokers(ctx echo.Context) error {
        return nil
 }
 
-func (im *InvokerManager) DeleteOnboardedInvokersOnboardingId(ctx echo.Context, onboardingId string) error {
+func (im *InvokerManager) prepareNewInvoker(newInvoker *invokerapi.APIInvokerEnrolmentDetails) {
        im.lock.Lock()
        defer im.lock.Unlock()
 
+       newInvoker.ApiInvokerId = im.getId(newInvoker.ApiInvokerInformation)
+       newInvoker.OnboardingInformation.OnboardingSecret = getOnboardingSecret(*newInvoker)
+
+       var apiList invokerapi.APIList = im.publishRegister.GetAllPublishedServices()
+       newInvoker.ApiList = &apiList
+
+       im.onboardedInvokers[*newInvoker.ApiInvokerId] = *newInvoker
+}
+
+func getOnboardingSecret(newInvoker invokerapi.APIInvokerEnrolmentDetails) *string {
+       onboardingSecret := "onboarding_secret_"
+       if newInvoker.ApiInvokerInformation != nil {
+               onboardingSecret = onboardingSecret + strings.ReplaceAll(*newInvoker.ApiInvokerInformation, " ", "_")
+       } else {
+               onboardingSecret = onboardingSecret + *newInvoker.ApiInvokerId
+       }
+       return &onboardingSecret
+}
+
+// Deletes an individual API Invoker.
+func (im *InvokerManager) DeleteOnboardedInvokersOnboardingId(ctx echo.Context, onboardingId string) error {
+       im.lock.Lock()
        delete(im.onboardedInvokers, onboardingId)
+       im.lock.Unlock()
+
+       go im.sendEvent(onboardingId, eventsapi.CAPIFEventAPIINVOKEROFFBOARDED)
 
        return ctx.NoContent(http.StatusNoContent)
 }
 
+// Updates an individual API invoker details.
 func (im *InvokerManager) PutOnboardedInvokersOnboardingId(ctx echo.Context, onboardingId string) error {
        var invoker invokerapi.APIInvokerEnrolmentDetails
        err := ctx.Bind(&invoker)
@@ -148,11 +179,10 @@ func (im *InvokerManager) PutOnboardedInvokersOnboardingId(ctx echo.Context, onb
                return coreError
        }
 
-       im.lock.Lock()
-       defer im.lock.Unlock()
-
        if _, ok := im.onboardedInvokers[onboardingId]; ok {
+               im.lock.Lock()
                im.onboardedInvokers[*invoker.ApiInvokerId] = invoker
+               im.lock.Unlock()
        } else {
                return sendCoreError(ctx, http.StatusNotFound, "The invoker to update has not been onboarded")
        }
@@ -204,6 +234,17 @@ func (im *InvokerManager) getId(invokerInfo *string) *string {
        return &idAsString
 }
 
+func (im *InvokerManager) sendEvent(invokerId string, eventType eventsapi.CAPIFEvent) {
+       invokerIds := []string{invokerId}
+       event := eventsapi.EventNotification{
+               EventDetail: &eventsapi.CAPIFEventDetail{
+                       ApiInvokerIds: &invokerIds,
+               },
+               Events: eventType,
+       }
+       im.eventChannel <- event
+}
+
 // This function wraps sending of an error in the Error format, and
 // handling the failure to marshal that.
 func sendCoreError(ctx echo.Context, code int, message string) error {