Merge newe2 into master

[ric-plt/submgr.git] / e2ap / pkg / e2ap / e2ap_tests / msg_e2ap_subscriptiondelete.go

diff --git a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscriptiondelete.go b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscriptiondelete.go
index 4cae8cc..012432d 100644 (file)
--- a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscriptiondelete.go
+++ b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscriptiondelete.go
@@ -39,33 +39,23 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteRequest(t *testing.T) {
 
        areqenc := e2ap.E2APSubscriptionDeleteRequest{}
        areqenc.RequestId.Id = 1
-       areqenc.RequestId.Seq = 22
+       areqenc.RequestId.InstanceId = 22
        areqenc.FunctionId = 33
 
-       seterr := e2SubsReq.Set(&areqenc)
-       if seterr != nil {
-               testCtxt.testError(t, "set err: %s", seterr.Error())
-               return
-       }
-       testCtxt.testPrint("print:\n%s", e2SubsReq.String())
        testCtxt.testPrint("pack")
-       err, packedMsg := e2SubsReq.Pack(nil)
+       err, packedMsg := e2SubsReq.Pack(&areqenc)
        if err != nil {
                testCtxt.testError(t, "Pack failed: %s", err.Error())
                return
        }
+       testCtxt.testPrint("print:\n%s", e2SubsReq.String())
        testCtxt.testPrint("unpack")
-       err = e2SubsReq.UnPack(packedMsg)
+       err, areqdec := e2SubsReq.UnPack(packedMsg)
        if err != nil {
                testCtxt.testError(t, "UnPack failed: %s", err.Error())
                return
        }
        testCtxt.testPrint("print:\n%s", e2SubsReq.String())
-       geterr, areqdec := e2SubsReq.Get()
-       if geterr != nil {
-               testCtxt.testError(t, "get nil: %s", geterr.Error())
-               return
-       }
        testCtxt.testValueEquality(t, "msg", &areqenc, areqdec)
 }
 
@@ -80,33 +70,23 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteResponse(t *testing.T) {
 
        arespenc := e2ap.E2APSubscriptionDeleteResponse{}
        arespenc.RequestId.Id = 1
-       arespenc.RequestId.Seq = 22
+       arespenc.RequestId.InstanceId = 22
        arespenc.FunctionId = 33
 
-       seterr := e2SubsResp.Set(&arespenc)
-       if seterr != nil {
-               testCtxt.testError(t, "set err: %s", seterr.Error())
-               return
-       }
-       testCtxt.testPrint("print:\n%s", e2SubsResp.String())
        testCtxt.testPrint("pack")
-       err, packedMsg := e2SubsResp.Pack(nil)
+       err, packedMsg := e2SubsResp.Pack(&arespenc)
        if err != nil {
                testCtxt.testError(t, "Pack failed: %s", err.Error())
                return
        }
+       testCtxt.testPrint("print:\n%s", e2SubsResp.String())
        testCtxt.testPrint("unpack")
-       err = e2SubsResp.UnPack(packedMsg)
+       err, arespdec := e2SubsResp.UnPack(packedMsg)
        if err != nil {
                testCtxt.testError(t, "UnPack failed: %s", err.Error())
                return
        }
        testCtxt.testPrint("print:\n%s", e2SubsResp.String())
-       geterr, arespdec := e2SubsResp.Get()
-       if geterr != nil {
-               testCtxt.testError(t, "get nil: %s", geterr.Error())
-               return
-       }
        testCtxt.testValueEquality(t, "msg", &arespenc, arespdec)
 }
 
