Adaptation to new xApp Descriptor

[ric-plt/xapp-frame.git] / pkg / xapp / subscription.go

diff --git a/pkg/xapp/subscription.go b/pkg/xapp/subscription.go
index cf8dc04..4ecc262 100755 (executable)
--- a/pkg/xapp/subscription.go
+++ b/pkg/xapp/subscription.go
@@ -29,8 +29,9 @@ import (
        "github.com/go-openapi/strfmt"
        "github.com/spf13/viper"
        "io/ioutil"
+       "net"
        "net/http"
-       "strings"
+       "os"
        "time"
 
        apiclient "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/clientapi"
@@ -66,7 +67,11 @@ type Subscriber struct {
 
 func NewSubscriber(host string, timo int) *Subscriber {
        if host == "" {
-               host = "service-ricplt-submgr-http:8088"
+               pltnamespace := os.Getenv("PLT_NAMESPACE")
+               if pltnamespace == "" {
+                       pltnamespace = "ricplt"
+               }
+               host = fmt.Sprintf("service-%s-submgr-http.%s:8088", pltnamespace, pltnamespace)
        }
 
        if timo == 0 {
@@ -164,8 +169,9 @@ func (r *Subscriber) Notify(resp *models.SubscriptionResponse, clientEndpoint st
                return err
        }
 
-       port := strings.Split(viper.GetString("local.host"), ":")[1]
-       clientUrl := fmt.Sprintf("http://%s:%s%s", clientEndpoint, port, r.clientUrl)
+       ep, _, _ := net.SplitHostPort(clientEndpoint)
+       _, port, _ := net.SplitHostPort(fmt.Sprintf(":%d", GetPortData("http").Port))
+       clientUrl := fmt.Sprintf("http://%s:%s%s", ep, port, r.clientUrl)
 
        retries := viper.GetInt("subscription.retryCount")
        if retries == 0 {