X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Frestendpoint.go;h=96df505375674de2e37092cfa3cd4117ce552c52;hb=da34eecb23220659f8d519973c03d29444797998;hp=b872c47c09b10f8facc2c24426353becbed66bd4;hpb=5ae07f45858be99f4309cb75461fb0283ebdc892;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/restendpoint.go b/pkg/control/restendpoint.go
index b872c47..96df505 100644
--- a/pkg/control/restendpoint.go
+++ b/pkg/control/restendpoint.go
@@ -22,6 +22,7 @@ package control
 import (
 	"fmt"
 	"strconv"
+	"strings"
 
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
@@ -38,12 +39,6 @@ func ConstructEndpointAddresses(clientEndpoint models.SubscriptionParamsClientEn
 	var xAppHTTPEndPoint string
 	var xAppRMREndPoint string
 
-	if *clientEndpoint.HTTPPort > 0 {
-		xAppHTTPEndPoint = host + ":" + strconv.FormatInt(*clientEndpoint.HTTPPort, 10)
-	}
-	if *clientEndpoint.RMRPort > 0 {
-		xAppRMREndPoint = host + ":" + strconv.FormatInt(*clientEndpoint.RMRPort, 10)
-	}
 	if host == "" || (HTTP_port == 0 && RMR_port == 0) {
 		err := fmt.Errorf("ClientEndpoint aprovided no PORT numbers")
 		return "INVALID_HTTP_ADDRESS:" + host + (string)(*clientEndpoint.HTTPPort),
@@ -51,6 +46,16 @@ func ConstructEndpointAddresses(clientEndpoint models.SubscriptionParamsClientEn
 			err
 	}
 
+	if *clientEndpoint.HTTPPort > 0 {
+		xAppHTTPEndPoint = host + ":" + strconv.FormatInt(*clientEndpoint.HTTPPort, 10)
+	}
+	if *clientEndpoint.RMRPort > 0 {
+		if i := strings.Index(host, "http"); i != -1 {
+			host = strings.Replace(host, "http", "rmr", -1)
+		}
+		xAppRMREndPoint = host + ":" + strconv.FormatInt(*clientEndpoint.RMRPort, 10)
+	}
+
 	xapp.Logger.Info("xAppHttpEndPoint=%v, xAppRrmEndPoint=%v", xAppHTTPEndPoint, xAppRMREndPoint)
 
 	return xAppHTTPEndPoint, xAppRMREndPoint, nil