X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fhttprestful.go;h=5393dc9fa7702be8f362ea529e4fdc52f12a4f8e;hb=0770de6e47404e68fc9cbb59263648ac54864aef;hp=f47034ea683df7266b501595fb2eddfcce050d77;hpb=bf0ea182799efa98c5e1b9c894891752848a86ce;p=ric-plt%2Frtmgr.git diff --git a/pkg/nbi/httprestful.go b/pkg/nbi/httprestful.go index f47034e..5393dc9 100644 --- a/pkg/nbi/httprestful.go +++ b/pkg/nbi/httprestful.go @@ -35,8 +35,8 @@ import ( "encoding/json" "errors" "fmt" - "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" 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" "net" @@ -56,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 + LaunchRest LaunchRestHandler + 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) @@ -101,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{ @@ -146,16 +124,31 @@ func validateXappCallbackData(callbackData *models.XappCallbackData) error { return nil } -func provideXappHandleHandlerImpl(datach chan<- *models.XappCallbackData, data *models.XappCallbackData) error { - if data != nil { +func provideXappHandleHandlerImpl(data *models.XappCallbackData) error { + if data == nil { xapp.Logger.Debug("Received callback data") + return nil } err := validateXappCallbackData(data) if err != nil { 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() + updateEp() + return sendRoutesToAll() + } + } + return nil } } @@ -171,27 +164,27 @@ func validateXappSubscriptionData(data *models.XappSubscriptionData) error { return err } -func validateE2tData(data *models.E2tData) error { +func validateE2tData(data *models.E2tData) (error, bool) { e2taddress_key := *data.E2TAddress if e2taddress_key == "" { - return fmt.Errorf("E2TAddress is empty!!!") + return fmt.Errorf("E2TAddress is empty!!!"), false } stringSlice := strings.Split(e2taddress_key, ":") if len(stringSlice) == 1 { - return fmt.Errorf("E2T E2TAddress is not a proper format like ip:port, %v", e2taddress_key) + return fmt.Errorf("E2T E2TAddress is not a proper format like ip:port, %v", e2taddress_key), false } _, err := net.LookupIP(stringSlice[0]) if err != nil { - return fmt.Errorf("E2T E2TAddress DNS look up failed, E2TAddress: %v", stringSlice[0]) + return fmt.Errorf("E2T E2TAddress DNS look up failed, E2TAddress: %v", stringSlice[0]), false } if checkValidaE2TAddress(e2taddress_key) { - return fmt.Errorf("E2TAddress already exist!!!, E2TAddress: %v", e2taddress_key) + return fmt.Errorf("E2TAddress already exist!!!, E2TAddress: %v", e2taddress_key), true } - return nil + return nil, false } func validateDeleteE2tData(data *models.E2tDeleteData) error { @@ -223,18 +216,18 @@ 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 + updateEp() + return sendRoutesToAll() } func subscriptionExists(data *models.XappSubscriptionData) bool { @@ -249,8 +242,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 { @@ -264,11 +256,14 @@ func deleteXappSubscriptionHandleImpl(subdelchan chan<- *models.XappSubscription return err } - subdelchan <- data - return nil + xapp.Logger.Debug("received XApp subscription delete data") + delSubscription(&rtmgr.Subs, data) + updateEp() + 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 @@ -289,20 +284,41 @@ func updateXappSubscriptionHandleImpl(subupdatechan chan<- *rtmgr.XappList, data return err } } - subupdatechan <- &xapplist - return nil + xapp.Logger.Debug("received XApp subscription Merge data") + updateSubscription(&xapplist) + updateEp() + 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) + err, IsDuplicate := validateE2tData(data) + if IsDuplicate == true { + updateEp() + return sendRoutesToAll() + } + 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() + updateEp() + sendRoutesToAll() + time.Sleep(10 * time.Second) + for ep, value := range rtmgr.RMRConnStatus { + if ep == *data.E2TAddress && value == true { + return nil + } + } + + return errors.New("Error while adding new E2T " + *data.E2TAddress) + } func validateE2TAddressRANListData(assRanE2tData models.RanE2tMap) error { @@ -323,32 +339,39 @@ 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() + updateEp() + 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() + updateEp() + 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) @@ -356,9 +379,12 @@ func deleteE2tHandleHandlerImpl(e2tdelchan chan<- *models.E2tDeleteData, xapp.Logger.Error(err.Error()) return err } + m.Lock() + sdlEngine.WriteDeleteE2TInstance(xapp.Config.GetString("rtfile"), data) + m.Unlock() + updateEp() + return sendRoutesToAll() - e2tdelchan <- data - return nil } func dumpDebugData() (models.Debuginfo, error) { @@ -366,9 +392,14 @@ func dumpDebugData() (models.Debuginfo, error) { sdlEngine, _ := sdl.GetSdl("file") rpeEngine, _ := rpe.GetRpe("rmrpush") data, err := sdlEngine.ReadAll(xapp.Config.GetString("rtfile")) - if err != nil || data == nil { - xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error()) - return response, err + if data == nil { + if err != nil { + xapp.Logger.Error("Cannot get data from sdl interface due to: " + err.Error()) + return response, err + } else { + xapp.Logger.Debug("Cannot get data from sdl interface") + return response, errors.New("Cannot get data from sdl interface") + } } response.RouteTable = *rpeEngine.GeneratePolicies(rtmgr.Eps, data) @@ -378,8 +409,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) @@ -405,87 +435,90 @@ 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()) + xapp.Logger.Error("RoutingManager->AppManager request Failed: " + err.Error()) return handle.NewProvideXappHandleBadRequest() } else { + xapp.Logger.Info("RoutingManager->AppManager request Success") return handle.NewGetHandlesOK() } }) api.HandleProvideXappSubscriptionHandleHandler = handle.ProvideXappSubscriptionHandleHandlerFunc( func(params handle.ProvideXappSubscriptionHandleParams) middleware.Responder { - err := provideXappSubscriptionHandleImpl(subchan, params.XappSubscriptionData) + err := provideXappSubscriptionHandleImpl(params.XappSubscriptionData) if err != nil { + xapp.Logger.Error("RoutingManager->SubManager Add Request Failed: " + err.Error()) 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) + xapp.Logger.Info("RoutingManager->SubManager Add Request Success, subid = %v, requestor = %v", *params.XappSubscriptionData.SubscriptionID, *params.XappSubscriptionData.Address) 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 { + xapp.Logger.Error("RoutingManager->SubManager Delete Request Failed: " + err.Error()) 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) + xapp.Logger.Info("RoutingManager->SubManager Delete Request Success, subid = %v, requestor = %v", *params.XappSubscriptionData.SubscriptionID, *params.XappSubscriptionData.Address) return handle.NewGetHandlesOK() } }) api.HandleUpdateXappSubscriptionHandleHandler = handle.UpdateXappSubscriptionHandleHandlerFunc( func(params handle.UpdateXappSubscriptionHandleParams) middleware.Responder { - err := updateXappSubscriptionHandleImpl(subupdatechan, ¶ms.XappList, params.SubscriptionID) + err := updateXappSubscriptionHandleImpl(¶ms.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 { + xapp.Logger.Error("RoutingManager->E2Manager AddE2T Request Failed: " + err.Error()) return handle.NewCreateNewE2tHandleBadRequest() } else { - time.Sleep(1 * time.Second) + xapp.Logger.Info("RoutingManager->E2Manager AddE2T Request Success, E2T = %v", *params.E2tData.E2TAddress) 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 { + xapp.Logger.Error("RoutingManager->E2Manager associateRanToE2T Request Failed: " + err.Error()) return handle.NewAssociateRanToE2tHandleBadRequest() } else { - time.Sleep(1 * time.Second) + xapp.Logger.Info("RoutingManager->E2Manager associateRanToE2T Request Success, E2T = %v", params.RanE2tList) 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 { + xapp.Logger.Error("RoutingManager->E2Manager DisassociateRanToE2T Request Failed: " + err.Error()) return handle.NewDissociateRanBadRequest() } else { - time.Sleep(1 * time.Second) + xapp.Logger.Info("RoutingManager->E2Manager DisassociateRanToE2T Request Success, E2T = %v", params.DissociateList) 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 { + xapp.Logger.Error("RoutingManager->E2Manager DeleteE2T Request Failed: " + err.Error()) return handle.NewDeleteE2tHandleBadRequest() } else { - time.Sleep(1 * time.Second) + xapp.Logger.Info("RoutingManager->E2Manager DeleteE2T Request Success, E2T = %v", *params.E2tData.E2TAddress) return handle.NewDeleteE2tHandleCreated() } }) @@ -498,6 +531,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 { @@ -574,40 +627,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++ { + for i := 1; i <= maxRetries; i++ { readErr = nil e2tDataList, err := httpGetE2TList(e2murl) @@ -620,28 +674,28 @@ 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) + 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()) - } + writeErr := sdlEngine.WriteAll(fileName, ricData) + if writeErr != nil { + xapp.Logger.Error(writeErr.Error()) + } xapp.Logger.Info("Trying to fetch Subscriptions data from Subscription manager") - for i := 1; i <= maxRetries; i++ { + for i := 1; i <= maxRetries; i++ { readErr = nil sub_list, err := xapp.Subscription.QuerySubscriptions() @@ -651,137 +705,51 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile } else { readErr = err xapp.Logger.Warn("cannot get xapp data due to: " + readErr.Error()) - } + } time.Sleep(2 * time.Second) } - if (readErr != nil) { - return readErr + 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]) + } + } + + return nil } - // 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 { + 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 } - - 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 - } - } - } - }() - - 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 - } - }() - - 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 - } - } - }() - - 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 - } - }() - - go func() { - for { - - data := <-disassociateranchan - xapp.Logger.Debug("received disassociate RANs from E2T instance") - m.Lock() - sdlEngine.WriteDisAssRANFromE2TInstance(fileName, data) - m.Unlock() - triggerSBI <- true - } - }() - - 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 @@ -872,7 +840,7 @@ func PopulateSubscription(sub_list xfmodel.SubscriptionList) { stringSlice := strings.Split(ep, ":") subdata.Address = &stringSlice[0] - intportval, _ := strconv.Atoi( stringSlice[1]) + 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) @@ -880,3 +848,57 @@ func PopulateSubscription(sub_list xfmodel.SubscriptionList) { } } } + +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) + } + + } + } + updateEp() + 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 +}