Resolve RMR port from K8s services

[ric-plt/appmgr.git] / pkg / resthooks / resthooks.go

diff --git a/pkg/resthooks/resthooks.go b/pkg/resthooks/resthooks.go
index 5076b06..dea70c9 100755 (executable)
--- a/pkg/resthooks/resthooks.go
+++ b/pkg/resthooks/resthooks.go
@@ -22,23 +22,27 @@ package resthooks
 import (
        "bytes"
        "encoding/json"
-       sdl "gerrit.oran-osc.org/r/ric-plt/sdlgo"
+       sdl "gerrit.o-ran-sc.org/r/ric-plt/sdlgo"
        cmap "github.com/orcaman/concurrent-map"
        "github.com/segmentio/ksuid"
        "net/http"
        "time"
 
-       "gerrit.oran-osc.org/r/ric-plt/appmgr/pkg/appmgr"
-       "gerrit.oran-osc.org/r/ric-plt/appmgr/pkg/models"
+       "gerrit.o-ran-sc.org/r/ric-plt/appmgr/pkg/appmgr"
+       "gerrit.o-ran-sc.org/r/ric-plt/appmgr/pkg/models"
 )
 
-func NewResthook() *Resthook {
+func NewResthook(restoreData bool) *Resthook {
        rh := &Resthook{
                client: &http.Client{},
                db:     sdl.NewSdlInstance("appmgr", sdl.NewDatabase()),
        }
 
-       rh.subscriptions = rh.RestoreSubscriptions()
+       if restoreData {
+               rh.subscriptions = rh.RestoreSubscriptions()
+       } else {
+               rh.subscriptions = cmap.New()
+       }
        return rh
 }
 
@@ -47,7 +51,8 @@ func (rh *Resthook) AddSubscription(sr models.SubscriptionRequest) *models.Subsc
                r := v.Val.(SubscriptionInfo).req
                if *r.Data.TargetURL == *sr.Data.TargetURL && r.Data.EventType == sr.Data.EventType {
                        appmgr.Logger.Info("Similar subscription already exists!")
-                       return &models.SubscriptionResponse{}
+                       resp := v.Val.(SubscriptionInfo).resp
+                       return &resp
                }
        }
 
@@ -122,7 +127,14 @@ func (rh *Resthook) NotifyClients(xapps models.AllDeployedXapps, et models.Event
 }
 
 func (rh *Resthook) notify(xapps models.AllDeployedXapps, et models.EventType, s SubscriptionInfo, seq int64) error {
-       notif := models.SubscriptionNotification{ID: s.Id, Version: seq, EventType: et, XApps: xapps}
+       xappData, err := json.Marshal(xapps)
+       if err != nil {
+               appmgr.Logger.Info("json.Marshal failed: %v", err)
+               return err
+       }
+
+       // TODO: Use models.SubscriptionNotification instead of internal ...
+       notif := SubscriptionNotification{ID: s.Id, Version: seq, Event: string(et), XApps: string(xappData)}
        jsonData, err := json.Marshal(notif)
        if err != nil {
                appmgr.Logger.Info("json.Marshal failed: %v", err)