X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fsubscription.go;h=58f0adf545703644eaa18263e4e8df1af718ac4b;hb=2178218dbe9007bee3a614b592f630f0b74924b8;hp=ec6f67a6269efb9bc5368e10e7fc6a92157a5d4c;hpb=c92b421ec9f89e77df36422987e478ed8db85299;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/subscription.go b/pkg/control/subscription.go
index ec6f67a..58f0adf 100644
--- a/pkg/control/subscription.go
+++ b/pkg/control/subscription.go
@@ -23,7 +23,6 @@ import (
 	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 
-	//"reflect"
 	"sync"
 )
 
@@ -35,15 +34,19 @@ type Subscription struct {
 	valid            bool                          // valid
 	registry         *Registry                     // Registry
 	ReqId            RequestId                     // ReqId (Requestor Id + Seq Nro a.k.a subsid)
-	Meid             *xapp.RMRMeid                 // Meid/ RanName
+	Meid             *xapp.RMRMeid                 // Meid/RanName
 	EpList           xapp.RmrEndpointList          // Endpoints
+	RMRRouteCreated  bool                          // Does subscription have RMR route
 	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
+	OngoingReqCount  int                           // Subscription create process is ongoing. In merge case it can ongoing for more than one endpoint
+	OngoingDelCount  int                           // Subscription delete process is ongoing. In merge case it can ongoing for more than one endpoint
+	PolicyUpdate     bool                          // This is true when policy subscrition is being updated. Used not to send delete for update after timeout or restart
 	RetryFromXapp    bool                          // Retry form xApp for subscription that already exist
 	SubRespRcvd      bool                          // Subscription response received
-	DeleteFromDb     bool                          // Delete subscription form db
+	DeleteFromDb     bool                          // Delete subscription from db
 	NoRespToXapp     bool                          // Send no response for subscription delete to xApp after restart
 	DoNotWaitSubResp bool                          // Test flag. Response is not waited for Subscription Request
 }
@@ -79,10 +82,7 @@ func (s *Subscription) GetReqId() *RequestId {
 func (s *Subscription) GetMeid() *xapp.RMRMeid {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	if s.Meid != nil {
-		return s.Meid
-	}
-	return nil
+	return s.Meid
 }
 
 func (s *Subscription) GetTransaction() TransactionIf {
@@ -163,8 +163,6 @@ func (s *Subscription) IsMergeable(trans *TransactionXapp, subReqMsg *e2ap.E2APS
 					return false
 				}
 			}
-			//reflect.DeepEqual(acts.ActionDefinitionChoice, actt.ActionDefinitionChoice)
-
 			if acts.SubsequentAction.Present != actt.SubsequentAction.Present ||
 				acts.SubsequentAction.Type != actt.SubsequentAction.Type ||
 				acts.SubsequentAction.TimetoWait != actt.SubsequentAction.TimetoWait {
@@ -172,6 +170,5 @@ func (s *Subscription) IsMergeable(trans *TransactionXapp, subReqMsg *e2ap.E2APS
 			}
 		}
 	}
-
 	return true
 }