X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Finvokermanagement%2Finvokermanagement.go;h=43bdc02591f279552b5c12dccdf403697ef8033c;hb=bf237808ac109b30461a453c59ff4e9cc9b297f4;hp=5d4ba2511f124f475337b4aa1cae9a39a7aeadc9;hpb=f62685e5a2187fb58c7f27cdd1f14dd2c152880d;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/invokermanagement/invokermanagement.go b/capifcore/internal/invokermanagement/invokermanagement.go
index 5d4ba25..43bdc02 100644
--- a/capifcore/internal/invokermanagement/invokermanagement.go
+++ b/capifcore/internal/invokermanagement/invokermanagement.go
@@ -21,14 +21,12 @@
 package invokermanagement
 
 import (
-	"errors"
 	"fmt"
 	"net/http"
 	"path"
 	"sync"
 
 	"oransc.org/nonrtric/capifcore/internal/eventsapi"
-	publishapi "oransc.org/nonrtric/capifcore/internal/publishserviceapi"
 
 	"oransc.org/nonrtric/capifcore/internal/common29122"
 	invokerapi "oransc.org/nonrtric/capifcore/internal/invokermanagementapi"
@@ -108,8 +106,8 @@ func (im *InvokerManager) PostOnboardedInvokers(ctx echo.Context) error {
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, "invalid format for invoker"))
 	}
 
-	if im.isInvokerOnboarded(newInvoker) {
-		return sendCoreError(ctx, http.StatusForbidden, fmt.Sprintf(errMsg, "invoker already onboarded"))
+	if err := im.isInvokerOnboarded(newInvoker); err != nil {
+		return sendCoreError(ctx, http.StatusForbidden, fmt.Sprintf(errMsg, err))
 	}
 
 	if err := im.validateInvoker(newInvoker, ctx); err != nil {
@@ -131,13 +129,13 @@ func (im *InvokerManager) PostOnboardedInvokers(ctx echo.Context) error {
 	return nil
 }
 
-func (im *InvokerManager) isInvokerOnboarded(newInvoker invokerapi.APIInvokerEnrolmentDetails) bool {
+func (im *InvokerManager) isInvokerOnboarded(newInvoker invokerapi.APIInvokerEnrolmentDetails) error {
 	for _, invoker := range im.onboardedInvokers {
-		if newInvoker.OnboardingInformation.ApiInvokerPublicKey == invoker.OnboardingInformation.ApiInvokerPublicKey {
-			return true
+		if err := invoker.ValidateAlreadyOnboarded(newInvoker); err != nil {
+			return err
 		}
 	}
-	return false
+	return nil
 }
 
 func (im *InvokerManager) prepareNewInvoker(newInvoker *invokerapi.APIInvokerEnrolmentDetails) {
@@ -214,20 +212,10 @@ func (im *InvokerManager) validateInvoker(invoker invokerapi.APIInvokerEnrolment
 	if err := invoker.Validate(); err != nil {
 		return err
 	}
-	if !im.areAPIsPublished(invoker.ApiList) {
-		return errors.New("some APIs needed by invoker are not registered")
-	}
 
 	return nil
 }
 
-func (im *InvokerManager) areAPIsPublished(apis *invokerapi.APIList) bool {
-	if apis == nil {
-		return true
-	}
-	return im.publishRegister.AreAPIsPublished((*[]publishapi.ServiceAPIDescription)(apis))
-}
-
 func (im *InvokerManager) sendEvent(invokerId string, eventType eventsapi.CAPIFEvent) {
 	invokerIds := []string{invokerId}
 	event := eventsapi.EventNotification{