X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=9e4eaaa6c2235d2cf507e6f1b0bc4662a66de9ea;hb=795f2c942e017df38ad5cdc3b0ab01c21fd2854a;hp=396daded93335e834879b7442a2f6a0f0786e5d5;hpb=cc7d9e0cf982acb7448e23e8c8d16b9aaaf133fb;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 396dade..9e4eaaa 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -22,7 +22,6 @@ package control
 import (
 	"fmt"
 	"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/models"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"sync"
@@ -197,6 +196,7 @@ func (r *Registry) AssignToSubscription(trans *TransactionXapp, subReqMsg *e2ap.
 func (r *Registry) CheckActionTypes(subReqMsg *e2ap.E2APSubscriptionRequest) (uint64, error) {
 	var reportFound bool = false
 	var policyFound bool = false
+	var insertFound bool = false
 
 	for _, acts := range subReqMsg.ActionSetups {
 		if acts.ActionType == e2ap.E2AP_ActionTypeReport {
@@ -205,9 +205,12 @@ func (r *Registry) CheckActionTypes(subReqMsg *e2ap.E2APSubscriptionRequest) (ui
 		if acts.ActionType == e2ap.E2AP_ActionTypePolicy {
 			policyFound = true
 		}
+		if acts.ActionType == e2ap.E2AP_ActionTypeInsert {
+			insertFound = true
+		}
 	}
-	if reportFound == true && policyFound == true {
-		return e2ap.E2AP_ActionTypeInvalid, fmt.Errorf("Report and Policy in same RICactions-ToBeSetup-List")
+	if reportFound == true && policyFound == true || reportFound == true && insertFound == true || policyFound == true && insertFound == true {
+		return e2ap.E2AP_ActionTypeInvalid, fmt.Errorf("Different action types (Report, Policy or Insert) in same RICactions-ToBeSetup-List")
 	}
 	if reportFound == true {
 		return e2ap.E2AP_ActionTypeReport, nil
@@ -215,6 +218,9 @@ func (r *Registry) CheckActionTypes(subReqMsg *e2ap.E2APSubscriptionRequest) (ui
 	if policyFound == true {
 		return e2ap.E2AP_ActionTypePolicy, nil
 	}
+	if insertFound == true {
+		return e2ap.E2AP_ActionTypeInsert, nil
+	}
 	return e2ap.E2AP_ActionTypeInvalid, fmt.Errorf("Invalid action type in RICactions-ToBeSetup-List")
 }
 
@@ -247,7 +253,7 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction
 			//
 			// Subscription route delete
 			//
-			tmpList := xapptweaks.RmrEndpointList{}
+			tmpList := xapp.RmrEndpointList{}
 			tmpList.AddEndpoint(trans.GetEndpoint())
 			subRouteAction := SubRouteInfo{tmpList, uint16(subId)}
 			r.rtmgrClient.SubscriptionRequestDelete(subRouteAction)