pespin has uploaded this change for review.
stp: STP_Tests.ttcn: Use M3UA PC and RCTX from config
Change-Id: I81c8402d5ccd6e59f2a6869927c637fff30cb952
---
M stp/STP_Tests.ttcn
M stp/STP_Tests_M3UA.ttcn
2 files changed, 22 insertions(+), 21 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/39662/1
diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn
index 60d68c9..b7f6ec1 100644
--- a/stp/STP_Tests.ttcn
+++ b/stp/STP_Tests.ttcn
@@ -62,15 +62,15 @@
/* Test routing of SCCP between an M3UA and an IPA ASP */
testcase TC_m3ua_to_ipa() runs on IPA_M3UA_CT {
- var OCT4 rctx_sender := int2oct(1023, 4);
- var OCT4 pc_sender := int2oct(23, 4);
- var OCT4 pc_receiver := int2oct(5, 4);
-
f_init_m3ua();
f_init_ipa();
+ var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
+ var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4);
+ var OCT4 pc_receiver := int2oct(5, 4);
+
f_connect_ipa(4);
- f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx
+ f_M3UA_asp_up_act(0, omit, rctx_sender);
/* send a well-formed, encoded SCCP message via M3UA */
var octetstring data := f_rnd_octstring_rnd_len(100);
@@ -90,10 +90,6 @@
/* test routing an SCCP message from IPA ASP to M3UA ASP */
testcase TC_ipa_to_m3ua() runs on IPA_M3UA_CT {
- var OCT4 pc_sender := int2oct(5, 4);
- var OCT4 rctx_receiver := int2oct(1023, 4);
- var OCT4 pc_receiver := int2oct(23, 4);
-
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"},
"point-code override patch-sccp disabled");
@@ -101,8 +97,12 @@
f_init_m3ua();
f_init_ipa();
+ var OCT4 pc_sender := int2oct(5, 4);
+ var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4);
+
f_connect_ipa(4);
- f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx
+ f_M3UA_asp_up_act(0, omit, rctx_receiver);
/* send a well-formed, encoded SCCP message via IPA */
var octetstring data := f_rnd_octstring_rnd_len(100);
@@ -122,9 +122,6 @@
/* test routing an SCCP message from IPA ASP to M3UA ASP using national network indicator */
testcase TC_ipa_to_m3ua_ni() runs on IPA_M3UA_CT {
- var OCT4 pc_sender := int2oct(5, 4);
- var OCT4 rctx_receiver := int2oct(1023, 4);
- var OCT4 pc_receiver := int2oct(23, 4);
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"},
@@ -133,8 +130,12 @@
f_init_m3ua();
f_init_ipa();
+ var OCT4 pc_sender := int2oct(5, 4);
+ var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4);
+
f_connect_ipa(4);
- f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx
+ f_M3UA_asp_up_act(0, omit, rctx_receiver);
/* send a well-formed, encoded SCCP message via IPA */
var octetstring data := f_rnd_octstring_rnd_len(100);
@@ -157,10 +158,6 @@
/* test routing an SCCP message from IPA ASP to M3UA ASP while patching PC into SCCP addresses */
testcase TC_ipa_to_m3ua_patch_sccp() runs on IPA_M3UA_CT {
- var OCT4 pc_sender := int2oct(5, 4);
- var OCT4 rctx_receiver := int2oct(1023, 4);
- var OCT4 pc_receiver := int2oct(23, 4);
-
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"},
"point-code override patch-sccp both");
@@ -168,8 +165,12 @@
f_init_m3ua();
f_init_ipa();
+ var OCT4 pc_sender := int2oct(5, 4);
+ var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4);
+
f_connect_ipa(4);
- f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx
+ f_M3UA_asp_up_act(0, omit, rctx_receiver);
/* send a well-formed, encoded SCCP message via IPA */
var octetstring data := f_rnd_octstring_rnd_len(100);
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 4a3da7c..ba44b3f 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -135,14 +135,14 @@
return g_m3ua_num_clients + idx;
}
-private function f_m3ua_cli_config(integer idx) runs on RAW_M3UA_CT return M3uaConfig {
+friend function f_m3ua_cli_config(integer idx) runs on RAW_M3UA_CT return M3uaConfig {
if (idx < 0 or idx >= g_m3ua_num_clients) {
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_m3ua_cli_config(): unexpected idx");
}
return g_m3ua_configs[idx];
}
-private function f_m3ua_srv_config(integer idx) runs on RAW_M3UA_CT return M3uaConfig {
+friend function f_m3ua_srv_config(integer idx) runs on RAW_M3UA_CT return M3uaConfig {
if (idx < 0 or idx >= g_m3ua_num_servers) {
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_m3ua_srv_config(): unexpected idx");
}
To view, visit change 39662. To unsubscribe, or for help writing mail filters, visit settings.