X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Fprovidermanagement%2Fprovidermanagement.go;h=6ca4a7c92b6b519fed6718c6c4bc40a0b6d1dfb8;hb=590dbe9389e8d8746bbcf30fc8b74d0f4ee81a1b;hp=82dfba2189d484a73866240642a788caf90c6f6d;hpb=c58285c8b76f7833877e328f94e947b0384c4a86;p=nonrtric%2Fplt%2Fsme.git diff --git a/capifcore/internal/providermanagement/providermanagement.go b/capifcore/internal/providermanagement/providermanagement.go index 82dfba2..6ca4a7c 100644 --- a/capifcore/internal/providermanagement/providermanagement.go +++ b/capifcore/internal/providermanagement/providermanagement.go @@ -24,7 +24,6 @@ import ( "fmt" "net/http" "path" - "strings" "sync" "github.com/labstack/echo/v4" @@ -42,219 +41,150 @@ type ServiceRegister interface { } type ProviderManager struct { - onboardedProviders map[string]provapi.APIProviderEnrolmentDetails - lock sync.Mutex + registeredProviders map[string]provapi.APIProviderEnrolmentDetails + lock sync.Mutex } func NewProviderManager() *ProviderManager { return &ProviderManager{ - onboardedProviders: make(map[string]provapi.APIProviderEnrolmentDetails), + registeredProviders: make(map[string]provapi.APIProviderEnrolmentDetails), } } func (pm *ProviderManager) IsFunctionRegistered(functionId string) bool { - registered := false -out: - for _, provider := range pm.onboardedProviders { - for _, registeredFunc := range *provider.ApiProvFuncs { - if *registeredFunc.ApiProvFuncId == functionId { - registered = true - break out - } + for _, provider := range pm.registeredProviders { + if provider.IsFunctionRegistered(functionId) { + return true } } - - return registered + return false } func (pm *ProviderManager) GetAefsForPublisher(apfId string) []string { - for _, provider := range pm.onboardedProviders { - for _, registeredFunc := range *provider.ApiProvFuncs { - if *registeredFunc.ApiProvFuncId == apfId && registeredFunc.ApiProvFuncRole == provapi.ApiProviderFuncRoleAPF { - return getExposedFuncs(provider.ApiProvFuncs) - } + for _, provider := range pm.registeredProviders { + if aefs := provider.GetExposingFunctionIdsForPublisher(apfId); aefs != nil { + return aefs } } return nil } -func getExposedFuncs(providerFuncs *[]provapi.APIProviderFunctionDetails) []string { - exposedFuncs := []string{} - for _, registeredFunc := range *providerFuncs { - if registeredFunc.ApiProvFuncRole == provapi.ApiProviderFuncRoleAEF { - exposedFuncs = append(exposedFuncs, *registeredFunc.ApiProvFuncId) - } - } - return exposedFuncs -} - func (pm *ProviderManager) PostRegistrations(ctx echo.Context) error { var newProvider provapi.APIProviderEnrolmentDetails - err := ctx.Bind(&newProvider) - if err != nil { - return sendCoreError(ctx, http.StatusBadRequest, "Invalid format for provider") + errMsg := "Unable to register provider due to %s" + if err := ctx.Bind(&newProvider); err != nil { + return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, "invalid format for provider")) } - if newProvider.ApiProvDomInfo == nil || *newProvider.ApiProvDomInfo == "" { - return sendCoreError(ctx, http.StatusBadRequest, "Provider missing required ApiProvDomInfo") + if pm.isProviderRegistered(newProvider) { + return sendCoreError(ctx, http.StatusForbidden, fmt.Sprintf(errMsg, "provider already registered")) } - pm.lock.Lock() - defer pm.lock.Unlock() - - newProvider.ApiProvDomId = pm.getDomainId(newProvider.ApiProvDomInfo) + if err := newProvider.Validate(); err != nil { + return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err)) + } - pm.registerFunctions(newProvider.ApiProvFuncs) - pm.onboardedProviders[*newProvider.ApiProvDomId] = newProvider + pm.prepareNewProvider(&newProvider) uri := ctx.Request().Host + ctx.Request().URL.String() ctx.Response().Header().Set(echo.HeaderLocation, ctx.Scheme()+`://`+path.Join(uri, *newProvider.ApiProvDomId)) - err = ctx.JSON(http.StatusCreated, newProvider) - if err != nil { + if err := ctx.JSON(http.StatusCreated, newProvider); err != nil { // Something really bad happened, tell Echo that our handler failed return err } - return nil } -func (pm *ProviderManager) DeleteRegistrationsRegistrationId(ctx echo.Context, registrationId string) error { +func (pm *ProviderManager) isProviderRegistered(newProvider provapi.APIProviderEnrolmentDetails) bool { + for _, prov := range pm.registeredProviders { + if newProvider.RegSec == prov.RegSec { + return true + } + } + return false +} + +func (pm *ProviderManager) prepareNewProvider(newProvider *provapi.APIProviderEnrolmentDetails) { pm.lock.Lock() defer pm.lock.Unlock() - log.Debug(pm.onboardedProviders) - if _, ok := pm.onboardedProviders[registrationId]; ok { - log.Debug("Deleting provider", registrationId) - delete(pm.onboardedProviders, registrationId) - } + newProvider.PrepareNewProvider() + pm.registeredProviders[*newProvider.ApiProvDomId] = *newProvider +} +func (pm *ProviderManager) DeleteRegistrationsRegistrationId(ctx echo.Context, registrationId string) error { + log.Debug(pm.registeredProviders) + if _, ok := pm.registeredProviders[registrationId]; ok { + pm.deleteProvider(registrationId) + } return ctx.NoContent(http.StatusNoContent) } -func (pm *ProviderManager) PutRegistrationsRegistrationId(ctx echo.Context, registrationId string) error { +func (pm *ProviderManager) deleteProvider(registrationId string) { + log.Debug("Deleting provider", registrationId) pm.lock.Lock() defer pm.lock.Unlock() + delete(pm.registeredProviders, registrationId) +} - registeredProvider, shouldReturn, returnValue := pm.checkIfProviderIsRegistered(registrationId, ctx) - if shouldReturn { - return returnValue +func (pm *ProviderManager) PutRegistrationsRegistrationId(ctx echo.Context, registrationId string) error { + errMsg := "Unable to update provider due to %s." + registeredProvider, err := pm.checkIfProviderIsRegistered(registrationId, ctx) + if err != nil { + return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err)) } - updatedProvider, shouldReturn1, returnValue1 := getProviderFromRequest(ctx) - if shouldReturn1 { - return returnValue1 + updatedProvider, err := getProviderFromRequest(ctx) + if err != nil { + return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err)) } - if updatedProvider.ApiProvDomInfo != nil { - registeredProvider.ApiProvDomInfo = updatedProvider.ApiProvDomInfo + if updatedProvider.Validate() != nil { + return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err)) } - shouldReturn, returnValue = pm.updateFunctions(updatedProvider, registeredProvider, ctx) - if shouldReturn { - return returnValue + if err = pm.updateProvider(updatedProvider, registeredProvider); err != nil { + return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err)) } - err := ctx.JSON(http.StatusOK, pm.onboardedProviders[registrationId]) - if err != nil { + if err = ctx.JSON(http.StatusOK, updatedProvider); err != nil { // Something really bad happened, tell Echo that our handler failed return err } - return nil } -func (pm *ProviderManager) checkIfProviderIsRegistered(registrationId string, ctx echo.Context) (provapi.APIProviderEnrolmentDetails, bool, error) { - registeredProvider, ok := pm.onboardedProviders[registrationId] +func (pm *ProviderManager) ModifyIndApiProviderEnrolment(ctx echo.Context, registrationId string) error { + return ctx.NoContent(http.StatusNotImplemented) +} + +func (pm *ProviderManager) checkIfProviderIsRegistered(registrationId string, ctx echo.Context) (*provapi.APIProviderEnrolmentDetails, error) { + registeredProvider, ok := pm.registeredProviders[registrationId] if !ok { - return provapi.APIProviderEnrolmentDetails{}, true, sendCoreError(ctx, http.StatusBadRequest, "Provider must be onboarded before updating it") + return nil, fmt.Errorf("provider not onboarded") } - return registeredProvider, false, nil + return ®isteredProvider, nil } -func getProviderFromRequest(ctx echo.Context) (provapi.APIProviderEnrolmentDetails, bool, error) { +func getProviderFromRequest(ctx echo.Context) (provapi.APIProviderEnrolmentDetails, error) { var updatedProvider provapi.APIProviderEnrolmentDetails err := ctx.Bind(&updatedProvider) if err != nil { - return provapi.APIProviderEnrolmentDetails{}, true, sendCoreError(ctx, http.StatusBadRequest, "Invalid format for provider") - } - return updatedProvider, false, nil -} - -func (pm *ProviderManager) updateFunctions(updatedProvider provapi.APIProviderEnrolmentDetails, registeredProvider provapi.APIProviderEnrolmentDetails, ctx echo.Context) (bool, error) { - for _, function := range *updatedProvider.ApiProvFuncs { - if function.ApiProvFuncId == nil { - pm.addFunction(function, registeredProvider) - } else { - shouldReturn, returnValue := pm.updateFunction(function, registeredProvider, ctx) - if shouldReturn { - return true, returnValue - } - } + return provapi.APIProviderEnrolmentDetails{}, fmt.Errorf("invalid format for provider") } - return false, nil -} - -func (pm *ProviderManager) addFunction(function provapi.APIProviderFunctionDetails, registeredProvider provapi.APIProviderEnrolmentDetails) { - function.ApiProvFuncId = pm.getFuncId(function.ApiProvFuncRole, function.ApiProvFuncInfo) - registeredFuncs := *registeredProvider.ApiProvFuncs - newFuncs := append(registeredFuncs, function) - registeredProvider.ApiProvFuncs = &newFuncs - pm.onboardedProviders[*registeredProvider.ApiProvDomId] = registeredProvider + return updatedProvider, nil } -func (*ProviderManager) updateFunction(function provapi.APIProviderFunctionDetails, registeredProvider provapi.APIProviderEnrolmentDetails, ctx echo.Context) (bool, error) { - pos, registeredFunction, err := getApiFunc(*function.ApiProvFuncId, registeredProvider.ApiProvFuncs) - if err != nil { - return true, sendCoreError(ctx, http.StatusBadRequest, "Unable to update provider due to: "+err.Error()) - } - if function.ApiProvFuncInfo != nil { - registeredFunction.ApiProvFuncInfo = function.ApiProvFuncInfo - (*registeredProvider.ApiProvFuncs)[pos] = registeredFunction - } - return false, nil -} - -func getApiFunc(funcId string, apiFunctions *[]provapi.APIProviderFunctionDetails) (int, provapi.APIProviderFunctionDetails, error) { - for pos, function := range *apiFunctions { - if *function.ApiProvFuncId == funcId { - return pos, function, nil - } - } - return 0, provapi.APIProviderFunctionDetails{}, fmt.Errorf("function with ID %s is not registered for the provider", funcId) -} - -func (pm *ProviderManager) ModifyIndApiProviderEnrolment(ctx echo.Context, registrationId string) error { - return ctx.NoContent(http.StatusNotImplemented) -} - -func (pm *ProviderManager) registerFunctions(provFuncs *[]provapi.APIProviderFunctionDetails) { - if provFuncs == nil { - return - } - for i, provFunc := range *provFuncs { - (*provFuncs)[i].ApiProvFuncId = pm.getFuncId(provFunc.ApiProvFuncRole, provFunc.ApiProvFuncInfo) - } -} - -func (pm *ProviderManager) getDomainId(domainInfo *string) *string { - idAsString := "domain_id_" + strings.ReplaceAll(*domainInfo, " ", "_") - return &idAsString -} +func (pm *ProviderManager) updateProvider(updatedProvider provapi.APIProviderEnrolmentDetails, registeredProvider *provapi.APIProviderEnrolmentDetails) error { + pm.lock.Lock() + defer pm.lock.Unlock() -func (pm *ProviderManager) getFuncId(role provapi.ApiProviderFuncRole, funcInfo *string) *string { - var idPrefix string - switch role { - case provapi.ApiProviderFuncRoleAPF: - idPrefix = "APF_id_" - case provapi.ApiProviderFuncRoleAMF: - idPrefix = "AMF_id_" - case provapi.ApiProviderFuncRoleAEF: - idPrefix = "AEF_id_" - default: - idPrefix = "function_id_" + if err := updatedProvider.UpdateFuncs(*registeredProvider); err == nil { + pm.registeredProviders[*updatedProvider.ApiProvDomId] = updatedProvider + return nil + } else { + return err } - idAsString := idPrefix + strings.ReplaceAll(*funcInfo, " ", "_") - return &idAsString } // This function wraps sending of an error in the Error format, and