Fix for Submgr crash problem

 - Submgr crashed when xApp was restarted after Submgr restart
 - There was an uninitialised pointer after Submgr restart
 - Storing REST subscriptions to SDL did not worked properly

Change-Id: I7dc55841cffc9a0fe56cad0db49f97c256c0e216
Signed-off-by: Anssi Mannila <anssi.mannila@nokia.com>

diff --git a/pkg/control/control.go b/pkg/control/control.go
index e4b5820..3ebcbcd 100755 (executable)
--- a/pkg/control/control.go
+++ b/pkg/control/control.go
@@ -142,25 +142,6 @@ func NewControl() *Control {
        // Read subscriptions from db
        c.ReadE2Subscriptions()
        c.ReadRESTSubscriptions()
-
-       /*
-               xapp.Logger.Info("Reading subscriptions from db")
-               subIds, register, err := c.ReadAllSubscriptionsFromSdl()
-               if err != nil {
-                       xapp.Logger.Error("%v", err)
-               } else {
-                       c.registry.subIds = subIds
-                       c.registry.register = register
-                       c.HandleUncompletedSubscriptions(register)
-               }
-
-               restSubscriptions, err := c.ReadAllRESTSubscriptionsFromSdl()
-               if err != nil {
-                       xapp.Logger.Error("%v", err)
-               } else {
-                       c.registry.restSubscriptions = restSubscriptions
-               }
-       */
        return c
 }
 

diff --git a/pkg/control/sdl_restSubsDb.go b/pkg/control/sdl_restSubsDb.go
index 1c46856..f9d837b 100644 (file)
--- a/pkg/control/sdl_restSubsDb.go
+++ b/pkg/control/sdl_restSubsDb.go
@@ -28,10 +28,10 @@ import (
 )
 
 type RESTSubscriptionInfo struct {
-       xAppRmrEndPoint  string
+       XAppRmrEndPoint  string
        Meid             string
        InstanceIds      []uint32
-       xAppIdToE2Id     map[int64]int64
+       XAppIdToE2Id     map[int64]int64
        SubReqOngoing    bool
        SubDelReqOngoing bool
        Md5sum           string
@@ -44,10 +44,10 @@ func CreateRESTSdl() Sdlnterface {
 func (c *Control) WriteRESTSubscriptionToSdl(restSubId string, restSubs *RESTSubscription) error {
 
        var restSubscriptionInfo RESTSubscriptionInfo
-       restSubscriptionInfo.xAppRmrEndPoint = restSubs.xAppRmrEndPoint
+       restSubscriptionInfo.XAppRmrEndPoint = restSubs.xAppRmrEndPoint
        restSubscriptionInfo.Meid = restSubs.Meid
        restSubscriptionInfo.InstanceIds = restSubs.InstanceIds
-       restSubscriptionInfo.xAppIdToE2Id = restSubs.xAppIdToE2Id
+       restSubscriptionInfo.XAppIdToE2Id = restSubs.xAppIdToE2Id
        restSubscriptionInfo.SubReqOngoing = restSubs.SubReqOngoing
        restSubscriptionInfo.SubDelReqOngoing = restSubs.SubDelReqOngoing
        restSubscriptionInfo.Md5sum = restSubs.lastReqMd5sum
@@ -102,10 +102,10 @@ func (c *Control) ReadRESTSubscriptionFromSdl(restSubId string) (*RESTSubscripti
 func (c *Control) CreateRESTSubscription(restSubscriptionInfo *RESTSubscriptionInfo, jsonSubscriptionInfo *string) *RESTSubscription {
 
        restSubs := &RESTSubscription{}
-       restSubs.xAppRmrEndPoint = restSubscriptionInfo.xAppRmrEndPoint
+       restSubs.xAppRmrEndPoint = restSubscriptionInfo.XAppRmrEndPoint
        restSubs.Meid = restSubscriptionInfo.Meid
        restSubs.InstanceIds = restSubscriptionInfo.InstanceIds
-       restSubs.xAppIdToE2Id = restSubscriptionInfo.xAppIdToE2Id
+       restSubs.xAppIdToE2Id = restSubscriptionInfo.XAppIdToE2Id
        restSubs.SubReqOngoing = restSubscriptionInfo.SubReqOngoing
        restSubs.SubDelReqOngoing = restSubscriptionInfo.SubDelReqOngoing
        restSubs.lastReqMd5sum = restSubscriptionInfo.Md5sum