X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fhttprestful.go;h=5223162386d04c27d5e7f20ccca7211c35686bcc;hb=b3c466d8ab4254f6b34a1f0af926c79a92ea372b;hp=f49f3ae8defce6f289025e8202b4d484af64ad8b;hpb=2c131acf0418c45d9045a6a81baf3e7d047fcb38;p=ric-plt%2Frtmgr.git diff --git a/pkg/nbi/httprestful.go b/pkg/nbi/httprestful.go index f49f3ae..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 - RetrieveStartupData RetrieveStartupDataHandler + //LaunchRest LaunchRestHandler + RetrieveStartupData RetrieveStartupDataHandler } func NewHttpRestful() *HttpRestful { instance := new(HttpRestful) - instance.LaunchRest = launchRest + //instance.LaunchRest = launchRest instance.RetrieveStartupData = retrieveStartupData return instance } @@ -124,9 +124,10 @@ func validateXappCallbackData(callbackData *models.XappCallbackData) error { return nil } -func provideXappHandleHandlerImpl(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 { @@ -134,18 +135,20 @@ func provideXappHandleHandlerImpl(data *models.XappCallbackData) error { return err } else { appdata, err := recvXappCallbackData(data) - if err != nil { + 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() + } 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 sendPartialRoutesToAll(nil, rtmgr.XappType) + } + } return nil } @@ -162,27 +165,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 { @@ -214,17 +217,18 @@ 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") - addSubscription(&rtmgr.Subs, data) + 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 { @@ -239,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 { @@ -253,13 +257,14 @@ func deleteXappSubscriptionHandleImpl(data *models.XappSubscriptionData) error { return err } - xapp.Logger.Debug("received XApp subscription delete data") - delSubscription(&rtmgr.Subs, 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 @@ -280,25 +285,42 @@ func updateXappSubscriptionHandleImpl(data *models.XappList, subid uint16) error return err } } - xapp.Logger.Debug("received XApp subscription Merge data") - updateSubscription(&xapplist) + 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 := validateE2tData(data) + err, IsDuplicate := validateE2tData(data) + if IsDuplicate == true { + updateEp() + //return sendPartialRoutesToAll(nil, rtmgr.E2Type) + return sendRoutesToAll() + } + if err != nil { xapp.Logger.Error(err.Error()) return err } //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() + 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) + 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) } @@ -320,37 +342,39 @@ 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") - m.Lock() - sdlEngine.WriteAssRANToE2TInstance(xapp.Config.GetString("rtfile"), data) - m.Unlock() + 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(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") - m.Lock() - sdlEngine.WriteDisAssRANFromE2TInstance(xapp.Config.GetString("rtfile"), data) - m.Unlock() + 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(data *models.E2tDeleteData) error { +func DeleteE2tHandleHandlerImpl(data *models.E2tDeleteData) error { xapp.Logger.Debug("Invoked deleteE2tHandleHandlerImpl") err := validateDeleteE2tData(data) @@ -358,21 +382,27 @@ func deleteE2tHandleHandlerImpl(data *models.E2tDeleteData) error { xapp.Logger.Error(err.Error()) return err } - m.Lock() - sdlEngine.WriteDeleteE2TInstance(xapp.Config.GetString("rtfile"), data) - m.Unlock() + 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") 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) @@ -382,122 +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("Invalid XApp callback data: " + err.Error()) - return handle.NewProvideXappHandleBadRequest() - } else { - return handle.NewGetHandlesOK() - } - }) - api.HandleProvideXappSubscriptionHandleHandler = handle.ProvideXappSubscriptionHandleHandlerFunc( - func(params handle.ProvideXappSubscriptionHandleParams) middleware.Responder { - err := provideXappSubscriptionHandleImpl(params.XappSubscriptionData) - if err != nil { - return handle.NewProvideXappSubscriptionHandleBadRequest() - } else { - return handle.NewGetHandlesOK() - } - }) - api.HandleDeleteXappSubscriptionHandleHandler = handle.DeleteXappSubscriptionHandleHandlerFunc( - func(params handle.DeleteXappSubscriptionHandleParams) middleware.Responder { - err := deleteXappSubscriptionHandleImpl(params.XappSubscriptionData) - if err != nil { - return handle.NewDeleteXappSubscriptionHandleNoContent() - } else { - 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 { - return handle.NewCreateNewE2tHandleBadRequest() - } else { - return handle.NewCreateNewE2tHandleCreated() - } - }) - - api.HandleAssociateRanToE2tHandleHandler = handle.AssociateRanToE2tHandleHandlerFunc( - func(params handle.AssociateRanToE2tHandleParams) middleware.Responder { - err := associateRanToE2THandlerImpl(params.RanE2tList) - if err != nil { - return handle.NewAssociateRanToE2tHandleBadRequest() - } else { - return handle.NewAssociateRanToE2tHandleCreated() - } - }) - - api.HandleDissociateRanHandler = handle.DissociateRanHandlerFunc( - func(params handle.DissociateRanParams) middleware.Responder { - err := disassociateRanToE2THandlerImpl(params.DissociateList) - if err != nil { - return handle.NewDissociateRanBadRequest() - } else { - return handle.NewDissociateRanCreated() - } - }) - - api.HandleDeleteE2tHandleHandler = handle.DeleteE2tHandleHandlerFunc( - func(params handle.DeleteE2tHandleParams) middleware.Responder { - err := deleteE2tHandleHandlerImpl(params.E2tData) - if err != nil { - return handle.NewDeleteE2tHandleBadRequest() - } else { - 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) - } - }) - // 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) @@ -537,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 { @@ -563,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 { @@ -606,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") @@ -636,18 +551,18 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile 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() + readErr = nil + sub_list, err := xapp.Subscription.QuerySubscriptions() - 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) + 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) + } if readErr != nil { return readErr @@ -655,7 +570,26 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile // 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 } @@ -669,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 } @@ -769,3 +700,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 +}