X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Finvokermanagement%2Finvokermanagement.go;fp=capifcore%2Finternal%2Finvokermanagement%2Finvokermanagement.go;h=7f5782efffba4978bd30f77a7343c5a758edfdcd;hb=2ba4580c67fbe7994141e4cd2701f7bd22b69ebf;hp=20bba33de57264c87e51003fc335fb2600e8e889;hpb=f083d47095bf223383a4e6c17d895655b900f9de;p=nonrtric%2Fplt%2Fsme.git diff --git a/capifcore/internal/invokermanagement/invokermanagement.go b/capifcore/internal/invokermanagement/invokermanagement.go index 20bba33..7f5782e 100644 --- a/capifcore/internal/invokermanagement/invokermanagement.go +++ b/capifcore/internal/invokermanagement/invokermanagement.go @@ -46,15 +46,15 @@ type InvokerRegister interface { 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 { +func NewInvokerManager(publishRegister publishservice.PublishRegister) *InvokerManager { return &InvokerManager{ onboardedInvokers: make(map[string]invokerapi.APIInvokerEnrolmentDetails), - apiRegister: apiRegister, + publishRegister: publishRegister, nextId: 1000, } } @@ -179,18 +179,18 @@ func (im *InvokerManager) validateInvoker(invoker invokerapi.APIInvokerEnrolment return true, sendCoreError(ctx, http.StatusBadRequest, "Invoker missing required OnboardingInformation.ApiInvokerPublicKey") } - if !im.areAPIsRegistered(invoker.ApiList) { + if !im.areAPIsPublished(invoker.ApiList) { return true, sendCoreError(ctx, http.StatusBadRequest, "Some APIs needed by invoker are not registered") } 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 {