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

diff --git a/pkg/control/subscription.go b/pkg/control/subscription.go
index ac68aa6..6ea2c1f 100644
--- a/pkg/control/subscription.go
+++ b/pkg/control/subscription.go
@@ -21,8 +21,9 @@ package control
 
 import (
 	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
-	"gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/xapptweaks"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+
+	//"reflect"
 	"sync"
 )
 
@@ -30,20 +31,29 @@ import (
 //
 //-----------------------------------------------------------------------------
 type Subscription struct {
-	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    xapptweaks.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
+	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           xapp.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
+	RetryFromXapp    bool                          // Retry form xApp for subscription that already exist
+	SubRespRcvd      bool                          // Subscription response received
+	DeleteFromDb     bool                          // Delete subscription form db
+	NoRespToXapp     bool                          // Send no response for subscription delete to xApp after restart
+	DoNotWaitSubResp bool                          // Test flag. Response is not waited for Subscription Request
 }
 
 func (s *Subscription) String() string {
-	return "subs(" + s.ReqId.String() + "/" + (&xapptweaks.RMRMeid{s.Meid}).String() + "/" + s.EpList.String() + ")"
+	meidstr := "N/A"
+	if s.Meid != nil {
+		meidstr = s.Meid.String()
+	}
+	return "subs(" + s.ReqId.String() + "/" + meidstr + "/" + s.EpList.String() + ")"
 }
 
 func (s *Subscription) GetCachedResponse() (interface{}, bool) {
@@ -69,10 +79,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 {
@@ -114,22 +121,13 @@ func (s *Subscription) IsMergeable(trans *TransactionXapp, subReqMsg *e2ap.E2APS
 	}
 
 	// 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
-	}
-
-	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() {
+	if s.SubReqMsg.EventTriggerDefinition.Data.Length != subReqMsg.EventTriggerDefinition.Data.Length {
 		return false
 	}
-
-	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
+	for i := uint64(0); i < s.SubReqMsg.EventTriggerDefinition.Data.Length; i++ {
+		if s.SubReqMsg.EventTriggerDefinition.Data.Data[i] != subReqMsg.EventTriggerDefinition.Data.Data[i] {
+			return false
+		}
 	}
 
 	// Actions check
@@ -150,11 +148,20 @@ func (s *Subscription) IsMergeable(trans *TransactionXapp, subReqMsg *e2ap.E2APS
 				return false
 			}
 
-			if acts.ActionDefinition.Present != actt.ActionDefinition.Present ||
-				acts.ActionDefinition.StyleId != actt.ActionDefinition.StyleId ||
-				acts.ActionDefinition.ParamId != actt.ActionDefinition.ParamId {
+			if acts.RicActionDefinitionPresent != actt.RicActionDefinitionPresent {
+				return false
+			}
+
+			if acts.ActionDefinitionChoice.Data.Length != actt.ActionDefinitionChoice.Data.Length {
 				return false
 			}
+			for i := uint64(0); i < acts.ActionDefinitionChoice.Data.Length; i++ {
+				if acts.ActionDefinitionChoice.Data.Data[i] != actt.ActionDefinitionChoice.Data.Data[i] {
+					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 {