Change-Id: Ibe601879ef5afcaf3b92e9798fb4da26bc035ed8
Signed-off-by: Anssi Mannila <anssi.mannila@nokia.com>
# By default this file is in the docker build directory,
# but the location can configured in the JJB template.
---
# By default this file is in the docker build directory,
# but the location can configured in the JJB template.
---
case *e2ap.E2APSubscriptionFailure:
removeSubscriptionFromDb = true
subRfMsg, valid = subs.SetCachedResponse(event, false)
case *e2ap.E2APSubscriptionFailure:
removeSubscriptionFromDb = true
subRfMsg, valid = subs.SetCachedResponse(event, false)
- xapp.Logger.Info("SUBS-SubReq: internal delete due event(%s) %s", typeofSubsMessage(event), idstring(nil, trans, subs, parentTrans))
- c.sendE2TSubscriptionDeleteRequest(subs, trans, parentTrans)
+ xapp.Logger.Info("SUBS-SubReq: internal delete due event(%s) %s", typeofSubsMessage(event), idstring(nil, trans, subs, parentTrans))
case *SubmgrRestartTestEvent:
// This simulates that no response has been received and after restart subscriptions are restored from db
xapp.Logger.Debug("Test restart flag is active. Dropping this transaction to test restart case")
case *SubmgrRestartTestEvent:
// This simulates that no response has been received and after restart subscriptions are restored from db
xapp.Logger.Debug("Test restart flag is active. Dropping this transaction to test restart case")
EpList xapp.RmrEndpointList
SubReqMsg e2ap.E2APSubscriptionRequest
SubRespMsg e2ap.E2APSubscriptionResponse
EpList xapp.RmrEndpointList
SubReqMsg e2ap.E2APSubscriptionRequest
SubRespMsg e2ap.E2APSubscriptionResponse
- SubFailMsg e2ap.E2APSubscriptionFailure
if typeofSubsMessage(subs.SubRFMsg) == "SubResp" {
subscriptionInfo.SubRespRcvd = "SubResp"
subscriptionInfo.SubRespMsg = *subs.SubRFMsg.(*e2ap.E2APSubscriptionResponse)
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 = ""
}
} else {
subscriptionInfo.SubRespRcvd = ""
}
subResp := e2ap.E2APSubscriptionResponse{}
subResp = subscriptionInfo.SubRespMsg
subs.SubRFMsg = &subResp
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
} else {
subs.SubRespRcvd = false
subs.SubRFMsg = nil
// | | SubFail |
// | |<-------------|
// | | |
// | | SubFail |
// | |<-------------|
// | | |
-// | | SubDelReq |
-// | |------------->|
-// | | |
-// | | SubDelResp |
-// | |<-------------|
-// | | |
// | SubFail | |
// |<-------------| |
// | | |
// | SubFail | |
// |<-------------| |
// | | |
Counter{cSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubFailFromE2, 1},
Counter{cSubReqFromXapp, 1},
Counter{cSubReqToE2, 1},
Counter{cSubFailFromE2, 1},
- Counter{cSubDelReqToE2, 1},
- Counter{cSubDelRespFromE2, 1},
Counter{cSubFailToXapp, 1},
})
Counter{cSubFailToXapp, 1},
})
fparams1.Set(crereq1)
e2termConn1.SendSubsFail(t, fparams1, cremsg1)
fparams1.Set(crereq1)
e2termConn1.SendSubsFail(t, fparams1, cremsg1)
- // E2t: Receive SubsDelReq and send SubsDelResp (internal first)
- delreq1, delmsg1 := e2termConn1.RecvSubsDelReq(t)
- e2termConn1.SendSubsDelResp(t, delreq1, delmsg1)
-
// Xapp: Receive SubsFail
e2SubsId := xappConn1.RecvSubsFail(t, cretrans)
// Xapp: Receive SubsFail
e2SubsId := xappConn1.RecvSubsFail(t, cretrans)
// | | | SubFail1 |
// | | |<-------------|
// | | | |
// | | | SubFail1 |
// | | |<-------------|
// | | | |
-// | | | SubDelReq |
-// | | |------------->|
-// | | | SubDelResp |
-// | | |<-------------|
-// | | | |
// | | SubFail1 | |
// | |<-------------| |
// | | | |
// | | SubFail1 | |
// | |<-------------| |
// | | | |
fparams1.Set(crereq1)
e2termConn1.SendSubsFail(t, fparams1, cremsg1)
fparams1.Set(crereq1)
e2termConn1.SendSubsFail(t, fparams1, cremsg1)
- // E2t: internal delete
- delreq, delmsg := e2termConn1.RecvSubsDelReq(t)
- e2termConn1.SendSubsDelResp(t, delreq, delmsg)
-
//Fail1
e2SubsId1 := xappConn1.RecvSubsFail(t, cretrans1)
//Fail2
//Fail1
e2SubsId1 := xappConn1.RecvSubsFail(t, cretrans1)
//Fail2