X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=e2ap%2Fpkg%2Fe2ap%2Fe2ap_tests%2Fmsg_e2ap_subscription.go;h=50a4eabfcde54ce24a2d15aeb78e995dc976fdb0;hb=14f827331f7ae565d33cdf23c82f7794d3fc2d0d;hp=348fe4e37b2c4c08140a5504fb51ea707c110fe1;hpb=ff8dccd02d76eebfccc0b509ce0b42a2c1760e12;p=ric-plt%2Fsubmgr.git

diff --git a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go
index 348fe4e..50a4eab 100644
--- a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go
+++ b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go
@@ -34,30 +34,20 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionRequestWithData(t *testing.T,
 
 	testCtxt.testPrint("########## ##########")
 	testCtxt.testPrint("init")
-	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)
 	testCtxt.testValueEquality(t, "EventTriggerDefinition", &areqenc.EventTriggerDefinition, &areqdec.EventTriggerDefinition)
 }
@@ -87,28 +77,32 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionRequest(t *testing.T) {
 	}
 
 	areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-	areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
+	areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Mcc = "310"
+	areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Mnc = "150"
 	areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDHomeBits28
 	areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 202251
 	testCtxt.SetDesc("SubsReq-28bit")
 	testCtxt.E2ApTestMsgSubscriptionRequestWithData(t, &areqenc)
 
 	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
+	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Mcc = "310"
+	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Mnc = "150"
 	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDShortMacroits18
 	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 55
 	//testCtxt.SetDesc("SubsReq-18bit")
 	//testCtxt.E2ApTestMsgSubscriptionRequestWithData(t,&areqenc)
 
 	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
+	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Mcc = "310"
+	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Mnc = "150"
 	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDMacroPBits20
 	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 55
 	//testCtxt.SetDesc("SubsReq-20bit")
 	//testCtxt.E2ApTestMsgSubscriptionRequestWithData(t,&areqenc)
 
 	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.Present = true
-	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.StringPut("310150")
+	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Mcc = "310"
+	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.PlmnIdentity.Mnc = "150"
 	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Bits = e2ap.E2AP_ENBIDlongMacroBits21
 	//areqenc.EventTriggerDefinition.InterfaceId.GlobalEnbId.NodeId.Id = 55
 	//testCtxt.SetDesc("SubsReq-21bit")
@@ -142,30 +136,20 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionResponse(t *testing.T) {
 		arespenc.ActionNotAdmittedList.Items = append(arespenc.ActionNotAdmittedList.Items, item)
 	}
 
-	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)
 }
 
@@ -205,29 +189,81 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionFailure(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) E2ApTestMsgSubscriptionRequestBuffers(t *testing.T) {
+
+	testfunc := func(buffer string) {
+		packedData := testCtxt.toPackedData(t, buffer)
+		if packedData == nil {
+			return
+		}
+		e2SubResp := testCtxt.packerif.NewPackerSubscriptionRequest()
+		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("SubReqBuffer")
+	testfunc("00c9402c000003ea7e00050000010000ea6300020001ea810016000b00130051407b000000054000ea6b000420000000")
+}
+
+func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionResponseBuffers(t *testing.T) {
+
+	testfunc := func(buffer string) {
+		packedData := testCtxt.toPackedData(t, buffer)
+		if packedData == nil {
+			return
+		}
+		e2SubResp := testCtxt.packerif.NewPackerSubscriptionResponse()
+		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("SubRespBuffer")
+	testfunc("20c9402a000004ea7e00050000018009ea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
+	testfunc("20c9401d000003ea7e0005004eec0004ea6300020001ea6c000700ea6d40020000")
+
+}
+
+func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionFailureBuffers(t *testing.T) {
+
+	testfunc := func(buffer string) {
+		packedData := testCtxt.toPackedData(t, buffer)
+		if packedData == nil {
+			return
+		}
+		e2SubResp := testCtxt.packerif.NewPackerSubscriptionFailure()
+		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("SubFailBuffer")
+	testfunc("40c94017000003ea7e000500000106f3ea6300020001ea6e000100")
+}