Merge newe2 into master

[ric-plt/submgr.git] / pkg / control / subscription.go

diff --git a/pkg/control/subscription.go b/pkg/control/subscription.go
index ac68aa6..b2516bd 100644 (file)
--- a/pkg/control/subscription.go
+++ b/pkg/control/subscription.go
@@ -23,6 +23,7 @@ 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"
 )
 
@@ -150,11 +151,11 @@ 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 ||
+                               reflect.DeepEqual(acts.ActionDefinitionChoice, actt.ActionDefinitionChoice) == false {
                                return false
                        }
+
                        if acts.SubsequentAction.Present != actt.SubsequentAction.Present ||
                                acts.SubsequentAction.Type != actt.SubsequentAction.Type ||
                                acts.SubsequentAction.TimetoWait != actt.SubsequentAction.TimetoWait {