X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fsdl.go;h=ac8b8fb39e97b28c7b902c128f8bd0606ae0d1ee;hb=e5e672c043d80c7a531b9d6d640ca8879d9bf01b;hp=f179975bf9e30510715a0c4ff415f03118428a49;hpb=4abf18056b1674fb284c4d7d753c35a3ddab37e4;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/sdl.go b/pkg/control/sdl.go
index f179975..ac8b8fb 100644
--- a/pkg/control/sdl.go
+++ b/pkg/control/sdl.go
@@ -35,7 +35,6 @@ type SubscriptionInfo struct {
 	EpList      xapp.RmrEndpointList
 	SubReqMsg   e2ap.E2APSubscriptionRequest
 	SubRespMsg  e2ap.E2APSubscriptionResponse
-	SubFailMsg  e2ap.E2APSubscriptionFailure
 	SubRespRcvd string
 }
 
@@ -55,9 +54,6 @@ func (c *Control) WriteSubscriptionToSdl(subId uint32, subs *Subscription) error
 	if typeofSubsMessage(subs.SubRFMsg) == "SubResp" {
 		subscriptionInfo.SubRespRcvd = "SubResp"
 		subscriptionInfo.SubRespMsg = *subs.SubRFMsg.(*e2ap.E2APSubscriptionResponse)
-	} else if typeofSubsMessage(subs.SubRFMsg) == "SubFail" {
-		subscriptionInfo.SubRespRcvd = "SubFail"
-		subscriptionInfo.SubFailMsg = *subs.SubRFMsg.(*e2ap.E2APSubscriptionFailure)
 	} else {
 		subscriptionInfo.SubRespRcvd = ""
 	}
@@ -127,11 +123,6 @@ func (c *Control) CreateSubscription(subscriptionInfo *SubscriptionInfo, jsonSub
 		subResp := e2ap.E2APSubscriptionResponse{}
 		subResp = subscriptionInfo.SubRespMsg
 		subs.SubRFMsg = &subResp
-	} else if subscriptionInfo.SubRespRcvd == "SubFail" {
-		subs.SubRespRcvd = false
-		subFail := e2ap.E2APSubscriptionFailure{}
-		subFail = subscriptionInfo.SubFailMsg
-		subs.SubRFMsg = &subFail
 	} else {
 		subs.SubRespRcvd = false
 		subs.SubRFMsg = nil
@@ -200,8 +191,7 @@ func (c *Control) ReadAllSubscriptionsFromSdl() ([]uint32, map[uint32]*Subscript
 		retMap[subscriptionInfo.ReqId.InstanceId] = subs
 
 		// Remove subId from free subIds. Original slice is modified here!
-		subIds, err = removeNumber(subIds, subscriptionInfo.ReqId.InstanceId)
-		if err != nil {
+		if subIds, err = removeNumber(subIds, subscriptionInfo.ReqId.InstanceId); err != nil {
 			return nil, nil, fmt.Errorf("SDL: ReadAllSubscriptionsFromSdl() error: %s\n", err.Error())
 		}
 	}