package control
import (
+ "encoding/json"
"fmt"
+ "strings"
"sync"
"time"
xAppRmrEndPoint string
Meid string
InstanceIds []uint32
+ xAppIdToE2Id map[int64]int64
SubReqOngoing bool
SubDelReqOngoing bool
+ lastReqMd5sum string
}
-func (r *RESTSubscription) AddInstanceId(instanceId uint32) {
+func (r *RESTSubscription) AddE2InstanceId(instanceId uint32) {
+
+ for _, v := range r.InstanceIds {
+ if v == instanceId {
+ return
+ }
+
+ }
+
r.InstanceIds = append(r.InstanceIds, instanceId)
}
-func (r *RESTSubscription) SetProcessed() {
- r.SubReqOngoing = false
+func (r *RESTSubscription) AddMd5Sum(md5sum string) {
+ if md5sum != "" {
+ r.lastReqMd5sum = md5sum
+ } else {
+ xapp.Logger.Error("EMPTY md5sum attempted to be add to subscrition")
+ }
}
-func (r *RESTSubscription) DeleteInstanceId(instanceId uint32) {
+func (r *RESTSubscription) DeleteE2InstanceId(instanceId uint32) {
r.InstanceIds = r.InstanceIds[1:]
}
+func (r *RESTSubscription) AddXappIdToE2Id(xAppEventInstanceID int64, e2EventInstanceID int64) {
+ r.xAppIdToE2Id[xAppEventInstanceID] = e2EventInstanceID
+}
+
+func (r *RESTSubscription) GetE2IdFromXappIdToE2Id(xAppEventInstanceID int64) int64 {
+ return r.xAppIdToE2Id[xAppEventInstanceID]
+}
+
+func (r *RESTSubscription) DeleteXappIdToE2Id(xAppEventInstanceID int64) {
+ delete(r.xAppIdToE2Id, xAppEventInstanceID)
+}
+
+func (r *RESTSubscription) SetProcessed(err error) {
+ r.SubReqOngoing = false
+ if err != nil {
+ r.lastReqMd5sum = ""
+ }
+}
+
type Registry struct {
mutex sync.Mutex
register map[uint32]*Subscription
}
}
-func (r *Registry) CreateRESTSubscription(restSubId *string, xAppRmrEndPoint *string, maid *string) (*RESTSubscription, error) {
+func (r *Registry) GetAllRestSubscriptions() []byte {
+ r.mutex.Lock()
+ defer r.mutex.Unlock()
+ restSubscriptionsJson, err := json.Marshal(r.restSubscriptions)
+ if err != nil {
+ xapp.Logger.Error("GetAllRestSubscriptions(): %v", err)
+ }
+ return restSubscriptionsJson
+}
+
+func (r *Registry) CreateRESTSubscription(restSubId *string, xAppRmrEndPoint *string, maid *string) *RESTSubscription {
r.mutex.Lock()
defer r.mutex.Unlock()
newRestSubscription := RESTSubscription{}
newRestSubscription.SubReqOngoing = true
newRestSubscription.SubDelReqOngoing = false
r.restSubscriptions[*restSubId] = &newRestSubscription
- xapp.Logger.Info("Registry: Created REST subscription successfully. restSubId=%v, subscriptionCount=%v, e2apCubscriptionCount=%v", *restSubId, len(r.restSubscriptions), len(r.register))
- return &newRestSubscription, nil
+ newRestSubscription.xAppIdToE2Id = make(map[int64]int64)
+ xapp.Logger.Debug("Registry: Created REST subscription successfully. restSubId=%v, subscriptionCount=%v, e2apSubscriptionCount=%v", *restSubId, len(r.restSubscriptions), len(r.register))
+ return &newRestSubscription
}
func (r *Registry) DeleteRESTSubscription(restSubId *string) {
r.mutex.Lock()
defer r.mutex.Unlock()
delete(r.restSubscriptions, *restSubId)
- xapp.Logger.Info("Registry: Deleted REST subscription successfully. restSubId=%v, subscriptionCount=%v", *restSubId, len(r.restSubscriptions))
+ xapp.Logger.Debug("Registry: Deleted REST subscription successfully. restSubId=%v, subscriptionCount=%v", *restSubId, len(r.restSubscriptions))
}
-func (r *Registry) GetRESTSubscription(restSubId string) (*RESTSubscription, error) {
+func (r *Registry) GetRESTSubscription(restSubId string, IsDelReqOngoing bool) (*RESTSubscription, error) {
r.mutex.Lock()
defer r.mutex.Unlock()
if restSubscription, ok := r.restSubscriptions[restSubId]; ok {
// Subscription deletion is not allowed if prosessing subscription request in not ready
if restSubscription.SubDelReqOngoing == false && restSubscription.SubReqOngoing == false {
- restSubscription.SubDelReqOngoing = true
+ if IsDelReqOngoing == true {
+ restSubscription.SubDelReqOngoing = true
+ }
r.restSubscriptions[restSubId] = restSubscription
return restSubscription, nil
} else {
return restSubscription, fmt.Errorf("Registry: REST request is still ongoing for the endpoint=%v, restSubId=%v, SubDelReqOngoing=%v, SubReqOngoing=%v", restSubscription, restSubId, restSubscription.SubDelReqOngoing, restSubscription.SubReqOngoing)
}
- return restSubscription, nil
}
return nil, fmt.Errorf("Registry: No valid subscription found with restSubId=%v", restSubId)
}
return resp, nil
}
-func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest, resetTestFlag bool) (*Subscription, error) {
+func (r *Registry) allocateSubs(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest, resetTestFlag bool, rmrRoutecreated bool) (*Subscription, error) {
if len(r.subIds) > 0 {
subId := r.subIds[0]
r.subIds = r.subIds[1:]
subs := &Subscription{
registry: r,
Meid: trans.Meid,
+ RMRRouteCreated: rmrRoutecreated,
SubReqMsg: subReqMsg,
valid: true,
+ PolicyUpdate: false,
RetryFromXapp: false,
SubRespRcvd: false,
DeleteFromDb: false,
NoRespToXapp: false,
DoNotWaitSubResp: false,
}
- subs.ReqId.Id = 123
+ subs.ReqId.Id = subReqMsg.RequestId.Id
subs.ReqId.InstanceId = subId
- if resetTestFlag == true {
- subs.DoNotWaitSubResp = true
- }
+ r.SetResetTestFlag(resetTestFlag, subs)
if subs.EpList.AddEndpoint(trans.GetEndpoint()) == false {
r.subIds = append(r.subIds, subs.ReqId.InstanceId)
return nil, false
}
-func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest, resetTestFlag bool, c *Control) (*Subscription, error) {
+func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest, resetTestFlag bool, c *Control, createRMRRoute bool) (*Subscription, ErrorInfo, error) {
var err error
var newAlloc bool
+ errorInfo := ErrorInfo{}
r.mutex.Lock()
defer r.mutex.Unlock()
actionType, err := r.CheckActionTypes(subReqMsg)
if err != nil {
xapp.Logger.Debug("CREATE %s", err)
- return nil, err
+ err = fmt.Errorf("E2 content validation failed")
+ return nil, errorInfo, err
}
//
xapp.Logger.Debug("CREATE %s. Existing subscription for Policy found.", subs.String())
// Update message data to subscription
subs.SubReqMsg = subReqMsg
+ subs.PolicyUpdate = true
subs.SetCachedResponse(nil, true)
- return subs, nil
+ r.SetResetTestFlag(resetTestFlag, subs)
+ return subs, errorInfo, nil
}
}
subs, endPointFound := r.findExistingSubs(trans, subReqMsg)
if subs == nil {
- if subs, err = r.allocateSubs(trans, subReqMsg, resetTestFlag); err != nil {
- return nil, err
+ if subs, err = r.allocateSubs(trans, subReqMsg, resetTestFlag, createRMRRoute); err != nil {
+ xapp.Logger.Error("%s", err.Error())
+ err = fmt.Errorf("subscription not allocated")
+ return nil, errorInfo, err
}
newAlloc = true
} else if endPointFound == true {
// Requesting endpoint is already present in existing subscription. This can happen if xApp is restarted.
subs.RetryFromXapp = true
- xapp.Logger.Debug("CREATE: subscription already exists. %s", subs.String())
- return subs, nil
+ xapp.Logger.Debug("CREATE subReqMsg.InstanceId=%v. Same subscription %s already exists.", subReqMsg.InstanceId, subs.String())
+ c.UpdateCounter(cDuplicateE2SubReq)
+ return subs, errorInfo, nil
}
//
defer subs.mutex.Unlock()
epamount := subs.EpList.Size()
- xapp.Logger.Info("AssignToSubscription subs.EpList.Size() = %v", subs.EpList.Size())
+ xapp.Logger.Debug("AssignToSubscription subs.EpList.Size()=%v", subs.EpList.Size())
r.mutex.Unlock()
//
// Subscription route updates
//
- if epamount == 1 {
- err = r.RouteCreate(subs, c)
+ if createRMRRoute == true {
+ if epamount == 1 {
+ errorInfo, err = r.RouteCreate(subs, c)
+ } else {
+ errorInfo, err = r.RouteCreateUpdate(subs, c)
+ }
} else {
- err = r.RouteCreateUpdate(subs, c)
+ xapp.Logger.Debug("RMR route not created: createRMRRoute=%v", createRMRRoute)
}
r.mutex.Lock()
}
// Delete already added endpoint for the request
subs.EpList.DelEndpoint(trans.GetEndpoint())
- return nil, err
+ return nil, errorInfo, err
}
if newAlloc {
}
xapp.Logger.Debug("CREATE %s", subs.String())
xapp.Logger.Debug("Registry: substable=%v", r.register)
- return subs, nil
+ return subs, errorInfo, nil
}
-func (r *Registry) RouteCreate(subs *Subscription, c *Control) error {
+func (r *Registry) RouteCreate(subs *Subscription, c *Control) (ErrorInfo, error) {
+ errorInfo := ErrorInfo{}
subRouteAction := SubRouteInfo{subs.EpList, uint16(subs.ReqId.InstanceId)}
err := r.rtmgrClient.SubscriptionRequestCreate(subRouteAction)
if err != nil {
+ if strings.Contains(err.Error(), "status 400") {
+ errorInfo.TimeoutType = models.SubscriptionInstanceTimeoutTypeRTMGRTimeout
+ } else {
+ errorInfo.ErrorSource = models.SubscriptionInstanceErrorSourceRTMGR
+ }
+ errorInfo.ErrorCause = err.Error()
c.UpdateCounter(cRouteCreateFail)
+ xapp.Logger.Error("%s", err.Error())
+ err = fmt.Errorf("RTMGR route create failure")
}
- return err
+ return errorInfo, err
}
-func (r *Registry) RouteCreateUpdate(subs *Subscription, c *Control) error {
+func (r *Registry) RouteCreateUpdate(subs *Subscription, c *Control) (ErrorInfo, error) {
+ errorInfo := ErrorInfo{}
subRouteAction := SubRouteInfo{subs.EpList, uint16(subs.ReqId.InstanceId)}
err := r.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
if err != nil {
+ if strings.Contains(err.Error(), "status 400") {
+ errorInfo.TimeoutType = models.SubscriptionInstanceTimeoutTypeRTMGRTimeout
+ } else {
+ errorInfo.ErrorSource = models.SubscriptionInstanceErrorSourceRTMGR
+ }
+ errorInfo.ErrorCause = err.Error()
c.UpdateCounter(cRouteCreateUpdateFail)
- return err
+ xapp.Logger.Error("%s", err.Error())
+ err = fmt.Errorf("RTMGR route update failure")
+ return errorInfo, err
}
c.UpdateCounter(cMergedSubscriptions)
- return err
+ return errorInfo, err
}
func (r *Registry) CheckActionTypes(subReqMsg *e2ap.E2APSubscriptionRequest) (uint64, error) {
go func() {
if waitRouteClean > 0 {
+ xapp.Logger.Debug("Pending %v in order to wait route cleanup", waitRouteClean)
time.Sleep(waitRouteClean)
}
subs.mutex.Lock()
defer subs.mutex.Unlock()
- xapp.Logger.Info("CLEAN %s", subs.String())
+ xapp.Logger.Debug("CLEAN %s", subs.String())
if epamount == 0 {
//
// Subscription route delete
//
- r.RouteDelete(subs, trans, c)
+ if subs.RMRRouteCreated == true {
+ r.RouteDelete(subs, trans, c)
+ }
//
// Subscription release
//
// Subscription route update
//
- r.RouteDeleteUpdate(subs, c)
+ if subs.RMRRouteCreated == true {
+ r.RouteDeleteUpdate(subs, c)
+ }
}
}()
}
return nil, fmt.Errorf("No valid subscription found with subIds %v", subIds)
}
+
+func (r *Registry) SetResetTestFlag(resetTestFlag bool, subs *Subscription) {
+ if resetTestFlag == true {
+ // This is used in submgr restart unit tests
+ xapp.Logger.Debug("resetTestFlag == true")
+ subs.DoNotWaitSubResp = true
+ } else {
+ xapp.Logger.Debug("resetTestFlag == false")
+ }
+}
Code Review / ric-plt / submgr.git / blobdiff