type Control struct {
e2ap *E2ap
registry *Registry
- rtmgrClient *RtmgrClient
tracker *Tracker
timerMap *TimerMap
rmrSendMutex sync.Mutex
func NewControl() *Control {
+ transport := httptransport.New(viper.GetString("rtmgr.HostAddr")+":"+viper.GetString("rtmgr.port"), viper.GetString("rtmgr.baseUrl"), []string{"http"})
+ client := rtmgrclient.New(transport, strfmt.Default)
+ handle := rtmgrhandle.NewProvideXappSubscriptionHandleParamsWithTimeout(10 * time.Second)
+ deleteHandle := rtmgrhandle.NewDeleteXappSubscriptionHandleParamsWithTimeout(10 * time.Second)
+ rtmgrClient := RtmgrClient{client, handle, deleteHandle}
+
registry := new(Registry)
registry.Initialize(seedSN)
+ registry.rtmgrClient = &rtmgrClient
tracker := new(Tracker)
tracker.Init()
timerMap := new(TimerMap)
timerMap.Init()
- transport := httptransport.New(viper.GetString("rtmgr.HostAddr")+":"+viper.GetString("rtmgr.port"), viper.GetString("rtmgr.baseUrl"), []string{"http"})
- client := rtmgrclient.New(transport, strfmt.Default)
- handle := rtmgrhandle.NewProvideXappSubscriptionHandleParamsWithTimeout(10 * time.Second)
- deleteHandle := rtmgrhandle.NewDeleteXappSubscriptionHandleParamsWithTimeout(10 * time.Second)
- rtmgrClient := RtmgrClient{client, handle, deleteHandle}
-
- rtmgrClientPtr := &rtmgrClient
-
- //TODO: to make this better. Now it is just a hack.
- registry.rtmgrClient = rtmgrClientPtr
-
return &Control{e2ap: new(E2ap),
- registry: registry,
- rtmgrClient: rtmgrClientPtr,
- tracker: tracker,
- timerMap: timerMap,
- msgCounter: 0,
+ registry: registry,
+ tracker: tracker,
+ timerMap: timerMap,
+ msgCounter: 0,
}
}
err = subs.SetTransaction(trans)
if err != nil {
xapp.Logger.Error("SubReq: %s, Dropping this msg. %s", err.Error(), trans)
- c.registry.DelSubscription(subs.Seq)
+ subs.Release()
trans.Release()
return
}
packedData, err := c.e2ap.PackSubscriptionRequest(trans.SubReqMsg)
if err != nil {
xapp.Logger.Error("SubReq: %s for trans %s", err.Error(), trans)
- c.registry.DelSubscription(subs.Seq)
+ subs.Release()
trans.Release()
return
}
}
trans.Release()
- if !c.registry.DelSubscription(subs.GetSubId()) {
- xapp.Logger.Error("SubFail: Failed to release sequency number. %s", subs)
- }
+ subs.Release()
return
}
trans.RetryTransaction()
- c.rmrSend("SubReq(SubReq timer) to E2T", subs, trans, trans.Payload, trans.PayloadLen)
+ c.rmrSend("SubReq(SubReq timer retransmit) to E2T", subs, trans, trans.Payload, trans.PayloadLen)
tryCount++
c.timerMap.StartTimer("RIC_SUB_REQ", int(subs.GetSubId()), subReqTime, tryCount, c.handleSubscriptionRequestTimer)
if err != nil {
xapp.Logger.Error("SubReq timeout: %s, Dropping this msg.", err.Error())
//TODO improve error handling. Important at least in merge
- c.registry.DelSubscription(subs.GetSubId())
+ subs.Release()
return
}
xapp.Logger.Error("SubReq timeout: Packing SubDelReq failed. Err: %v", err)
//TODO improve error handling. Important at least in merge
deltrans.Release()
- c.registry.DelSubscription(subs.GetSubId())
+ subs.Release()
return
}
deltrans.PayloadLen = len(packedData.Buf)
return
}
- trans.Release()
-
if trans.ForwardRespToXapp == true {
c.rmrReplyToSender("SubDelResp to xapp", subs, trans, params.Mtype, params.Payload, params.PayloadLen)
time.Sleep(3 * time.Second)
}
- xapp.Logger.Info("SubDelResp: Deleting trans record. SubId: %v, Xid: %s", subs.GetSubId(), trans.GetXid())
- if !c.registry.DelSubscription(subs.GetSubId()) {
- xapp.Logger.Error("SubDelResp: Failed to release sequency number. SubId: %v, Xid: %s", subs.GetSubId(), trans.GetXid())
- return
- }
+ trans.Release()
+ subs.Release()
return
}
time.Sleep(3 * time.Second)
}
- xapp.Logger.Info("SubDelFail: Deleting trans record. SubId: %v, Xid: %s", subs.GetSubId(), trans.GetXid())
trans.Release()
- if !c.registry.DelSubscription(subs.GetSubId()) {
- xapp.Logger.Error("SubDelFail: Failed to release sequency number. Err: %v, SubId: %v, Xid: %s", err, subs.GetSubId(), trans.GetXid())
- return
- }
+ subs.Release()
return
}
}
if tryCount < maxSubDelReqTryCount {
- xapp.Logger.Info("SubDelReq timeout: Resending SubDelReq to E2T: Mtype: %v, SubId: %v, Xid %s, Meid %v", trans.GetMtype(), subs.GetSubId(), trans.GetXid(), trans.GetMeid())
// Set possible to handle new response for the subId
-
trans.RetryTransaction()
-
- c.rmrSend("SubDelReq(SubDelReq timer) to E2T", subs, trans, trans.Payload, trans.PayloadLen)
-
+ c.rmrSend("SubDelReq(SubDelReq timer retransmit) to E2T", subs, trans, trans.Payload, trans.PayloadLen)
tryCount++
c.timerMap.StartTimer("RIC_SUB_DEL_REQ", int(subs.GetSubId()), subReqTime, tryCount, c.handleSubscriptionDeleteRequestTimer)
return
time.Sleep(3 * time.Second)
}
-
- xapp.Logger.Info("SubDelReq timeout: Deleting trans record. SubId: %v, Xid: %s", subs.GetSubId(), trans.GetXid())
trans.Release()
- if !c.registry.DelSubscription(subs.GetSubId()) {
- xapp.Logger.Error("SubDelReq timeout: Failed to release sequency number. SubId: %v, Xid: %s", subs.GetSubId(), trans.GetXid())
- }
+ subs.Release()
return
}
//
//-----------------------------------------------------------------------------
type Subscription struct {
- mutex sync.Mutex
- Seq uint16
- Active bool
+ mutex sync.Mutex
+ registry *Registry
+ Seq uint16
+ Active bool
//
Meid *xapp.RMRMeid
RmrEndpoint // xapp endpoint. Now only one xapp can have relation to single subscription. To be changed in merge
return s.Trans
}
-func (s *Subscription) UpdateRoute(act Action, rtmgrClient *RtmgrClient) error {
- s.mutex.Lock()
- defer s.mutex.Unlock()
+func (s *Subscription) updateRouteImpl(act Action) error {
xapp.Logger.Info("Subscription: Starting routing manager route add. SubId: %d, RmrEndpoint: %s", s.Seq, s.RmrEndpoint)
subRouteAction := SubRouteInfo{act, s.RmrEndpoint.Addr, s.RmrEndpoint.Port, s.Seq}
- err := rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
+ err := s.registry.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
if err != nil {
return fmt.Errorf("Subscription: Failed to add route. SubId: %d, RmrEndpoint: %s", s.Seq, s.RmrEndpoint)
}
return nil
}
+
+func (s *Subscription) UpdateRoute(act Action) error {
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ return s.updateRouteImpl(act)
+}
+
+func (s *Subscription) Release() {
+ xapp.Logger.Info("Subscription: Releasing %s", s)
+ s.mutex.Lock()
+ defer s.mutex.Unlock()
+ s.registry.DelSubscription(s.Seq)
+ err := s.updateRouteImpl(DELETE)
+ if err != nil {
+ xapp.Logger.Error("Registry: Failed to del route. SubId: %d, RmrEndpoint: %s", s.Seq, s.RmrEndpoint)
+ }
+}