X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Finvokermanagement%2Finvokermanagement.go;h=69d7149144f8a5e36c642dbb9e7d8ef6b7b40227;hb=0b4c4ecb52b1c04037a65644dc8c6c29981d9736;hp=2de6ca66bb571bcacbcd8cf64700a00c4dc01b15;hpb=a3a54cad38108ae4f753eae6bc90ca1357defe4f;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/invokermanagement/invokermanagement.go b/capifcore/internal/invokermanagement/invokermanagement.go
index 2de6ca6..69d7149 100644
--- a/capifcore/internal/invokermanagement/invokermanagement.go
+++ b/capifcore/internal/invokermanagement/invokermanagement.go
@@ -39,22 +39,29 @@ 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
 }
 
 type InvokerManager struct {
 	onboardedInvokers map[string]invokerapi.APIInvokerEnrolmentDetails
-	apiRegister       publishservice.APIRegister
+	publishRegister   publishservice.PublishRegister
 	nextId            int64
 	lock              sync.Mutex
 }
 
-func NewInvokerManager(apiRegister publishservice.APIRegister) *InvokerManager {
+// Creates a manager that implements both the InvokerRegister and the invokermanagementapi.ServerInterface interfaces.
+func NewInvokerManager(publishRegister publishservice.PublishRegister) *InvokerManager {
 	return &InvokerManager{
 		onboardedInvokers: make(map[string]invokerapi.APIInvokerEnrolmentDetails),
-		apiRegister:       apiRegister,
+		publishRegister:   publishRegister,
 		nextId:            1000,
 	}
 }
@@ -86,6 +93,7 @@ func (im *InvokerManager) GetInvokerApiList(invokerId string) *invokerapi.APILis
 	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)
@@ -93,8 +101,8 @@ func (im *InvokerManager) PostOnboardedInvokers(ctx echo.Context) error {
 		return sendCoreError(ctx, http.StatusBadRequest, "Invalid format for invoker")
 	}
 
-	coreError := im.validateInvoker(newInvoker, ctx)
-	if coreError != nil {
+	shouldReturn, coreError := im.validateInvoker(newInvoker, ctx)
+	if shouldReturn {
 		return coreError
 	}
 
@@ -110,6 +118,9 @@ func (im *InvokerManager) PostOnboardedInvokers(ctx echo.Context) error {
 	}
 	newInvoker.OnboardingInformation.OnboardingSecret = &onboardingSecret
 
+	var apiList invokerapi.APIList = im.publishRegister.GetAllPublishedServices()
+	newInvoker.ApiList = &apiList
+
 	im.onboardedInvokers[*newInvoker.ApiInvokerId] = newInvoker
 
 	uri := ctx.Request().Host + ctx.Request().URL.String()
@@ -123,6 +134,7 @@ func (im *InvokerManager) PostOnboardedInvokers(ctx echo.Context) error {
 	return nil
 }
 
+// Deletes an individual API Invoker.
 func (im *InvokerManager) DeleteOnboardedInvokersOnboardingId(ctx echo.Context, onboardingId string) error {
 	im.lock.Lock()
 	defer im.lock.Unlock()
@@ -132,6 +144,7 @@ func (im *InvokerManager) DeleteOnboardedInvokersOnboardingId(ctx echo.Context,
 	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)
@@ -143,8 +156,8 @@ func (im *InvokerManager) PutOnboardedInvokersOnboardingId(ctx echo.Context, onb
 		return sendCoreError(ctx, http.StatusBadRequest, "Invoker ApiInvokerId not matching")
 	}
 
-	coreError := im.validateInvoker(invoker, ctx)
-	if coreError != nil {
+	shouldReturn, coreError := im.validateInvoker(invoker, ctx)
+	if shouldReturn {
 		return coreError
 	}
 
@@ -170,27 +183,27 @@ func (im *InvokerManager) ModifyIndApiInvokeEnrolment(ctx echo.Context, onboardi
 	return ctx.NoContent(http.StatusNotImplemented)
 }
 
-func (im *InvokerManager) validateInvoker(invoker invokerapi.APIInvokerEnrolmentDetails, ctx echo.Context) error {
+func (im *InvokerManager) validateInvoker(invoker invokerapi.APIInvokerEnrolmentDetails, ctx echo.Context) (bool, error) {
 	if invoker.NotificationDestination == "" {
-		return sendCoreError(ctx, http.StatusBadRequest, "Invoker missing required NotificationDestination")
+		return true, sendCoreError(ctx, http.StatusBadRequest, "Invoker missing required NotificationDestination")
 	}
 
 	if invoker.OnboardingInformation.ApiInvokerPublicKey == "" {
-		return sendCoreError(ctx, http.StatusBadRequest, "Invoker missing required OnboardingInformation.ApiInvokerPublicKey")
+		return true, sendCoreError(ctx, http.StatusBadRequest, "Invoker missing required OnboardingInformation.ApiInvokerPublicKey")
 	}
 
-	if !im.areAPIsRegistered(invoker.ApiList) {
-		return sendCoreError(ctx, http.StatusBadRequest, "Some APIs needed by invoker are not registered")
+	if !im.areAPIsPublished(invoker.ApiList) {
+		return true, sendCoreError(ctx, http.StatusBadRequest, "Some APIs needed by invoker are not registered")
 	}
 
-	return nil
+	return false, nil
 }
 
-func (im *InvokerManager) areAPIsRegistered(apis *invokerapi.APIList) bool {
+func (im *InvokerManager) areAPIsPublished(apis *invokerapi.APIList) bool {
 	if apis == nil {
 		return true
 	}
-	return im.apiRegister.AreAPIsRegistered((*[]publishapi.ServiceAPIDescription)(apis))
+	return im.publishRegister.AreAPIsPublished((*[]publishapi.ServiceAPIDescription)(apis))
 }
 
 func (im *InvokerManager) getId(invokerInfo *string) *string {