X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;h=a1fe4b85f17208cd74221b69e7d4b2e938bfac0f;hb=refs%2Fchanges%2F32%2F2232%2F1;hp=2c5bd8c7d46e886e7d4b74eea1eae0f99d587ed7;hpb=0388dd945789dae802aaa93c5062e3ae4c45ddf1;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 2c5bd8c..a1fe4b8 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -42,7 +42,7 @@ func (r *Registry) Initialize(seedsn uint16) {
 }
 
 // Reserves and returns the next free sequence number
-func (r *Registry) ReserveSubscription(endPoint RmrEndpoint, meid *xapp.RMRMeid) (*Subscription, error) {
+func (r *Registry) ReserveSubscription(endPoint *RmrEndpoint, meid *xapp.RMRMeid) (*Subscription, error) {
 	// Check is current SequenceNumber valid
 	// Allocate next SequenceNumber value and retry N times
 	r.mutex.Lock()
@@ -58,9 +58,10 @@ func (r *Registry) ReserveSubscription(endPoint RmrEndpoint, meid *xapp.RMRMeid)
 		}
 		if _, ok := r.register[sequenceNumber]; ok == false {
 			subs := &Subscription{
+				registry:    r,
 				Seq:         sequenceNumber,
 				Active:      false,
-				RmrEndpoint: endPoint,
+				RmrEndpoint: *endPoint,
 				Meid:        meid,
 				Trans:       nil,
 			}
@@ -68,7 +69,7 @@ func (r *Registry) ReserveSubscription(endPoint RmrEndpoint, meid *xapp.RMRMeid)
 
 			// Update routing
 			r.mutex.Unlock()
-			err := subs.UpdateRoute(CREATE, r.rtmgrClient)
+			err := subs.UpdateRoute(CREATE)
 			r.mutex.Lock()
 			if err != nil {
 				if _, ok := r.register[sequenceNumber]; ok {
@@ -96,16 +97,7 @@ func (r *Registry) DelSubscription(sn uint16) bool {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
 	if _, ok := r.register[sn]; ok {
-		subs := r.register[sn]
 		delete(r.register, sn)
-
-		// Update routing
-		r.mutex.Unlock()
-		err := subs.UpdateRoute(DELETE, r.rtmgrClient)
-		r.mutex.Lock()
-		if err != nil {
-			xapp.Logger.Error("Registry: Failed to del route. SubId: %d, RmrEndpoint: %s", subs.Seq, subs.RmrEndpoint)
-		}
 		return true
 	}
 	return false