Roll versions after J-Relase (master branch)

[nonrtric/plt/sme.git] / capifcore / internal / discoverservice / discoverservice.go

diff --git a/capifcore/internal/discoverservice/discoverservice.go b/capifcore/internal/discoverservice/discoverservice.go
index 4ab8a92..82b5972 100644 (file)
--- a/capifcore/internal/discoverservice/discoverservice.go
+++ b/capifcore/internal/discoverservice/discoverservice.go
@@ -3,6 +3,7 @@
 //   O-RAN-SC
 //   %%
 //   Copyright (C) 2022: Nordix Foundation
+//   Copyright (C) 2023: OpenInfra Foundation Europe.
 //   %%
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@
 package discoverservice
 
 import (
+       "fmt"
        "net/http"
 
        "oransc.org/nonrtric/capifcore/internal/common29122"
@@ -45,20 +47,14 @@ func NewDiscoverService(invokerRegister invokermanagement.InvokerRegister) *Disc
 func (ds *DiscoverService) GetAllServiceAPIs(ctx echo.Context, params discoverapi.GetAllServiceAPIsParams) error {
        allApis := ds.invokerRegister.GetInvokerApiList(params.ApiInvokerId)
        if allApis == nil {
-               return sendCoreError(ctx, http.StatusNotFound, "Invoker not registered")
+               return sendCoreError(ctx, http.StatusNotFound, fmt.Sprintf("Invoker %s not registered", params.ApiInvokerId))
        }
+
        filteredApis := []publishapi.ServiceAPIDescription{}
-       gatewayDomain := "r1-expo-func-aef"
        for _, api := range *allApis {
-               if !matchesFilter(api, params) {
-                       continue
-               }
-               profiles := *api.AefProfiles
-               for i, profile := range profiles {
-                       profile.DomainName = &gatewayDomain // Hardcoded for now. Should be provided through some other mechanism.
-                       profiles[i] = profile
+               if matchesFilter(api, params) {
+                       filteredApis = append(filteredApis, api)
                }
-               filteredApis = append(filteredApis, api)
        }
        discoveredApis := discoverapi.DiscoveredAPIs{
                ServiceAPIDescriptions: &filteredApis,