X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fteststube2ap%2FstubE2.go;h=ec3010a17f803865d5be3665fbd53841dee0cbab;hb=c9ef0ba044f66201c34f42e3bb459e0ae4e6855b;hp=bcc6aae4e23b47fa07a09ea7e297e651722c86c5;hpb=fe2cdabf98e8d1028bbe1713daa187e538f042a0;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/teststube2ap/stubE2.go b/pkg/teststube2ap/stubE2.go
index bcc6aae..ec3010a 100644
--- a/pkg/teststube2ap/stubE2.go
+++ b/pkg/teststube2ap/stubE2.go
@@ -324,6 +324,38 @@ func (tc *E2Stub) SendSubsResp(t *testing.T, req *e2ap.E2APSubscriptionRequest,
 	}
 }
 
+//-----------------------------------------------------------------------------
+//
+//-----------------------------------------------------------------------------
+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())
+	}
+}
+
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
@@ -597,7 +629,7 @@ func (tc *E2Stub) SendSubsDelFail(t *testing.T, req *e2ap.E2APSubscriptionDelete
 	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)
@@ -792,27 +824,10 @@ func (tc *E2Stub) SendRESTSubsReq(t *testing.T, params *RESTSubsReqParams) strin
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-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
 }
@@ -824,7 +839,7 @@ type RESTSubsReqParams struct {
 	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
@@ -1009,10 +1024,10 @@ func (tc *E2Stub) SendRESTSubsDelReq(t *testing.T, subscriptionID *string) {
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-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
 }
@@ -1020,7 +1035,7 @@ func (tc *E2Stub) GetRESTSubsReqPolicyParams(subReqCount int, actionDefinitionPr
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
-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