X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fsubscription.go;h=6fd806c610ce7c3761a9cd8d593c4e25e800a6fe;hb=31797b49985822f1d402501f16ab2794838bebba;hp=6a72f7423f64e3bda3ed34132dd72ccfb0770e5e;hpb=56e0383cad5307302f547a95755c3bcdd9e3251d;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/subscription.go b/pkg/control/subscription.go
index 6a72f74..6fd806c 100644
--- a/pkg/control/subscription.go
+++ b/pkg/control/subscription.go
@@ -35,15 +35,19 @@ type Subscription struct {
 	Seq      uint16
 	Active   bool
 	//
-	Meid        *xapp.RMRMeid
-	RmrEndpoint // xapp endpoint. Now only one xapp can have relation to single subscription. To be changed in merge
-	Trans       *Transaction
+	Meid   *xapp.RMRMeid
+	EpList RmrEndpointList
+	Trans  *Transaction
+}
+
+func (s *Subscription) stringImpl() string {
+	return "subs(" + strconv.FormatUint(uint64(s.Seq), 10) + "/" + s.Meid.RanName + "/" + s.EpList.String() + ")"
 }
 
 func (s *Subscription) String() string {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
-	return strconv.FormatUint(uint64(s.Seq), 10) + "/" + s.RmrEndpoint.String() + "/" + s.Meid.RanName
+	return s.stringImpl()
 }
 
 func (s *Subscription) GetSubId() uint16 {
@@ -79,20 +83,29 @@ func (s *Subscription) IsConfirmed() bool {
 	return s.Active
 }
 
-func (s *Subscription) SetTransaction(trans *Transaction) error {
+func (s *Subscription) IsEndpoint(ep *RmrEndpoint) bool {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
+	return s.EpList.HasEndpoint(ep)
+}
 
-	subString := strconv.FormatUint(uint64(s.Seq), 10) + "/" + s.RmrEndpoint.String() + "/" + s.Meid.RanName
+func (s *Subscription) SetTransaction(trans *Transaction) error {
+	s.mutex.Lock()
+	defer s.mutex.Unlock()
 
-	if (s.RmrEndpoint.Addr != trans.RmrEndpoint.Addr) || (s.RmrEndpoint.Port != trans.RmrEndpoint.Port) {
-		return fmt.Errorf("Subscription: %s endpoint mismatch with trans: %s", subString, trans)
-	}
 	if s.Trans != nil {
-		return fmt.Errorf("Subscription: %s trans %s exist, can not register %s", subString, s.Trans, trans)
+		return fmt.Errorf("subs(%s) trans(%s) exist, can not register trans(%s)", s.stringImpl(), s.Trans, trans)
 	}
 	trans.Subs = s
 	s.Trans = trans
+
+	if len(s.EpList.Endpoints) == 0 {
+		s.EpList.Endpoints = append(s.EpList.Endpoints, trans.RmrEndpoint)
+		return s.updateRouteImpl(CREATE)
+	} else if s.EpList.HasEndpoint(&trans.RmrEndpoint) == false {
+		s.EpList.Endpoints = append(s.EpList.Endpoints, trans.RmrEndpoint)
+		return s.updateRouteImpl(MERGE)
+	}
 	return nil
 }
 
@@ -113,11 +126,10 @@ func (s *Subscription) GetTransaction() *Transaction {
 }
 
 func (s *Subscription) updateRouteImpl(act Action) error {
-	xapp.Logger.Info("Subscription: Starting routing manager route add. SubId: %d, RmrEndpoint: %s", s.Seq, s.RmrEndpoint)
-	subRouteAction := SubRouteInfo{act, s.RmrEndpoint.Addr, s.RmrEndpoint.Port, s.Seq}
+	subRouteAction := SubRouteInfo{act, s.EpList, s.Seq}
 	err := s.registry.rtmgrClient.SubscriptionRequestUpdate(subRouteAction)
 	if err != nil {
-		return fmt.Errorf("Subscription: Failed to add route. SubId: %d, RmrEndpoint: %s", s.Seq, s.RmrEndpoint)
+		return fmt.Errorf("subs(%s) %s", s.stringImpl(), err.Error())
 	}
 	return nil
 }
@@ -129,12 +141,9 @@ func (s *Subscription) UpdateRoute(act Action) error {
 }
 
 func (s *Subscription) Release() {
-	xapp.Logger.Info("Subscription: Releasing %s", s)
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
 	s.registry.DelSubscription(s.Seq)
-	err := s.updateRouteImpl(DELETE)
+	err := s.UpdateRoute(DELETE)
 	if err != nil {
-		xapp.Logger.Error("Registry: Failed to del route. SubId: %d, RmrEndpoint: %s", s.Seq, s.RmrEndpoint)
+		xapp.Logger.Error("%s", err.Error())
 	}
 }