Symptom data collection

Change-Id: I62aaa547aa85c02b8574b2d44c5136c5de3afccf
Signed-off-by: Abukar Mohamed <abukar.mohamed@nokia.com>

diff --git a/go.mod b/go.mod
index 0188db9..9d884ab 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.12
 
 replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2
 
-replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.6.8
+replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.7.3
 
 replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.2
 

diff --git a/pkg/control/control.go b/pkg/control/control.go
index 59a840e..3446f25 100755 (executable)
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -117,6 +117,7 @@ func NewControl() *Control {
 
        // Register REST handler for testing support
        xapp.Resource.InjectRoute("/ric/v1/test/{testId}", c.TestRestHandler, "POST")
+       xapp.Resource.InjectRoute("/ric/v1/symptomdata", c.SymptomDataHandler, "GET")
 
        go xapp.Subscription.Listen(c.SubscriptionHandler, c.QueryHandler, c.SubscriptionDeleteHandler)
 
@@ -137,6 +138,11 @@ func NewControl() *Control {
        return c
 }
 
+func (c *Control) SymptomDataHandler(w http.ResponseWriter, r *http.Request) {
+       subscriptions, _ := c.registry.QueryHandler()
+       xapp.Resource.SendSymptomDataJson(w, r, subscriptions, "platform/subscriptions.json")
+}
+
 //-------------------------------------------------------------------
 //
 //-------------------------------------------------------------------
@@ -280,7 +286,11 @@ func (c *Control) rmrSendToE2T(desc string, subs *Subscription, trans *Transacti
        params.Payload = trans.Payload.Buf
        params.Mbuf = nil
        xapp.Logger.Info("MSG to E2T: %s %s %s", desc, trans.String(), params.String())
-       return c.SendWithRetry(params, false, 5)
+       err = c.SendWithRetry(params, false, 5)
+       if err != nil {
+               xapp.Logger.Error("rmrSendToE2T: Send failed: %+v", err)
+       }
+       return err
 }
 
 func (c *Control) rmrSendToXapp(desc string, subs *Subscription, trans *TransactionXapp) (err error) {
@@ -295,7 +305,11 @@ func (c *Control) rmrSendToXapp(desc string, subs *Subscription, trans *Transact
        params.Payload = trans.Payload.Buf
        params.Mbuf = nil
        xapp.Logger.Info("MSG to XAPP: %s %s %s", desc, trans.String(), params.String())
-       return c.SendWithRetry(params, false, 5)
+       err = c.SendWithRetry(params, false, 5)
+       if err != nil {
+               xapp.Logger.Error("rmrSendToXapp: Send failed: %+v", err)
+       }
+       return err
 }
 
 func (c *Control) Consume(msg *xapp.RMRParams) (err error) {