X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fhttprestful.go;h=5223162386d04c27d5e7f20ccca7211c35686bcc;hb=b3c466d8ab4254f6b34a1f0af926c79a92ea372b;hp=f505b6308fb8751e9a56962a44fba25a5a6f96b5;hpb=8c690b8970f4409ddf6fee547b6246839b88c247;p=ric-plt%2Frtmgr.git diff --git a/pkg/nbi/httprestful.go b/pkg/nbi/httprestful.go index f505b63..5223162 100644 --- a/pkg/nbi/httprestful.go +++ b/pkg/nbi/httprestful.go @@ -37,16 +37,16 @@ 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/sdl" @@ -58,13 +58,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 } @@ -124,7 +124,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 @@ -144,7 +144,9 @@ func provideXappHandleHandlerImpl(data *models.XappCallbackData) error { m.Lock() sdlEngine.WriteXApps(xapp.Config.GetString("rtfile"), alldata) m.Unlock() + updateEp() return sendRoutesToAll() + //return sendPartialRoutesToAll(nil, rtmgr.XappType) } } @@ -215,7 +217,7 @@ 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 { @@ -225,7 +227,8 @@ func provideXappSubscriptionHandleImpl(data *models.XappSubscriptionData) error xapp.Logger.Debug("received XApp subscription data") addSubscription(&rtmgr.Subs, data) xapp.Logger.Debug("Endpoints: %v", rtmgr.Eps) - return sendRoutesToAll() + updateEp() + return sendPartialRoutesToAll(data, rtmgr.SubsType) } func subscriptionExists(data *models.XappSubscriptionData) bool { @@ -240,7 +243,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 { @@ -256,11 +259,12 @@ func deleteXappSubscriptionHandleImpl(data *models.XappSubscriptionData) error { 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 @@ -283,13 +287,16 @@ func updateXappSubscriptionHandleImpl(data *models.XappList, subid uint16) error } 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 { + updateEp() + //return sendPartialRoutesToAll(nil, rtmgr.E2Type) return sendRoutesToAll() } @@ -303,7 +310,17 @@ func createNewE2tHandleHandlerImpl(data *models.E2tData) error { m.Lock() sdlEngine.WriteNewE2TInstance(xapp.Config.GetString("rtfile"), e2data, meiddata) m.Unlock() - return sendRoutesToAll() + updateEp() + //sendPartialRoutesToAll(nil, rtmgr.E2Type) + 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) } @@ -325,7 +342,7 @@ 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 { @@ -336,11 +353,12 @@ func associateRanToE2THandlerImpl(data models.RanE2tMap) error { m.Lock() sdlEngine.WriteAssRANToE2TInstance(xapp.Config.GetString("rtfile"), data) m.Unlock() + updateEp() return sendRoutesToAll() } -func disassociateRanToE2THandlerImpl(data models.RanE2tMap) error { +func DisassociateRanToE2THandlerImpl(data models.RanE2tMap) error { xapp.Logger.Debug("Invoked disassociateRanToE2THandlerImpl") err := validateE2TAddressRANListData(data) if err != nil { @@ -351,11 +369,12 @@ func disassociateRanToE2THandlerImpl(data models.RanE2tMap) error { m.Lock() sdlEngine.WriteDisAssRANFromE2TInstance(xapp.Config.GetString("rtfile"), data) m.Unlock() + updateEp() return sendRoutesToAll() } -func deleteE2tHandleHandlerImpl(data *models.E2tDeleteData) error { +func DeleteE2tHandleHandlerImpl(data *models.E2tDeleteData) error { xapp.Logger.Debug("Invoked deleteE2tHandleHandlerImpl") err := validateDeleteE2tData(data) @@ -366,11 +385,12 @@ func deleteE2tHandleHandlerImpl(data *models.E2tDeleteData) error { m.Lock() sdlEngine.WriteDeleteE2TInstance(xapp.Config.GetString("rtfile"), data) m.Unlock() + updateEp() return sendRoutesToAll() } -func dumpDebugData() (models.Debuginfo, error) { +func DumpDebugData() (models.Debuginfo, error) { var response models.Debuginfo sdlEngine, _ := sdl.GetSdl("file") rpeEngine, _ := rpe.GetRpe("rmrpush") @@ -392,155 +412,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 DisiassociateRanToE2T 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) @@ -580,14 +451,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 { @@ -606,12 +477,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 { @@ -649,7 +521,7 @@ 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") @@ -731,9 +603,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 } @@ -832,7 +701,7 @@ func PopulateSubscription(sub_list xfmodel.SubscriptionList) { } } -func adddelrmrroute(routelist models.Routelist, rtflag bool) error { +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 @@ -870,6 +739,7 @@ func adddelrmrroute(routelist models.Routelist, rtflag bool) error { } } + updateEp() return sendRoutesToAll() }