@@ -121,10 +101,10 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteFailure(t *testing.T) {
 
        afailenc := e2ap.E2APSubscriptionDeleteFailure{}
        afailenc.RequestId.Id = 1
-       afailenc.RequestId.Seq = 22
+       afailenc.RequestId.InstanceId = 22
        afailenc.FunctionId = 33
        afailenc.Cause.Content = 1
-       afailenc.Cause.CauseVal = 1
+       afailenc.Cause.Value = 1
        // NOT SUPPORTED CURRENTLY
        //      afailenc.CriticalityDiagnostics.Present = false
        //      afailenc.CriticalityDiagnostics.ProcCodePresent = true
@@ -141,29 +121,93 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteFailure(t *testing.T) {
        //              afailenc.CriticalityDiagnostics.CriticalityDiagnosticsIEList.Items = append(afailenc.CriticalityDiagnostics.CriticalityDiagnosticsIEList.Items, ieitem)
        //      }
 
-       seterr := e2SubsFail.Set(&afailenc)
-       if seterr != nil {
-               testCtxt.testError(t, "set err: %s", seterr.Error())
-               return
-       }
-       testCtxt.testPrint("print:\n%s", e2SubsFail.String())
        testCtxt.testPrint("pack")
-       err, packedMsg := e2SubsFail.Pack(nil)
+       err, packedMsg := e2SubsFail.Pack(&afailenc)
        if err != nil {
                testCtxt.testError(t, "Pack failed: %s", err.Error())
                return
        }
+       testCtxt.testPrint("print:\n%s", e2SubsFail.String())
        testCtxt.testPrint("unpack")
-       err = e2SubsFail.UnPack(packedMsg)
+       err, afaildec := e2SubsFail.UnPack(packedMsg)
        if err != nil {
                testCtxt.testError(t, "UnPack failed: %s", err.Error())
                return
        }
        testCtxt.testPrint("print:\n%s", e2SubsFail.String())
-       geterr, afaildec := e2SubsFail.Get()
-       if geterr != nil {
-               testCtxt.testError(t, "get nil: %s", geterr.Error())
-               return
-       }
        testCtxt.testValueEquality(t, "msg", &afailenc, afaildec)
 }
+
+func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteRequestBuffers(t *testing.T) {
+
+       testfunc := func(buffer string) {
+               packedData := testCtxt.toPackedData(t, buffer)
+               if packedData == nil {
+                       return
+               }
+               e2SubResp := testCtxt.packerif.NewPackerSubscriptionDeleteRequest()
+               err, _ := e2SubResp.UnPack(packedData)
+               if err != nil {
+                       testCtxt.testError(t, "UnPack() Failed: %s [%s]", err.Error(), buffer)
+                       return
+               }
+               testCtxt.testPrint("OK [%s]", buffer)
+       }
+
+       testCtxt.SetDesc("SubDelReqBuffer")
+
+       testfunc("00ca4012000002ea7e000500000106e7ea6300020001")
+       testfunc("00ca4012000002ea7e000500000106e8ea6300020001")
+       testfunc("00ca4012000002ea7e000500000106e9ea6300020001")
+       testfunc("00ca4012000002ea7e000500000106eaea6300020001")
+       testfunc("00ca4012000002ea7e000500000106ebea6300020001")
+       testfunc("00ca4012000002ea7e000500000106ecea6300020001")
+       testfunc("00ca4012000002ea7e000500000106edea6300020001")
+       testfunc("00ca4012000002ea7e000500000106eeea6300020001")
+       testfunc("00ca4012000002ea7e000500000106efea6300020001")
+       testfunc("00ca4012000002ea7e000500000106f0ea6300020001")
+       testfunc("00ca4012000002ea7e000500000106f4ea6300020001")
+       testfunc("00ca4012000002ea7e000500000106f5ea6300020001")
+       testfunc("00ca4012000002ea7e000500000106f6ea6300020001")
+}
+
+func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteResponseBuffers(t *testing.T) {
+
+       testfunc := func(buffer string) {
+               packedData := testCtxt.toPackedData(t, buffer)
+               if packedData == nil {
+                       return
+               }
+               e2SubResp := testCtxt.packerif.NewPackerSubscriptionDeleteResponse()
+               err, _ := e2SubResp.UnPack(packedData)
+               if err != nil {
+                       testCtxt.testError(t, "UnPack() Failed: %s [%s]", err.Error(), buffer)
+                       return
+               }
+               testCtxt.testPrint("OK [%s]", buffer)
+       }
+
+       testCtxt.SetDesc("SubDelRespBuffer")
+       testfunc("20ca4012000002ea7e000500000106e7ea6300020001")
+
+}
+
+func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteFailureBuffers(t *testing.T) {
+
+       testfunc := func(buffer string) {
+               packedData := testCtxt.toPackedData(t, buffer)
+               if packedData == nil {
+                       return
+               }
+               e2SubResp := testCtxt.packerif.NewPackerSubscriptionDeleteFailure()
+               err, _ := e2SubResp.UnPack(packedData)
+               if err != nil {
+                       testCtxt.testError(t, "UnPack() Failed: %s [%s]", err.Error(), buffer)
+                       return
+               }
+               testCtxt.testPrint("OK [%s]", buffer)
+       }
+
+       testCtxt.SetDesc("SubDelFailBuffer")
+       testfunc("40ca4017000003ea7e000500000106f6ea6300020001ea74000124")
+}