EpList xapp.RmrEndpointList
SubReqMsg e2ap.E2APSubscriptionRequest
SubRespMsg e2ap.E2APSubscriptionResponse
- SubFailMsg e2ap.E2APSubscriptionFailure
SubRespRcvd string
}
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 = ""
}
return fmt.Errorf("SDL: WriteSubscriptionToSdl() json.Marshal error: %s", err.Error())
}
- err = c.db.Set(strconv.FormatUint(uint64(subId), 10), jsonData)
- if err != nil {
+ if err = c.db.Set(strconv.FormatUint(uint64(subId), 10), jsonData); err != nil {
+ c.UpdateCounter(cSDLWriteFailure)
return fmt.Errorf("SDL: WriteSubscriptionToSdl(): %s", err.Error())
} else {
xapp.Logger.Debug("SDL: Subscription written in db. subId = %v", subId)
key := strconv.FormatUint(uint64(subId), 10)
retMap, err := c.db.Get([]string{key})
if err != nil {
+ c.UpdateCounter(cSDLReadFailure)
return nil, fmt.Errorf("SDL: ReadSubscriptionFromSdl(): %s", err.Error())
} else {
xapp.Logger.Debug("SDL: Subscription read from db. subId = %v", subId)
subscriptionInfo := &SubscriptionInfo{}
jsonSubscriptionInfo := iSubscriptionInfo.(string)
- err := json.Unmarshal([]byte(jsonSubscriptionInfo), subscriptionInfo)
- if err != nil {
+ if err := json.Unmarshal([]byte(jsonSubscriptionInfo), subscriptionInfo); err != nil {
return nil, fmt.Errorf("SDL: ReadSubscriptionFromSdl() json.unmarshal error: %s\n", err.Error())
}
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
func (c *Control) RemoveSubscriptionFromSdl(subId uint32) error {
key := strconv.FormatUint(uint64(subId), 10)
- err := c.db.Remove([]string{key})
- if err != nil {
+ if err := c.db.Remove([]string{key}); err != nil {
return fmt.Errorf("SDL: RemoveSubscriptionfromSdl(): %s\n", err.Error())
} else {
xapp.Logger.Debug("SDL: Subscription removed from db. subId = %v", subId)
// Get all keys
keys, err := c.db.GetAll()
if err != nil {
+ c.UpdateCounter(cSDLReadFailure)
return nil, nil, fmt.Errorf("SDL: ReadAllSubscriptionsFromSdl(), GetAll(). Error while reading keys from DBAAS %s\n", err.Error())
}
// Get all subscriptionInfos
iSubscriptionMap, err := c.db.Get(keys)
if err != nil {
+ c.UpdateCounter(cSDLReadFailure)
return nil, nil, fmt.Errorf("SDL: ReadAllSubscriptionsFromSdl(), Get(): Error while reading subscriptions from DBAAS %s\n", err.Error())
}
subscriptionInfo := &SubscriptionInfo{}
jsonSubscriptionInfo := iSubscriptionInfo.(string)
- err := json.Unmarshal([]byte(jsonSubscriptionInfo), subscriptionInfo)
- if err != nil {
+ if err := json.Unmarshal([]byte(jsonSubscriptionInfo), subscriptionInfo); err != nil {
return nil, nil, fmt.Errorf("SDL: ReadAllSubscriptionsFromSdl() json.unmarshal error: %s\n", err.Error())
}
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())
}
}
}
func (c *Control) RemoveAllSubscriptionsFromSdl() error {
- err := c.db.RemoveAll()
- if err != nil {
+ if err := c.db.RemoveAll(); err != nil {
+ c.UpdateCounter(cSDLRemoveFailure)
return fmt.Errorf("SDL: RemoveAllSubscriptionsFromSdl(): %s\n", err.Error())
} else {
xapp.Logger.Debug("SDL: All subscriptions removed from db")