}
}
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+func (tc *E2Stub) SendInvalidE2Asn1Resp(t *testing.T, msg *xapp.RMRParams, msgType int) {
+
+ params := &xapp.RMRParams{}
+ params.Mtype = msgType
+ params.SubId = -1
+ params.Payload = []byte{1, 2, 3, 4, 5}
+ params.PayloadLen = 5
+ params.Meid = msg.Meid
+ params.Xid = ""
+ params.Mbuf = nil
+
+ if params.Mtype == xapp.RIC_SUB_RESP {
+ tc.Info("SEND INVALID ASN.1 SUB RESP")
+
+ } else if params.Mtype == xapp.RIC_SUB_FAILURE {
+ tc.Info("SEND INVALID ASN.1 SUB FAILURE")
+
+ } else if params.Mtype == xapp.RIC_SUB_DEL_RESP {
+ tc.Info("SEND INVALID ASN.1 SUB DEL RESP")
+
+ } else if params.Mtype == xapp.RIC_SUB_DEL_FAILURE {
+ tc.Info("SEND INVALID ASN.1 SUB DEL FAILURE")
+ }
+ snderr := tc.SendWithRetry(params, false, 5)
+ if snderr != nil {
+ tc.TestError(t, "RMR SEND FAILED: %s", snderr.Error())
+ }
+}
+
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
resp.RequestId.Id = req.RequestId.Id
resp.RequestId.InstanceId = req.RequestId.InstanceId
resp.FunctionId = req.FunctionId
- resp.Cause.Content = 4 // CauseMisc
+ resp.Cause.Content = 5 // CauseMisc
resp.Cause.Value = 3 // unspecified
packerr, packedMsg := e2SubsDelFail.Pack(resp)
//-----------------------------------------------------------------------------
func (tc *E2Stub) SubscriptionRespHandler(resp *clientmodel.SubscriptionResponse) {
if tc.subscriptionId == "SUBSCRIPTIONID NOT SET" {
- tc.Info("REST notification received for %v while no SubscriptionID was not set for InstanceID=%v, RequestorID=%v (%v)",
- *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID, tc)
- tc.CallBackNotification <- *resp.SubscriptionInstances[0].InstanceID
+ tc.Info("REST notification received for %v while no SubscriptionID was not set for E2EventInstanceID=%v, XappEventInstanceID=%v (%v)",
+ *resp.SubscriptionID, *resp.SubscriptionInstances[0].E2EventInstanceID, *resp.SubscriptionInstances[0].XappEventInstanceID, tc)
+ tc.CallBackNotification <- *resp.SubscriptionInstances[0].E2EventInstanceID
} else if tc.subscriptionId == *resp.SubscriptionID {
- tc.Info("REST notification received SubscriptionID=%s, InstanceID=%v, RequestorID=%v (%v)",
- *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID, tc)
- tc.CallBackNotification <- *resp.SubscriptionInstances[0].InstanceID
+ tc.Info("REST notification received SubscriptionID=%s, E2EventInstanceID=%v, RequestorID=%v (%v)",
+ *resp.SubscriptionID, *resp.SubscriptionInstances[0].E2EventInstanceID, *resp.SubscriptionInstances[0].XappEventInstanceID, tc)
+ tc.CallBackNotification <- *resp.SubscriptionInstances[0].E2EventInstanceID
} else {
- tc.Info("MISMATCHING REST notification received SubscriptionID=%s<>%s, InstanceID=%v, RequestorID=%v (%v)",
- tc.subscriptionId, *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID, tc)
+ tc.Info("MISMATCHING REST notification received SubscriptionID=%s<>%s, E2EventInstanceID=%v, XappEventInstanceID=%v (%v)",
+ tc.subscriptionId, *resp.SubscriptionID, *resp.SubscriptionInstances[0].E2EventInstanceID, *resp.SubscriptionInstances[0].XappEventInstanceID, tc)
}
}
} else {
for i, subsId := range tc.restSubsIdList {
if *resp.SubscriptionID == subsId {
- //tc.Info("Listed REST notifications received SubscriptionID=%s, InstanceID=%v, RequestorID=%v",
- // *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID)
+ //tc.Info("Listed REST notifications received SubscriptionID=%s, InstanceID=%v, XappEventInstanceID=%v",
+ // *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].XappEventInstanceID)
tc.restSubsIdList = append(tc.restSubsIdList[:i], tc.restSubsIdList[i+1:]...)
//tc.Info("Removed %s from Listed REST notifications, %v entries left", *resp.SubscriptionID, len(tc.restSubsIdList))
- tc.CallBackListedNotifications <- E2RestIds{*resp.SubscriptionID, uint32(*resp.SubscriptionInstances[0].InstanceID)}
+ tc.CallBackListedNotifications <- E2RestIds{*resp.SubscriptionID, uint32(*resp.SubscriptionInstances[0].E2EventInstanceID)}
if len(tc.restSubsIdList) == 0 {
//tc.Info("All listed REST notifications received for endpoint=%s", tc.clientEndpoint)
return
}
}
- tc.Error("UNKONWN REST notification received SubscriptionID=%s<>%s, InstanceID=%v, RequestorID=%v (%v)",
- tc.subscriptionId, *resp.SubscriptionID, *resp.SubscriptionInstances[0].InstanceID, *resp.SubscriptionInstances[0].RequestorID, tc)
+ tc.Error("UNKONWN REST notification received SubscriptionID=%s<>%s, InstanceID=%v, XappEventInstanceID=%v (%v)",
+ tc.subscriptionId, *resp.SubscriptionID, *resp.SubscriptionInstances[0].E2EventInstanceID, *resp.SubscriptionInstances[0].XappEventInstanceID, tc)
}
}
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
-func (tc *E2Stub) GetRESTSubsReqReportParams(subReqCount int, parameterSet int, actionDefinitionPresent bool, actionParamCount int) *RESTSubsReqParams {
-
- reportParams := RESTSubsReqParams{}
- if parameterSet == 1 {
- reportParams.GetRESTSubsReqReportParams1(subReqCount, actionDefinitionPresent, actionParamCount, &tc.clientEndpoint, &tc.meid)
- } else if parameterSet == 2 {
-
- } else {
- tc.Error("Invalid parameterSet=%v", parameterSet)
- }
- tc.requestCount = subReqCount
- return &reportParams
-}
-
-//-----------------------------------------------------------------------------
-//
-//-----------------------------------------------------------------------------
-func (tc *E2Stub) GetRESTSubsReqReportParams1(subReqCount int, actionDefinitionPresent bool, actionParamCount int) *RESTSubsReqParams {
+func (tc *E2Stub) GetRESTSubsReqReportParams(subReqCount int) *RESTSubsReqParams {
reportParams := RESTSubsReqParams{}
- reportParams.GetRESTSubsReqReportParams1(subReqCount, actionDefinitionPresent, actionParamCount, &tc.clientEndpoint, &tc.meid)
+ reportParams.GetRESTSubsReqReportParams(subReqCount, &tc.clientEndpoint, &tc.meid)
tc.requestCount = subReqCount
return &reportParams
}
SubsReqParams clientmodel.SubscriptionParams
}
-func (p *RESTSubsReqParams) GetRESTSubsReqReportParams1(subReqCount int, actionDefinitionPresent bool, actionParamCount int, clientEndpoint *clientmodel.SubscriptionParamsClientEndpoint, meid *string) {
+func (p *RESTSubsReqParams) GetRESTSubsReqReportParams(subReqCount int, clientEndpoint *clientmodel.SubscriptionParamsClientEndpoint, meid *string) {
// E2SM-gNB-X2
p.SubsReqParams.ClientEndpoint = clientEndpoint
for requestCount := 0; requestCount < subReqCount; requestCount++ {
reqId := int64(requestCount) + 1
- seqId := int64(requestCount) + 1
subscriptionDetail := &clientmodel.SubscriptionDetail{
- RequestorID: &reqId,
- InstanceID: &seqId,
+ XappEventInstanceID: &reqId,
EventTriggers: &clientmodel.EventTriggerDefinition{
OctetString: "1234" + strconv.Itoa(requestCount),
},
}
}
+func (p *RESTSubsReqParams) SetSubscriptionID(SubscriptionID *string) {
+
+ if *SubscriptionID == "" {
+ return
+ }
+ p.SubsReqParams.SubscriptionID = *SubscriptionID
+}
+
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
-func (tc *E2Stub) GetRESTSubsReqPolicyParams(subReqCount int, actionDefinitionPresent bool, policyParamCount int) *RESTSubsReqParams {
+func (tc *E2Stub) GetRESTSubsReqPolicyParams(subReqCount int) *RESTSubsReqParams {
policyParams := RESTSubsReqParams{}
- policyParams.GetRESTSubsReqPolicyParams(subReqCount, actionDefinitionPresent, policyParamCount, &tc.clientEndpoint, &tc.meid)
+ policyParams.GetRESTSubsReqPolicyParams(subReqCount, &tc.clientEndpoint, &tc.meid)
tc.requestCount = subReqCount
return &policyParams
}
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
-func (p *RESTSubsReqParams) GetRESTSubsReqPolicyParams(subReqCount int, actionDefinitionPresent bool, policyParamCount int, clientEndpoint *clientmodel.SubscriptionParamsClientEndpoint, meid *string) {
+func (p *RESTSubsReqParams) GetRESTSubsReqPolicyParams(subReqCount int, clientEndpoint *clientmodel.SubscriptionParamsClientEndpoint, meid *string) {
p.SubsReqParams.ClientEndpoint = clientEndpoint
p.SubsReqParams.Meid = meid
for requestCount := 0; requestCount < subReqCount; requestCount++ {
reqId := int64(requestCount) + 1
- seqId := int64(0)
subscriptionDetail := &clientmodel.SubscriptionDetail{
- RequestorID: &reqId,
- InstanceID: &seqId,
+ XappEventInstanceID: &reqId,
EventTriggers: &clientmodel.EventTriggerDefinition{
OctetString: "1234" + strconv.Itoa(requestCount),
},