[S] Change in docker-playground[master]: scripts/kernel-test: add /dev/null
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36135?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: scripts/kernel-test: add /dev/null .. scripts/kernel-test: add /dev/null Some busybox programs need /dev/null, add it to the initramfs. Change-Id: Ie583ae816b517c10d13d77aa45155fc4d1209c26 --- M scripts/kernel-test/initrd-build.sh 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: osmith: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/scripts/kernel-test/initrd-build.sh b/scripts/kernel-test/initrd-build.sh index d942719..e97ff89 100755 --- a/scripts/kernel-test/initrd-build.sh +++ b/scripts/kernel-test/initrd-build.sh @@ -117,6 +117,8 @@ initrd_add_file \ /lib/modules/*/modules.dep +mknod dev/null c 1 3 + # Required for osmo-ggsn mknod dev/net/tun c 10 200 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36135?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie583ae816b517c10d13d77aa45155fc4d1209c26 Gerrit-Change-Number: 36135 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in docker-playground[master]: scripts/kernel-test: add /dev/null
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36135?usp=email ) Change subject: scripts/kernel-test: add /dev/null .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36135?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie583ae816b517c10d13d77aa45155fc4d1209c26 Gerrit-Change-Number: 36135 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Mar 2024 07:50:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: xua_accept_cb(): distinguish ASPs using different trans_proto
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/36152?usp=email )
Change subject: xua_accept_cb(): distinguish ASPs using different trans_proto
..
xua_accept_cb(): distinguish ASPs using different trans_proto
This fixes a problem found by TTCN-3 testcases: two ASPs can have
identical socket address/port, but different transport protocols.
We need to take this into account in ss7_asp_find_by_socket_addr().
Change-Id: I28aab37e8967de51ad2714543fd235d407e304c5
Related: osmo-ttcn3-hacks.git I1e2a887aa22f317783b3207494fd707d7b426439
Related: SYS#5424
---
M src/osmo_ss7_asp.c
M src/osmo_ss7_xua_srv.c
M src/ss7_internal.h
3 files changed, 20 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/52/36152/1
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index f211872..5bab5ff 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -458,7 +458,7 @@
* \param[in] fd socket descriptor of given socket
* \returns SS7 ASP in case a matching one is found; NULL otherwise */
struct osmo_ss7_asp *
-ss7_asp_find_by_socket_addr(int fd)
+ss7_asp_find_by_socket_addr(int fd, int trans_proto)
{
struct osmo_ss7_instance *inst;
struct sockaddr_storage sa_l, sa_r;
@@ -505,6 +505,8 @@
llist_for_each_entry(inst, _ss7_instances, list) {
struct osmo_ss7_asp *asp;
llist_for_each_entry(asp, >asp_list, list) {
+ if (asp->cfg.trans_proto != trans_proto)
+ continue;
if (asp->cfg.local.port != local_port)
continue;
if (asp->cfg.remote.port && asp->cfg.remote.port !=
remote_port)
diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c
index 0b83b19..6da7b7a 100644
--- a/src/osmo_ss7_xua_srv.c
+++ b/src/osmo_ss7_xua_srv.c
@@ -101,7 +101,7 @@
return -1;
}
- asp = ss7_asp_find_by_socket_addr(fd);
+ asp = ss7_asp_find_by_socket_addr(fd, oxs->cfg.trans_proto);
if (asp) {
LOGP(DLSS7, LOGL_INFO, "%s: matched connection to ASP %s\n",
sock_name, asp->cfg.name);
diff --git a/src/ss7_internal.h b/src/ss7_internal.h
index ed4fae7..758da90 100644
--- a/src/ss7_internal.h
+++ b/src/ss7_internal.h
@@ -20,7 +20,7 @@
bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp);
bool ss7_asp_is_started(const struct osmo_ss7_asp *asp);
int ss7_asp_get_fd(const struct osmo_ss7_asp *asp);
-struct osmo_ss7_asp *ss7_asp_find_by_socket_addr(int fd);
+struct osmo_ss7_asp *ss7_asp_find_by_socket_addr(int fd, int trans_proto);
bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int
trans_proto);
int ss7_default_trans_proto_for_asp_proto(enum osmo_ss7_asp_protocol proto);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36152?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I28aab37e8967de51ad2714543fd235d407e304c5
Gerrit-Change-Number: 36152
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: WIP
fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36099?usp=email ) Change subject: WIP .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36099?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6dfed05adb332c29404997ea7dc93ec3dabfc43a Gerrit-Change-Number: 36099 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
[S] Change in docker-playground[master]: ttcn3-stp-test: enable M3UA-over-TCP testing for master
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36151?usp=email ) Change subject: ttcn3-stp-test: enable M3UA-over-TCP testing for master .. ttcn3-stp-test: enable M3UA-over-TCP testing for master Change-Id: I210b7d62845075dcfe147f2f77603625cc1e64f9 Depends: osmo-ttcn3-hacks.git I5d0b05aa434c057ad379125ac293f5fc9a240b6f Related: osmo-ttcn3-hacks.git I1e2a887aa22f317783b3207494fd707d7b426439 Related: SYS#5424 --- M ttcn3-stp-test/jenkins.sh A ttcn3-stp-test/osmo-stp-tcp.confmerge 2 files changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/51/36151/1 diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 006bb3b..14cca36 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -16,6 +16,13 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ +# XXX: M3UA-over-TCP is not supported by osmo-stp <= 1.8.1 +if image_suffix_is_master; then + osmo-config-merge "$VOL_BASE_DIR/stp/osmo-stp.cfg" \ + osmo-stp-tcp.confmerge \ + > "$VOL_BASE_DIR/stp/osmo-stp.cfg" +fi + network_create network_replace_subnet_in_configs diff --git a/ttcn3-stp-test/osmo-stp-tcp.confmerge b/ttcn3-stp-test/osmo-stp-tcp.confmerge new file mode 100644 index 000..8772c35 --- /dev/null +++ b/ttcn3-stp-test/osmo-stp-tcp.confmerge @@ -0,0 +1,28 @@ +cs7 instance 0 + asp asp-sender-tcp 2905 m3ua tcp + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 + remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 + role sg + transport-role server + asp asp-client0-tcp 10002 2906 m3ua tcp + local-ip 172.18.19.200 + local-ip fd02:db8:19::200 + remote-ip 172.18.19.203 + remote-ip fd02:db8:19::203 + 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 172.18.19.200 + local-ip fd02:db8:19::200 + accept-asp-connections dynamic-permitted -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36151?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I210b7d62845075dcfe147f2f77603625cc1e64f9 Gerrit-Change-Number: 36151 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: stp: add and use f_m3ua_{cli,srv}_config() helpers
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36148?usp=email )
Change subject: stp: add and use f_m3ua_{cli,srv}_config() helpers
..
stp: add and use f_m3ua_{cli,srv}_config() helpers
Using this API reduces the risk of using the wrong half of the
mp_m3ua_configs[] array and improves the code readability a bit.
Change-Id: I9788f52c20574f4f9d015d2de11b5e42bb03d15f
Related: SYS#5424
---
M stp/STP_Tests_M3UA.ttcn
1 file changed, 96 insertions(+), 61 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/48/36148/1
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 5af894a..8b3db48 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -104,6 +104,22 @@
return NR_M3UA+idx;
}
+private function f_m3ua_cli_config(integer idx) return M3uaConfig {
+ if (idx < 0 or idx >= NR_M3UA) {
+ setverdict(fail, "f_m3ua_cli_config(): unexpected idx");
+ mtc.stop;
+ }
+ return mp_m3ua_configs[idx];
+}
+
+private function f_m3ua_srv_config(integer idx) return M3uaConfig {
+ if (idx < 0 or idx >= NR_M3UA_SRV) {
+ setverdict(fail, "f_m3ua_srv_config(): unexpected idx");
+ mtc.stop;
+ }
+ return mp_m3ua_configs[M3UA_SRV(idx)];
+}
+
type component RAW_M3UA_CT extends Test_CT {
port M3UA_CODEC_PT M3UA[NR_M3UA+NR_M3UA_SRV];
var integer g_m3ua_conn_id[NR_M3UA+NR_M3UA_SRV];
@@ -415,10 +431,10 @@
/* test whether the STP accepts M3UA DATA without Routing Context IE */
testcase TC_act_rctx_data_no_rctx() runs on RAW_M3UA_CT {
- var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4);
- var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4);
- var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4);
- var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].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 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();
/* bring up the sender specifying a routing context */
@@ -447,10 +463,10 @@
/* test "traffic-mode override" behavior */
testcase TC_tmt_override() runs on RAW_M3UA_CT {
- var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4);
- var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4);
- var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4);
- var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].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 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();
@@ -484,10 +500,10 @@
/* test "traffic-mode load-share" behavior */
testcase TC_tmt_loadshare() runs on RAW_M3UA_CT {
- var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4);
- var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4);
- var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4);
- var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].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 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 integer i;
f_init_m3ua();
@@ -537,10 +553,10 @@
/* test "traffic-mode broadcast" behavior */
testcase TC_tmt_broadcast() runs on RAW_M3UA_CT {
- var OCT4 rctx_sender := int2oct(mp_m3ua_configs[0].routing_ctx, 4);
- var OCT4 pc_sender := int2oct(mp_m3ua_configs[0].point_code, 4);
- var OCT4 rctx_receiver := int2oct(mp_m3ua_configs[1].routing_ctx, 4);
- var OCT4 pc_receiver := int2oct(mp_m3ua_configs[1].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 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 integer i;
f_init_m3ua();
@@ -599,8 +615,8 @@
/* Send RKM registration; expect OK as RCTX does match config */
testcase TC_rkm_reg_static_permitted() runs on RAW_M3UA_CT {
- var OCT3 dpc := int2oct(mp_m3ua_configs[0].point_code, 3); // must
match config
- var OCT4
[M] Change in osmo-ttcn3-hacks[master]: stp: add testcases for M3UA-over-TCP
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36150?usp=email )
Change subject: stp: add testcases for M3UA-over-TCP
..
stp: add testcases for M3UA-over-TCP
Change-Id: I1e2a887aa22f317783b3207494fd707d7b426439
Related: docker-playground.git I210b7d62845075dcfe147f2f77603625cc1e64f9
Related: SYS#5424
---
M stp/STP_Tests_M3UA.ttcn
1 file changed, 74 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/50/36150/1
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 3100ab6..4c2d526 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -1203,6 +1203,64 @@
f_clear_m3ua();
}
+private function f_TC_m3ua_tcp(integer idx_a, integer idx_b) runs on
RAW_M3UA_CT {
+ var M3uaConfig cfg_a := mp_m3ua_configs[idx_a];
+ var M3uaConfig cfg_b := mp_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 < NR_M3UA) {
+ 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 < NR_M3UA) {
+ f_M3UA_asp_up_act(idx_b, rctx := rctx_b);
+ } else {
+ f_M3UA_CLNT_asp_up_act(idx_b, rctx := rctx_b);
+ }
+
+ /* 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_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 */
@@ -1218,6 +1276,11 @@
execute( TC_tmt_broadcast() );
execute( TC_act_rctx_data_no_rctx() );
+ 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() );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36150?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I1e2a887aa22f317783b3207494fd707d7b426439
Gerrit-Change-Number: 36150
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: stp: prepare for testing M3UA-over-TCP
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36149?usp=email )
Change subject: stp: prepare for testing M3UA-over-TCP
..
stp: prepare for testing M3UA-over-TCP
* rename various fields and templates to be transport neutral
* extend mp_m3ua_configs[]: add one client and one server ASPs
* f_M3UA_connect(): split onto f_M3UA_connect_{tcp,sctp}()
* f[_no]_quirk(): properly handle ASPs using TCP transport
* add osmo-stp-tcp.confmerge [*]
We cannot add new M3UA-over-TCP ASPs to osmo-stp.cfg because that
would break the job testing latest osmo-stp version. Instead, add
a confmerge file to be applied by jenkins.sh (for nightly only).
Change-Id: I5d0b05aa434c057ad379125ac293f5fc9a240b6f
Related: docker-playground.git I210b7d62845075dcfe147f2f77603625cc1e64f9
Related: SYS#5424
---
M stp/STP_Tests_M3UA.ttcn
A stp/osmo-stp-tcp.confmerge
2 files changed, 175 insertions(+), 35 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/49/36149/1
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 8b3db48..3100ab6 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -2,6 +2,7 @@
/* Osmocom STP test suite in in TTCN-3
* (C) 2019 Harald Welte
+ * (C) 2024 by sysmocom - s.f.m.c. GmbH
* All rights reserved.
*
* Released under the terms of GNU General Public License, Version 2 or
@@ -15,6 +16,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;
@@ -34,8 +36,8 @@
import from STP_Tests_Common all;
-private const integer NR_M3UA := 3;/* number of M3UA clients in ATS */
-private const integer NR_M3UA_SRV := 3;/* number of M3UA servres in
ATS */
+private const integer NR_M3UA := 4;/* number of M3UA clients in ATS */
+private const integer NR_M3UA_SRV := 4;/* number of M3UA servres in
ATS */
modulepar {
/* STP-side IP addresses */
@@ -45,43 +47,65 @@
M3uaConfigs mp_m3ua_configs := {
/* as-sender: One ASP within AS */
{
- remote_sctp_port := 2905,
- local_sctp_port := ,
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := ,
point_code := 23,
routing_ctx := 1023
},
/* as-receiver: Two ASP within AS */
{
- remote_sctp_port := 2905,
- local_sctp_port := 1,
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 1,
point_code := 42,
routing_ctx := 1042
}, {
- remote_sctp_port := 2905,
- local_sctp_port := 10001,
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 10001,
point_code := 42,
routing_ctx := 1042
},
+ /* as-sender-tcp: One ASP within AS */
+ {
+ use_tcp := true,
+ remote_port := 2905,
+ local_port := ,
+ point_code := 123,
+ routing_ctx := 1123
+ },
/* as-client: One ASP within AS */
{
- remote_sctp_port := 2906,
- local_sctp_port := 10002,
+ use_tcp := false,
+ remote_port := 2906,
+ local_port := 10002,
point_code := 55,
routing_ctx := 1055
},
/* as-client60-norctx */
{
- remote_sctp_port := 2907,
- local_sctp_port := 11060,
+ use_tcp := false,
+ remote_port := 2907,
+ local_port := 11060,
point_code := 60,
routing_ctx := -
},
/* as-client61-norctx */
{
- remote_sctp_port := 2907,
- local_sctp_port := 11061,
+ use_tcp := false,
+ remote_port := 2907,
+ local_port := 11061,
point_code := 61,
routing_ctx := -
+ },
+ /* as-client-tcp: One ASP within AS */
+ {
+ use_tcp := true,
+ remote_port := 2906,
+
[M] Change in osmo-ttcn3-hacks[master]: stp: check-in expected-results.xml from Jenkins
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36147?usp=email ) Change subject: stp: check-in expected-results.xml from Jenkins .. stp: check-in expected-results.xml from Jenkins Change-Id: Id4081af9e9d5b0a95dc2fe7d137778747dc27bd0 --- A stp/expected-results.xml 1 file changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/36147/1 diff --git a/stp/expected-results.xml b/stp/expected-results.xml new file mode 100644 index 000..0f6073b --- /dev/null +++ b/stp/expected-results.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36147?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id4081af9e9d5b0a95dc2fe7d137778747dc27bd0 Gerrit-Change-Number: 36147 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
