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

diff --git a/pkg/control/subscription.go b/pkg/control/subscription.go
index 6fd806c..45c13ec 100644
--- a/pkg/control/subscription.go
+++ b/pkg/control/subscription.go
@@ -20,7 +20,7 @@
 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,24 +30,19 @@ import (
 //
 //-----------------------------------------------------------------------------
 type Subscription struct {
-	mutex    sync.Mutex
-	registry *Registry
-	Seq      uint16
-	Active   bool
-	//
-	Meid   *xapp.RMRMeid
-	EpList RmrEndpointList
-	Trans  *Transaction
-}
-
-func (s *Subscription) stringImpl() string {
-	return "subs(" + strconv.FormatUint(uint64(s.Seq), 10) + "/" + s.Meid.RanName + "/" + s.EpList.String() + ")"
+	mutex      sync.Mutex                     // Lock
+	registry   *Registry                      // Registry
+	Seq        uint16                         // SubsId
+	Meid       *xapp.RMRMeid                  // Meid/ RanName
+	EpList     RmrEndpointList                // Endpoints
+	TransLock  sync.Mutex                     // Lock transactions, only one executed per time for subs
+	TheTrans   *Transaction                   // Ongoing transaction from xapp
+	SubReqMsg  *e2ap.E2APSubscriptionRequest  // Subscription information
+	SubRespMsg *e2ap.E2APSubscriptionResponse // Subscription information
 }
 
 func (s *Subscription) String() string {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	return s.stringImpl()
+	return "subs(" + strconv.FormatUint(uint64(s.Seq), 10) + "/" + s.Meid.RanName + "/" + s.EpList.String() + ")"
 }
 
 func (s *Subscription) GetSubId() uint16 {
@@ -65,85 +60,34 @@ func (s *Subscription) GetMeid() *xapp.RMRMeid {
 	return nil
 }
 
-func (s *Subscription) Confirmed() {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	s.Active = true
-}
-
-func (s *Subscription) UnConfirmed() {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	s.Active = false
-}
-
-func (s *Subscription) IsConfirmed() bool {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	return s.Active
-}
-
-func (s *Subscription) IsEndpoint(ep *RmrEndpoint) 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.Trans != nil {
-		return fmt.Errorf("subs(%s) trans(%s) exist, can not register trans(%s)", s.stringImpl(), s.Trans, trans)
-	}
-	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)
-	}
-	return nil
-}
-
-func (s *Subscription) UnSetTransaction(trans *Transaction) bool {
+func (s *Subscription) IsTransactionReserved() bool {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	if trans == nil || trans == s.Trans {
-		s.Trans = nil
+	if s.TheTrans != nil {
 		return true
 	}
 	return false
+
 }
 
 func (s *Subscription) GetTransaction() *Transaction {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	return s.Trans
+	return s.TheTrans
 }
 
-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())
-	}
-	return nil
-}
-
-func (s *Subscription) UpdateRoute(act Action) error {
+func (s *Subscription) WaitTransactionTurn(trans *Transaction) {
+	s.TransLock.Lock()
 	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	return s.updateRouteImpl(act)
+	s.TheTrans = trans
+	s.mutex.Unlock()
 }
 
-func (s *Subscription) Release() {
-	s.registry.DelSubscription(s.Seq)
-	err := s.UpdateRoute(DELETE)
-	if err != nil {
-		xapp.Logger.Error("%s", err.Error())
+func (s *Subscription) ReleaseTransactionTurn(trans *Transaction) {
+	s.mutex.Lock()
+	if trans != nil && trans == s.TheTrans {
+		s.TheTrans = nil
 	}
+	s.mutex.Unlock()
+	s.TransLock.Unlock()
 }