X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fhttprestful.go;h=794cee9d6cbc5724c43fa9b457c88eb92772a57f;hb=refs%2Fchanges%2F54%2F12254%2F1;hp=60d65fbc06ad8e68b4b2e6fc6d24fa56b1817d2d;hpb=505e2497ce651c1127ffbcefe396b3f8c0d0f9dd;p=ric-plt%2Frtmgr.git diff --git a/pkg/nbi/httprestful.go b/pkg/nbi/httprestful.go index 60d65fb..794cee9 100644 --- a/pkg/nbi/httprestful.go +++ b/pkg/nbi/httprestful.go @@ -37,18 +37,19 @@ import ( "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" + //"github.com/go-openapi/loads" + //"github.com/go-openapi/runtime/middleware" "net" - "net/url" - "os" + //"net/url" + //"os" "routing-manager/pkg/models" - "routing-manager/pkg/restapi" - "routing-manager/pkg/restapi/operations" - "routing-manager/pkg/restapi/operations/debug" - "routing-manager/pkg/restapi/operations/handle" + //"routing-manager/pkg/restapi" + //"routing-manager/pkg/restapi/operations" + //"routing-manager/pkg/restapi/operations/debug" + //"routing-manager/pkg/restapi/operations/handle" "routing-manager/pkg/rpe" "routing-manager/pkg/rtmgr" + "routing-manager/pkg/sbi" "routing-manager/pkg/sdl" "strconv" "strings" @@ -58,13 +59,13 @@ import ( type HttpRestful struct { Engine - LaunchRest LaunchRestHandler + //LaunchRest LaunchRestHandler RetrieveStartupData RetrieveStartupDataHandler } func NewHttpRestful() *HttpRestful { instance := new(HttpRestful) - instance.LaunchRest = launchRest + //instance.LaunchRest = launchRest instance.RetrieveStartupData = retrieveStartupData return instance } @@ -84,7 +85,7 @@ func recvXappCallbackData(xappData *models.XappCallbackData) (*[]rtmgr.XApp, err func recvNewE2Tdata(e2tData *models.E2tData) (*rtmgr.E2TInstance, string, error) { var str string - xapp.Logger.Info("data received") + xapp.Logger.Info("Data received") if nil != e2tData { @@ -124,7 +125,7 @@ func validateXappCallbackData(callbackData *models.XappCallbackData) error { return nil } -func provideXappHandleHandlerImpl(data *models.XappCallbackData) error { +func ProvideXappHandleHandlerImpl(data *models.XappCallbackData) error { if data == nil { xapp.Logger.Debug("Received callback data") return nil @@ -136,9 +137,9 @@ func provideXappHandleHandlerImpl(data *models.XappCallbackData) error { } else { appdata, err := recvXappCallbackData(data) if err != nil { - xapp.Logger.Error("cannot get data from rest api dute to: " + err.Error()) + 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.") + 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() @@ -217,14 +218,14 @@ func checkValidaE2TAddress(e2taddress string) bool { } -func provideXappSubscriptionHandleImpl(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 } - xapp.Logger.Debug("received XApp subscription data") + xapp.Logger.Debug("Received xApp subscription data") addSubscription(&rtmgr.Subs, data) xapp.Logger.Debug("Endpoints: %v", rtmgr.Eps) updateEp() @@ -243,7 +244,7 @@ func subscriptionExists(data *models.XappSubscriptionData) bool { return present } -func deleteXappSubscriptionHandleImpl(data *models.XappSubscriptionData) error { +func DeleteXappSubscriptionHandleImpl(data *models.XappSubscriptionData) error { xapp.Logger.Debug("Invoked deleteXappSubscriptionHandleImpl") err := validateXappSubscriptionData(data) if err != nil { @@ -252,19 +253,19 @@ func deleteXappSubscriptionHandleImpl(data *models.XappSubscriptionData) error { } if !subscriptionExists(data) { - xapp.Logger.Warn("subscription not found: %d", *data.SubscriptionID) - err := fmt.Errorf("subscription not found: %d", *data.SubscriptionID) + xapp.Logger.Warn("Subscription not found: %d", *data.SubscriptionID) + err := fmt.Errorf("Subscription not found: %d", *data.SubscriptionID) return err } - xapp.Logger.Debug("received XApp subscription delete data") + xapp.Logger.Debug("Received xApp subscription delete data") delSubscription(&rtmgr.Subs, data) updateEp() return sendRoutesToAll() } -func updateXappSubscriptionHandleImpl(data *models.XappList, subid uint16) error { +func UpdateXappSubscriptionHandleImpl(data *models.XappList, subid uint16) error { xapp.Logger.Debug("Invoked updateXappSubscriptionHandleImpl") var fqdnlist []rtmgr.FqDn @@ -285,13 +286,13 @@ func updateXappSubscriptionHandleImpl(data *models.XappList, subid uint16) error return err } } - xapp.Logger.Debug("received XApp subscription Merge data") + xapp.Logger.Debug("Received XApp subscription Merge data") updateSubscription(&xapplist) updateEp() return sendRoutesToAll() } -func createNewE2tHandleHandlerImpl(data *models.E2tData) error { +func CreateNewE2tHandleHandlerImpl(data *models.E2tData) error { xapp.Logger.Debug("Invoked createNewE2tHandleHandlerImpl") err, IsDuplicate := validateE2tData(data) if IsDuplicate == true { @@ -306,18 +307,24 @@ func createNewE2tHandleHandlerImpl(data *models.E2tData) error { } //e2taddchan <- data e2data, meiddata, _ := recvNewE2Tdata(data) - xapp.Logger.Debug("received create New E2T data") + xapp.Logger.Debug("Received create New E2T data") m.Lock() sdlEngine.WriteNewE2TInstance(xapp.Config.GetString("rtfile"), e2data, meiddata) m.Unlock() updateEp() //sendPartialRoutesToAll(nil, rtmgr.E2Type) + sbi.Conn.Lock() + rtmgr.RMRConnStatus[*data.E2TAddress] = false + sbi.Conn.Unlock() + sendRoutesToAll() time.Sleep(10 * time.Second) - for ep, value := range rtmgr.RMRConnStatus { - if ep == *data.E2TAddress && value == true { - return nil - } + if rtmgr.RMRConnStatus[*data.E2TAddress] == true { + sbi.Conn.Lock() + delete(rtmgr.RMRConnStatus, *data.E2TAddress) + sbi.Conn.Unlock() + xapp.Logger.Debug("RMRConnStatus Map after = %v", rtmgr.RMRConnStatus) + return nil } return errors.New("Error while adding new E2T " + *data.E2TAddress) @@ -342,14 +349,14 @@ func validateE2TAddressRANListData(assRanE2tData models.RanE2tMap) error { return nil } -func associateRanToE2THandlerImpl(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 } - xapp.Logger.Debug("received associate RAN list to E2T instance mapping from E2 Manager") + 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() @@ -358,14 +365,14 @@ func associateRanToE2THandlerImpl(data models.RanE2tMap) error { } -func disassociateRanToE2THandlerImpl(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 } - xapp.Logger.Debug("received disassociate RANs from E2T instance") + xapp.Logger.Debug("Received disassociate RANs from E2T instance") m.Lock() sdlEngine.WriteDisAssRANFromE2TInstance(xapp.Config.GetString("rtfile"), data) m.Unlock() @@ -374,7 +381,7 @@ func disassociateRanToE2THandlerImpl(data models.RanE2tMap) error { } -func deleteE2tHandleHandlerImpl(data *models.E2tDeleteData) error { +func DeleteE2tHandleHandlerImpl(data *models.E2tDeleteData) error { xapp.Logger.Debug("Invoked deleteE2tHandleHandlerImpl") err := validateDeleteE2tData(data) @@ -390,7 +397,7 @@ func deleteE2tHandleHandlerImpl(data *models.E2tDeleteData) error { } -func dumpDebugData() (models.Debuginfo, error) { +func DumpDebugData() (models.Debuginfo, error) { var response models.Debuginfo sdlEngine, _ := sdl.GetSdl("file") rpeEngine, _ := rpe.GetRpe("rmrpush") @@ -412,155 +419,6 @@ func dumpDebugData() (models.Debuginfo, error) { return response, err } -func launchRest(nbiif *string) { - swaggerSpec, err := loads.Embedded(restapi.SwaggerJSON, restapi.FlatSwaggerJSON) - if err != nil { - //log.Fatalln(err) - xapp.Logger.Error(err.Error()) - os.Exit(1) - } - nbiUrl, err := url.Parse(*nbiif) - if err != nil { - xapp.Logger.Error(err.Error()) - os.Exit(1) - } - api := operations.NewRoutingManagerAPI(swaggerSpec) - server := restapi.NewServer(api) - defer server.Shutdown() - - server.Port, err = strconv.Atoi(nbiUrl.Port()) - if err != nil { - xapp.Logger.Error("Invalid NBI RestAPI port") - os.Exit(1) - } - server.Host = "0.0.0.0" - // set handlers - api.HandleProvideXappHandleHandler = handle.ProvideXappHandleHandlerFunc( - func(params handle.ProvideXappHandleParams) middleware.Responder { - xapp.Logger.Info("Data received on Http interface") - err := provideXappHandleHandlerImpl(params.XappCallbackData) - if err != nil { - 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(params.XappSubscriptionData) - if err != nil { - xapp.Logger.Error("RoutingManager->SubManager Add Request Failed: " + err.Error()) - return handle.NewProvideXappSubscriptionHandleBadRequest() - } else { - 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(params.XappSubscriptionData) - if err != nil { - xapp.Logger.Error("RoutingManager->SubManager Delete Request Failed: " + err.Error()) - return handle.NewDeleteXappSubscriptionHandleNoContent() - } else { - 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(¶ms.XappList, params.SubscriptionID) - if err != nil { - return handle.NewUpdateXappSubscriptionHandleBadRequest() - } else { - return handle.NewUpdateXappSubscriptionHandleCreated() - } - }) - api.HandleCreateNewE2tHandleHandler = handle.CreateNewE2tHandleHandlerFunc( - func(params handle.CreateNewE2tHandleParams) middleware.Responder { - err := createNewE2tHandleHandlerImpl(params.E2tData) - if err != nil { - xapp.Logger.Error("RoutingManager->E2Manager AddE2T Request Failed: " + err.Error()) - return handle.NewCreateNewE2tHandleBadRequest() - } else { - 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(params.RanE2tList) - if err != nil { - xapp.Logger.Error("RoutingManager->E2Manager associateRanToE2T Request Failed: " + err.Error()) - return handle.NewAssociateRanToE2tHandleBadRequest() - } else { - 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(params.DissociateList) - if err != nil { - xapp.Logger.Error("RoutingManager->E2Manager DisassociateRanToE2T Request Failed: " + err.Error()) - return handle.NewDissociateRanBadRequest() - } else { - 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(params.E2tData) - if err != nil { - xapp.Logger.Error("RoutingManager->E2Manager DeleteE2T Request Failed: " + err.Error()) - return handle.NewDeleteE2tHandleBadRequest() - } else { - xapp.Logger.Info("RoutingManager->E2Manager DeleteE2T Request Success, E2T = %v", *params.E2tData.E2TAddress) - return handle.NewDeleteE2tHandleCreated() - } - }) - api.DebugGetDebuginfoHandler = debug.GetDebuginfoHandlerFunc( - func(params debug.GetDebuginfoParams) middleware.Responder { - response, err := dumpDebugData() - if err != nil { - return debug.NewGetDebuginfoCreated() - } else { - 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 { - xapp.Logger.Error(err.Error()) - } -} - func httpGetXApps(xmurl string) (*[]rtmgr.XApp, error) { xapp.Logger.Info("Invoked httprestful.httpGetXApps: " + xmurl) r, err := myClient.Get(xmurl) @@ -600,14 +458,14 @@ func httpGetE2TList(e2murl string) (*[]rtmgr.E2tIdentity, error) { xapp.Logger.Warn("Json decode failed: " + err.Error()) } xapp.Logger.Info("HTTP GET: OK") - xapp.Logger.Debug("httprestful.httpGetXApps returns: %v", E2Tlist) + xapp.Logger.Debug("httprestful.httpGetE2TList returns: %v", E2Tlist) return &E2Tlist, err } xapp.Logger.Warn("httprestful got an unexpected http status code: %v", r.StatusCode) return nil, nil } -func PopulateE2TMap(e2tDataList *[]rtmgr.E2tIdentity, e2ts map[string]rtmgr.E2TInstance, meids []string) { +func PopulateE2TMap(e2tDataList *[]rtmgr.E2tIdentity, e2ts map[string]rtmgr.E2TInstance, meids *[]string) { xapp.Logger.Info("Invoked httprestful.PopulateE2TMap ") for _, e2tData := range *e2tDataList { @@ -626,12 +484,13 @@ func PopulateE2TMap(e2tDataList *[]rtmgr.E2tIdentity, e2ts map[string]rtmgr.E2TI for _, meid := range e2tData.Rannames { meidar += meid + " " } - str += "mme_ar|" + e2tData.E2taddress + "|" + strings.TrimSuffix(meidar, " ") + str = "mme_ar|" + e2tData.E2taddress + "|" + strings.TrimSuffix(meidar, " ") + *meids = append(*meids, str) } e2ts[e2tinst.Fqdn] = e2tinst - meids = append(meids, str) } + 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 { @@ -652,7 +511,7 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile } else if err == nil { readErr = errors.New("unexpected HTTP status code") } else { - xapp.Logger.Warn("cannot get xapp data due to: " + err.Error()) + xapp.Logger.Warn("Cannot get xapp data due to: " + err.Error()) readErr = err } } @@ -669,12 +528,12 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile readErr = nil e2tDataList, err := httpGetE2TList(e2murl) if e2tDataList != nil && err == nil { - PopulateE2TMap(e2tDataList, e2ts, meids[:]) + PopulateE2TMap(e2tDataList, e2ts, &meids) break } else if err == nil { readErr = errors.New("unexpected HTTP status code") } else { - xapp.Logger.Warn("cannot get E2T data from E2M due to: " + err.Error()) + xapp.Logger.Warn("Cannot get E2T data from E2M due to: " + err.Error()) readErr = err } time.Sleep(2 * time.Second) @@ -707,7 +566,7 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile break } else { readErr = err - xapp.Logger.Warn("cannot get xapp data due to: " + readErr.Error()) + xapp.Logger.Warn("Cannot get xapp data due to: " + readErr.Error()) } time.Sleep(2 * time.Second) } @@ -724,7 +583,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"]) @@ -733,7 +592,7 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile 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) + xapp.Logger.Info("Value of formed string in loop = %s", newstring) rtmgr.DynamicRouteList = append(rtmgr.DynamicRouteList, newstring[i]) } } @@ -751,9 +610,6 @@ func (r *HttpRestful) Initialize(xmurl string, nbiif string, fileName string, co xapp.Logger.Error("Exiting as nbi failed to get the initial startup data from the xapp manager: " + err.Error()) return err } - go func() { - r.LaunchRest(&nbiif) - }() return nil } @@ -817,7 +673,7 @@ func updateSubscription(data *rtmgr.XappList) { subdata.SubscriptionID = &subs.SubID subdata.Address = &subs.Fqdn subdata.Port = &subs.Port - xapp.Logger.Debug("Deletion Subscription List has %v", subdata) + xapp.Logger.Debug("Deleting Subscription List has %v", subdata) delSubscription(&rtmgr.Subs, &subdata) break } @@ -839,8 +695,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]) @@ -852,8 +707,8 @@ 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) +func Adddelrmrroute(routelist models.Routelist, rtflag bool) error { + xapp.Logger.Info("Updating rmr route with Route list: %v,flag: %v", routelist, rtflag) for _, rlist := range routelist { var subid int32 var data string @@ -877,12 +732,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) + xapp.Logger.Info("route %s deleted successfully", 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)