X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fsubscription.go;h=f66a1f14a1863f40dddcc3805beeb0a8d68d537c;hb=14f827331f7ae565d33cdf23c82f7794d3fc2d0d;hp=6fd806c610ce7c3761a9cd8d593c4e25e800a6fe;hpb=31797b49985822f1d402501f16ab2794838bebba;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/subscription.go b/pkg/control/subscription.go
index 6fd806c..f66a1f1 100644
--- a/pkg/control/subscription.go
+++ b/pkg/control/subscription.go
@@ -20,9 +20,8 @@
 package control
 
 import (
-	"fmt"
+	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-	"strconv"
 	"sync"
 )
 
@@ -30,30 +29,40 @@ import (
 //
 //-----------------------------------------------------------------------------
 type Subscription struct {
-	mutex    sync.Mutex
-	registry *Registry
-	Seq      uint16
-	Active   bool
-	//
-	Meid   *xapp.RMRMeid
-	EpList RmrEndpointList
-	Trans  *Transaction
+	mutex     sync.Mutex                    // Lock
+	valid     bool                          // valid
+	registry  *Registry                     // Registry
+	ReqId     RequestId                     // ReqId (Requestor Id + Seq Nro a.k.a subsid)
+	Meid      *xapp.RMRMeid                 // Meid/ RanName
+	EpList    RmrEndpointList               // Endpoints
+	TransLock sync.Mutex                    // Lock transactions, only one executed per time for subs
+	TheTrans  TransactionIf                 // Ongoing transaction
+	SubReqMsg *e2ap.E2APSubscriptionRequest // Subscription information
+	SubRFMsg  interface{}                   // Subscription information
 }
 
-func (s *Subscription) stringImpl() string {
-	return "subs(" + strconv.FormatUint(uint64(s.Seq), 10) + "/" + s.Meid.RanName + "/" + s.EpList.String() + ")"
+func (s *Subscription) String() string {
+	return "subs(" + s.ReqId.String() + "/" + s.Meid.RanName + "/" + s.EpList.String() + ")"
 }
 
-func (s *Subscription) String() string {
+func (s *Subscription) GetCachedResponse() (interface{}, bool) {
+	s.mutex.Lock()
+	defer s.mutex.Unlock()
+	return s.SubRFMsg, s.valid
+}
+
+func (s *Subscription) SetCachedResponse(subRFMsg interface{}, valid bool) (interface{}, bool) {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	return s.stringImpl()
+	s.SubRFMsg = subRFMsg
+	s.valid = valid
+	return s.SubRFMsg, s.valid
 }
 
-func (s *Subscription) GetSubId() uint16 {
+func (s *Subscription) GetReqId() *RequestId {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	return s.Seq
+	return &s.ReqId
 }
 
 func (s *Subscription) GetMeid() *xapp.RMRMeid {
@@ -65,85 +74,93 @@ func (s *Subscription) GetMeid() *xapp.RMRMeid {
 	return nil
 }
 
-func (s *Subscription) Confirmed() {
+func (s *Subscription) GetTransaction() TransactionIf {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	s.Active = true
+	return s.TheTrans
 }
 
-func (s *Subscription) UnConfirmed() {
+func (s *Subscription) WaitTransactionTurn(trans TransactionIf) {
+	s.TransLock.Lock()
 	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	s.Active = false
+	s.TheTrans = trans
+	s.mutex.Unlock()
 }
 
-func (s *Subscription) IsConfirmed() bool {
+func (s *Subscription) ReleaseTransactionTurn(trans TransactionIf) {
 	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	return s.Active
+	if trans != nil && trans == s.TheTrans {
+		s.TheTrans = nil
+	}
+	s.mutex.Unlock()
+	s.TransLock.Unlock()
 }
 
-func (s *Subscription) IsEndpoint(ep *RmrEndpoint) bool {
+func (s *Subscription) IsMergeable(trans *TransactionXapp, subReqMsg *e2ap.E2APSubscriptionRequest) bool {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	return s.EpList.HasEndpoint(ep)
-}
 
-func (s *Subscription) SetTransaction(trans *Transaction) error {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
+	if s.valid == false {
+		return false
+	}
 
-	if s.Trans != nil {
-		return fmt.Errorf("subs(%s) trans(%s) exist, can not register trans(%s)", s.stringImpl(), s.Trans, trans)
+	if s.SubReqMsg == nil {
+		return false
 	}
-	trans.Subs = s
-	s.Trans = trans
-
-	if len(s.EpList.Endpoints) == 0 {
-		s.EpList.Endpoints = append(s.EpList.Endpoints, trans.RmrEndpoint)
-		return s.updateRouteImpl(CREATE)
-	} else if s.EpList.HasEndpoint(&trans.RmrEndpoint) == false {
-		s.EpList.Endpoints = append(s.EpList.Endpoints, trans.RmrEndpoint)
-		return s.updateRouteImpl(MERGE)
+
+	if s.Meid.RanName != trans.Meid.RanName {
+		return false
 	}
-	return nil
-}
 
-func (s *Subscription) UnSetTransaction(trans *Transaction) bool {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	if trans == nil || trans == s.Trans {
-		s.Trans = nil
-		return true
+	// EventTrigger check
+	if s.SubReqMsg.EventTriggerDefinition.InterfaceDirection != subReqMsg.EventTriggerDefinition.InterfaceDirection ||
+		s.SubReqMsg.EventTriggerDefinition.ProcedureCode != subReqMsg.EventTriggerDefinition.ProcedureCode ||
+		s.SubReqMsg.EventTriggerDefinition.TypeOfMessage != subReqMsg.EventTriggerDefinition.TypeOfMessage {
+		return false
 	}
-	return false
-}
 
-func (s *Subscription) GetTransaction() *Transaction {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	return s.Trans
-}
+	if s.SubReqMsg.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present != subReqMsg.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present ||
+		s.SubReqMsg.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId != subReqMsg.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId ||
+		s.SubReqMsg.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.String() != subReqMsg.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.String() {
+		return false
+	}
 
-func (s *Subscription) updateRouteImpl(act Action) error {
-	subRouteAction := SubRouteInfo{act, s.EpList, s.Seq}
-	err := s.registry.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
-	if err != nil {
-		return fmt.Errorf("subs(%s) %s", s.stringImpl(), err.Error())
+	if s.SubReqMsg.EventTriggerDefinition.InterfaceId.GlobalGnbId.Present != subReqMsg.EventTriggerDefinition.InterfaceId.GlobalGnbId.Present ||
+		s.SubReqMsg.EventTriggerDefinition.InterfaceId.GlobalGnbId.NodeId != subReqMsg.EventTriggerDefinition.InterfaceId.GlobalGnbId.NodeId ||
+		s.SubReqMsg.EventTriggerDefinition.InterfaceId.GlobalGnbId.PlmnIdentity.String() != subReqMsg.EventTriggerDefinition.InterfaceId.GlobalGnbId.PlmnIdentity.String() {
+		return false
 	}
-	return nil
-}
 
-func (s *Subscription) UpdateRoute(act Action) error {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	return s.updateRouteImpl(act)
-}
+	// Actions check
+	if len(s.SubReqMsg.ActionSetups) != len(subReqMsg.ActionSetups) {
+		return false
+	}
 
-func (s *Subscription) Release() {
-	s.registry.DelSubscription(s.Seq)
-	err := s.UpdateRoute(DELETE)
-	if err != nil {
-		xapp.Logger.Error("%s", err.Error())
+	for _, acts := range s.SubReqMsg.ActionSetups {
+		for _, actt := range subReqMsg.ActionSetups {
+			if acts.ActionId != actt.ActionId {
+				return false
+			}
+			if acts.ActionType != actt.ActionType {
+				return false
+			}
+
+			if acts.ActionType != e2ap.E2AP_ActionTypeReport {
+				return false
+			}
+
+			if acts.ActionDefinition.Present != actt.ActionDefinition.Present ||
+				acts.ActionDefinition.StyleId != actt.ActionDefinition.StyleId ||
+				acts.ActionDefinition.ParamId != actt.ActionDefinition.ParamId {
+				return false
+			}
+			if acts.SubsequentAction.Present != actt.SubsequentAction.Present ||
+				acts.SubsequentAction.Type != actt.SubsequentAction.Type ||
+				acts.SubsequentAction.TimetoWait != actt.SubsequentAction.TimetoWait {
+				return false
+			}
+		}
 	}
+
+	return true
 }