neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/33747 )
Change subject: adjust HNBGW_Tests.cfg to changed HNBGW_Tests.ttcn
......................................................................
adjust HNBGW_Tests.cfg to changed HNBGW_Tests.ttcn
Fix current jenkins test breakage:
Adjust HNBGW_Tests.cfg after changes to osmo-ttcn3-hacks in
"hnbgw: prepare cn pool: add multiple MSCs and SGSNs"
Ia29565cabc072de9aa46565b57232e1eda65874f
Change-Id: I912e8ad1f528d0d726b778a02a0f54c77b298f54
---
M ttcn3-hnbgw-test/HNBGW_Tests.cfg
M ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
2 files changed, 199 insertions(+), 43 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/47/33747/1
diff --git a/ttcn3-hnbgw-test/HNBGW_Tests.cfg b/ttcn3-hnbgw-test/HNBGW_Tests.cfg
index 2768d20..5d07cb1 100644
--- a/ttcn3-hnbgw-test/HNBGW_Tests.cfg
+++ b/ttcn3-hnbgw-test/HNBGW_Tests.cfg
@@ -15,29 +15,99 @@
HNBGW_Tests.mp_hnodeb_ip := "172.18.35.203";
HNBGW_Tests.mp_hnbgw_ip := "172.18.35.20";
HNBGW_Tests.mp_mgw_ip := "172.18.35.203";
-HNBGW_Tests.mp_msc_cfg := {
- transport := RANAP_TRANSPORT_IuCS,
- sccp_service_type := "mtp3_itu",
- sctp_addr := { 23905, "172.18.35.203", 2905, "172.18.35.200" },
- own_pc := 188, /* 0.23.4 first MSC emulation */
- own_ssn := 142,
- peer_pc := 189, /* 0.23.5 osmo-hnbgw */
- peer_ssn := 142,
- sio := '83'O,
- rctx := 1
-};
-HNBGW_Tests.mp_sgsn_cfg := {
- transport := RANAP_TRANSPORT_IuCS,
- sccp_service_type := "mtp3_itu",
- sctp_addr := { 23906, "172.18.35.203", 2905, "172.18.35.200" },
- own_pc := 185, /* 0.23.1 first SGSN emulation */
- own_ssn := 142,
- peer_pc := 189, /* 0.23.5 osmo-hnbgw */
- peer_ssn := 142,
- sio := '83'O,
- rctx := 2
-};
+HNBGW_Tests.mp_cn_cfg := {
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { 23905, "172.18.35.203", 2905, "172.18.35.200" },
+ own_pc := 188, /* 0.23.4 first MSC emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 0.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 1
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { 23907, "172.18.35.203", 2905, "172.18.35.200" },
+ own_pc := 2, /* 0.0.2 second MSC emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 0.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 3
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { 23909, "172.18.35.203", 2905, "172.18.35.200" },
+ own_pc := 3, /* 0.0.3 third MSC emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 0.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 5
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { 23911, "172.18.35.203", 2905, "172.18.35.200" },
+ own_pc := 3, /* 0.0.3 third MSC emulation */
+ own_pc := 4, /* 0.0.4 fourth MSC emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 0.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 7
+ },
+ /* SGSNs (NUM_SGSN entries) */
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { /* local */ 23906, "172.18.35.203", 2905,
"172.18.35.200" },
+ own_pc := 185, /* 0.23.1 first SGSN emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 2237, 1.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 2
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { /* local */ 23908, "172.18.35.203", 2905,
"172.18.35.200" },
+ own_pc := 10, /* 0.1.2 second SGSN emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 2237, 1.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 4
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { /* local */ 23910, "172.18.35.203", 2905,
"172.18.35.200" },
+ own_pc := 11, /* 0.1.3 third SGSN emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 2237, 1.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 6
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { /* local */ 23912, "172.18.35.203", 2905,
"172.18.35.200" },
+ own_pc := 12, /* 0.1.4 fourth SGSN emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 2237, 1.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 8
+ }
+};
[MAIN_CONTROLLER]
diff --git a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
index 96609c2..8db8134 100644
--- a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
+++ b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
@@ -16,27 +16,98 @@
HNBGW_Tests.mp_hnodeb_ip := "172.18.35.203";
HNBGW_Tests.mp_hnbgw_ip := "172.18.35.20";
HNBGW_Tests.mp_mgw_ip := "172.18.35.203";
-HNBGW_Tests.mp_msc_cfg := {
- transport := RANAP_TRANSPORT_IuCS,
- sccp_service_type := "mtp3_itu",
- sctp_addr := { 23905, "172.18.35.203", 2905, "172.18.35.200" },
- own_pc := 188, /* 0.23.4 first MSC emulation */
- own_ssn := 142,
- peer_pc := 189, /* 0.23.5 osmo-hnbgw */
- peer_ssn := 142,
- sio := '83'O,
- rctx := 1
-};
-HNBGW_Tests.mp_sgsn_cfg := {
- transport := RANAP_TRANSPORT_IuCS,
- sccp_service_type := "mtp3_itu",
- sctp_addr := { 23906, "172.18.35.203", 2905, "172.18.35.200" },
- own_pc := 185, /* 0.23.1 first SGSN emulation */
- own_ssn := 142,
- peer_pc := 189, /* 0.23.5 osmo-hnbgw */
- peer_ssn := 142,
- sio := '83'O,
- rctx := 2
+HNBGW_Tests.mp_cn_cfg := {
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { 23905, "172.18.35.203", 2905, "172.18.35.200" },
+ own_pc := 188, /* 0.23.4 first MSC emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 0.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 1
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { 23907, "172.18.35.203", 2905, "172.18.35.200" },
+ own_pc := 2, /* 0.0.2 second MSC emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 0.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 3
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { 23909, "172.18.35.203", 2905, "172.18.35.200" },
+ own_pc := 3, /* 0.0.3 third MSC emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 0.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 5
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { 23911, "172.18.35.203", 2905, "172.18.35.200" },
+ own_pc := 3, /* 0.0.3 third MSC emulation */
+ own_pc := 4, /* 0.0.4 fourth MSC emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 0.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 7
+ },
+
+ /* SGSNs (NUM_SGSN entries) */
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { /* local */ 23906, "172.18.35.203", 2905,
"172.18.35.200" },
+ own_pc := 185, /* 0.23.1 first SGSN emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 2237, 1.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 2
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { /* local */ 23908, "172.18.35.203", 2905,
"172.18.35.200" },
+ own_pc := 10, /* 0.1.2 second SGSN emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 2237, 1.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 4
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { /* local */ 23910, "172.18.35.203", 2905,
"172.18.35.200" },
+ own_pc := 11, /* 0.1.3 third SGSN emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 2237, 1.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 6
+ },
+ {
+ transport := RANAP_TRANSPORT_IuCS,
+ sccp_service_type := "mtp3_itu",
+ sctp_addr := { /* local */ 23912, "172.18.35.203", 2905,
"172.18.35.200" },
+ own_pc := 12, /* 0.1.4 fourth SGSN emulation */
+ own_ssn := 142,
+ peer_pc := 189, /* 2237, 1.23.5 osmo-hnbgw */
+ peer_ssn := 142,
+ sio := '83'O,
+ rctx := 8
+ }
};
HNBGW_Tests.mp_enable_pfcp_tests := true;
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33747
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I912e8ad1f528d0d726b778a02a0f54c77b298f54
Gerrit-Change-Number: 33747
Gerrit-PatchSet: 1
Gerrit-Owner: neels <[email protected]>
Gerrit-MessageType: newchange
