Adding Unit Tests
[ric-plt/rtmgr.git] / pkg / nbi / httprestful.go
index b07a8db..e10f42b 100644 (file)
@@ -35,6 +35,7 @@ import (
        "encoding/json"
        "errors"
        "fmt"
+       xfmodel "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/models"
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
        "github.com/go-openapi/loads"
        "github.com/go-openapi/runtime/middleware"
@@ -55,39 +56,20 @@ import (
        "time"
 )
 
-//var myClient = &http.Client{Timeout: 1 * time.Second}
-
 type HttpRestful struct {
        Engine
        LaunchRest                   LaunchRestHandler
-       RecvXappCallbackData         RecvXappCallbackDataHandler
-       RecvNewE2Tdata               RecvNewE2TdataHandler
-       ProvideXappHandleHandlerImpl ProvideXappHandleHandlerImpl
        RetrieveStartupData          RetrieveStartupDataHandler
 }
 
 func NewHttpRestful() *HttpRestful {
        instance := new(HttpRestful)
        instance.LaunchRest = launchRest
-       instance.RecvXappCallbackData = recvXappCallbackData
-       instance.RecvNewE2Tdata = recvNewE2Tdata
-       instance.ProvideXappHandleHandlerImpl = provideXappHandleHandlerImpl
        instance.RetrieveStartupData = retrieveStartupData
        return instance
 }
 
-// ToDo: Use Range over channel. Read and return only the latest one.
-func recvXappCallbackData(dataChannel <-chan *models.XappCallbackData) (*[]rtmgr.XApp, error) {
-       var xappData *models.XappCallbackData
-       // Drain the channel as we are only looking for the latest value until
-       // xapp manager sends all xapp data with every request.
-       length := len(dataChannel)
-       //xapp.Logger.Info(length)
-       for i := 0; i <= length; i++ {
-               xapp.Logger.Info("data received")
-               // If no data received from the REST, it blocks.
-               xappData = <-dataChannel
-       }
+func recvXappCallbackData(xappData *models.XappCallbackData) (*[]rtmgr.XApp, error) {
        if nil != xappData {
                var xapps []rtmgr.XApp
                err := json.Unmarshal([]byte(xappData.XApps), &xapps)
@@ -100,13 +82,10 @@ func recvXappCallbackData(dataChannel <-chan *models.XappCallbackData) (*[]rtmgr
        return nil, nil
 }
 
-func recvNewE2Tdata(dataChannel <-chan *models.E2tData) (*rtmgr.E2TInstance, string, error) {
-       var e2tData *models.E2tData
+func recvNewE2Tdata(e2tData *models.E2tData) (*rtmgr.E2TInstance, string, error) {
        var str string
        xapp.Logger.Info("data received")
 
-       e2tData = <-dataChannel
-
        if nil != e2tData {
 
                e2tinst := rtmgr.E2TInstance{
@@ -145,7 +124,7 @@ func validateXappCallbackData(callbackData *models.XappCallbackData) error {
        return nil
 }
 
-func provideXappHandleHandlerImpl(datach chan<- *models.XappCallbackData, data *models.XappCallbackData) error {
+func provideXappHandleHandlerImpl(data *models.XappCallbackData) error {
        if data != nil {
                xapp.Logger.Debug("Received callback data")
        }
@@ -154,7 +133,20 @@ func provideXappHandleHandlerImpl(datach chan<- *models.XappCallbackData, data *
                xapp.Logger.Warn("XApp callback data validation failed: " + err.Error())
                return err
        } else {
-               datach <- data
+               appdata, err := recvXappCallbackData(data)
+                if err != nil {
+                       xapp.Logger.Error("cannot get data from rest api dute to: " + err.Error())
+                } else if appdata != nil {
+                        xapp.Logger.Debug("Fetching all xApps deployed in xApp Manager through GET operation.")
+                        alldata, err1 := httpGetXApps(xapp.Config.GetString("xmurl"))
+                        if alldata != nil && err1 == nil {
+                               m.Lock()
+                                sdlEngine.WriteXApps(xapp.Config.GetString("rtfile"), alldata)
+                                m.Unlock()
+                               return sendRoutesToAll()
+                        }
+                }
+
                return nil
        }
 }
@@ -222,18 +214,17 @@ func checkValidaE2TAddress(e2taddress string) bool {
 
 }
 
-func provideXappSubscriptionHandleImpl(subchan chan<- *models.XappSubscriptionData,
-       data *models.XappSubscriptionData) error {
+func provideXappSubscriptionHandleImpl(data *models.XappSubscriptionData) error {
        xapp.Logger.Debug("Invoked provideXappSubscriptionHandleImpl")
        err := validateXappSubscriptionData(data)
        if err != nil {
                xapp.Logger.Error(err.Error())
                return err
        }
-       subchan <- data
-       //var val = string(*data.Address + ":" + strconv.Itoa(int(*data.Port)))
+        xapp.Logger.Debug("received XApp subscription data")
+        addSubscription(&rtmgr.Subs, data)
        xapp.Logger.Debug("Endpoints: %v", rtmgr.Eps)
-       return nil
+       return sendRoutesToAll()
 }
 
 func subscriptionExists(data *models.XappSubscriptionData) bool {
@@ -248,8 +239,7 @@ func subscriptionExists(data *models.XappSubscriptionData) bool {
        return present
 }
 
-func deleteXappSubscriptionHandleImpl(subdelchan chan<- *models.XappSubscriptionData,
-       data *models.XappSubscriptionData) error {
+func deleteXappSubscriptionHandleImpl(data *models.XappSubscriptionData) error {
        xapp.Logger.Debug("Invoked deleteXappSubscriptionHandleImpl")
        err := validateXappSubscriptionData(data)
        if err != nil {
@@ -263,11 +253,13 @@ func deleteXappSubscriptionHandleImpl(subdelchan chan<- *models.XappSubscription
                return err
        }
 
-       subdelchan <- data
-       return nil
+        xapp.Logger.Debug("received XApp subscription delete data")
+        delSubscription(&rtmgr.Subs, data)
+       return sendRoutesToAll()
+
 }
 
-func updateXappSubscriptionHandleImpl(subupdatechan chan<- *rtmgr.XappList, data *models.XappList, subid uint16) error {
+func updateXappSubscriptionHandleImpl(data *models.XappList, subid uint16) error {
        xapp.Logger.Debug("Invoked updateXappSubscriptionHandleImpl")
 
        var fqdnlist []rtmgr.FqDn
@@ -288,20 +280,26 @@ func updateXappSubscriptionHandleImpl(subupdatechan chan<- *rtmgr.XappList, data
                        return err
                }
        }
-       subupdatechan <- &xapplist
-       return nil
+        xapp.Logger.Debug("received XApp subscription Merge data")
+        updateSubscription(&xapplist)
+       return sendRoutesToAll()
 }
 
-func createNewE2tHandleHandlerImpl(e2taddchan chan<- *models.E2tData,
-       data *models.E2tData) error {
+func createNewE2tHandleHandlerImpl(data *models.E2tData) error {
        xapp.Logger.Debug("Invoked createNewE2tHandleHandlerImpl")
        err := validateE2tData(data)
        if err != nil {
                xapp.Logger.Error(err.Error())
                return err
        }
-       e2taddchan <- data
-       return nil
+       //e2taddchan <- data
+       e2data, meiddata, _ := recvNewE2Tdata(data)
+        xapp.Logger.Debug("received create New E2T data")
+        m.Lock()
+        sdlEngine.WriteNewE2TInstance(xapp.Config.GetString("rtfile"), e2data, meiddata)
+        m.Unlock()
+        return sendRoutesToAll()
+
 }
 
 func validateE2TAddressRANListData(assRanE2tData models.RanE2tMap) error {
@@ -322,32 +320,37 @@ func validateE2TAddressRANListData(assRanE2tData models.RanE2tMap) error {
        return nil
 }
 
-func associateRanToE2THandlerImpl(assranchan chan<- models.RanE2tMap,
-       data models.RanE2tMap) error {
+func associateRanToE2THandlerImpl(data models.RanE2tMap) error {
        xapp.Logger.Debug("Invoked associateRanToE2THandlerImpl")
        err := validateE2TAddressRANListData(data)
        if err != nil {
                xapp.Logger.Warn(" Association of RAN to E2T Instance data validation failed: " + err.Error())
                return err
        }
-       assranchan <- data
-       return nil
+        xapp.Logger.Debug("received associate RAN list to E2T instance mapping from E2 Manager")
+        m.Lock()
+        sdlEngine.WriteAssRANToE2TInstance(xapp.Config.GetString("rtfile"), data)
+        m.Unlock()
+       return sendRoutesToAll()
+
 }
 
-func disassociateRanToE2THandlerImpl(disassranchan chan<- models.RanE2tMap,
-       data models.RanE2tMap) error {
+func disassociateRanToE2THandlerImpl(data models.RanE2tMap) error {
        xapp.Logger.Debug("Invoked disassociateRanToE2THandlerImpl")
        err := validateE2TAddressRANListData(data)
        if err != nil {
                xapp.Logger.Warn(" Disassociation of RAN List from E2T Instance data validation failed: " + err.Error())
                return err
        }
-       disassranchan <- data
-       return nil
+        xapp.Logger.Debug("received disassociate RANs from E2T instance")
+        m.Lock()
+        sdlEngine.WriteDisAssRANFromE2TInstance(xapp.Config.GetString("rtfile"), data)
+        m.Unlock()
+       return sendRoutesToAll()
+
 }
 
-func deleteE2tHandleHandlerImpl(e2tdelchan chan<- *models.E2tDeleteData,
-       data *models.E2tDeleteData) error {
+func deleteE2tHandleHandlerImpl(data *models.E2tDeleteData) error {
        xapp.Logger.Debug("Invoked deleteE2tHandleHandlerImpl")
 
        err := validateDeleteE2tData(data)
@@ -355,9 +358,11 @@ func deleteE2tHandleHandlerImpl(e2tdelchan chan<- *models.E2tDeleteData,
                xapp.Logger.Error(err.Error())
                return err
        }
+        m.Lock()
+        sdlEngine.WriteDeleteE2TInstance(xapp.Config.GetString("rtfile"), data)
+        m.Unlock()
+       return sendRoutesToAll()
 
-       e2tdelchan <- data
-       return nil
 }
 
 func dumpDebugData() (models.Debuginfo, error) {
@@ -377,8 +382,7 @@ func dumpDebugData() (models.Debuginfo, error) {
        return response, err
 }
 
-func launchRest(nbiif *string, datach chan<- *models.XappCallbackData, subchan chan<- *models.XappSubscriptionData, subupdatechan chan<- *rtmgr.XappList,
-       subdelchan chan<- *models.XappSubscriptionData, e2taddchan chan<- *models.E2tData, assranchan chan<- models.RanE2tMap, disassranchan chan<- models.RanE2tMap, e2tdelchan chan<- *models.E2tDeleteData) {
+func launchRest(nbiif *string){
        swaggerSpec, err := loads.Embedded(restapi.SwaggerJSON, restapi.FlatSwaggerJSON)
        if err != nil {
                //log.Fatalln(err)
@@ -404,7 +408,7 @@ func launchRest(nbiif *string, datach chan<- *models.XappCallbackData, subchan c
        api.HandleProvideXappHandleHandler = handle.ProvideXappHandleHandlerFunc(
                func(params handle.ProvideXappHandleParams) middleware.Responder {
                        xapp.Logger.Info("Data received on Http interface")
-                       err := provideXappHandleHandlerImpl(datach, params.XappCallbackData)
+                       err := provideXappHandleHandlerImpl(params.XappCallbackData)
                        if err != nil {
                                xapp.Logger.Error("Invalid XApp callback data: " + err.Error())
                                return handle.NewProvideXappHandleBadRequest()
@@ -414,77 +418,67 @@ func launchRest(nbiif *string, datach chan<- *models.XappCallbackData, subchan c
                })
        api.HandleProvideXappSubscriptionHandleHandler = handle.ProvideXappSubscriptionHandleHandlerFunc(
                func(params handle.ProvideXappSubscriptionHandleParams) middleware.Responder {
-                       err := provideXappSubscriptionHandleImpl(subchan, params.XappSubscriptionData)
+                       err := provideXappSubscriptionHandleImpl(params.XappSubscriptionData)
                        if err != nil {
                                return handle.NewProvideXappSubscriptionHandleBadRequest()
                        } else {
-                               //Delay the reponse as add subscription channel needs to update sdl and then sbi sends updated routes to all endpoints
-                               time.Sleep(1 * time.Second)
                                return handle.NewGetHandlesOK()
                        }
                })
        api.HandleDeleteXappSubscriptionHandleHandler = handle.DeleteXappSubscriptionHandleHandlerFunc(
                func(params handle.DeleteXappSubscriptionHandleParams) middleware.Responder {
-                       err := deleteXappSubscriptionHandleImpl(subdelchan, params.XappSubscriptionData)
+                       err := deleteXappSubscriptionHandleImpl(params.XappSubscriptionData)
                        if err != nil {
                                return handle.NewDeleteXappSubscriptionHandleNoContent()
                        } else {
-                               //Delay the reponse as delete subscription channel needs to update sdl and then sbi sends updated routes to all endpoints
-                               time.Sleep(1 * time.Second)
                                return handle.NewGetHandlesOK()
                        }
                })
        api.HandleUpdateXappSubscriptionHandleHandler = handle.UpdateXappSubscriptionHandleHandlerFunc(
                func(params handle.UpdateXappSubscriptionHandleParams) middleware.Responder {
-                       err := updateXappSubscriptionHandleImpl(subupdatechan, &params.XappList, params.SubscriptionID)
+                       err := updateXappSubscriptionHandleImpl(&params.XappList, params.SubscriptionID)
                        if err != nil {
                                return handle.NewUpdateXappSubscriptionHandleBadRequest()
                        } else {
-                               //Delay the reponse as delete subscription channel needs to update sdl and then sbi sends updated routes to all endpoints
-                               time.Sleep(1 * time.Second)
                                return handle.NewUpdateXappSubscriptionHandleCreated()
                        }
                })
        api.HandleCreateNewE2tHandleHandler = handle.CreateNewE2tHandleHandlerFunc(
                func(params handle.CreateNewE2tHandleParams) middleware.Responder {
-                       err := createNewE2tHandleHandlerImpl(e2taddchan, params.E2tData)
+                       err := createNewE2tHandleHandlerImpl(params.E2tData)
                        if err != nil {
                                return handle.NewCreateNewE2tHandleBadRequest()
                        } else {
-                               time.Sleep(1 * time.Second)
                                return handle.NewCreateNewE2tHandleCreated()
                        }
                })
 
        api.HandleAssociateRanToE2tHandleHandler = handle.AssociateRanToE2tHandleHandlerFunc(
                func(params handle.AssociateRanToE2tHandleParams) middleware.Responder {
-                       err := associateRanToE2THandlerImpl(assranchan, params.RanE2tList)
+                       err := associateRanToE2THandlerImpl(params.RanE2tList)
                        if err != nil {
                                return handle.NewAssociateRanToE2tHandleBadRequest()
                        } else {
-                               time.Sleep(1 * time.Second)
                                return handle.NewAssociateRanToE2tHandleCreated()
                        }
                })
 
        api.HandleDissociateRanHandler = handle.DissociateRanHandlerFunc(
                func(params handle.DissociateRanParams) middleware.Responder {
-                       err := disassociateRanToE2THandlerImpl(disassranchan, params.DissociateList)
+                       err := disassociateRanToE2THandlerImpl(params.DissociateList)
                        if err != nil {
                                return handle.NewDissociateRanBadRequest()
                        } else {
-                               time.Sleep(1 * time.Second)
                                return handle.NewDissociateRanCreated()
                        }
                })
 
        api.HandleDeleteE2tHandleHandler = handle.DeleteE2tHandleHandlerFunc(
                func(params handle.DeleteE2tHandleParams) middleware.Responder {
-                       err := deleteE2tHandleHandlerImpl(e2tdelchan, params.E2tData)
+                       err := deleteE2tHandleHandlerImpl(params.E2tData)
                        if err != nil {
                                return handle.NewDeleteE2tHandleBadRequest()
                        } else {
-                               time.Sleep(1 * time.Second)
                                return handle.NewDeleteE2tHandleCreated()
                        }
                })
@@ -497,6 +491,26 @@ func launchRest(nbiif *string, datach chan<- *models.XappCallbackData, subchan c
                                return debug.NewGetDebuginfoOK().WithPayload(&response)
                        }
                })
+        api.HandleAddRmrRouteHandler = handle.AddRmrRouteHandlerFunc(
+                func(params handle.AddRmrRouteParams) middleware.Responder {
+                       err := adddelrmrroute(params.RoutesList,true)
+                       if err != nil {
+                               return handle.NewAddRmrRouteBadRequest()
+                       } else {
+                               return handle.NewAddRmrRouteCreated()
+                       }
+
+                })
+        api.HandleDelRmrRouteHandler = handle.DelRmrRouteHandlerFunc(
+                func(params handle.DelRmrRouteParams) middleware.Responder {
+                       err := adddelrmrroute(params.RoutesList,false)
+                       if err != nil {
+                               return handle.NewDelRmrRouteBadRequest()
+                       } else {
+                               return handle.NewDelRmrRouteCreated()
+                       }
+                })
+
        // start to serve API
        xapp.Logger.Info("Starting the HTTP Rest service")
        if err := server.Serve(); err != nil {
@@ -573,41 +587,41 @@ func PopulateE2TMap(e2tDataList *[]rtmgr.E2tIdentity, e2ts map[string]rtmgr.E2TI
                }
 
                e2ts[e2tinst.Fqdn] = e2tinst
-               meids = append(meids,str)
+               meids = append(meids, str)
        }
 }
 
 func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile string, e2murl string, sdlEngine sdl.Engine) error {
        xapp.Logger.Info("Invoked retrieveStartupData ")
-        var readErr error
-        var maxRetries = 10
+       var readErr error
+       var err error
+       var maxRetries = 10
        var xappData *[]rtmgr.XApp
        xappData = new([]rtmgr.XApp)
        xapp.Logger.Info("Trying to fetch XApps data from XAPP manager")
-        for i := 1; i <= maxRetries; i++ {
-                time.Sleep(2 * time.Second)
+       for i := 1; i <= maxRetries; i++ {
+               time.Sleep(2 * time.Second)
 
                readErr = nil
-                xappData, err := httpGetXApps(xmurl)
-                if xappData != nil && err == nil {
+               xappData, err = httpGetXApps(xmurl)
+               if xappData != nil && err == nil {
                        break
-                } else if err == nil {
-                        readErr = errors.New("unexpected HTTP status code")
-                } else {
-                        xapp.Logger.Warn("cannot get xapp data due to: " + err.Error())
-                        readErr = err
-                }
-        }
+               } else if err == nil {
+                       readErr = errors.New("unexpected HTTP status code")
+               } else {
+                       xapp.Logger.Warn("cannot get xapp data due to: " + err.Error())
+                       readErr = err
+               }
+       }
 
-       if ( readErr != nil) {
-               return readErr
+       if readErr != nil {
+               return readErr
        }
 
        var meids []string
        e2ts := make(map[string]rtmgr.E2TInstance)
        xapp.Logger.Info("Trying to fetch E2T data from E2manager")
-        for i := 1; i <= maxRetries; i++ {
-                time.Sleep(2 * time.Second)
+       for i := 1; i <= maxRetries; i++ {
 
                readErr = nil
                e2tDataList, err := httpGetE2TList(e2murl)
@@ -620,147 +634,82 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile
                        xapp.Logger.Warn("cannot get E2T data from E2M due to: " + err.Error())
                        readErr = err
                }
+               time.Sleep(2 * time.Second)
        }
 
-       if ( readErr != nil) {
-               return readErr
+       if readErr != nil {
+               return readErr
        }
 
        pcData, confErr := rtmgr.GetPlatformComponents(configfile)
-        if confErr != nil {
-                xapp.Logger.Error(confErr.Error())
-                return confErr
-        }
-        xapp.Logger.Info("Recieved intial xapp data, E2T data and platform data, writing into SDL.")
-        // Combine the xapps data and platform data before writing to the SDL
+       if confErr != nil {
+               xapp.Logger.Error(confErr.Error())
+               return confErr
+       }
+       xapp.Logger.Info("Recieved intial xapp data, E2T data and platform data, writing into SDL.")
+       // Combine the xapps data and platform data before writing to the SDL
        ricData := &rtmgr.RicComponents{XApps: *xappData, Pcs: *pcData, E2Ts: e2ts, MeidMap: meids}
-        writeErr := sdlEngine.WriteAll(fileName, ricData)
-        if writeErr != nil {
-                xapp.Logger.Error(writeErr.Error())
-        }
-        // post subscription req to appmgr
-        readErr = PostSubReq(xmurl, nbiif)
-        if readErr == nil {
-                return nil
-        }
-       return readErr
-}
-
-func (r *HttpRestful) Initialize(xmurl string, nbiif string, fileName string, configfile string, e2murl string,
-       sdlEngine sdl.Engine, rpeEngine rpe.Engine, triggerSBI chan<- bool, m *sync.Mutex) error {
-       err := r.RetrieveStartupData(xmurl, nbiif, fileName, configfile, e2murl, sdlEngine)
-       if err != nil {
-               xapp.Logger.Error("Exiting as nbi failed to get the initial startup data from the xapp manager: " + err.Error())
-               return err
+       writeErr := sdlEngine.WriteAll(fileName, ricData)
+       if writeErr != nil {
+               xapp.Logger.Error(writeErr.Error())
        }
 
-       datach := make(chan *models.XappCallbackData, 10)
-       subschan := make(chan *models.XappSubscriptionData, 10)
-       subdelchan := make(chan *models.XappSubscriptionData, 10)
-       subupdatechan := make(chan *rtmgr.XappList, 10)
-       e2taddchan := make(chan *models.E2tData, 10)
-       associateranchan := make(chan models.RanE2tMap, 10)
-       disassociateranchan := make(chan models.RanE2tMap, 10)
-       e2tdelchan := make(chan *models.E2tDeleteData, 10)
-       xapp.Logger.Info("Launching Rest Http service")
-       go func() {
-               r.LaunchRest(&nbiif, datach, subschan, subupdatechan, subdelchan, e2taddchan, associateranchan, disassociateranchan, e2tdelchan)
-       }()
-
-       go func() {
-               for {
-                       data, err := r.RecvXappCallbackData(datach)
-                       if err != nil {
-                               xapp.Logger.Error("cannot get data from rest api dute to: " + err.Error())
-                       } else if data != nil {
-                               xapp.Logger.Debug("Fetching all xApps deployed in xApp Manager through GET operation.")
-                               alldata, err1 := httpGetXApps(xmurl)
-                               if alldata != nil && err1 == nil {
-                                       m.Lock()
-                                       sdlEngine.WriteXApps(fileName, alldata)
-                                       m.Unlock()
-                                       triggerSBI <- true
-                               }
-                       }
-               }
-       }()
+       xapp.Logger.Info("Trying to fetch Subscriptions data from Subscription manager")
+       for i := 1; i <= maxRetries; i++ {
+                       readErr = nil
+                       sub_list, err := xapp.Subscription.QuerySubscriptions()
 
-       go func() {
-               for {
-                       data := <-subschan
-                       xapp.Logger.Debug("received XApp subscription data")
-                       addSubscription(&rtmgr.Subs, data)
-                       triggerSBI <- true
-               }
-       }()
-
-       go func() {
-               for {
-                       data := <-subdelchan
-                       xapp.Logger.Debug("received XApp subscription delete data")
-                       delSubscription(&rtmgr.Subs, data)
-                       triggerSBI <- true
-               }
-       }()
-
-       go func() {
-               for {
-                       data := <-subupdatechan
-                       xapp.Logger.Debug("received XApp subscription Merge data")
-                       updateSubscription(data)
-                       triggerSBI <- true
+                       if sub_list != nil && err == nil {
+                               PopulateSubscription(sub_list)
+                               break
+                       } else {
+                               readErr = err
+                               xapp.Logger.Warn("cannot get xapp data due to: " + readErr.Error())
+               }
+                       time.Sleep(2 * time.Second)
                }
-       }()
 
-       go func() {
-               for {
-
-                       data, meiddata, _ := r.RecvNewE2Tdata(e2taddchan)
-                       if data != nil {
-                               xapp.Logger.Debug("received create New E2T data")
-                               m.Lock()
-                               sdlEngine.WriteNewE2TInstance(fileName, data, meiddata)
-                               m.Unlock()
-                               triggerSBI <- true
+       if readErr != nil {
+               return readErr
+       }
+
+       // post subscription req to appmgr
+       readErr = PostSubReq(xmurl, nbiif)
+       if readErr != nil {
+               return readErr
+       }
+
+       //rlist := make(map[string]string)
+       xapp.Logger.Info("Reading SDL for any routes")
+       rlist,sdlerr := xapp.Sdl.Read("routes")
+       readErr = sdlerr
+       if readErr == nil {
+               xapp.Logger.Info("Value is %s",rlist["routes"])
+               if rlist["routes"] != nil {
+                       formstring := fmt.Sprintf("%s",rlist["routes"])
+                       xapp.Logger.Info("Value of formed string = %s",formstring)
+                       newstring := strings.Split(formstring," ")
+                       for i,_ := range newstring {
+                               xapp.Logger.Info("in Loop Value of formed string = %s",newstring)
+                               rtmgr.DynamicRouteList = append(rtmgr.DynamicRouteList,newstring[i])
                        }
                }
-       }()
 
-       go func() {
-               for {
-                       data := <-associateranchan
-                       xapp.Logger.Debug("received associate RAN list to E2T instance mapping from E2 Manager")
-                       m.Lock()
-                       sdlEngine.WriteAssRANToE2TInstance(fileName, data)
-                       m.Unlock()
-                       triggerSBI <- true
-               }
-       }()
+               return nil
+       }
 
-       go func() {
-               for {
-
-                       data := <-disassociateranchan
-                       xapp.Logger.Debug("received disassociate RANs from E2T instance")
-                       m.Lock()
-                       sdlEngine.WriteDisAssRANFromE2TInstance(fileName, data)
-                       m.Unlock()
-                       triggerSBI <- true
-               }
-       }()
+       return readErr
+}
 
+func (r *HttpRestful) Initialize(xmurl string, nbiif string, fileName string, configfile string, e2murl string,
+       sdlEngine sdl.Engine, rpeEngine rpe.Engine, m *sync.Mutex) error {
+       err := r.RetrieveStartupData(xmurl, nbiif, fileName, configfile, e2murl, sdlEngine)
+       if err != nil {
+               xapp.Logger.Error("Exiting as nbi failed to get the initial startup data from the xapp manager: " + err.Error())
+               return err
+       }
        go func() {
-               for {
-
-                       data := <-e2tdelchan
-                       xapp.Logger.Debug("received Delete E2T data")
-                       if data != nil {
-                               m.Lock()
-                               sdlEngine.WriteDeleteE2TInstance(fileName, data)
-                               m.Unlock()
-                               triggerSBI <- true
-                       }
-               }
+               r.LaunchRest(&nbiif)
        }()
 
        return nil
@@ -841,3 +790,74 @@ func updateSubscription(data *rtmgr.XappList) {
        }
 
 }
+
+func PopulateSubscription(sub_list xfmodel.SubscriptionList) {
+       for _, sub_row := range sub_list {
+               var subdata models.XappSubscriptionData
+               id := int32(sub_row.SubscriptionID)
+               subdata.SubscriptionID = &id
+               for _, ep := range sub_row.Endpoint {
+
+                       stringSlice := strings.Split(ep, ":")
+                       subdata.Address = &stringSlice[0]
+                       intportval, _ := strconv.Atoi(stringSlice[1])
+                       value := uint16(intportval)
+                       subdata.Port = &value
+                       xapp.Logger.Debug("Adding Subscription List has Address :%v, port :%v, SubscriptionID :%v ", subdata.Address, subdata.Address, subdata.SubscriptionID)
+                       addSubscription(&rtmgr.Subs, &subdata)
+               }
+       }
+}
+
+func adddelrmrroute(routelist models.Routelist,rtflag bool) error {
+       xapp.Logger.Info("Updating rmrroute with Route list: %v,flag: %v", routelist,rtflag)
+       for _, rlist := range routelist {
+               var  subid int32
+               var data string
+               if rlist.SubscriptionID == 0 {
+                       subid = -1
+               } else {
+                       subid = rlist.SubscriptionID
+               }
+               if rlist.SenderEndPoint == "" && rlist.SubscriptionID != 0 {
+                       data = fmt.Sprintf("mse|%d|%d|%s\n",*rlist.MessageType,rlist.SubscriptionID,*rlist.TargetEndPoint)
+               } else if rlist.SenderEndPoint == "" && rlist.SubscriptionID == 0 {
+                       data = fmt.Sprintf("mse|%d|-1|%s\n",*rlist.MessageType,*rlist.TargetEndPoint)
+               } else {
+                       data = fmt.Sprintf("mse|%d,%s|%d|%s\n",*rlist.MessageType,rlist.SenderEndPoint,subid,*rlist.TargetEndPoint)
+               }
+               err := checkrepeatedroute(data)
+
+               if rtflag == true {
+                       if err == true {
+                               xapp.Logger.Info("Given route %s is a duplicate",data)
+                       }
+                       rtmgr.DynamicRouteList = append(rtmgr.DynamicRouteList,data)
+                       routearray := strings.Join(rtmgr.DynamicRouteList," ")
+                       xapp.Sdl.Store("routes",routearray)
+               } else {
+                       if err == true {
+                               xapp.Logger.Info("Successfully deleted route: %s",data)
+                               routearray := strings.Join(rtmgr.DynamicRouteList," ")
+                               xapp.Sdl.Store("routes",routearray)
+                       }else {
+                               xapp.Logger.Info("No such route: %s",data)
+                               return errors.New("No such route: " + data)
+                       }
+
+               }
+       }
+       return sendRoutesToAll()
+}
+
+func checkrepeatedroute (data string) bool {
+       for i:=0;i<len(rtmgr.DynamicRouteList);i++ {
+               if rtmgr.DynamicRouteList[i] == data {
+                       rtmgr.DynamicRouteList[i] = rtmgr.DynamicRouteList[len(rtmgr.DynamicRouteList)-1]
+                       rtmgr.DynamicRouteList[len(rtmgr.DynamicRouteList)-1] = ""
+                       rtmgr.DynamicRouteList = rtmgr.DynamicRouteList[:len(rtmgr.DynamicRouteList)-1]
+                       return true
+               }
+       }
+       return false
+}