X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fsubscription.go;h=1152520ec86cb613016296a4c832412705656abc;hb=f682ace08a827bd260e4905b5ee1bddacf01c6e0;hp=6ea2c1fadcadcf2385942cf9b89afea24752dab4;hpb=b91971f3e81361a0dd714b144fd35fbd5225ce40;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/subscription.go b/pkg/control/subscription.go
index 6ea2c1f..1152520 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,17 @@ 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
+	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
 }
@@ -160,8 +161,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 {
@@ -169,6 +168,5 @@ func (s *Subscription) IsMergeable(trans *TransactionXapp, subReqMsg *e2ap.E2APS
 			}
 		}
 	}
-
 	return true
 }