X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fnbi.go;h=ddbf34739ba0839eddcb48a4ee29af5558b62f6c;hb=45b86cc64dc6071f160b0f2c9ab8dfb57d1ce039;hp=2b9fa994f0da7b4ac7870c9d89098d220d662be3;hpb=aaf8d396257a455247b24716a32b05fc3fd145c2;p=ric-plt%2Frtmgr.git

diff --git a/pkg/nbi/nbi.go b/pkg/nbi/nbi.go
index 2b9fa99..ddbf347 100644
--- a/pkg/nbi/nbi.go
+++ b/pkg/nbi/nbi.go
@@ -14,6 +14,11 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+   This source code is part of the near-RT RIC (RAN Intelligent Controller)
+   platform project (RICP).
+
 ==================================================================================
 */
 /*
@@ -26,15 +31,16 @@ package nbi
 
 import (
 	"errors"
-	httptransport "github.com/go-openapi/runtime/client"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
 	"net/url"
 	apiclient "routing-manager/pkg/appmgr_client"
 	"routing-manager/pkg/appmgr_client/operations"
 	"routing-manager/pkg/appmgr_model"
-	"routing-manager/pkg/rtmgr"
 	"time"
+
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+	httptransport "github.com/go-openapi/runtime/client"
+	"github.com/go-openapi/strfmt"
+	"github.com/go-openapi/swag"
 )
 
 var (
@@ -70,13 +76,17 @@ func GetNbi(nbiName string) (Engine, error) {
 
 func CreateSubReq(restUrl string, restPort string) *appmgr_model.SubscriptionRequest {
 	// TODO: parameterize function
-	subReq := appmgr_model.SubscriptionRequest{
+	subData := appmgr_model.SubscriptionData{
 		TargetURL:  swag.String(restUrl + ":" + restPort + "/ric/v1/handles/xapp-handle/"),
-		EventType:  swag.String("all"),
+		EventType:  appmgr_model.EventTypeAll,
 		MaxRetries: swag.Int64(5),
 		RetryTimer: swag.Int64(10),
 	}
 
+	subReq := appmgr_model.SubscriptionRequest{
+		Data: &subData,
+	}
+
 	return &subReq
 }
 
@@ -84,12 +94,12 @@ func PostSubReq(xmUrl string, nbiif string) error {
 	// setting up POST request to Xapp Manager
 	appmgrUrl, err := url.Parse(xmUrl)
 	if err != nil {
-		rtmgr.Logger.Error("Invalid XApp manager url/hostname: " + err.Error())
+		xapp.Logger.Error("Invalid XApp manager url/hostname: " + err.Error())
 		return err
 	}
 	nbiifUrl, err := url.Parse(nbiif)
 	if err != nil {
-		rtmgr.Logger.Error("Invalid NBI address/port: " + err.Error())
+		xapp.Logger.Error("Invalid NBI address/port: " + err.Error())
 		return err
 	}
 	transport := httptransport.New(appmgrUrl.Hostname()+":"+appmgrUrl.Port(), "/ric/v1", []string{"http"})
@@ -99,11 +109,11 @@ func PostSubReq(xmUrl string, nbiif string) error {
 	subReq := CreateSubReq(nbiifUrl.Scheme+"://"+nbiifUrl.Hostname(), nbiifUrl.Port())
 	resp, postErr := client.Operations.AddSubscription(addSubParams.WithSubscriptionRequest(subReq))
 	if postErr != nil {
-		rtmgr.Logger.Error("POST unsuccessful:" + postErr.Error())
+		xapp.Logger.Error("POST unsuccessful:" + postErr.Error())
 		return postErr
 	} else {
 		// TODO: use the received ID
-		rtmgr.Logger.Info("POST received: " + string(resp.Payload.ID))
+		xapp.Logger.Info("POST received: " + string(resp.Payload.ID))
 		return nil
 	}
 }