Replace deprecated SDL APIs

[ric-plt/rtmgr.git] / pkg / nbi / httprestful.go

diff --git a/pkg/nbi/httprestful.go b/pkg/nbi/httprestful.go
index 5223162..7db7071 100644 (file)
--- a/pkg/nbi/httprestful.go
+++ b/pkg/nbi/httprestful.go
@@ -478,12 +478,12 @@ func PopulateE2TMap(e2tDataList *[]rtmgr.E2tIdentity, e2ts map[string]rtmgr.E2TI
                                meidar += meid + " "
                        }
                        str = "mme_ar|" + e2tData.E2taddress + "|" + strings.TrimSuffix(meidar, " ")
-                   *meids = append(*meids, str)
+                       *meids = append(*meids, str)
                }
 
                e2ts[e2tinst.Fqdn] = e2tinst
        }
-    xapp.Logger.Info("MEID's retrieved are %v", *meids)
+       xapp.Logger.Info("MEID's retrieved are %v", *meids)
 }
 
 func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile string, e2murl string, sdlEngine sdl.Engine) error {
@@ -576,7 +576,7 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile
 
        //rlist := make(map[string]string)
        xapp.Logger.Info("Reading SDL for any routes")
-       rlist, sdlerr := xapp.Sdl.Read("routes")
+       rlist, sdlerr := xapp.SdlStorage.Read(rtmgr.RTMGR_SDL_NS, "routes")
        readErr = sdlerr
        if readErr == nil {
                xapp.Logger.Info("Value is %s", rlist["routes"])
@@ -688,8 +688,7 @@ func PopulateSubscription(sub_list xfmodel.SubscriptionList) {
                var subdata models.XappSubscriptionData
                id := int32(sub_row.SubscriptionID)
                subdata.SubscriptionID = &id
-               for _, ep := range sub_row.Endpoint {
-
+               for _, ep := range sub_row.ClientEndpoint {
                        stringSlice := strings.Split(ep, ":")
                        subdata.Address = &stringSlice[0]
                        intportval, _ := strconv.Atoi(stringSlice[1])
@@ -726,12 +725,12 @@ func Adddelrmrroute(routelist models.Routelist, rtflag bool) error {
                        }
                        rtmgr.DynamicRouteList = append(rtmgr.DynamicRouteList, data)
                        routearray := strings.Join(rtmgr.DynamicRouteList, " ")
-                       xapp.Sdl.Store("routes", routearray)
+                       xapp.SdlStorage.Store(rtmgr.RTMGR_SDL_NS, "routes", routearray)
                } else {
                        if err == true {
                                xapp.Logger.Info("Successfully deleted route: %s", data)
                                routearray := strings.Join(rtmgr.DynamicRouteList, " ")
-                               xapp.Sdl.Store("routes", routearray)
+                               xapp.SdlStorage.Store(rtmgr.RTMGR_SDL_NS, "routes", routearray)
                        } else {
                                xapp.Logger.Info("No such route: %s", data)
                                return errors.New("No such route: " + data)