[XS] Change in ...osmo-epdg[master]: s2b: when socket opening fails, stop the S2b module
by laforge
Attention is currently required from: lynxis lazus.
laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901?usp=email )
Change subject: s2b: when socket opening fails, stop the S2b module
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37901?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I49a6a1ec0c938aa70444c19c0b7b644f2e42f1fd
Gerrit-Change-Number: 37901
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Thu, 22 May 2025 04:40:00 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
1 month
- 1
- 0
[S] Change in ...osmo-epdg[master]: s2b: answer echo requests
by laforge
Attention is currently required from: lynxis lazus, pespin.
laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37900?usp=email )
Change subject: s2b: answer echo requests
......................................................................
Patch Set 1:
(1 comment)
File src/epdg_gtpc_s2b.erl:
https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37900/comment/2610c1aa_b5ea… :
PS1, Line 520: IEs = [#v2_recovery{restart_counter = RCnt}],
> This looks wrong. The RestartCounter we send has nothing to do with the one we receive. […]
agreeing with pespin. And indeed it's supposed to increment at every local restart. So either store it in a file (like osmo-ggsn/sgsn does, AFAIR) or use a timestamp based hack as suggested. However, the timestamp must not be the local time when sending the echo, but a timestamp that's once obtained when the process starts and then used for all RestartCounter fields during the runtime of the program (basically as long as beam runs in the erlang case).
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/37900?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: erlang/osmo-epdg
Gerrit-Branch: master
Gerrit-Change-Id: I3c470bd89b9811ba269b53eb400ffc21db4fba3a
Gerrit-Change-Number: 37900
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Thu, 22 May 2025 04:39:37 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
1 month
- 1
- 0
[XS] Change in osmo-ci[master]: jobs: ttcn3-stp*: Pass '-c all'
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40326?usp=email )
Change subject: jobs: ttcn3-stp*: Pass '-c all'
......................................................................
jobs: ttcn3-stp*: Pass '-c all'
That testsuite has recently migrated to use several configs, so make
sure to run all of them.
Depends: osmo-ttcn3-hacks.git Change-Id I4ec8e1bbc8e71d8bd421dfbd5356bf1937ce2bb4
Change-Id: I76af2a979c1f29711bf9c3865d08229240f13eba
---
M jobs/ttcn3-testsuites-testenv.yml
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml
index dc5892b..076bbe3 100644
--- a/jobs/ttcn3-testsuites-testenv.yml
+++ b/jobs/ttcn3-testsuites-testenv.yml
@@ -92,7 +92,7 @@
- ttcn3-stp-test: # ~10 min
testsuite: stp
- args: -b osmocom:nightly
+ args: -b osmocom:nightly -c all
timer: H 09 * * *
- ttcn3-hnodeb-test: # ~1 min
@@ -263,7 +263,7 @@
- ttcn3-stp-test-latest: # ~10 min
testsuite: stp
- args: -b osmocom:latest
+ args: -b osmocom:latest -c all
timer: H 12 * * *
- ttcn3-hnbgw-test-latest: # ~13 min
@@ -396,7 +396,7 @@
- ttcn3-stp-test-io_uring: # ~10 min
testsuite: stp
- args: -b osmocom:nightly --io-uring
+ args: -b osmocom:nightly --io-uring -c all
timer: H 14 * * *
- ttcn3-bsc-test-io_uring: # ~96 min
@@ -469,7 +469,7 @@
- ttcn3-stp-test-asan: # ~10 min
testsuite: stp
- args: -b osmocom:nightly:asan
+ args: -b osmocom:nightly:asan -c all
timer: H 16 * * *
- ttcn3-pcu-test-asan: # ~14 min
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40326?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I76af2a979c1f29711bf9c3865d08229240f13eba
Gerrit-Change-Number: 40326
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 month
- 1
- 0
[L] Change in osmo-ttcn3-hacks[master]: stp: ipa: Specify ASP names to use per test
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40328?usp=email )
Change subject: stp: ipa: Specify ASP names to use per test
......................................................................
stp: ipa: Specify ASP names to use per test
Similar to what was done for M3UA ASPs in previous commit.
Change-Id: Ifce2a3964d4caf0850691515e516cee93dbe8d44
---
M stp/STP_Tests_IPA.cfg
M stp/STP_Tests_IPA.ttcn
M stp/STP_Tests_IPA_M3UA.cfg
M stp/STP_Tests_IPA_M3UA.ttcn
M stp/osmo-stp-ipa.confmerge
5 files changed, 242 insertions(+), 95 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg
index d1ab417..5399093 100644
--- a/stp/STP_Tests_IPA.cfg
+++ b/stp/STP_Tests_IPA.cfg
@@ -11,16 +11,57 @@
[TESTPORT_PARAMETERS]
[MODULE_PARAMETERS]
-STP_Tests_IPA.mp_ipa_as_names := {
- "ipa-as-loadshare-sender",
- "ipa-as-loadshare-sender",
- "ipa-as-loadshare-receiver",
- "ipa-as-loadshare-receiver",
- "ipa-as-dynamic-asp",
- "ipa-as-override-sender",
- "ipa-as-override-receiver",
- "ipa-as-override-receiver"
-};
+STP_Tests_IPA.mp_ipa_configs := {
+ {
+ asp_name := "ipa-asp-loadshare-sender0",
+ as_name := "ipa-as-loadshare-sender",
+ is_server := false,
+ remote_port := 5000,
+ local_port := 20000
+ },
+ {
+ asp_name := "ipa-asp-loadshare-sender1",
+ as_name := "ipa-as-loadshare-sender",
+ is_server := false,
+ remote_port := 5000,
+ local_port := 20001
+ },
+ {
+ asp_name := "ipa-asp-loadshare-receiver0",
+ as_name := "ipa-as-loadshare-receiver",
+ is_server := false,
+ remote_port := 5000,
+ local_port := 20002
+ },
+ {
+ asp_name := "ipa-asp-loadshare-receiver1",
+ as_name := "ipa-as-loadshare-receiver",
+ is_server := false,
+ remote_port := 5000,
+ local_port := 20003
+ },
+ {
+ asp_name := "ipa-asp-override-sender",
+ as_name := "ipa-as-override-sender",
+ is_server := false,
+ remote_port := 5000,
+ local_port := 20005
+ },
+ {
+ asp_name := "ipa-asp-override-receiver0",
+ as_name := "ipa-as-override-receiver",
+ is_server := false,
+ remote_port := 5000,
+ local_port := 20006
+ },
+ {
+ asp_name := "ipa-asp-override-receiver1",
+ as_name := "ipa-as-override-receiver",
+ is_server := false,
+ remote_port := 5000,
+ local_port := 20007
+ }
+}
[MAIN_CONTROLLER]
diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn
index 5fb8423..537cac4 100644
--- a/stp/STP_Tests_IPA.ttcn
+++ b/stp/STP_Tests_IPA.ttcn
@@ -42,10 +42,25 @@
charstring mp_stp_ipa_ip := "127.0.0.1";
charstring mp_local_ipa_ip := "127.0.0.1";
integer mp_stp_ipa_port := 5000;
- integer mp_local_ipa_port := 20000;
- AspNameArray mp_ipa_as_names := {};
+ //integer mp_local_ipa_port := 20000;
+ /* local ASPs. Set in .cfg file: */
+ IpaConfigs mp_ipa_configs := {}
}
+type record IpaConfig {
+ /* Name of the ASP in the STP, (eg. to access it over VTY) */
+ charstring asp_name,
+ /* Name of the AS in the STP, (eg. to access it over VTY) */
+ charstring as_name,
+ /* Whether local side is a TCP/SCTP server */
+ boolean is_server,
+ /* STP-side SCTP (or TCP) port for M3UA */
+ integer remote_port,
+ /* local M3UA base port on TTCN3 side */
+ integer local_port
+};
+type record of IpaConfig IpaConfigs;
+
type component IPA_CT extends Test_CT {
/* for IPA we use the IPA_Emulation and not directly IPA_CodecPort to avoid
* having to re-invent IPA CCM handling here */
@@ -53,6 +68,43 @@
port IPA_SP_PT IPA_CTRL[MAX_NR_IPA];
var IPA_Emulation_CT vc_IPA[MAX_NR_IPA];
var IPA_CCM_Parameters g_ccm_pars[MAX_NR_IPA];
+ var IpaConfigs g_ipa_configs;
+}
+
+friend function ipa_build_configs(template (omit) Misc_Helpers.ro_charstring asps := omit)
+return IpaConfigs
+{
+ if (not isvalue(asps)) {
+ return mp_ipa_configs;
+ }
+
+ var IpaConfigs ipa_configs := {};
+ for (var integer i := 0; i < lengthof(asps); i := i + 1) {
+ var boolean found := false;
+ for (var integer j := 0; j < lengthof(mp_ipa_configs); j := j + 1) {
+ if (mp_ipa_configs[j].asp_name == valueof(asps[i])) {
+ found := true;
+ ipa_configs := ipa_configs & {mp_ipa_configs[j]};
+ break;
+ }
+ }
+ if (not found) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("Could not find ASP ", asps[i], ", check your configuration"));
+ }
+ }
+ return ipa_configs;
+}
+
+private function f_vty_cs7_listen_ipa_cmd(charstring cmd, integer ipa_port := 5000) runs on IPA_CT
+{
+ f_vty_config2(VTY, {"cs7 instance 0", "listen ipa " & int2str(ipa_port)}, cmd);
+}
+
+friend function f_vty_cs7_ipa_as_cmd(charstring as_name, charstring cmd) runs on IPA_CT
+{
+ f_vty_config2(VTY, {"cs7 instance 0", "as " & as_name & " ipa"}, cmd);
+
}
friend function f_IPA_send(integer idx, octetstring data) runs on IPA_CT {
@@ -89,30 +141,33 @@
f_IPA_exp(idx_rx, data);
}
-friend function f_init_ipa() runs on IPA_CT {
+friend function f_init_ipa(template (omit) IpaConfigs ipa_configs := omit) runs on IPA_CT {
var integer i;
f_init_common();
- for (i := 0; i < lengthof(mp_ipa_as_names); i:=i+1) {
+ if (not istemplatekind(ipa_configs, "omit")) {
+ g_ipa_configs := valueof(ipa_configs);
+ } else {
+ g_ipa_configs := mp_ipa_configs;
+ }
+
+ for (i := 0; i < lengthof(g_ipa_configs); i:=i+1) {
vc_IPA[i] := IPA_Emulation_CT.create("IPA" & int2str(i));
map(vc_IPA[i]:IPA_PORT, system:IPA_CODEC_PT);
connect(self:IPA[i], vc_IPA[i]:MTP3_SP_PORT);
connect(self:IPA_CTRL[i], vc_IPA[i]:IPA_SP_PORT);
g_ccm_pars[i] := c_IPA_default_ccm_pars;
- g_ccm_pars[i].name := mp_ipa_as_names[i];
+ g_ccm_pars[i].name := g_ipa_configs[i].as_name;
}
}
-friend function f_connect_ipa(integer idx, boolean use_unknown_asp_port := false, boolean exp_act := true) runs on IPA_CT {
- var integer port_offset := 0;
- if (use_unknown_asp_port) {
- /* Add 100 to the port since we know that port is not configured in any
- ASP only up to MAX_NR_IPA are configured. */
- port_offset := 100;
- }
- vc_IPA[idx].start(IPA_Emulation.main_client(mp_stp_ipa_ip, mp_stp_ipa_port, mp_local_ipa_ip,
- mp_local_ipa_port + idx + port_offset, g_ccm_pars[idx]));
+friend function f_connect_ipa(integer idx, boolean exp_act := true) runs on IPA_CT {
+ vc_IPA[idx].start(IPA_Emulation.main_client(mp_stp_ipa_ip,
+ g_ipa_configs[idx].remote_port,
+ mp_local_ipa_ip,
+ g_ipa_configs[idx].local_port,
+ g_ccm_pars[idx]));
IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP));
alt {
[exp_act] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK));
@@ -124,58 +179,87 @@
/* "accept-asp-connections pre-configured" and client from unknown source */
testcase TC_unknown_client_nodynamic() runs on IPA_CT {
+ var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" };
+ var IpaConfigs ipa_configs := ipa_build_configs(asps);
+ /* Build an ASP unknown (port) from osmo-stp: */
+ ipa_configs := {
+ { asp_name := "ipa-asp-unknown",
+ as_name := ipa_configs[0].as_name,
+ is_server := false,
+ remote_port := ipa_configs[0].remote_port,
+ local_port := 3000 }
+ };
f_init_common();
- f_vty_config2(VTY, {"cs7 instance 0", "listen ipa 5000"},
- "accept-asp-connections pre-configured");
- f_init_ipa();
- f_connect_ipa(0, true, false);
+ f_vty_cs7_listen_ipa_cmd("accept-asp-connections pre-configured", ipa_configs[0].remote_port);
+ f_init_ipa(ipa_configs := ipa_configs);
+ f_connect_ipa(0, false);
/* switch back to default */
- f_vty_config2(VTY, {"cs7 instance 0", "listen ipa 5000"},
- "accept-asp-connections dynamic-permitted");
+ f_vty_cs7_listen_ipa_cmd("accept-asp-connections dynamic-permitted", ipa_configs[0].remote_port);
setverdict(pass);
}
/* "accept-asp-connections pre-configured" and client from known source */
testcase TC_known_client_nodynamic() runs on IPA_CT {
+ var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" };
+ var IpaConfigs ipa_configs := ipa_build_configs(asps);
+
f_init_common();
- f_vty_config2(VTY, {"cs7 instance 0", "listen ipa 5000"},
- "accept-asp-connections pre-configured");
- f_init_ipa();
- f_connect_ipa(0, false);
+ f_vty_cs7_listen_ipa_cmd("accept-asp-connections pre-configured", ipa_configs[0].remote_port);
+ f_init_ipa(ipa_configs := ipa_configs);
+ f_connect_ipa(0);
/* switch back to default */
- f_vty_config2(VTY, {"cs7 instance 0", "listen ipa 5000"},
- "accept-asp-connections dynamic-permitted");
+ f_vty_cs7_listen_ipa_cmd("accept-asp-connections dynamic-permitted", ipa_configs[0].remote_port);
setverdict(pass);
}
/* "accept-asp-connections dynamic-permitted" and client from unknown source */
testcase TC_unknown_client_dynamic() runs on IPA_CT {
+ var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0" };
+ var IpaConfigs ipa_configs := ipa_build_configs(asps);
+ /* Build an ASP unknown (port) from osmo-stp: */
+ ipa_configs := {
+ { asp_name := "ipa-asp-unknown2",
+ as_name := ipa_configs[0].as_name,
+ is_server := false,
+ remote_port := ipa_configs[0].remote_port,
+ local_port := 3001 }
+ };
+
f_init_common();
- f_init_ipa();
- f_connect_ipa(0, true);
+ f_init_ipa(ipa_configs := ipa_configs);
+ f_connect_ipa(0);
setverdict(pass);
}
private function f_tc_tmt_override(boolean unknwon_dynamic_asp)
runs on IPA_CT {
- f_init_ipa();
+ var Misc_Helpers.ro_charstring asps := { "ipa-asp-override-sender",
+ "ipa-asp-override-receiver0",
+ "ipa-asp-override-receiver1" };
+ var IpaConfigs ipa_configs := ipa_build_configs(asps);
+ if (unknwon_dynamic_asp) {
+ ipa_configs[0].local_port := 3002;
+ ipa_configs[1].local_port := 3003;
+ ipa_configs[2].local_port := 3004;
+ }
+ f_init_ipa(ipa_configs := ipa_configs);
/* bring up the 'sender' side (single ASP in AS) */
- f_connect_ipa(5, unknwon_dynamic_asp);
+ f_connect_ipa(0);
/* activate the first 'receiver' side ASP */
- f_connect_ipa(6, unknwon_dynamic_asp);
+ f_connect_ipa(1);
/* verify traffic is routed from sender to [sole] receiver */
- f_test_traffic(5, 6);
+ f_test_traffic(0, 1);
/* activate the second 'receiver' side ASP */
- f_connect_ipa(7, unknwon_dynamic_asp);
+ f_connect_ipa(2);
/* verify traffic is routed from sender to new receiver */
- f_test_traffic(5, 7);
+ f_test_traffic(0, 2);
setverdict(pass);
}
@@ -199,23 +283,32 @@
private function f_tc_tmt_loadshare_roundrobin(boolean unknwon_dynamic_asp)
runs on IPA_CT {
var integer i;
+ var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0",
+ "ipa-asp-loadshare-receiver0",
+ "ipa-asp-loadshare-receiver1" };
+ var IpaConfigs ipa_configs := ipa_build_configs(asps);
+ if (unknwon_dynamic_asp) {
+ ipa_configs[0].local_port := 3005;
+ ipa_configs[1].local_port := 3006;
+ ipa_configs[2].local_port := 3007;
+ }
- f_init_ipa();
+ f_init_ipa(ipa_configs := ipa_configs);
- f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "traffic-mode roundrobin");
+ f_vty_cs7_ipa_as_cmd(ipa_configs[1].as_name, "traffic-mode roundrobin");
/* bring up the 'sender' side (single ASP in AS) */
- f_connect_ipa(0, unknwon_dynamic_asp);
+ f_connect_ipa(0);
/* activate the first 'receiver' side ASP */
- f_connect_ipa(2, unknwon_dynamic_asp);
+ f_connect_ipa(1);
/* verify traffic is routed from sender to [sole] receiver */
for (i := 0; i < 10; i := i+1) {
- f_test_traffic(0, 2);
+ f_test_traffic(0, 1);
}
/* activate the second 'receiver' side ASP */
- f_connect_ipa(3, unknwon_dynamic_asp);
+ f_connect_ipa(2);
/* verify traffic is routed from sender to new receiver */
const integer iter_per_asp := 5;
@@ -224,8 +317,8 @@
var octetstring data := f_rnd_octstring(f_rnd_ipa_len());
f_IPA_send(0, data);
alt {
- [] as_count_rx(2, data, num_rx[0]);
- [] as_count_rx(3, data, num_rx[1]);
+ [] as_count_rx(1, data, num_rx[0]);
+ [] as_count_rx(2, data, num_rx[1]);
}
}
/* FIXME: check for extraneous messages? */
@@ -237,7 +330,7 @@
}
setverdict(pass);
- f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "no traffic-mode");
+ f_vty_cs7_ipa_as_cmd(ipa_configs[1].as_name, "no traffic-mode");
}
/* test "traffic-mode load-share" behavior */
@@ -259,15 +352,25 @@
runs on IPA_CT {
var integer i;
- f_init_ipa();
+ var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0",
+ "ipa-asp-loadshare-sender1",
+ "ipa-asp-loadshare-receiver0",
+ "ipa-asp-loadshare-receiver1" };
+ var IpaConfigs ipa_configs := ipa_build_configs(asps);
+ if (unknwon_dynamic_asp) {
+ ipa_configs[0].local_port := 3010;
+ ipa_configs[1].local_port := 3011;
+ }
- f_vty_config3(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"},
+ f_init_ipa(ipa_configs := ipa_configs);
+
+ f_vty_config3(VTY, {"cs7 instance 0", "as " & ipa_configs[2].as_name & " ipa"},
{ "traffic-mode loadshare", "binding-table reset" });
/* bring up the 'sender' side (single ASP in AS) */
- f_connect_ipa(0, unknwon_dynamic_asp);
+ f_connect_ipa(0);
/* activate the first 'receiver' side ASP */
- f_connect_ipa(2, unknwon_dynamic_asp);
+ f_connect_ipa(2);
/* verify traffic is routed from sender to [sole] receiver */
for (i := 0; i < 10; i := i+1) {
@@ -275,11 +378,11 @@
}
/* activate the second 'receiver' side ASP */
- f_connect_ipa(3, unknwon_dynamic_asp);
+ f_connect_ipa(3);
/* Since we are using dynamic ASPs, they were unknown by STP until they got connected.
* Hence, reset the binding-table so that load is now properly spread among them: */
- f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "binding-table reset" );
+ f_vty_cs7_ipa_as_cmd(ipa_configs[2].as_name, "binding-table reset");
/* verify traffic is routed from sender to new receiver */
const integer iter_per_asp := 20;
@@ -313,7 +416,7 @@
/* activate the second 'sender' side ASP */
- f_connect_ipa(1, unknwon_dynamic_asp);
+ f_connect_ipa(1);
num_rx_1 := 0;
@@ -345,7 +448,7 @@
}
setverdict(pass);
- f_vty_config2(VTY, {"cs7 instance 0", "as " & mp_ipa_as_names[2] & " ipa"}, "no traffic-mode");
+ f_vty_cs7_ipa_as_cmd(ipa_configs[2].as_name, "no traffic-mode");
}
/* test "traffic-mode load-share" behavior */
diff --git a/stp/STP_Tests_IPA_M3UA.cfg b/stp/STP_Tests_IPA_M3UA.cfg
index 4ca349d..7849d3a 100644
--- a/stp/STP_Tests_IPA_M3UA.cfg
+++ b/stp/STP_Tests_IPA_M3UA.cfg
@@ -11,21 +11,27 @@
[TESTPORT_PARAMETERS]
[MODULE_PARAMETERS]
-STP_Tests_IPA.mp_ipa_as_names := {
- "ipa-as-dynamic-asp"
+STP_Tests_IPA.mp_ipa_configs := {
+ {
+ asp_name := "ipa-asp-dynamic-unknown",
+ as_name := "ipa-as-dynamic-asp",
+ is_server := false,
+ remote_port := 5000,
+ local_port := 40000
+ }
};
STP_Tests_M3UA.mp_m3ua_configs := {
- {
- asp_name := "asp-sender",
- is_server := false,
- use_tcp := false,
- remote_port := 2905,
- local_port := 9999,
- point_code := 23,
- routing_ctx := 1023
- }
- };
+ {
+ asp_name := "asp-sender",
+ is_server := false,
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 9999,
+ point_code := 23,
+ routing_ctx := 1023
+ }
+};
[MAIN_CONTROLLER]
diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn
index f62fc7c..5600f6e 100644
--- a/stp/STP_Tests_IPA_M3UA.ttcn
+++ b/stp/STP_Tests_IPA_M3UA.ttcn
@@ -63,8 +63,8 @@
/* Test routing of SCCP between an M3UA and an IPA ASP */
testcase TC_m3ua_to_ipa() runs on IPA_M3UA_CT {
- var Misc_Helpers.ro_charstring asps := { "asp-sender" };
- var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps);
var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4);
var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4);
var OCT4 pc_receiver := int2oct(5, 4);
@@ -93,18 +93,19 @@
/* test routing an SCCP message from IPA ASP to M3UA ASP */
testcase TC_ipa_to_m3ua() runs on IPA_M3UA_CT {
- var Misc_Helpers.ro_charstring asps := { "asp-sender" };
- var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var Misc_Helpers.ro_charstring ipa_asps := { "ipa-asp-dynamic-unknown" };
+ var IpaConfigs ipa_configs := ipa_build_configs(ipa_asps);
+ var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps);
var OCT4 pc_sender := int2oct(5, 4);
var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4);
var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4);
f_init_common();
- f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"},
- "point-code override patch-sccp disabled");
+ f_vty_cs7_ipa_as_cmd(ipa_configs[0].as_name, "point-code override patch-sccp disabled");
f_init_m3ua(m3ua_configs := m3ua_configs);
- f_init_ipa();
+ f_init_ipa(ipa_configs := ipa_configs);
f_connect_ipa(0);
f_M3UA_asp_up_act(0, omit, rctx_receiver);
@@ -127,18 +128,19 @@
/* 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 Misc_Helpers.ro_charstring asps := { "asp-sender" };
- var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var Misc_Helpers.ro_charstring ipa_asps := { "ipa-asp-dynamic-unknown" };
+ var IpaConfigs ipa_configs := ipa_build_configs(ipa_asps);
+ var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps);
var OCT4 pc_sender := int2oct(5, 4);
var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4);
var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4);
f_init_common();
- f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"},
- "point-code override patch-sccp disabled");
+ f_vty_cs7_ipa_as_cmd(ipa_configs[0].as_name, "point-code override patch-sccp disabled");
f_init_m3ua(m3ua_configs := m3ua_configs);
- f_init_ipa();
+ f_init_ipa(ipa_configs := ipa_configs);
f_connect_ipa(0);
f_M3UA_asp_up_act(0, omit, rctx_receiver);
@@ -164,15 +166,16 @@
/* 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 Misc_Helpers.ro_charstring asps := { "asp-sender" };
- var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var Misc_Helpers.ro_charstring ipa_asps := { "ipa-asp-dynamic-unknown" };
+ var IpaConfigs ipa_configs := ipa_build_configs(ipa_asps);
+ var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps);
var OCT4 pc_sender := int2oct(5, 4);
var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4);
var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4);
f_init_common();
- f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"},
- "point-code override patch-sccp both");
+ f_vty_cs7_ipa_as_cmd(ipa_configs[0].as_name, "point-code override patch-sccp both");
f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_ipa();
diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge
index 712e2a9..500f5ac 100644
--- a/stp/osmo-stp-ipa.confmerge
+++ b/stp/osmo-stp-ipa.confmerge
@@ -29,7 +29,6 @@
point-code override dpc 32
asp ipa-asp-loadshare-receiver0
asp ipa-asp-loadshare-receiver1
- ! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3.
! OVERRIDE:
asp ipa-asp-override-sender 20005 5000 ipa
local-ip 127.0.0.1
@@ -54,17 +53,12 @@
point-code override dpc 34
asp ipa-asp-override-receiver0
asp ipa-asp-override-receiver1
- ! DYNAMIC AS:
- as ipa-as-dynamic-asp ipa
- routing-key 0 5
- point-code override dpc 23
!
! ROUTING TABLE:
!
route-table system
update route 31 16777215 linkset ipa-as-loadshare-receiver
update route 33 16777215 linkset ipa-as-override-receiver
- update route 5 16777215 linkset ipa-as-dynamic-asp
!
!SERVERS:
!
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40328?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ifce2a3964d4caf0850691515e516cee93dbe8d44
Gerrit-Change-Number: 40328
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 month
- 1
- 0
[L] Change in osmo-ttcn3-hacks[master]: stp: Initial split into several testenv config
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40323?usp=email )
Change subject: stp: Initial split into several testenv config
......................................................................
stp: Initial split into several testenv config
As a first step, split the generic config into 3 configs, one per
module.
The idea is to have a different config for a given set of related tests
running on a specific network topology/setup.
This helps in simplifying the test conditions, which allows easily
adding new topologies to test, validate specific scenarios or debug
existing ones.
For instance, to test Combined linkset loadsharing, we'll need to set up
some sort of scenario where we have at least 2 AS with each at least 1
ASP.
Change-Id: I4ec8e1bbc8e71d8bd421dfbd5356bf1937ce2bb4
---
A stp/STP_Tests_IPA.cfg
M stp/STP_Tests_IPA.ttcn
A stp/STP_Tests_IPA_M3UA.cfg
M stp/STP_Tests_IPA_M3UA.ttcn
A stp/STP_Tests_M3UA.cfg
M stp/STP_Tests_M3UA.ttcn
A stp/osmo-stp-ipa-m3ua.confmerge
A stp/osmo-stp-ipa.confmerge
A stp/osmo-stp-m3ua.confmerge
M stp/osmo-stp.cfg
D stp/testenv.cfg
A stp/testenv_ipa-m3ua.cfg
A stp/testenv_ipa.cfg
A stp/testenv_m3ua.cfg
14 files changed, 442 insertions(+), 277 deletions(-)
Approvals:
daniel: Looks good to me, approved
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg
new file mode 100644
index 0000000..d1ab417
--- /dev/null
+++ b/stp/STP_Tests_IPA.cfg
@@ -0,0 +1,28 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./STP_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+STP_Tests_IPA.mp_ipa_as_names := {
+ "ipa-as-loadshare-sender",
+ "ipa-as-loadshare-sender",
+ "ipa-as-loadshare-receiver",
+ "ipa-as-loadshare-receiver",
+ "ipa-as-dynamic-asp",
+ "ipa-as-override-sender",
+ "ipa-as-override-receiver",
+ "ipa-as-override-receiver"
+};
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+STP_Tests_IPA.control
diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn
index 3e484cb..5fb8423 100644
--- a/stp/STP_Tests_IPA.ttcn
+++ b/stp/STP_Tests_IPA.ttcn
@@ -43,15 +43,7 @@
charstring mp_local_ipa_ip := "127.0.0.1";
integer mp_stp_ipa_port := 5000;
integer mp_local_ipa_port := 20000;
- AspNameArray mp_ipa_as_names := {"ipa-as-loadshare-sender",
- "ipa-as-loadshare-sender",
- "ipa-as-loadshare-receiver",
- "ipa-as-loadshare-receiver",
- "ipa-as-dynamic-asp",
- "ipa-as-override-sender",
- "ipa-as-override-receiver",
- "ipa-as-override-receiver"
- };
+ AspNameArray mp_ipa_as_names := {};
}
type component IPA_CT extends Test_CT {
diff --git a/stp/STP_Tests_IPA_M3UA.cfg b/stp/STP_Tests_IPA_M3UA.cfg
new file mode 100644
index 0000000..be16ccf
--- /dev/null
+++ b/stp/STP_Tests_IPA_M3UA.cfg
@@ -0,0 +1,38 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./STP_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+STP_Tests_IPA.mp_ipa_as_names := {
+ "ipa-as-dynamic-asp"
+};
+
+/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
+STP_Tests_M3UA.mp_m3ua_configs := {
+ /* as-sender: One ASP within AS */
+ {
+ asp_name := "asp-sender",
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 9999,
+ point_code := 23,
+ routing_ctx := 1023
+ }
+ };
+/* number of M3UA clients in ATS */
+STP_Tests_M3UA.mp_m3ua_num_clients := 1;
+/* number of M3UA servers in ATS */
+STP_Tests_M3UA.mp_m3ua_num_servers := 0;
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+STP_Tests_IPA_M3UA.control
diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn
index 08ca5aa..4fcd506 100644
--- a/stp/STP_Tests_IPA_M3UA.ttcn
+++ b/stp/STP_Tests_IPA_M3UA.ttcn
@@ -65,12 +65,15 @@
f_init_m3ua();
f_init_ipa();
+ const integer ipa_idx := 0;
+ const integer m3ua_idx := 0;
+
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, rctx_sender);
+ f_connect_ipa(ipa_idx);
+ f_M3UA_asp_up_act(m3ua_idx, omit, rctx_sender);
/* send a well-formed, encoded SCCP message via M3UA */
var octetstring data := f_rnd_octstring_rnd_len(100);
@@ -80,10 +83,10 @@
var octetstring sccp_enc := enc_PDU_SCCP(sccp);
var template (value) M3UA_Protocol_Data tx_pd;
tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, sccp_enc);
- f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1);
+ f_M3UA_send(m3ua_idx, ts_M3UA_DATA(rctx_sender, tx_pd), 1);
/* expect to receive it via IPA */
- f_IPA_exp(4, sccp_enc);
+ f_IPA_exp(ipa_idx, sccp_enc);
f_clear_m3ua();
}
@@ -97,12 +100,15 @@
f_init_m3ua();
f_init_ipa();
+ const integer ipa_idx := 0;
+ const integer m3ua_idx := 0;
+
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, rctx_receiver);
+ f_connect_ipa(ipa_idx);
+ f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver);
/* send a well-formed, encoded SCCP message via IPA */
var octetstring data := f_rnd_octstring_rnd_len(100);
@@ -110,12 +116,12 @@
var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H));
var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data));
var octetstring sccp_enc := enc_PDU_SCCP(sccp);
- f_IPA_send(4, sccp_enc);
+ f_IPA_send(ipa_idx, sccp_enc);
/* expect to receive it via M3UA */
var template (present) M3UA_Protocol_Data rx_pd;
rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, sccp_enc);
- f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd));
+ f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd));
f_clear_m3ua();
}
@@ -130,12 +136,15 @@
f_init_m3ua();
f_init_ipa();
+ const integer ipa_idx := 0;
+ const integer m3ua_idx := 0;
+
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, rctx_receiver);
+ f_connect_ipa(ipa_idx);
+ f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver);
/* send a well-formed, encoded SCCP message via IPA */
var octetstring data := f_rnd_octstring_rnd_len(100);
@@ -144,13 +153,13 @@
var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data));
var octetstring sccp_enc := enc_PDU_SCCP(sccp);
f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator national");
- f_IPA_send(4, sccp_enc);
+ f_IPA_send(ipa_idx, sccp_enc);
/* expect to receive it via M3UA */
var template (present) M3UA_Protocol_Data rx_pd;
rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, c_M3UA_NI_NATIONAL,
'00'O, ?, sccp_enc);
- f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd));
+ f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd));
f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator international");
f_clear_m3ua();
}
@@ -165,19 +174,22 @@
f_init_m3ua();
f_init_ipa();
+ const integer ipa_idx := 0;
+ const integer m3ua_idx := 0;
+
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, rctx_receiver);
+ f_connect_ipa(ipa_idx);
+ f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver);
/* send a well-formed, encoded SCCP message via IPA */
var octetstring data := f_rnd_octstring_rnd_len(100);
var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H));
var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H));
var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data));
- f_IPA_send(4, enc_PDU_SCCP(sccp));
+ f_IPA_send(ipa_idx, enc_PDU_SCCP(sccp));
/* patch point codes into addresses */
called := valueof(ts_SccpAddr_PC_GT(oct2int(pc_receiver), '83'O, "mtp3_itu", '1234'H));
@@ -188,7 +200,7 @@
var template (present) M3UA_Protocol_Data rx_pd;
rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?,
enc_PDU_SCCP(sccp_exp));
- f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd));
+ f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd));
f_clear_m3ua();
}
diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg
new file mode 100644
index 0000000..d5894a1
--- /dev/null
+++ b/stp/STP_Tests_M3UA.cfg
@@ -0,0 +1,95 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./STP_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
+STP_Tests_M3UA.mp_m3ua_configs := {
+ /* as-sender: One ASP within AS */
+ {
+ asp_name := "asp-sender",
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 9999,
+ point_code := 23,
+ routing_ctx := 1023
+ },
+ /* as-receiver: Two ASP within AS */
+ {
+ asp_name := "asp-receiver0",
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 10000,
+ point_code := 42,
+ routing_ctx := 1042
+ }, {
+ asp_name := "asp-receiver1",
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 10001,
+ point_code := 42,
+ routing_ctx := 1042
+ },
+ /* as-sender-tcp: One ASP within AS */
+ {
+ asp_name := "asp-sender-tcp",
+ use_tcp := true,
+ remote_port := 2905,
+ local_port := 9999,
+ point_code := 123,
+ routing_ctx := 1123
+ },
+ /* as-client: One ASP within AS */
+ {
+ asp_name := "asp-client0",
+ use_tcp := false,
+ remote_port := 2906,
+ local_port := 10002,
+ point_code := 55,
+ routing_ctx := 1055
+ },
+ /* as-client60-norctx */
+ {
+ asp_name := "asp-client60-norctx0",
+ use_tcp := false,
+ remote_port := 2907,
+ local_port := 11060,
+ point_code := 60,
+ routing_ctx := -
+ },
+ /* as-client61-norctx */
+ {
+ asp_name := "asp-client61-norctx0",
+ use_tcp := false,
+ remote_port := 2907,
+ local_port := 11061,
+ point_code := 61,
+ routing_ctx := -
+ },
+ /* as-client-tcp: One ASP within AS */
+ {
+ asp_name := "asp-client0-tcp",
+ use_tcp := true,
+ remote_port := 2906,
+ local_port := 10002,
+ point_code := 155,
+ routing_ctx := 1155
+ }
+ };
+/* number of M3UA clients in ATS */
+STP_Tests_M3UA.mp_m3ua_num_clients := 4;
+/* number of M3UA servers in ATS */
+STP_Tests_M3UA.mp_m3ua_num_servers := 4;
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+STP_Tests_M3UA.control
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index eddd0b1..a78dec5 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -45,82 +45,11 @@
/* local IP addresses */
HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" };
/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
- M3uaConfigs mp_m3ua_configs := {
- /* as-sender: One ASP within AS */
- {
- asp_name := "asp-sender",
- use_tcp := false,
- remote_port := 2905,
- local_port := 9999,
- point_code := 23,
- routing_ctx := 1023
- },
- /* as-receiver: Two ASP within AS */
- {
- asp_name := "asp-receiver0",
- use_tcp := false,
- remote_port := 2905,
- local_port := 10000,
- point_code := 42,
- routing_ctx := 1042
- }, {
- asp_name := "asp-receiver1",
- use_tcp := false,
- remote_port := 2905,
- local_port := 10001,
- point_code := 42,
- routing_ctx := 1042
- },
- /* as-sender-tcp: One ASP within AS */
- {
- asp_name := "asp-sender-tcp",
- use_tcp := true,
- remote_port := 2905,
- local_port := 9999,
- point_code := 123,
- routing_ctx := 1123
- },
- /* as-client: One ASP within AS */
- {
- asp_name := "asp-client0",
- use_tcp := false,
- remote_port := 2906,
- local_port := 10002,
- point_code := 55,
- routing_ctx := 1055
- },
- /* as-client60-norctx */
- {
- asp_name := "asp-client60-norctx0",
- use_tcp := false,
- remote_port := 2907,
- local_port := 11060,
- point_code := 60,
- routing_ctx := -
- },
- /* as-client61-norctx */
- {
- asp_name := "asp-client61-norctx0",
- use_tcp := false,
- remote_port := 2907,
- local_port := 11061,
- point_code := 61,
- routing_ctx := -
- },
- /* as-client-tcp: One ASP within AS */
- {
- asp_name := "asp-client0-tcp",
- use_tcp := true,
- remote_port := 2906,
- local_port := 10002,
- point_code := 155,
- routing_ctx := 1155
- }
- };
+ M3uaConfigs mp_m3ua_configs := {};
/* number of M3UA clients in ATS */
- integer mp_m3ua_num_clients := 4;
+ integer mp_m3ua_num_clients := 0;
/* number of M3UA servers in ATS */
- integer mp_m3ua_num_servers := 4;
+ integer mp_m3ua_num_servers := 0;
integer mp_recovery_timeout_msec := 2000;
charstring mp_sccp_service_type := "mtp3_itu";
}
diff --git a/stp/osmo-stp-ipa-m3ua.confmerge b/stp/osmo-stp-ipa-m3ua.confmerge
new file mode 100644
index 0000000..ce3123b
--- /dev/null
+++ b/stp/osmo-stp-ipa-m3ua.confmerge
@@ -0,0 +1,36 @@
+cs7 instance 0
+ !
+ !M3UA AS/ASP:
+ !
+ asp asp-sender 9999 2905 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ sctp-role server
+ as as-sender m3ua
+ asp asp-sender
+ routing-key 1023 23
+ !
+ ! IPA DYNAMIC AS:
+ !
+ as ipa-as-dynamic-asp ipa
+ routing-key 0 5
+ point-code override dpc 23
+ !
+ ! ROUTING TABLE:
+ !
+ route-table system
+ update route 23 16777215 linkset as-sender
+ route-table system
+ update route 5 16777215 linkset ipa-as-dynamic-asp
+ !
+ !SERVERS:
+ !
+ listen m3ua 2905
+ local-ip 127.0.0.1
+ local-ip ::1
+ accept-asp-connections dynamic-permitted
+ listen ipa 5000
+ accept-asp-connections dynamic-permitted
diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge
new file mode 100644
index 0000000..712e2a9
--- /dev/null
+++ b/stp/osmo-stp-ipa.confmerge
@@ -0,0 +1,72 @@
+cs7 instance 0
+ !
+ ! IPA AS/ASP:
+ !
+ asp ipa-asp-loadshare-sender0 20000 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ asp ipa-asp-loadshare-sender1 20001 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ as ipa-as-loadshare-sender ipa
+ routing-key 0 6
+ point-code override dpc 31
+ asp ipa-asp-loadshare-sender0
+ asp ipa-asp-loadshare-sender1
+ asp ipa-asp-loadshare-receiver0 20002 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ role sg
+ sctp-role server
+ asp ipa-asp-loadshare-receiver1 20003 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ role sg
+ sctp-role server
+ as ipa-as-loadshare-receiver ipa
+ traffic-mode loadshare
+ routing-key 0 7
+ point-code override dpc 32
+ asp ipa-asp-loadshare-receiver0
+ asp ipa-asp-loadshare-receiver1
+ ! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3.
+ ! OVERRIDE:
+ asp ipa-asp-override-sender 20005 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ as ipa-as-override-sender ipa
+ routing-key 0 6
+ point-code override dpc 33
+ asp ipa-asp-override-sender
+ asp ipa-asp-override-receiver0 20006 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ role sg
+ sctp-role server
+ asp ipa-asp-override-receiver1 20007 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ role sg
+ sctp-role server
+ as ipa-as-override-receiver ipa
+ traffic-mode override
+ routing-key 0 8
+ point-code override dpc 34
+ asp ipa-asp-override-receiver0
+ asp ipa-asp-override-receiver1
+ ! DYNAMIC AS:
+ as ipa-as-dynamic-asp ipa
+ routing-key 0 5
+ point-code override dpc 23
+ !
+ ! ROUTING TABLE:
+ !
+ route-table system
+ update route 31 16777215 linkset ipa-as-loadshare-receiver
+ update route 33 16777215 linkset ipa-as-override-receiver
+ update route 5 16777215 linkset ipa-as-dynamic-asp
+ !
+ !SERVERS:
+ !
+ listen ipa 5000
+ accept-asp-connections dynamic-permitted
diff --git a/stp/osmo-stp-m3ua.confmerge b/stp/osmo-stp-m3ua.confmerge
new file mode 100644
index 0000000..2140553
--- /dev/null
+++ b/stp/osmo-stp-m3ua.confmerge
@@ -0,0 +1,108 @@
+cs7 instance 0
+ !
+ ! M3UA-TCP AS/ASP:
+ !
+ asp asp-sender-tcp 9999 2905 m3ua tcp
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ transport-role server
+ asp asp-client0-tcp 10002 2906 m3ua tcp
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role asp
+ transport-role client
+ as as-sender-tcp m3ua
+ asp asp-sender-tcp
+ routing-key 1123 123
+ as as-client-tcp m3ua
+ routing-key 1155 155
+ asp asp-client0-tcp
+ !
+ !M3UA AS/ASP:
+ !
+ asp asp-sender 9999 2905 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ sctp-role server
+ asp asp-receiver0 10000 2905 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ sctp-role server
+ asp asp-receiver1 10001 2905 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ sctp-role server
+ asp asp-client0 10002 2906 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role asp
+ sctp-role client
+ asp asp-client60-norctx0 11060 2907 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role asp
+ sctp-role client
+ asp asp-client61-norctx0 11061 2907 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role asp
+ sctp-role client
+ as as-sender m3ua
+ asp asp-sender
+ routing-key 1023 23
+ as as-receiver m3ua
+ asp asp-receiver0
+ asp asp-receiver1
+ routing-key 1042 42
+ as as-client m3ua
+ routing-key 1055 55
+ asp asp-client0
+ as as-client60-norctx m3ua
+ routing-key 0 60
+ asp asp-client60-norctx0
+ as as-client61-norctx m3ua
+ routing-key 0 61
+ asp asp-client61-norctx0
+ !
+ ! ROUTING TABLE:
+ !
+ route-table system
+ update route 123 16777215 linkset as-sender-tcp
+ update route 155 16777215 linkset as-client-tcp
+ route-table system
+ update route 23 16777215 linkset as-sender
+ update route 42 16777215 linkset as-receiver
+ update route 55 16777215 linkset as-client
+ update route 60 16777215 linkset as-client60-norctx
+ update route 61 16777215 linkset as-client61-norctx
+ !
+ !SERVERS:
+ !
+ listen m3ua 2905 tcp
+ local-ip 127.0.0.1
+ local-ip ::1
+ accept-asp-connections dynamic-permitted
+ listen m3ua 2905
+ local-ip 127.0.0.1
+ local-ip ::1
+ accept-asp-connections dynamic-permitted
diff --git a/stp/osmo-stp.cfg b/stp/osmo-stp.cfg
index 355bf20..241382d 100644
--- a/stp/osmo-stp.cfg
+++ b/stp/osmo-stp.cfg
@@ -24,171 +24,3 @@
!
cs7 instance 0
point-code format 24
- asp asp-sender-tcp 9999 2905 m3ua tcp
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role sg
- transport-role server
- asp asp-client0-tcp 10002 2906 m3ua tcp
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role asp
- transport-role client
- as as-sender-tcp m3ua
- asp asp-sender-tcp
- routing-key 1123 123
- as as-client-tcp m3ua
- routing-key 1155 155
- asp asp-client0-tcp
- route-table system
- update route 123 16777215 linkset as-sender-tcp
- update route 155 16777215 linkset as-client-tcp
- listen m3ua 2905 tcp
- local-ip 127.0.0.1
- local-ip ::1
- accept-asp-connections dynamic-permitted
-!
-!M3UA AS/ASP:
-!
- asp asp-sender 9999 2905 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role sg
- sctp-role server
- asp asp-receiver0 10000 2905 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role sg
- sctp-role server
- asp asp-receiver1 10001 2905 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role sg
- sctp-role server
- asp asp-client0 10002 2906 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role asp
- sctp-role client
- asp asp-client60-norctx0 11060 2907 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role asp
- sctp-role client
- asp asp-client61-norctx0 11061 2907 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role asp
- sctp-role client
- as as-sender m3ua
- asp asp-sender
- routing-key 1023 23
- as as-receiver m3ua
- asp asp-receiver0
- asp asp-receiver1
- routing-key 1042 42
- as as-client m3ua
- routing-key 1055 55
- asp asp-client0
- as as-client60-norctx m3ua
- routing-key 0 60
- asp asp-client60-norctx0
- as as-client61-norctx m3ua
- routing-key 0 61
- asp asp-client61-norctx0
-!
-! IPA AS/ASP:
-!
- asp ipa-asp-loadshare-sender0 20000 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- asp ipa-asp-loadshare-sender1 20001 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- as ipa-as-loadshare-sender ipa
- routing-key 0 6
- point-code override dpc 31
- asp ipa-asp-loadshare-sender0
- asp ipa-asp-loadshare-sender1
- asp ipa-asp-loadshare-receiver0 20002 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- role sg
- sctp-role server
- asp ipa-asp-loadshare-receiver1 20003 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- role sg
- sctp-role server
- as ipa-as-loadshare-receiver ipa
- traffic-mode loadshare
- routing-key 0 7
- point-code override dpc 32
- asp ipa-asp-loadshare-receiver0
- asp ipa-asp-loadshare-receiver1
-! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3.
-! OVERRIDE:
- asp ipa-asp-override-sender 20005 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- as ipa-as-override-sender ipa
- routing-key 0 6
- point-code override dpc 33
- asp ipa-asp-override-sender
- asp ipa-asp-override-receiver0 20006 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- role sg
- sctp-role server
- asp ipa-asp-override-receiver1 20007 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- role sg
- sctp-role server
- as ipa-as-override-receiver ipa
- traffic-mode override
- routing-key 0 8
- point-code override dpc 34
- asp ipa-asp-override-receiver0
- asp ipa-asp-override-receiver1
-! DYNAMIC AS:
- as ipa-as-dynamic-asp ipa
- routing-key 0 5
- point-code override dpc 23
-!
-! ROUTING TABLE:
-!
- route-table system
- update route 23 16777215 linkset as-sender
- update route 42 16777215 linkset as-receiver
- update route 55 16777215 linkset as-client
- update route 60 16777215 linkset as-client60-norctx
- update route 61 16777215 linkset as-client61-norctx
- update route 31 16777215 linkset ipa-as-loadshare-receiver
- update route 33 16777215 linkset ipa-as-override-receiver
- update route 5 16777215 linkset ipa-as-dynamic-asp
-!
-!SERVERS:
-!
- listen m3ua 2905
- local-ip 127.0.0.1
- local-ip ::1
- accept-asp-connections dynamic-permitted
- listen ipa 5000
- accept-asp-connections dynamic-permitted
diff --git a/stp/testenv.cfg b/stp/testenv.cfg
deleted file mode 100644
index a0f14e1..0000000
--- a/stp/testenv.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-[testsuite]
-program=STP_Tests
-config=STP_Tests.cfg
-
-[stp]
-program=osmo-stp
-make=libosmo-sigtran
-package=osmo-stp
-copy=osmo-stp.cfg
-vty_port=4239
diff --git a/stp/testenv_ipa-m3ua.cfg b/stp/testenv_ipa-m3ua.cfg
new file mode 100644
index 0000000..144e6a9
--- /dev/null
+++ b/stp/testenv_ipa-m3ua.cfg
@@ -0,0 +1,11 @@
+[testsuite]
+program=STP_Tests
+config=STP_Tests_IPA_M3UA.cfg
+
+[stp]
+prepare=osmo-config-merge osmo-stp.cfg osmo-stp-ipa-m3ua.confmerge > osmo-stp-ipa-m3ua.cfg
+program=osmo-stp -c osmo-stp-ipa-m3ua.cfg
+make=libosmo-sigtran
+package=osmo-stp libosmocore-utils
+copy=osmo-stp.cfg osmo-stp-ipa-m3ua.confmerge
+vty_port=4239
diff --git a/stp/testenv_ipa.cfg b/stp/testenv_ipa.cfg
new file mode 100644
index 0000000..91320e1
--- /dev/null
+++ b/stp/testenv_ipa.cfg
@@ -0,0 +1,11 @@
+[testsuite]
+program=STP_Tests
+config=STP_Tests_IPA.cfg
+
+[stp]
+prepare=osmo-config-merge osmo-stp.cfg osmo-stp-ipa.confmerge > osmo-stp-ipa.cfg
+program=osmo-stp -c osmo-stp-ipa.cfg
+make=libosmo-sigtran
+package=osmo-stp libosmocore-utils
+copy=osmo-stp.cfg osmo-stp-ipa.confmerge
+vty_port=4239
diff --git a/stp/testenv_m3ua.cfg b/stp/testenv_m3ua.cfg
new file mode 100644
index 0000000..d645d4d
--- /dev/null
+++ b/stp/testenv_m3ua.cfg
@@ -0,0 +1,11 @@
+[testsuite]
+program=STP_Tests
+config=STP_Tests_M3UA.cfg
+
+[stp]
+prepare=osmo-config-merge osmo-stp.cfg osmo-stp-m3ua.confmerge > osmo-stp-m3ua.cfg
+program=osmo-stp -c osmo-stp-m3ua.cfg
+make=libosmo-sigtran
+package=osmo-stp libosmocore-utils
+copy=osmo-stp.cfg osmo-stp-m3ua.confmerge
+vty_port=4239
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40323?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4ec8e1bbc8e71d8bd421dfbd5356bf1937ce2bb4
Gerrit-Change-Number: 40323
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 month
- 1
- 0
[L] Change in osmo-ttcn3-hacks[master]: stp: Split M3UA TCP tests into its own testenv config
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40324?usp=email )
Change subject: stp: Split M3UA TCP tests into its own testenv config
......................................................................
stp: Split M3UA TCP tests into its own testenv config
That group of tests explicitly tests operation of m3ua-tcp AS(P)s and
interaction with m3ua(-sctp) ones.
Hence, create a new config to test those, where we keep the TCP related
configuration in osmo-stp.
Change-Id: I8123887755aa3253830b43407b4cc6b21142233c
---
M stp/STP_Tests_M3UA.cfg
M stp/STP_Tests_M3UA.ttcn
A stp/STP_Tests_M3UA_TCP.cfg
A stp/STP_Tests_M3UA_TCP.ttcn
M stp/expected-results.xml
A stp/osmo-stp-m3ua-tcp.confmerge
M stp/osmo-stp-m3ua.confmerge
A stp/testenv_m3ua-tcp.cfg
8 files changed, 262 insertions(+), 131 deletions(-)
Approvals:
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg
index d5894a1..994314a 100644
--- a/stp/STP_Tests_M3UA.cfg
+++ b/stp/STP_Tests_M3UA.cfg
@@ -38,15 +38,6 @@
point_code := 42,
routing_ctx := 1042
},
- /* as-sender-tcp: One ASP within AS */
- {
- asp_name := "asp-sender-tcp",
- use_tcp := true,
- remote_port := 2905,
- local_port := 9999,
- point_code := 123,
- routing_ctx := 1123
- },
/* as-client: One ASP within AS */
{
asp_name := "asp-client0",
@@ -73,21 +64,12 @@
local_port := 11061,
point_code := 61,
routing_ctx := -
- },
- /* as-client-tcp: One ASP within AS */
- {
- asp_name := "asp-client0-tcp",
- use_tcp := true,
- remote_port := 2906,
- local_port := 10002,
- point_code := 155,
- routing_ctx := 1155
}
};
/* number of M3UA clients in ATS */
-STP_Tests_M3UA.mp_m3ua_num_clients := 4;
+STP_Tests_M3UA.mp_m3ua_num_clients := 3;
/* number of M3UA servers in ATS */
-STP_Tests_M3UA.mp_m3ua_num_servers := 4;
+STP_Tests_M3UA.mp_m3ua_num_servers := 3;
[MAIN_CONTROLLER]
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index a78dec5..64153ab 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -12,6 +12,7 @@
*/
friend module STP_Tests_IPA_M3UA;
+friend module STP_Tests_M3UA_TCP;
import from General_Types all;
import from Osmocom_Types all;
@@ -70,7 +71,7 @@
};
type record of M3uaConfig M3uaConfigs;
-private function M3UA_SRV(integer idx) runs on RAW_M3UA_CT return integer {
+friend function M3UA_SRV(integer idx) runs on RAW_M3UA_CT return integer {
return g_m3ua_num_clients + idx;
}
@@ -515,7 +516,7 @@
}
/* Test if traffic is routed from idx_tx/pc_tx to idx_rx/pc_rx */
-private function f_test_traffic(integer idx_tx, template (omit) OCT4 rctx_sender, OCT4 pc_tx,
+friend function f_test_traffic(integer idx_tx, template (omit) OCT4 rctx_sender, OCT4 pc_tx,
integer idx_rx, template (omit) OCT4 rctx_receiver, OCT4 pc_rx,
OCT1 si := '23'O, OCT1 ni := '00'O, OCT1 mp := '00'O, OCT1 sls := '00'O)
runs on RAW_M3UA_CT {
@@ -1456,76 +1457,6 @@
f_clear_m3ua();
}
-private function f_TC_m3ua_tcp(integer idx_a, integer idx_b) runs on RAW_M3UA_CT {
- var M3uaConfig cfg_a := g_m3ua_configs[idx_a];
- var M3uaConfig cfg_b := g_m3ua_configs[idx_b];
- var OCT4 rctx_a := int2oct(cfg_a.routing_ctx, 4);
- var OCT4 rctx_b := int2oct(cfg_b.routing_ctx, 4);
- var OCT4 pc_a := int2oct(cfg_a.point_code, 4);
- var OCT4 pc_b := int2oct(cfg_b.point_code, 4);
-
- /* establish connection with ASP 'A' */
- if (idx_a < g_m3ua_num_clients) {
- f_M3UA_asp_up_act(idx_a, rctx := rctx_a);
- } else {
- f_M3UA_CLNT_asp_up_act(idx_a, rctx := rctx_a);
- }
-
- /* establish connection with ASP 'B' */
- if (idx_b < g_m3ua_num_clients) {
- f_M3UA_asp_up_act(idx_b, rctx := rctx_b);
- } else {
- f_M3UA_CLNT_asp_up_act(idx_b, rctx := rctx_b);
- }
-
- /* In the case when ASP[idx_b] is configured as the client (i.e. osmo-stp connects to
- * the testsuite; idx_b >= g_m3ua_num_clients), in f_M3UA_CLNT_asp_up_act() we're expecting
- * to receive ASPACT and then sending ASPACT_ACK to it. Right after that, we're sending
- * some random data via ASP[idx_a], which we then expect to receive via ASP[idx_b].
- *
- * There is a chance that the random data sent via ASP[idx_a] would reach osmo-stp
- * earlier than the ASPUP_ACK we sent for ASP[idx_b]. This is happening most of the
- * times when running TC_m3ua_tcp_cli_srv. Using f_sleep() helps to avoid this. */
- f_sleep(1.0);
-
- /* M3UA/A -> M3UA/B */
- f_test_traffic(idx_a, rctx_a, pc_a,
- idx_b, rctx_b, pc_b);
- /* M3UA/B -> M3UA/A */
- f_test_traffic(idx_b, rctx_b, pc_b,
- idx_a, rctx_a, pc_a);
-
- f_clear_m3ua();
-}
-
-/* test routing between M3UA/SCTP (client) and M3UA/TCP (client) */
-testcase TC_m3ua_tcp_cli() runs on RAW_M3UA_CT {
- f_init_m3ua();
- f_TC_m3ua_tcp(0, 3); /* 'asp-sender' <-> 'asp-sender-tcp' */
-}
-
-/* test routing between M3UA/SCTP (client) and M3UA/TCP (server) */
-testcase TC_m3ua_tcp_cli_srv() runs on RAW_M3UA_CT {
- f_init_m3ua();
- f_init_m3ua_srv();
- f_TC_m3ua_tcp(0, M3UA_SRV(3)); /* 'asp-sender' <-> 'asp-client-tcp' */
-}
-
-/* test routing between M3UA/SCTP (server) and M3UA/TCP (server) */
-testcase TC_m3ua_tcp_srv() runs on RAW_M3UA_CT {
- f_init_m3ua();
- f_init_m3ua_srv();
- f_TC_m3ua_tcp(M3UA_SRV(0), M3UA_SRV(3)); /* 'asp-client' <-> 'asp-client-tcp' */
-}
-
-/* test routing between M3UA/SCTP (server) and M3UA/TCP (client) */
-testcase TC_m3ua_tcp_srv_cli() runs on RAW_M3UA_CT {
- f_init_m3ua();
- f_init_m3ua_srv();
- f_TC_m3ua_tcp(M3UA_SRV(0), 3); /* 'asp-client' <-> 'asp-sender-tcp' */
-}
-
-
control {
/* M3UA Tests */
execute( TC_connect_asp_up() );
@@ -1542,11 +1473,6 @@
execute( TC_act_rctx_data_no_rctx() );
execute( TC_m3ua_sctp_srv_adm_shutdown() );
- execute( TC_m3ua_tcp_cli() );
- execute( TC_m3ua_tcp_cli_srv() );
- execute( TC_m3ua_tcp_srv() );
- execute( TC_m3ua_tcp_srv_cli() );
-
/* M3UA RKM tests */
execute( TC_rkm_reg_static_notpermitted() );
execute( TC_rkm_reg_static_permitted() );
diff --git a/stp/STP_Tests_M3UA_TCP.cfg b/stp/STP_Tests_M3UA_TCP.cfg
new file mode 100644
index 0000000..7113e97
--- /dev/null
+++ b/stp/STP_Tests_M3UA_TCP.cfg
@@ -0,0 +1,61 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./STP_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
+STP_Tests_M3UA.mp_m3ua_configs := {
+ /* as-sender: One ASP within AS */
+ {
+ asp_name := "asp-sender",
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 9999,
+ point_code := 23,
+ routing_ctx := 1023
+ },
+ /* as-sender-tcp: One ASP within AS */
+ {
+ asp_name := "asp-sender-tcp",
+ use_tcp := true,
+ remote_port := 2905,
+ local_port := 9999,
+ point_code := 123,
+ routing_ctx := 1123
+ },
+ /* as-client: One ASP within AS */
+ {
+ asp_name := "asp-client0",
+ use_tcp := false,
+ remote_port := 2906,
+ local_port := 10002,
+ point_code := 55,
+ routing_ctx := 1055
+ },
+ /* as-client-tcp: One ASP within AS */
+ {
+ asp_name := "asp-client0-tcp",
+ use_tcp := true,
+ remote_port := 2906,
+ local_port := 10002,
+ point_code := 155,
+ routing_ctx := 1155
+ }
+ };
+/* number of M3UA clients in ATS */
+STP_Tests_M3UA.mp_m3ua_num_clients := 2;
+/* number of M3UA servers in ATS */
+STP_Tests_M3UA.mp_m3ua_num_servers := 2;
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+STP_Tests_M3UA_TCP.control
diff --git a/stp/STP_Tests_M3UA_TCP.ttcn b/stp/STP_Tests_M3UA_TCP.ttcn
new file mode 100644
index 0000000..15361ef
--- /dev/null
+++ b/stp/STP_Tests_M3UA_TCP.ttcn
@@ -0,0 +1,114 @@
+module STP_Tests_M3UA_TCP {
+
+/* Osmocom STP test suite in in TTCN-3
+ * (C) 2019 Harald Welte <laforge(a)gnumonks.org>
+ * (C) 2024-2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All rights reserved.
+ *
+ * Released under the terms of GNU General Public License, Version 2 or
+ * (at your option) any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+import from General_Types all;
+import from Osmocom_Types all;
+import from IPL4asp_Types all;
+
+import from Osmocom_VTY_Functions all;
+
+import from M3UA_Types all;
+import from M3UA_Templates all;
+import from M3UA_CodecPort all;
+import from M3UA_CodecPort_CtrlFunct all;
+
+import from M3UA_Emulation all;
+import from MTP3asp_Types all;
+import from MTP3asp_PortType all;
+
+import from SCCP_Types all;
+import from SCCP_Templates all;
+import from SCCPasp_Types all;
+import from SCCP_Emulation all;
+
+import from STP_Tests_Common all;
+import from STP_Tests_M3UA all;
+
+private function f_TC_m3ua_tcp(integer idx_a, integer idx_b) runs on RAW_M3UA_CT {
+ var M3uaConfig cfg_a := g_m3ua_configs[idx_a];
+ var M3uaConfig cfg_b := g_m3ua_configs[idx_b];
+ var OCT4 rctx_a := int2oct(cfg_a.routing_ctx, 4);
+ var OCT4 rctx_b := int2oct(cfg_b.routing_ctx, 4);
+ var OCT4 pc_a := int2oct(cfg_a.point_code, 4);
+ var OCT4 pc_b := int2oct(cfg_b.point_code, 4);
+
+ /* establish connection with ASP 'A' */
+ if (idx_a < g_m3ua_num_clients) {
+ f_M3UA_asp_up_act(idx_a, rctx := rctx_a);
+ } else {
+ f_M3UA_CLNT_asp_up_act(idx_a, rctx := rctx_a);
+ }
+
+ /* establish connection with ASP 'B' */
+ if (idx_b < g_m3ua_num_clients) {
+ f_M3UA_asp_up_act(idx_b, rctx := rctx_b);
+ } else {
+ f_M3UA_CLNT_asp_up_act(idx_b, rctx := rctx_b);
+ }
+
+ /* In the case when ASP[idx_b] is configured as the client (i.e. osmo-stp connects to
+ * the testsuite; idx_b >= g_m3ua_num_clients), in f_M3UA_CLNT_asp_up_act() we're expecting
+ * to receive ASPACT and then sending ASPACT_ACK to it. Right after that, we're sending
+ * some random data via ASP[idx_a], which we then expect to receive via ASP[idx_b].
+ *
+ * There is a chance that the random data sent via ASP[idx_a] would reach osmo-stp
+ * earlier than the ASPUP_ACK we sent for ASP[idx_b]. This is happening most of the
+ * times when running TC_m3ua_tcp_cli_srv. Using f_sleep() helps to avoid this. */
+ f_sleep(1.0);
+
+ /* M3UA/A -> M3UA/B */
+ f_test_traffic(idx_a, rctx_a, pc_a,
+ idx_b, rctx_b, pc_b);
+ /* M3UA/B -> M3UA/A */
+ f_test_traffic(idx_b, rctx_b, pc_b,
+ idx_a, rctx_a, pc_a);
+
+ f_clear_m3ua();
+}
+
+/* test routing between M3UA/SCTP (client) and M3UA/TCP (client) */
+testcase TC_m3ua_tcp_cli() runs on RAW_M3UA_CT {
+ f_init_m3ua();
+ f_TC_m3ua_tcp(0, 1); /* 'asp-sender' <-> 'asp-sender-tcp' */
+}
+
+/* test routing between M3UA/SCTP (client) and M3UA/TCP (server) */
+testcase TC_m3ua_tcp_cli_srv() runs on RAW_M3UA_CT {
+ f_init_m3ua();
+ f_init_m3ua_srv();
+ f_TC_m3ua_tcp(0, M3UA_SRV(1)); /* 'asp-sender' <-> 'asp-client-tcp' */
+}
+
+/* test routing between M3UA/SCTP (server) and M3UA/TCP (server) */
+testcase TC_m3ua_tcp_srv() runs on RAW_M3UA_CT {
+ f_init_m3ua();
+ f_init_m3ua_srv();
+ f_TC_m3ua_tcp(M3UA_SRV(0), M3UA_SRV(1)); /* 'asp-client' <-> 'asp-client-tcp' */
+}
+
+/* test routing between M3UA/SCTP (server) and M3UA/TCP (client) */
+testcase TC_m3ua_tcp_srv_cli() runs on RAW_M3UA_CT {
+ f_init_m3ua();
+ f_init_m3ua_srv();
+ f_TC_m3ua_tcp(M3UA_SRV(0), 1); /* 'asp-client' <-> 'asp-sender-tcp' */
+}
+
+control {
+ /* M3UA TCP Tests */
+ execute( TC_m3ua_tcp_cli() );
+ execute( TC_m3ua_tcp_cli_srv() );
+ execute( TC_m3ua_tcp_srv() );
+ execute( TC_m3ua_tcp_srv_cli() );
+}
+
+}
\ No newline at end of file
diff --git a/stp/expected-results.xml b/stp/expected-results.xml
index c0fb22f..44088fc 100644
--- a/stp/expected-results.xml
+++ b/stp/expected-results.xml
@@ -13,10 +13,6 @@
<testcase classname='STP_Tests_M3UA' name='TC_tmt_broadcast' time='MASKED'/>
<testcase classname='STP_Tests_M3UA' name='TC_act_rctx_data_no_rctx' time='MASKED'/>
<testcase classname='STP_Tests_M3UA' name='TC_m3ua_sctp_srv_adm_shutdown' time='MASKED'/>
- <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_cli' time='MASKED'/>
- <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_cli_srv' time='MASKED'/>
- <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_srv' time='MASKED'/>
- <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_srv_cli' time='MASKED'/>
<testcase classname='STP_Tests_M3UA' name='TC_rkm_reg_static_notpermitted' time='MASKED'/>
<testcase classname='STP_Tests_M3UA' name='TC_rkm_reg_static_permitted' time='MASKED'/>
<testcase classname='STP_Tests_M3UA' name='TC_rkm_reg_dynamic_permitted' time='MASKED'/>
@@ -44,6 +40,10 @@
<testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_dupu' time='MASKED'/>
<testcase classname='STP_Tests_M3UA' name='TC_ssnm_distribution_scon' time='MASKED'/>
<testcase classname='STP_Tests_M3UA' name='TC_clnt_asp_act_tmt_loadshare' time='MASKED'/>
+ <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_cli' time='MASKED'/>
+ <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_cli_srv' time='MASKED'/>
+ <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv' time='MASKED'/>
+ <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv_cli' time='MASKED'/>
<testcase classname='STP_Tests_IPA' name='TC_unknown_client_nodynamic' time='MASKED'/>
<testcase classname='STP_Tests_IPA' name='TC_known_client_nodynamic' time='MASKED'/>
<testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic' time='MASKED'/>
diff --git a/stp/osmo-stp-m3ua-tcp.confmerge b/stp/osmo-stp-m3ua-tcp.confmerge
new file mode 100644
index 0000000..7c77b05
--- /dev/null
+++ b/stp/osmo-stp-m3ua-tcp.confmerge
@@ -0,0 +1,67 @@
+cs7 instance 0
+ !
+ ! M3UA-TCP AS/ASP:
+ !
+ asp asp-sender-tcp 9999 2905 m3ua tcp
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ transport-role server
+ asp asp-client0-tcp 10002 2906 m3ua tcp
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role asp
+ transport-role client
+ as as-sender-tcp m3ua
+ asp asp-sender-tcp
+ routing-key 1123 123
+ as as-client-tcp m3ua
+ routing-key 1155 155
+ asp asp-client0-tcp
+ !
+ !M3UA AS/ASP:
+ !
+ asp asp-sender 9999 2905 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ sctp-role server
+ asp asp-client0 10002 2906 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role asp
+ sctp-role client
+ as as-sender m3ua
+ asp asp-sender
+ routing-key 1023 23
+ as as-client m3ua
+ routing-key 1055 55
+ asp asp-client0
+ !
+ ! ROUTING TABLE:
+ !
+ route-table system
+ update route 123 16777215 linkset as-sender-tcp
+ update route 155 16777215 linkset as-client-tcp
+ route-table system
+ update route 23 16777215 linkset as-sender
+ update route 55 16777215 linkset as-client
+ !
+ !SERVERS:
+ !
+ listen m3ua 2905 tcp
+ local-ip 127.0.0.1
+ local-ip ::1
+ accept-asp-connections dynamic-permitted
+ listen m3ua 2905
+ local-ip 127.0.0.1
+ local-ip ::1
+ accept-asp-connections dynamic-permitted
diff --git a/stp/osmo-stp-m3ua.confmerge b/stp/osmo-stp-m3ua.confmerge
index 2140553..65e2fa2 100644
--- a/stp/osmo-stp-m3ua.confmerge
+++ b/stp/osmo-stp-m3ua.confmerge
@@ -1,28 +1,5 @@
cs7 instance 0
!
- ! M3UA-TCP AS/ASP:
- !
- asp asp-sender-tcp 9999 2905 m3ua tcp
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role sg
- transport-role server
- asp asp-client0-tcp 10002 2906 m3ua tcp
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role asp
- transport-role client
- as as-sender-tcp m3ua
- asp asp-sender-tcp
- routing-key 1123 123
- as as-client-tcp m3ua
- routing-key 1155 155
- asp asp-client0-tcp
- !
!M3UA AS/ASP:
!
asp asp-sender 9999 2905 m3ua
@@ -87,9 +64,6 @@
! ROUTING TABLE:
!
route-table system
- update route 123 16777215 linkset as-sender-tcp
- update route 155 16777215 linkset as-client-tcp
- route-table system
update route 23 16777215 linkset as-sender
update route 42 16777215 linkset as-receiver
update route 55 16777215 linkset as-client
@@ -98,10 +72,6 @@
!
!SERVERS:
!
- listen m3ua 2905 tcp
- local-ip 127.0.0.1
- local-ip ::1
- accept-asp-connections dynamic-permitted
listen m3ua 2905
local-ip 127.0.0.1
local-ip ::1
diff --git a/stp/testenv_m3ua-tcp.cfg b/stp/testenv_m3ua-tcp.cfg
new file mode 100644
index 0000000..37b2338
--- /dev/null
+++ b/stp/testenv_m3ua-tcp.cfg
@@ -0,0 +1,11 @@
+[testsuite]
+program=STP_Tests
+config=STP_Tests_M3UA_TCP.cfg
+
+[stp]
+prepare=osmo-config-merge osmo-stp.cfg osmo-stp-m3ua-tcp.confmerge > osmo-stp-m3ua-tcp.cfg
+program=osmo-stp -c osmo-stp-m3ua-tcp.cfg
+make=libosmo-sigtran
+package=osmo-stp libosmocore-utils
+copy=osmo-stp.cfg osmo-stp-m3ua-tcp.confmerge
+vty_port=4239
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40324?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I8123887755aa3253830b43407b4cc6b21142233c
Gerrit-Change-Number: 40324
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 month
- 1
- 0
[L] Change in osmo-ttcn3-hacks[master]: stp: m3ua: Specify ASP names to use per test
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40325?usp=email )
Change subject: stp: m3ua: Specify ASP names to use per test
......................................................................
stp: m3ua: Specify ASP names to use per test
Since we recently introduced an "asp_name" into each m3ua_config,
use that to construct a list of m3ua_configs to set up for each test.
This makes each test only set up the relevant ASPs for the test easily,
plus the big win of port offsets becoming test-specific.
That means changing the order or clients or servers in the testsuite
config, or adding new ones won't break existing tests.
Also add a new "is_server" field which allows specifying clients and
servers in whichever order we like.
Change-Id: I63ed043014ee8a9a593ed17797b621f39c746bcd
---
M stp/STP_Tests_IPA_M3UA.cfg
M stp/STP_Tests_IPA_M3UA.ttcn
M stp/STP_Tests_M3UA.cfg
M stp/STP_Tests_M3UA.ttcn
M stp/STP_Tests_M3UA_TCP.cfg
M stp/STP_Tests_M3UA_TCP.ttcn
6 files changed, 419 insertions(+), 313 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/stp/STP_Tests_IPA_M3UA.cfg b/stp/STP_Tests_IPA_M3UA.cfg
index be16ccf..4ca349d 100644
--- a/stp/STP_Tests_IPA_M3UA.cfg
+++ b/stp/STP_Tests_IPA_M3UA.cfg
@@ -15,11 +15,10 @@
"ipa-as-dynamic-asp"
};
-/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
STP_Tests_M3UA.mp_m3ua_configs := {
- /* as-sender: One ASP within AS */
{
asp_name := "asp-sender",
+ is_server := false,
use_tcp := false,
remote_port := 2905,
local_port := 9999,
@@ -27,10 +26,6 @@
routing_ctx := 1023
}
};
-/* number of M3UA clients in ATS */
-STP_Tests_M3UA.mp_m3ua_num_clients := 1;
-/* number of M3UA servers in ATS */
-STP_Tests_M3UA.mp_m3ua_num_servers := 0;
[MAIN_CONTROLLER]
diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn
index 4fcd506..f62fc7c 100644
--- a/stp/STP_Tests_IPA_M3UA.ttcn
+++ b/stp/STP_Tests_IPA_M3UA.ttcn
@@ -13,6 +13,7 @@
import from General_Types all;
import from Osmocom_Types all;
import from IPL4asp_Types all;
+import from Misc_Helpers all;
import from Osmocom_VTY_Functions all;
@@ -62,18 +63,17 @@
/* Test routing of SCCP between an M3UA and an IPA ASP */
testcase TC_m3ua_to_ipa() runs on IPA_M3UA_CT {
- f_init_m3ua();
- f_init_ipa();
-
- const integer ipa_idx := 0;
- const integer m3ua_idx := 0;
-
- 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 Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4);
var OCT4 pc_receiver := int2oct(5, 4);
- f_connect_ipa(ipa_idx);
- f_M3UA_asp_up_act(m3ua_idx, omit, rctx_sender);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
+ f_init_ipa();
+
+ f_connect_ipa(0);
+ 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);
@@ -83,32 +83,31 @@
var octetstring sccp_enc := enc_PDU_SCCP(sccp);
var template (value) M3UA_Protocol_Data tx_pd;
tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, sccp_enc);
- f_M3UA_send(m3ua_idx, ts_M3UA_DATA(rctx_sender, tx_pd), 1);
+ f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1);
/* expect to receive it via IPA */
- f_IPA_exp(ipa_idx, sccp_enc);
+ f_IPA_exp(0, sccp_enc);
f_clear_m3ua();
}
/* test routing an SCCP message from IPA ASP to M3UA ASP */
testcase TC_ipa_to_m3ua() runs on IPA_M3UA_CT {
+ var Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 pc_sender := int2oct(5, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4);
+
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"},
"point-code override patch-sccp disabled");
- f_init_m3ua();
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_ipa();
- const integer ipa_idx := 0;
- const integer m3ua_idx := 0;
-
- 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(ipa_idx);
- f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver);
+ f_connect_ipa(0);
+ 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);
@@ -116,35 +115,33 @@
var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H));
var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data));
var octetstring sccp_enc := enc_PDU_SCCP(sccp);
- f_IPA_send(ipa_idx, sccp_enc);
+ f_IPA_send(0, sccp_enc);
/* expect to receive it via M3UA */
var template (present) M3UA_Protocol_Data rx_pd;
rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, sccp_enc);
- f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd));
+ f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd));
f_clear_m3ua();
}
/* 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 Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 pc_sender := int2oct(5, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4);
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"},
"point-code override patch-sccp disabled");
- f_init_m3ua();
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_ipa();
- const integer ipa_idx := 0;
- const integer m3ua_idx := 0;
-
- 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(ipa_idx);
- f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver);
+ f_connect_ipa(0);
+ 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);
@@ -153,13 +150,13 @@
var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data));
var octetstring sccp_enc := enc_PDU_SCCP(sccp);
f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator national");
- f_IPA_send(ipa_idx, sccp_enc);
+ f_IPA_send(0, sccp_enc);
/* expect to receive it via M3UA */
var template (present) M3UA_Protocol_Data rx_pd;
rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, c_M3UA_NI_NATIONAL,
'00'O, ?, sccp_enc);
- f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd));
+ f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd));
f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator international");
f_clear_m3ua();
}
@@ -167,29 +164,28 @@
/* 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 Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 pc_sender := int2oct(5, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4);
+
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0", "as ipa-as-dynamic-asp ipa"},
"point-code override patch-sccp both");
- f_init_m3ua();
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_ipa();
- const integer ipa_idx := 0;
- const integer m3ua_idx := 0;
-
- 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(ipa_idx);
- f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver);
+ f_connect_ipa(0);
+ 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);
var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H));
var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H));
var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data));
- f_IPA_send(ipa_idx, enc_PDU_SCCP(sccp));
+ f_IPA_send(0, enc_PDU_SCCP(sccp));
/* patch point codes into addresses */
called := valueof(ts_SccpAddr_PC_GT(oct2int(pc_receiver), '83'O, "mtp3_itu", '1234'H));
@@ -200,7 +196,7 @@
var template (present) M3UA_Protocol_Data rx_pd;
rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?,
enc_PDU_SCCP(sccp_exp));
- f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd));
+ f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd));
f_clear_m3ua();
}
diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg
index 994314a..dd0c97b 100644
--- a/stp/STP_Tests_M3UA.cfg
+++ b/stp/STP_Tests_M3UA.cfg
@@ -11,65 +11,62 @@
[TESTPORT_PARAMETERS]
[MODULE_PARAMETERS]
-/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
STP_Tests_M3UA.mp_m3ua_configs := {
- /* as-sender: One ASP within AS */
{
asp_name := "asp-sender",
+ is_server := false,
use_tcp := false,
remote_port := 2905,
local_port := 9999,
point_code := 23,
routing_ctx := 1023
},
- /* as-receiver: Two ASP within AS */
{
asp_name := "asp-receiver0",
+ is_server := false,
use_tcp := false,
remote_port := 2905,
local_port := 10000,
point_code := 42,
routing_ctx := 1042
- }, {
+ },
+ {
asp_name := "asp-receiver1",
+ is_server := false,
use_tcp := false,
remote_port := 2905,
local_port := 10001,
point_code := 42,
routing_ctx := 1042
},
- /* as-client: One ASP within AS */
{
asp_name := "asp-client0",
+ is_server := true,
use_tcp := false,
remote_port := 2906,
local_port := 10002,
point_code := 55,
routing_ctx := 1055
},
- /* as-client60-norctx */
{
asp_name := "asp-client60-norctx0",
+ is_server := true,
use_tcp := false,
remote_port := 2907,
local_port := 11060,
point_code := 60,
- routing_ctx := -
+ routing_ctx := omit
},
- /* as-client61-norctx */
{
asp_name := "asp-client61-norctx0",
+ is_server := true,
use_tcp := false,
remote_port := 2907,
local_port := 11061,
point_code := 61,
- routing_ctx := -
+ routing_ctx := omit
}
};
-/* number of M3UA clients in ATS */
-STP_Tests_M3UA.mp_m3ua_num_clients := 3;
-/* number of M3UA servers in ATS */
-STP_Tests_M3UA.mp_m3ua_num_servers := 3;
[MAIN_CONTROLLER]
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 64153ab..2f452de 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -45,12 +45,8 @@
HostList mp_stp_m3ua_ip := { "127.0.0.1", "::1" };
/* local IP addresses */
HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" };
- /* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
+ /* local ASPs. Set in .cfg file: */
M3uaConfigs mp_m3ua_configs := {};
- /* number of M3UA clients in ATS */
- integer mp_m3ua_num_clients := 0;
- /* number of M3UA servers in ATS */
- integer mp_m3ua_num_servers := 0;
integer mp_recovery_timeout_msec := 2000;
charstring mp_sccp_service_type := "mtp3_itu";
}
@@ -58,6 +54,8 @@
type record M3uaConfig {
/* Name of the ASP in the STP, (eg. to access it over VTY) */
charstring asp_name,
+ /* Whether local side is a TCP/SCTP server */
+ boolean is_server,
/* use TCP (true) or SCTP (false) */
boolean use_tcp,
/* STP-side SCTP (or TCP) port for M3UA */
@@ -67,36 +65,63 @@
/* point code routed via this M3U */
integer point_code,
/* associated routing context */
- integer routing_ctx
+ integer routing_ctx optional
};
type record of M3uaConfig M3uaConfigs;
-friend function M3UA_SRV(integer idx) runs on RAW_M3UA_CT return integer {
- return g_m3ua_num_clients + idx;
-}
-
-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];
-}
-
-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");
- }
- return g_m3ua_configs[M3UA_SRV(idx)];
-}
-
type component RAW_M3UA_CT extends Test_CT {
port M3UA_CODEC_PT M3UA[MAX_NR_M3UA];
var M3uaConfigs g_m3ua_configs;
- var integer g_m3ua_num_clients;
- var integer g_m3ua_num_servers;
var integer g_m3ua_conn_id[MAX_NR_M3UA];
}
+friend function f_m3ua_get_config_idx(charstring asp_name) runs on RAW_M3UA_CT return integer {
+ for (var integer i := 0; i < lengthof(g_m3ua_configs); i := i + 1) {
+ if (g_m3ua_configs[i].asp_name == asp_name) {
+ return i;
+ }
+ }
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("f_m3ua_get_config_idx(): unexpected asp_name not found: ", asp_name));
+ return -1;
+}
+
+friend function f_m3ua_get_config_by_idx(integer idx) runs on RAW_M3UA_CT return M3uaConfig {
+ if (idx < 0 or idx >= lengthof(g_m3ua_configs)) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "f_m3ua_get_config(): unexpected idx");
+ }
+ return g_m3ua_configs[idx];
+}
+
+friend function f_m3ua_get_config_by_name(charstring asp_name) runs on RAW_M3UA_CT return M3uaConfig {
+ return f_m3ua_get_config_by_idx(f_m3ua_get_config_idx(asp_name));
+}
+
+friend function m3ua_build_configs(template (omit) Misc_Helpers.ro_charstring asps := omit)
+runs on RAW_M3UA_CT return M3uaConfigs
+{
+ if (not isvalue(asps)) {
+ return mp_m3ua_configs;
+ }
+
+ var M3uaConfigs m3ua_configs := {};
+ for (var integer i := 0; i < lengthof(asps); i := i + 1) {
+ var boolean found := false;
+ for (var integer j := 0; j < lengthof(mp_m3ua_configs); j := j + 1) {
+ if (mp_m3ua_configs[j].asp_name == valueof(asps[i])) {
+ found := true;
+ m3ua_configs := m3ua_configs & {mp_m3ua_configs[j]};
+ break;
+ }
+ }
+ if (not found) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("Could not find ASP ", asps[i], ", check your configuration"));
+ }
+ }
+ return m3ua_configs;
+}
+
private template PortEvent tr_ConnOpened := {
connOpened := ?
}
@@ -279,27 +304,34 @@
}
}
+private function m3ua_configs_mapped() runs on RAW_M3UA_CT return integer
+{
+ for (var integer i := 0; i < lengthof(g_m3ua_configs); i := i + 1) {
+ if (not M3UA[i].checkstate("Mapped")) {
+ return i;
+ }
+ }
+ return lengthof(g_m3ua_configs);
+}
+
friend function f_init_m3ua(boolean ignore_ssnm := true,
- template (omit) M3uaConfigs m3ua_configs := omit,
- integer m3ua_num_clients := 0,
- integer m3ua_num_servers := 0) runs on RAW_M3UA_CT {
+ template (omit) M3uaConfigs m3ua_configs := omit)
+
+runs on RAW_M3UA_CT {
var integer i;
f_init_common();
- if (isvalue(m3ua_configs)) {
+ if (not istemplatekind(m3ua_configs, "omit")) {
g_m3ua_configs := valueof(m3ua_configs);
- g_m3ua_num_clients := m3ua_num_clients;
- g_m3ua_num_servers := m3ua_num_servers
} else {
g_m3ua_configs := mp_m3ua_configs;
- g_m3ua_num_clients := mp_m3ua_num_clients;
- g_m3ua_num_servers := mp_m3ua_num_servers;
}
-
- for (i := 0; i < g_m3ua_num_clients; i:=i+1) {
- map(self:M3UA[i], system:M3UA_CODEC_PT);
+ for (i := 0; i < lengthof(g_m3ua_configs); i:= i + 1) {
+ if (not g_m3ua_configs[i].is_server) {
+ map(self:M3UA[i], system:M3UA_CODEC_PT);
+ }
}
activate(as_m3ua_sctp());
@@ -307,11 +339,13 @@
activate(as_m3ua_ssnm_ignore());
}
- for (i := 0; i < g_m3ua_num_clients; i:=i+1) {
- if (g_m3ua_configs[i].use_tcp) {
- f_M3UA_connect_tcp(i);
- } else {
- f_M3UA_connect_sctp(i);
+ for (i := 0; i < lengthof(g_m3ua_configs); i:=i+1) {
+ if (not g_m3ua_configs[i].is_server) {
+ if (g_m3ua_configs[i].use_tcp) {
+ f_M3UA_connect_tcp(i);
+ } else {
+ f_M3UA_connect_sctp(i);
+ }
}
}
}
@@ -321,8 +355,10 @@
log("Clearing M3UA...");
- for (i := 0; i < g_m3ua_num_clients; i:=i+1) {
- f_M3UA_close(i);
+ for (i := 0; i < lengthof(g_m3ua_configs); i:=i+1) {
+ if (not g_m3ua_configs[i].is_server) {
+ f_M3UA_close(i);
+ }
}
/* Wait for recovery timer to trigger and shutdown all AS: */
f_sleep(int2float(mp_recovery_timeout_msec)/1000.0 + 0.5);
@@ -333,17 +369,25 @@
var integer i;
var PortEvent port_evt;
- for (i := g_m3ua_num_clients; i < lengthof(g_m3ua_configs); i:=i+1) {
- map(self:M3UA[i], system:M3UA_CODEC_PT);
+ var integer start_idx := m3ua_configs_mapped();
+
+ for (i := start_idx; i < lengthof(g_m3ua_configs); i:=i+1) {
+ if (g_m3ua_configs[i].is_server) {
+ map(self:M3UA[i], system:M3UA_CODEC_PT);
+ }
}
- for (i := g_m3ua_num_clients; i < lengthof(g_m3ua_configs); i:=i+1) {
- /* bind + listen */
- f_M3UA_listen(i);
+ for (i := start_idx; i < lengthof(g_m3ua_configs); i:=i+1) {
+ if (g_m3ua_configs[i].is_server) {
+ /* bind + listen */
+ f_M3UA_listen(i);
+ }
}
- for (i := g_m3ua_num_clients; i < lengthof(g_m3ua_configs); i:=i+1) {
- /* wait for accept() */
- M3UA[i].receive(tr_ConnOpened) -> value port_evt {
- g_m3ua_conn_id[i] := port_evt.connOpened.connId;
+ for (i := start_idx; i < lengthof(g_m3ua_configs); i:=i+1) {
+ if (g_m3ua_configs[i].is_server) {
+ /* wait for accept() */
+ M3UA[i].receive(tr_ConnOpened) -> value port_evt {
+ g_m3ua_conn_id[i] := port_evt.connOpened.connId;
+ }
}
}
}
@@ -467,11 +511,15 @@
/* test whether the STP accepts M3UA DATA without Routing Context IE */
testcase TC_act_rctx_data_no_rctx() runs on RAW_M3UA_CT {
- f_init_m3ua();
- 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 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4);
- var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4);
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4);
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
+
/* bring up the sender specifying a routing context */
f_M3UA_asp_up_act(0, rctx := rctx_sender);
@@ -485,11 +533,13 @@
/* Test administrative state, VTY "[no] shutdown" */
testcase TC_m3ua_sctp_srv_adm_shutdown() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_M3UA_asp_up_act(0, c_M3UA_TMT_override, omit);
f_sleep(1.0);
- f_vty_cs7_asp_cmd(f_m3ua_cli_config(0), "shutdown");
+ f_vty_cs7_asp_cmd(g_m3ua_configs[0], "shutdown");
log("ASP should now be DOWN")
as_M3UA_wait_sctp_conn_closed(0);
@@ -507,7 +557,7 @@
}
/* Now let the ASP be active again, it should reconnect to us: */
- f_vty_cs7_asp_cmd(f_m3ua_cli_config(0), "no shutdown");
+ f_vty_cs7_asp_cmd(g_m3ua_configs[0], "no shutdown");
log("Connecting to ASP (expect success):");
f_M3UA_connect_sctp(0);
f_M3UA_asp_up_act(0, c_M3UA_TMT_override, omit, ntfy_after_up := c_M3UA_ST_I_AS_PENDING);
@@ -530,13 +580,14 @@
/* test "traffic-mode override" behavior */
testcase TC_tmt_override() runs on RAW_M3UA_CT {
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4);
- f_init_m3ua();
-
- 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 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4);
- var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
/* bring up the 'sender' side (single ASP in AS) */
f_M3UA_asp_up_act(0, omit, omit);
@@ -571,16 +622,17 @@
/* Test "traffic-mode roundrobin" behavior (distributing within ASPs of a given AS in roundrobin fashion). */
testcase TC_tmt_loadshare_roundrobin() runs on RAW_M3UA_CT {
var integer i;
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4);
- f_init_m3ua();
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_vty_config2(VTY, {"cs7 instance 0", "as as-receiver m3ua"}, "traffic-mode roundrobin");
- 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 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4);
- var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4);
-
/* bring up the 'sender' side (single ASP in AS) */
f_M3UA_asp_up_act(0, omit, rctx_sender);
@@ -643,17 +695,18 @@
* within linksets/ASs of a combined linkset). */
testcase TC_tmt_loadshare_sls() runs on RAW_M3UA_CT {
var integer i;
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4);
- f_init_m3ua();
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_vty_config3(VTY, {"cs7 instance 0", "as as-receiver m3ua"},
{ "traffic-mode loadshare", "binding-table reset" });
- 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 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4);
- var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4);
-
/* bring up the 'sender' side (single ASP in AS) */
f_M3UA_asp_up_act(0, omit, rctx_sender);
@@ -725,13 +778,14 @@
/* test "traffic-mode broadcast" behavior */
testcase TC_tmt_broadcast() runs on RAW_M3UA_CT {
var integer i;
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0", "asp-receiver1" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4);
- f_init_m3ua();
-
- 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 rctx_receiver := int2oct(f_m3ua_cli_config(1).routing_ctx, 4);
- var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(1).point_code, 4);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
/* FIXME: configure the STP via VTY to set traffic-mode */
@@ -781,7 +835,9 @@
/* Send RKM registration; expect -EPERM as RCTX doesn't match config and dynamic not permitted */
testcase TC_rkm_reg_static_notpermitted() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='00000099'O, dpc:='aabbcc'O)}));
f_M3UA_exp(0, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:='00000099'O, status:=c_M3UA_REGSTS_ERR_EPERM,
@@ -792,10 +848,12 @@
/* Send RKM registration; expect OK as RCTX does match config */
testcase TC_rkm_reg_static_permitted() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT3 dpc := int2oct(m3ua_configs[0].point_code, 3); // must match config
+ var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4); // must match config
- var OCT3 dpc := int2oct(f_m3ua_cli_config(0).point_code, 3); // must match config
- var OCT4 rctx := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); // must match config
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='10000099'O, dpc:=dpc, rctx:=rctx)}));
f_M3UA_exp(0, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:='10000099'O, status:=c_M3UA_REGSTS_SUCCESS,
@@ -806,9 +864,11 @@
/* Send RKM registration; expect OK as dynamic not permitted */
testcase TC_rkm_reg_dynamic_permitted() runs on RAW_M3UA_CT {
+ var Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted");
- f_init_m3ua();
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_M3UA_send(0, ts_M3UA_REG_REQ({ts_M3UA_rkey(id:='20000099'O, dpc:='aabbcc'O)}));
f_M3UA_exp(0, tr_M3UA_REG_RSP({tr_M3UA_reg_res(id:='20000099'O, status:=c_M3UA_REGSTS_SUCCESS,
@@ -821,8 +881,11 @@
/* try to de-register a routing key that was never registered -> error */
testcase TC_rkm_unreg_never_registered() runs on RAW_M3UA_CT {
- f_init_m3ua();
- var octetstring rctx := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
+ var Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var octetstring rctx := int2oct(m3ua_configs[0].routing_ctx, 4);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
+
f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(rctx)));
f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_ERR_NOT_REG)}));
f_clear_m3ua();
@@ -830,7 +893,10 @@
/* try to de-register a routing key that is invalid (non-existant) -> error */
testcase TC_rkm_unreg_invalid() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
+
f_M3UA_send(0, ts_M3UA_DEREG_REQ(ts_M3UA_routing_ctx(int2oct(1234,4))));
f_M3UA_exp(0, tr_M3UA_DEREG_RSP({tr_M3UA_dereg_res(?,c_m3UA_DEREGSTS_ERR_INVAL_RCTX)}));
f_clear_m3ua();
@@ -838,12 +904,14 @@
/* try to de-register a routing key that was registered -> OK */
testcase TC_rkm_unreg_registered() runs on RAW_M3UA_CT {
+ var Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
var OCT3 dpc := int2oct(123, 3);
var OCT4 rctx := int2oct(1234, 4);
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted");
- f_init_m3ua();
+ f_init_m3ua(m3ua_configs := m3ua_configs);
/* first register the routing key */
f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, rctx:=rctx, ntfy_after_reg := omit);
@@ -858,13 +926,15 @@
/* try to de-register a routing key for an active ASP -> ERROR */
testcase TC_rkm_unreg_active() runs on RAW_M3UA_CT {
- f_init_common();
- f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted");
- f_init_m3ua();
-
+ var Misc_Helpers.ro_charstring asps := { "asp-sender" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
var OCT3 dpc := int2oct(123, 3);
var OCT4 rctxA := int2oct(1234, 4);
- var OCT4 rctxB := int2oct(f_m3ua_cli_config(0).routing_ctx, 4); // must match config
+ var OCT4 rctxB := int2oct(m3ua_configs[0].routing_ctx, 4); // must match config
+
+ f_init_common();
+ f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted");
+ f_init_m3ua(m3ua_configs := m3ua_configs);
/* first register the routing key */
f_M3UA_rkm_register(0, local_id:='30000099'O, dpc:=dpc, rctx:=rctxA, ntfy_after_reg := omit);
@@ -901,6 +971,7 @@
var M3uaConfigs m3ua_configs := {
{
asp_name := "unknown",
+ is_server := false,
use_tcp := false,
remote_port := 2905,
local_port := 2222,
@@ -911,7 +982,7 @@
var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4);
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted");
- f_init_m3ua(m3ua_configs := m3ua_configs, m3ua_num_clients := 1, m3ua_num_servers := 0);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
/* ASPUP + ACK */
f_M3UA_asp_up(0);
@@ -939,6 +1010,7 @@
var M3uaConfigs m3ua_configs := {
{
asp_name := "unknown0",
+ is_server := false,
use_tcp := false,
remote_port := 2905,
local_port := 2222,
@@ -946,6 +1018,7 @@
routing_ctx := 220
}, {
asp_name := "unknown1",
+ is_server := false,
use_tcp := false,
remote_port := 2905,
local_port := 2223,
@@ -957,7 +1030,7 @@
var OCT4 rctx1 := int2oct(m3ua_configs[0].routing_ctx, 4);
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0"}, "xua rkm routing-key-allocation dynamic-permitted");
- f_init_m3ua(m3ua_configs := m3ua_configs, m3ua_num_clients := 2, m3ua_num_servers := 0);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
///////// ASP 0 /////////////
/* ASPUP + ACK */
@@ -1040,34 +1113,41 @@
/* Expect inbound connection from ASP/SCTP-client, followed by ASP-UP */
testcase TC_clnt_connect_asp_up() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_m3ua_srv();
- f_M3UA_CLNT_asp_up(M3UA_SRV(0));
+ f_M3UA_CLNT_asp_up(0);
f_clear_m3ua();
}
/* Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */
testcase TC_clnt_asp_act() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4);
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_m3ua_srv();
- var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx);
+ f_M3UA_CLNT_asp_up_act(0, rctx := rctx);
f_clear_m3ua();
}
/* Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */
testcase TC_clnt_asp_act_tmt_loadshare() runs on RAW_M3UA_CT {
+ var Misc_Helpers.ro_charstring asps := { "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4);
+
f_init_common();
f_vty_config2(VTY, {"cs7 instance 0", "as as-client m3ua"}, "traffic-mode loadshare");
- f_init_m3ua();
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_m3ua_srv();
- var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), tmt := c_M3UA_TMT_loadshare, rctx := rctx);
+ f_M3UA_CLNT_asp_up_act(0, tmt := c_M3UA_TMT_loadshare, rctx := rctx);
f_clear_m3ua();
}
@@ -1075,21 +1155,23 @@
/* Test traffic being routed through "server" side STP (M3UA SG), coming back in "client"
* side STP (M3UA ASP) */
testcase TC_clnt_sg_to_asp() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4);
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_M3UA_asp_up_act(0);
- 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 rctx_receiver := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
- var OCT4 pc_receiver := int2oct(f_m3ua_srv_config(0).point_code, 4);
-
f_init_m3ua_srv();
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx_receiver);
+ f_M3UA_CLNT_asp_up_act(1, rctx := rctx_receiver);
f_sleep(1.0);
/* verify traffic is routed from sender to [sole] receiver */
- f_test_traffic(0, rctx_sender, pc_sender, M3UA_SRV(0), rctx_receiver, pc_receiver);
+ f_test_traffic(0, rctx_sender, pc_sender, 1, rctx_receiver, pc_receiver);
f_clear_m3ua();
}
@@ -1097,47 +1179,51 @@
/* Test traffic being routed through "client" side STP (M3UA ASP), coming back in "server"
* side STP (M3UA SG) */
testcase TC_clnt_asp_to_sg() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx_sender := int2oct(m3ua_configs[1].routing_ctx, 4);
+ var OCT4 pc_sender := int2oct(m3ua_configs[1].point_code, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4);
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_M3UA_asp_up_act(0);
- var OCT4 rctx_sender := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
- var OCT4 pc_sender := int2oct(f_m3ua_srv_config(0).point_code, 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_init_m3ua_srv();
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx_sender);
+ f_M3UA_CLNT_asp_up_act(1, rctx := rctx_sender);
f_sleep(1.0);
/* verify traffic is routed from sender to [sole] receiver */
- f_test_traffic(M3UA_SRV(0), rctx_sender, pc_sender, 0, rctx_receiver, pc_receiver);
+ f_test_traffic(1, rctx_sender, pc_sender, 0, rctx_receiver, pc_receiver);
f_clear_m3ua();
}
/* Test traffic being routed through "server" side STP (M3UA SG), coming back in "client"
* side STP (M3UA ASP) which has no routing context set */
testcase TC_clnt_sg_to_asp_norctx() runs on RAW_M3UA_CT {
- /* activate the sender side (ATS is client to STP in SG role) */
- f_init_m3ua();
- f_M3UA_asp_up_act(0);
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client60-norctx0", "asp-client61-norctx0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[1].point_code, 4);
+ var OCT4 pc_receiver2 := int2oct(m3ua_configs[2].point_code, 4);
- 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(f_m3ua_srv_config(1).point_code, 4);
- var OCT4 pc_receiver2 := int2oct(f_m3ua_srv_config(2).point_code, 4);
+ /* activate the sender side (ATS is client to STP in SG role) */
+ f_init_m3ua(m3ua_configs := m3ua_configs);
+ f_M3UA_asp_up_act(0);
/* activate the receiver side (ATS is server to STP in ASP role) */
f_init_m3ua_srv();
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(1), rctx := omit);
+ f_M3UA_CLNT_asp_up_act(1, rctx := omit);
/* activate another instance of STP in ASP role with no routing context */
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(2), rctx := omit);
+ f_M3UA_CLNT_asp_up_act(2, rctx := omit);
f_sleep(1.0);
/* verify traffic is routed from sender to [sole] receiver for each PC */
- f_test_traffic(0, rctx_sender, pc_sender, M3UA_SRV(1), omit, pc_receiver);
- f_test_traffic(0, rctx_sender, pc_sender, M3UA_SRV(2), omit, pc_receiver2);
+ f_test_traffic(0, rctx_sender, pc_sender, 1, omit, pc_receiver);
+ f_test_traffic(0, rctx_sender, pc_sender, 2, omit, pc_receiver2);
f_clear_m3ua();
}
@@ -1145,39 +1231,44 @@
/* Test traffic being routed through "server" side STP (M3UA SG), coming back in "client"
* side STP (M3UA ASP) which has no routing context set */
testcase TC_clnt_asp_to_sg_norctx() runs on RAW_M3UA_CT {
- /* activate the sender side (ATS is client to STP in SG role) */
- f_init_m3ua();
- f_M3UA_asp_up_act(0);
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client60-norctx0", "asp-client61-norctx0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
- 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);
- var OCT4 pc_sender := int2oct(f_m3ua_srv_config(1).point_code, 4);
- var OCT4 pc_sender2 := int2oct(f_m3ua_srv_config(2).point_code, 4);
+ var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4);
+ var OCT4 pc_sender := int2oct(m3ua_configs[1].point_code, 4);
+ var OCT4 pc_sender2 := int2oct(m3ua_configs[2].point_code, 4);
+
+ /* activate the sender side (ATS is client to STP in SG role) */
+ f_init_m3ua(m3ua_configs := m3ua_configs);
+ f_M3UA_asp_up_act(0);
/* activate the receiver side (ATS is server to STP in ASP role) */
f_init_m3ua_srv();
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(1), rctx := omit);
+ f_M3UA_CLNT_asp_up_act(1, rctx := omit);
/* activate another instance of STP in ASP role with no routing context */
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(2), rctx := omit);
+ f_M3UA_CLNT_asp_up_act(2, rctx := omit);
f_sleep(1.0);
/* verify traffic is routed from sender to [sole] receiver for each PC */
- f_test_traffic(M3UA_SRV(1), omit, pc_sender, 0, rctx_receiver, pc_receiver);
- f_test_traffic(M3UA_SRV(2), omit, pc_sender2, 0, rctx_receiver, pc_receiver);
+ f_test_traffic(1, omit, pc_sender, 0, rctx_receiver, pc_receiver);
+ f_test_traffic(2, omit, pc_sender2, 0, rctx_receiver, pc_receiver);
f_clear_m3ua();
}
/* Test if ASPAC / ASPIA of one ASP generates DAVA / DUNA on other ASP */
testcase TC_ssnm_aspac_dava_aspia_duna() runs on RAW_M3UA_CT {
- f_init_m3ua(ignore_ssnm := false);
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-receiver0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var integer pc0 := m3ua_configs[1].point_code;
+
+ f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs);
/* activate the first ASP */
f_M3UA_asp_up_act(0);
- var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
- var integer pc0 := f_m3ua_cli_config(1).point_code;
-
/* activate the second ASP */
f_M3UA_asp_up_act(1, c_M3UA_TMT_override, omit);
/* expect DAVA for PC of second ASP on first ASP */
@@ -1195,102 +1286,106 @@
/* Test if DAVA/DUNA sent from SG to ASP-role STP gets forwarded to other ASP */
testcase TC_ssnm_distribution_dava_duna() runs on RAW_M3UA_CT {
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4);
/* some random point code whose availability we advertise */
var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0);
- f_init_m3ua(ignore_ssnm := false);
+ f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs);
/* activate the first ASP */
f_M3UA_asp_up_act(0);
- var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
- var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
-
/* activate SG-role ASP (ASP on STP) */
f_init_m3ua_srv();
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0);
+ f_M3UA_CLNT_asp_up_act(1, rctx := rctxS0);
/* transmit a DAVA to the remote ASP */
- f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA({adv_pc}, rctxS0));
+ f_M3UA_send(1, ts_M3UA_DAVA({adv_pc}, rctxS0));
/* expect that to show up on other ASP */
f_M3UA_exp(0, tr_M3UA_DAVA({adv_pc}, rctx0));
/* transmit a DUNA to the remote ASP */
- f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUNA({adv_pc}, rctxS0));
+ f_M3UA_send(1, ts_M3UA_DUNA({adv_pc}, rctxS0));
/* expect that to show up on other ASP */
f_M3UA_exp(0, tr_M3UA_DUNA({adv_pc}, rctx0));
}
/* Test if DAVA/DUNA sent from SG to ASP-role STP gets forwarded to other ASP */
testcase TC_ssnm_distribution_dava_duna_multipc() runs on RAW_M3UA_CT {
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4);
/* some random point code whose availability we advertise */
var template (value) M3UA_Point_Codes adv_pcs := { ts_M3UA_PC(1234, 0), ts_M3UA_PC(5678, 0) };
- f_init_m3ua(ignore_ssnm := false);
+ f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs);
/* activate the first ASP */
f_M3UA_asp_up_act(0);
- var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
- var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
-
/* activate SG-role ASP (ASP on STP) */
f_init_m3ua_srv();
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0);
+ f_M3UA_CLNT_asp_up_act(1, rctx := rctxS0);
/* transmit a DAVA to the remote ASP */
- f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA(adv_pcs, rctxS0));
+ f_M3UA_send(1, ts_M3UA_DAVA(adv_pcs, rctxS0));
/* expect that to show up on other ASP */
f_M3UA_exp(0, tr_M3UA_DAVA(adv_pcs, rctx0));
/* transmit a DUNA to the remote ASP */
- f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUNA(adv_pcs, rctxS0));
+ f_M3UA_send(1, ts_M3UA_DUNA(adv_pcs, rctxS0));
/* expect that to show up on other ASP */
f_M3UA_exp(0, tr_M3UA_DUNA(adv_pcs, rctx0));
}
/* Test if DUPU sent from SG to ASP-role STP gets forwarded to other ASP */
testcase TC_ssnm_distribution_dupu() runs on RAW_M3UA_CT {
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4);
/* some random point code whose availability we advertise */
var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0);
- f_init_m3ua(ignore_ssnm := false);
+ f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs);
/* activate the first ASP */
f_M3UA_asp_up_act(0);
- var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
- var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
-
/* activate SG-role ASP (ASP on STP) */
f_init_m3ua_srv();
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0);
+ f_M3UA_CLNT_asp_up_act(1, rctx := rctxS0);
/* transmit a DUPU to the remote ASP */
- f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUPU({adv_pc}, '0102'O, 'ABCD'O, rctxS0));
+ f_M3UA_send(1, ts_M3UA_DUPU({adv_pc}, '0102'O, 'ABCD'O, rctxS0));
/* expect that to show up on other ASP */
f_M3UA_exp(0, tr_M3UA_DUPU({adv_pc}, '0102'O, 'ABCD'O, rctx0));
}
/* Test if SCON sent from SG to ASP-role STP gets forwarded to other ASP */
testcase TC_ssnm_distribution_scon() runs on RAW_M3UA_CT {
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx0 := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var OCT4 rctxS0 := int2oct(m3ua_configs[1].routing_ctx, 4);
/* some random point code whose availability we advertise */
var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0);
- f_init_m3ua(ignore_ssnm := false);
+ f_init_m3ua(ignore_ssnm := false, m3ua_configs := m3ua_configs);
/* activate the first ASP */
f_M3UA_asp_up_act(0);
- var OCT4 rctx0 := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
- var OCT4 rctxS0 := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
-
/* activate SG-role ASP (ASP on STP) */
f_init_m3ua_srv();
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctxS0);
+ f_M3UA_CLNT_asp_up_act(1, rctx := rctxS0);
/* transmit a SCON to the remote ASP */
- f_M3UA_send(M3UA_SRV(0), ts_M3UA_SCON({adv_pc}, rctxS0));
+ f_M3UA_send(1, ts_M3UA_SCON({adv_pc}, rctxS0));
/* expect that to show up on other ASP */
f_M3UA_exp(0, tr_M3UA_SCON({adv_pc}, rctx0));
}
@@ -1317,21 +1412,24 @@
f_vty_config2(VTY, {"cs7 instance 0", asp_cfg_str}, cmd);
}
-private function f_quirk(charstring quirk) runs on RAW_M3UA_CT {
- f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "quirk " & quirk)
+private function f_quirk(charstring quirk, integer m3ua_idx := 0) runs on RAW_M3UA_CT {
+ f_vty_cs7_asp_cmd(g_m3ua_configs[m3ua_idx], "quirk " & quirk)
}
-private function f_no_quirk(charstring quirk) runs on RAW_M3UA_CT {
- f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "no quirk " & quirk)
+private function f_no_quirk(charstring quirk, integer m3ua_idx := 0) runs on RAW_M3UA_CT {
+ f_vty_cs7_asp_cmd(g_m3ua_configs[m3ua_idx], "no quirk " & quirk)
}
/* quirk 'no_notify': Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */
testcase TC_clnt_quirk_no_notify_asp_act() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_quirk("no_notify");
f_init_m3ua_srv();
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4),
+ f_M3UA_CLNT_asp_up_act(0, rctx := int2oct(g_m3ua_configs[0].routing_ctx, 4),
ntfy_after_up := omit, ntfy_after_act := omit);
f_no_quirk("no_notify");
f_clear_m3ua();
@@ -1339,18 +1437,20 @@
/* ensure that DAUD is not supported in ASP role, as required by RFC */
testcase TC_clnt_no_daud_in_asp() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var integer pc := m3ua_configs[0].point_code;
+ var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(pc) };
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_no_quirk("daud_in_asp");
f_init_m3ua_srv();
- var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
- var integer pc := f_m3ua_srv_config(0).point_code;
+ f_M3UA_CLNT_asp_up_act(0, rctx := rctx);
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx);
-
- var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(pc) };
- f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAUD(aff_pcs));
- f_M3UA_exp(M3UA_SRV(0), tr_M3UA_ERR('00000004'O, omit));
+ f_M3UA_send(0, ts_M3UA_DAUD(aff_pcs));
+ f_M3UA_exp(0, tr_M3UA_ERR('00000004'O, omit));
setverdict(pass);
f_clear_m3ua();
@@ -1358,18 +1458,20 @@
/* quirk 'daud_in_asp': allowing inbound DAUD from SG in ASP role */
testcase TC_clnt_quirk_daud_in_asp() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4);
+ var integer pc := m3ua_configs[0].point_code;
+ var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(pc) };
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_quirk("daud_in_asp");
f_init_m3ua_srv();
- var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
- var integer pc := f_m3ua_srv_config(0).point_code;
+ f_M3UA_CLNT_asp_up_act(0, rctx := rctx);
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx);
-
- var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(pc) };
- f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAUD(aff_pcs));
- f_M3UA_exp(M3UA_SRV(0), tr_M3UA_DAVA(aff_pcs));
+ f_M3UA_send(0, ts_M3UA_DAUD(aff_pcs));
+ f_M3UA_exp(0, tr_M3UA_DAVA(aff_pcs));
setverdict(pass);
f_no_quirk("daud_in_asp");
@@ -1378,19 +1480,22 @@
/* Expect a normal ASP to reject any [S]SNM messages in ASP-INACTIVE state */
testcase TC_clnt_no_snm_inactive() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(m3ua_configs[0].point_code) };
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_quirk("no_notify");
f_quirk("daud_in_asp");
f_no_quirk("snm_inactive");
f_init_m3ua_srv();
/* bring ASP only UP (into INACTIVE state), but not ACTIVE! */
- f_M3UA_CLNT_asp_up(M3UA_SRV(0));
- f_M3UA_exp(M3UA_SRV(0), tr_M3UA_ASPAC(*, *));
+ f_M3UA_CLNT_asp_up(0);
+ f_M3UA_exp(0, tr_M3UA_ASPAC(*, *));
- var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(f_m3ua_srv_config(0).point_code) };
- f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAUD(aff_pcs));
- f_M3UA_exp(M3UA_SRV(0), tr_M3UA_ERR('00000006'O, omit));
+ f_M3UA_send(0, ts_M3UA_DAUD(aff_pcs));
+ f_M3UA_exp(0, tr_M3UA_ERR('00000006'O, omit));
setverdict(pass);
f_no_quirk("no_notify");
@@ -1400,19 +1505,22 @@
/* quirk 'snm_inactive': Process [S]SNM in ASP-INACTIVE state */
testcase TC_clnt_quirk_snm_inactive() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+ var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(m3ua_configs[0].point_code) };
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_quirk("no_notify");
f_quirk("daud_in_asp");
f_quirk("snm_inactive");
f_init_m3ua_srv();
/* bring ASP only UP (into INACTIVE state), but not ACTIVE! */
- f_M3UA_CLNT_asp_up(M3UA_SRV(0));
- f_M3UA_exp(M3UA_SRV(0), tr_M3UA_ASPAC(*, *));
+ f_M3UA_CLNT_asp_up(0);
+ f_M3UA_exp(0, tr_M3UA_ASPAC(*, *));
- var template (value) M3UA_Point_Codes aff_pcs := { ts_M3UA_PC(f_m3ua_srv_config(0).point_code) };
- f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAUD(aff_pcs));
- f_M3UA_exp(M3UA_SRV(0), tr_M3UA_DUNA(aff_pcs));
+ f_M3UA_send(0, ts_M3UA_DAUD(aff_pcs));
+ f_M3UA_exp(0, tr_M3UA_DUNA(aff_pcs));
setverdict(pass);
f_no_quirk("no_notify");
@@ -1424,22 +1532,24 @@
/* Test administrative state, VTY "[no] shutdown" */
testcase TC_clnt_sctp_adm_shutdown() runs on RAW_M3UA_CT {
var PortEvent pev;
+ var Misc_Helpers.ro_charstring asps := { "asp-client0" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
- f_init_m3ua();
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_m3ua_srv();
- var OCT4 rctx := int2oct(f_m3ua_srv_config(0).routing_ctx, 4);
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx);
+ var OCT4 rctx := int2oct(m3ua_configs[0].routing_ctx, 4);
+ f_M3UA_CLNT_asp_up_act(0, rctx := rctx);
f_sleep(1.0);
- f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "shutdown");
+ f_vty_cs7_asp_cmd(m3ua_configs[0], "shutdown");
log("ASP should now be DOWN")
- as_M3UA_wait_sctp_conn_closed(M3UA_SRV(0));
+ as_M3UA_wait_sctp_conn_closed(0);
/* Wait for a while to make sure ASP doesn't reconnect to us: */
timer T := 10.0;
T.start;
alt {
- [] M3UA[M3UA_SRV(0)].receive(tr_ConnOpened) {
+ [] M3UA[0].receive(tr_ConnOpened) {
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
"Unexpected reconnect from ASP client!");
}
@@ -1447,12 +1557,12 @@
}
/* Now let the ASP be active again, it should reconnect to us: */
- f_vty_cs7_asp_cmd(f_m3ua_srv_config(0), "no shutdown");
+ f_vty_cs7_asp_cmd(m3ua_configs[0], "no shutdown");
log("Waiting for client ASP to reconnect to us");
- M3UA[M3UA_SRV(0)].receive(tr_ConnOpened) -> value pev {
- g_m3ua_conn_id[M3UA_SRV(0)] := pev.connOpened.connId;
+ M3UA[0].receive(tr_ConnOpened) -> value pev {
+ g_m3ua_conn_id[0] := pev.connOpened.connId;
}
- f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx := rctx);
+ f_M3UA_CLNT_asp_up_act(0, rctx := rctx);
f_clear_m3ua();
}
diff --git a/stp/STP_Tests_M3UA_TCP.cfg b/stp/STP_Tests_M3UA_TCP.cfg
index 7113e97..704de7a 100644
--- a/stp/STP_Tests_M3UA_TCP.cfg
+++ b/stp/STP_Tests_M3UA_TCP.cfg
@@ -11,38 +11,37 @@
[TESTPORT_PARAMETERS]
[MODULE_PARAMETERS]
-/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
STP_Tests_M3UA.mp_m3ua_configs := {
- /* as-sender: One ASP within AS */
{
asp_name := "asp-sender",
+ is_server := false,
use_tcp := false,
remote_port := 2905,
local_port := 9999,
point_code := 23,
routing_ctx := 1023
},
- /* as-sender-tcp: One ASP within AS */
{
asp_name := "asp-sender-tcp",
+ is_server := false,
use_tcp := true,
remote_port := 2905,
local_port := 9999,
point_code := 123,
routing_ctx := 1123
},
- /* as-client: One ASP within AS */
{
asp_name := "asp-client0",
+ is_server := true,
use_tcp := false,
remote_port := 2906,
local_port := 10002,
point_code := 55,
routing_ctx := 1055
},
- /* as-client-tcp: One ASP within AS */
{
asp_name := "asp-client0-tcp",
+ is_server := true,
use_tcp := true,
remote_port := 2906,
local_port := 10002,
@@ -50,10 +49,6 @@
routing_ctx := 1155
}
};
-/* number of M3UA clients in ATS */
-STP_Tests_M3UA.mp_m3ua_num_clients := 2;
-/* number of M3UA servers in ATS */
-STP_Tests_M3UA.mp_m3ua_num_servers := 2;
[MAIN_CONTROLLER]
diff --git a/stp/STP_Tests_M3UA_TCP.ttcn b/stp/STP_Tests_M3UA_TCP.ttcn
index 15361ef..a5e4c2a 100644
--- a/stp/STP_Tests_M3UA_TCP.ttcn
+++ b/stp/STP_Tests_M3UA_TCP.ttcn
@@ -14,6 +14,7 @@
import from General_Types all;
import from Osmocom_Types all;
import from IPL4asp_Types all;
+import from Misc_Helpers all;
import from Osmocom_VTY_Functions all;
@@ -43,22 +44,22 @@
var OCT4 pc_b := int2oct(cfg_b.point_code, 4);
/* establish connection with ASP 'A' */
- if (idx_a < g_m3ua_num_clients) {
- f_M3UA_asp_up_act(idx_a, rctx := rctx_a);
- } else {
+ if (g_m3ua_configs[idx_a].is_server) {
f_M3UA_CLNT_asp_up_act(idx_a, rctx := rctx_a);
+ } else {
+ f_M3UA_asp_up_act(idx_a, rctx := rctx_a);
}
/* establish connection with ASP 'B' */
- if (idx_b < g_m3ua_num_clients) {
- f_M3UA_asp_up_act(idx_b, rctx := rctx_b);
- } else {
+ if (g_m3ua_configs[idx_b].is_server) {
f_M3UA_CLNT_asp_up_act(idx_b, rctx := rctx_b);
+ } else {
+ f_M3UA_asp_up_act(idx_b, rctx := rctx_b);
}
/* In the case when ASP[idx_b] is configured as the client (i.e. osmo-stp connects to
- * the testsuite; idx_b >= g_m3ua_num_clients), in f_M3UA_CLNT_asp_up_act() we're expecting
- * to receive ASPACT and then sending ASPACT_ACK to it. Right after that, we're sending
+ * the testsuite), in f_M3UA_CLNT_asp_up_act() we're expecting to receive ASPACT and
+ * then sending ASPACT_ACK to it. Right after that, we're sending
* some random data via ASP[idx_a], which we then expect to receive via ASP[idx_b].
*
* There is a chance that the random data sent via ASP[idx_a] would reach osmo-stp
@@ -78,29 +79,41 @@
/* test routing between M3UA/SCTP (client) and M3UA/TCP (client) */
testcase TC_m3ua_tcp_cli() runs on RAW_M3UA_CT {
- f_init_m3ua();
- f_TC_m3ua_tcp(0, 1); /* 'asp-sender' <-> 'asp-sender-tcp' */
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-sender-tcp" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
+ f_TC_m3ua_tcp(0, 1);
}
/* test routing between M3UA/SCTP (client) and M3UA/TCP (server) */
testcase TC_m3ua_tcp_cli_srv() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-client0-tcp" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_m3ua_srv();
- f_TC_m3ua_tcp(0, M3UA_SRV(1)); /* 'asp-sender' <-> 'asp-client-tcp' */
+ f_TC_m3ua_tcp(0, 1);
}
/* test routing between M3UA/SCTP (server) and M3UA/TCP (server) */
testcase TC_m3ua_tcp_srv() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-client0", "asp-client0-tcp" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_m3ua_srv();
- f_TC_m3ua_tcp(M3UA_SRV(0), M3UA_SRV(1)); /* 'asp-client' <-> 'asp-client-tcp' */
+ f_TC_m3ua_tcp(0, 1);
}
/* test routing between M3UA/SCTP (server) and M3UA/TCP (client) */
testcase TC_m3ua_tcp_srv_cli() runs on RAW_M3UA_CT {
- f_init_m3ua();
+ var Misc_Helpers.ro_charstring asps := { "asp-client0", "asp-sender-tcp" };
+ var M3uaConfigs m3ua_configs := m3ua_build_configs(asps);
+
+ f_init_m3ua(m3ua_configs := m3ua_configs);
f_init_m3ua_srv();
- f_TC_m3ua_tcp(M3UA_SRV(0), 1); /* 'asp-client' <-> 'asp-sender-tcp' */
+ f_TC_m3ua_tcp(0, 1);
}
control {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40325?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I63ed043014ee8a9a593ed17797b621f39c746bcd
Gerrit-Change-Number: 40325
Gerrit-PatchSet: 5
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 month
- 1
- 0
[S] Change in upf-benchmark[master]: testsuites: tunmap: upf: Support upf running in epyc1
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40337?usp=email )
Change subject: testsuites: tunmap: upf: Support upf running in epyc1
......................................................................
testsuites: tunmap: upf: Support upf running in epyc1
Change-Id: I8c211147cc2c29ac87acd909041219bf668e8f8a
---
M testsuites/gtplab-sysmo2025/tunmap/upf/eupf/configure.sh
M testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/configure.sh
2 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/testsuites/gtplab-sysmo2025/tunmap/upf/eupf/configure.sh b/testsuites/gtplab-sysmo2025/tunmap/upf/eupf/configure.sh
index bcd9ee7..cabb332 100755
--- a/testsuites/gtplab-sysmo2025/tunmap/upf/eupf/configure.sh
+++ b/testsuites/gtplab-sysmo2025/tunmap/upf/eupf/configure.sh
@@ -24,6 +24,12 @@
sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_RAN
sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_CN
;;
+epyc1)
+ IFACE_RAN="enp129s0f0np0"
+ IFACE_CN="enp129s0f1np1"
+ # TRex peer is c240-1 Mellanox NIC:
+ MAC_CN_PEER="88:e9:a4:3b:f0:49"
+ ;;
*)
echo "UNEXPECTED HOSTNAME: $(hostname)"
exit 1
diff --git a/testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/configure.sh b/testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/configure.sh
index 7c308ce..a64a376 100755
--- a/testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/configure.sh
+++ b/testsuites/gtplab-sysmo2025/tunmap/upf/osmo-upf/configure.sh
@@ -24,6 +24,12 @@
sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_RAN
sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_CN
;;
+epyc1)
+ IFACE_RAN="enp129s0f0np0"
+ IFACE_CN="enp129s0f1np1"
+ # TRex peer is c240-1 Mellanox NIC:
+ MAC_CN_PEER="88:e9:a4:3b:f0:49"
+ ;;
*)
echo "UNEXPECTED HOSTNAME: $(hostname)"
exit 1
--
To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40337?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: upf-benchmark
Gerrit-Branch: master
Gerrit-Change-Id: I8c211147cc2c29ac87acd909041219bf668e8f8a
Gerrit-Change-Number: 40337
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 month
- 1
- 0
[S] Change in upf-benchmark[master]: testsuites: tunend: upf: Support upf running in epyc1
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40338?usp=email )
Change subject: testsuites: tunend: upf: Support upf running in epyc1
......................................................................
testsuites: tunend: upf: Support upf running in epyc1
Change-Id: I18ab093167476f9075877207a49da95bd9fb9bd2
---
M testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh
M testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh
2 files changed, 14 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh
index fb76737..7fff94b 100755
--- a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh
+++ b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/configure.sh
@@ -29,6 +29,13 @@
sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_RAN
sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_CN
;;
+epyc1)
+ IFACE_RAN="enp129s0f0np0"
+ IFACE_CN="enp129s0f1np1"
+ # TRex peer is c240-1 Mellanox NIC:
+ MAC_RAN_PEER="88:e9:a4:3b:f0:48"
+ MAC_CN_PEER="88:e9:a4:3b:f0:49"
+ ;;
*)
echo "UNEXPECTED HOSTNAME: $(hostname)"
exit 1
diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh
index 92f4fb3..e2c46cc 100755
--- a/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh
+++ b/testsuites/gtplab-sysmo2025/tunend/upf/osmo-upf/configure.sh
@@ -30,6 +30,13 @@
sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_RAN
sudo "$SCRIPT_DIR/../../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_CN
;;
+epyc1)
+ IFACE_RAN="enp129s0f0np0"
+ IFACE_CN="enp129s0f1np1"
+ # TRex peer is c240-1 Mellanox NIC:
+ MAC_RAN_PEER="88:e9:a4:3b:f0:48"
+ MAC_CN_PEER="88:e9:a4:3b:f0:49"
+ ;;
*)
echo "UNEXPECTED HOSTNAME: $(hostname)"
exit 1
--
To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40338?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: upf-benchmark
Gerrit-Branch: master
Gerrit-Change-Id: I18ab093167476f9075877207a49da95bd9fb9bd2
Gerrit-Change-Number: 40338
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 month
- 1
- 0
[XS] Change in upf-benchmark[master]: testsuites: tunend: eupf: Run with GIN_MODE=release
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/upf-benchmark/+/40340?usp=email )
Change subject: testsuites: tunend: eupf: Run with GIN_MODE=release
......................................................................
testsuites: tunend: eupf: Run with GIN_MODE=release
As already done in tunmap and also older testsuites.
Change-Id: I50deef5730367812b5357fa49d5d9b3177660426
---
M testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh
index 1532b76..26a1931 100755
--- a/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh
+++ b/testsuites/gtplab-sysmo2025/tunend/upf/eupf/run.sh
@@ -2,4 +2,4 @@
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-sudo eupf --config "$SCRIPT_DIR/eupf.yaml"
+sudo GIN_MODE=release eupf --config "$SCRIPT_DIR/eupf.yaml"
--
To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/40340?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: upf-benchmark
Gerrit-Branch: master
Gerrit-Change-Id: I50deef5730367812b5357fa49d5d9b3177660426
Gerrit-Change-Number: 40340
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
1 month
- 1
- 0