X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=capifcore%2Finternal%2Finvokermanagement%2Finvokermanagement.go;fp=capifcore%2Finternal%2Finvokermanagement%2Finvokermanagement.go;h=9025f83e602bec08b7b945af4de3a8e4b8effdbe;hb=6edc6544f698b8f5d923f3b2717ab103b7473dfe;hp=52b86cd8f00f92f82a645e4ac2c1f9355257c4a0;hpb=3928f2d539956636d31902d9e3650a3a50410df3;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/invokermanagement/invokermanagement.go b/capifcore/internal/invokermanagement/invokermanagement.go
index 52b86cd..9025f83 100644
--- a/capifcore/internal/invokermanagement/invokermanagement.go
+++ b/capifcore/internal/invokermanagement/invokermanagement.go
@@ -89,11 +89,11 @@ func (im *InvokerManager) VerifyInvokerSecret(invokerId, secret string) bool {
 }
 
 func (im *InvokerManager) GetInvokerApiList(invokerId string) *invokerapi.APIList {
+	var apiList invokerapi.APIList = im.publishRegister.GetAllPublishedServices()
+	im.lock.Lock()
+	defer im.lock.Unlock()
 	invoker, ok := im.onboardedInvokers[invokerId]
 	if ok {
-		var apiList invokerapi.APIList = im.publishRegister.GetAllPublishedServices()
-		im.lock.Lock()
-		defer im.lock.Unlock()
 		invoker.ApiList = &apiList
 		return &apiList
 	}
@@ -153,15 +153,21 @@ func getOnboardingSecret(newInvoker invokerapi.APIInvokerEnrolmentDetails) *stri
 
 // 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()
+	if _, ok := im.onboardedInvokers[onboardingId]; ok {
+		im.deleteInvoker(onboardingId)
+	}
 
 	go im.sendEvent(onboardingId, eventsapi.CAPIFEventAPIINVOKEROFFBOARDED)
 
 	return ctx.NoContent(http.StatusNoContent)
 }
 
+func (im *InvokerManager) deleteInvoker(onboardingId string) {
+	im.lock.Lock()
+	defer im.lock.Unlock()
+	delete(im.onboardedInvokers, onboardingId)
+}
+
 // Updates an individual API invoker details.
 func (im *InvokerManager) PutOnboardedInvokersOnboardingId(ctx echo.Context, onboardingId string) error {
 	var invoker invokerapi.APIInvokerEnrolmentDetails
@@ -180,9 +186,7 @@ func (im *InvokerManager) PutOnboardedInvokersOnboardingId(ctx echo.Context, onb
 	}
 
 	if _, ok := im.onboardedInvokers[onboardingId]; ok {
-		im.lock.Lock()
-		im.onboardedInvokers[*invoker.ApiInvokerId] = invoker
-		im.lock.Unlock()
+		im.updateInvoker(invoker)
 	} else {
 		return sendCoreError(ctx, http.StatusNotFound, "The invoker to update has not been onboarded")
 	}
@@ -196,6 +200,12 @@ func (im *InvokerManager) PutOnboardedInvokersOnboardingId(ctx echo.Context, onb
 	return nil
 }
 
+func (im *InvokerManager) updateInvoker(invoker invokerapi.APIInvokerEnrolmentDetails) {
+	im.lock.Lock()
+	defer im.lock.Unlock()
+	im.onboardedInvokers[*invoker.ApiInvokerId] = invoker
+}
+
 func (im *InvokerManager) ModifyIndApiInvokeEnrolment(ctx echo.Context, onboardingId string) error {
 	return ctx.NoContent(http.StatusNotImplemented)
 }