Merge "Adding Capif provider"

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

diff --git a/capifcore/internal/discoverservice/discoverservice.go b/capifcore/internal/discoverservice/discoverservice.go
index 797eaa7..511dbe0 100644 (file)
--- a/capifcore/internal/discoverservice/discoverservice.go
+++ b/capifcore/internal/discoverservice/discoverservice.go
@@ -21,6 +21,7 @@
 package discoverservice
 
 import (
+       "fmt"
        "net/http"
 
        "oransc.org/nonrtric/capifcore/internal/common29122"
@@ -45,7 +46,7 @@ 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"
@@ -141,18 +142,12 @@ func checkVersion(version publishapi.Version, wantedVersion *string, commType *p
 }
 
 func checkCommType(resources *[]publishapi.Resource, commType *publishapi.CommunicationType) bool {
-       match := false
-       if commType != nil {
-               for _, resource := range *resources {
-                       if resource.CommType == *commType {
-                               match = true
-                               break
-                       }
+       for _, resource := range *resources {
+               if resource.CommType == *commType {
+                       return true
                }
-       } else {
-               match = true
        }
-       return match
+       return false
 }
 
 // This function wraps sending of an error in the Error format, and