fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42350?usp=email )
Change subject: s1gw: make S1AP_Server.f_conn_add() return nothing
......................................................................
s1gw: make S1AP_Server.f_conn_add() return nothing
The index of a new entry is not used anywhere, so do not return it.
Change-Id: I8df3985a665ae919849559ea8cf0fd33b5b22df8
---
M s1gw/S1AP_Server.ttcn
1 file changed, 2 insertions(+), 5 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/s1gw/S1AP_Server.ttcn b/s1gw/S1AP_Server.ttcn
index 5bd83a4..df91eaa 100644
--- a/s1gw/S1AP_Server.ttcn
+++ b/s1gw/S1AP_Server.ttcn
@@ -128,9 +128,9 @@
return -1;
}
-/* add a new connection, return its index */
+/* add a new connection */
private function f_conn_add(ConnectionId conn_id)
-runs on S1AP_Server_CT return integer {
+runs on S1AP_Server_CT {
var ConnData conn := { conn_id, - };
var integer idx;
@@ -139,11 +139,8 @@
mtc.stop;
}
- idx := lengthof(g_conn_list);
g_conn_list := g_conn_list & { conn };
log("Connection (id=", conn_id, ") is registered");
-
- return idx;
}
/* del an existing connection */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42350?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: I8df3985a665ae919849559ea8cf0fd33b5b22df8
Gerrit-Change-Number: 42350
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42349?usp=email )
Change subject: s1gw: remove unused mp_s1gw_mme_ip
......................................................................
s1gw: remove unused mp_s1gw_mme_ip
We don't really care what address the S1GW is using when connecting
to our virtual MME. This is why this parameter is not used anywhere.
Change-Id: I4fff3954c005ac3df34d00c3b0312300ba4f49a1
---
M s1gw/S1GW_Tests.cfg
M s1gw/S1GW_Tests.ttcn
2 files changed, 0 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/s1gw/S1GW_Tests.cfg b/s1gw/S1GW_Tests.cfg
index 69e893f..8174b9e 100644
--- a/s1gw/S1GW_Tests.cfg
+++ b/s1gw/S1GW_Tests.cfg
@@ -13,7 +13,6 @@
[MODULE_PARAMETERS]
S1GW_Tests.mp_s1gw_enb_ip := "127.0.1.1";
S1GW_Tests.mp_enb_bind_ip := "127.0.1.10";
-S1GW_Tests.mp_s1gw_mme_ip := "127.0.2.1";
S1GW_Tests.mp_mme_bind_ip := "127.0.2.10";
S1GW_Tests.mp_s1gw_upf_ip := "127.0.3.1";
S1GW_Tests.mp_upf_bind_ip := "127.0.3.10";
diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index 43cbe74..ff4734d 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -54,7 +54,6 @@
modulepar {
charstring mp_s1gw_enb_ip := "127.0.1.1"; /* eNB facing address of the S1GW */
charstring mp_enb_bind_ip := "127.0.1.10"; /* eNB address to use locally when connecting to S1GW */
- charstring mp_s1gw_mme_ip := "127.0.2.1"; /* MME facing address of the S1GW */
charstring mp_mme_bind_ip := "127.0.2.10"; /* MME address on which we get connections from S1GW */
charstring mp_s1gw_upf_ip := "127.0.3.1"; /* UPF facing address of the S1GW */
charstring mp_upf_bind_ip := "127.0.3.10"; /* UPF address on which we get connections from S1GW */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42349?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: I4fff3954c005ac3df34d00c3b0312300ba4f49a1
Gerrit-Change-Number: 42349
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42342?usp=email )
Change subject: s1gw: fix TC_e_rab_setup_failure: expect a specific S1AP PDU
......................................................................
s1gw: fix TC_e_rab_setup_failure: expect a specific S1AP PDU
setup_rsp is carefully constructed, but is not actually used.
The f_ConnHdlr_rx_s1ap_from_enb() call falls through to the ? default,
so the test accepts any S1AP PDU and never validates that the S1GW
actually populated the failed-items list correctly.
Change-Id: I6dbe272af4302c83ac26db9b7da5a7f7bc96daa7
Fixes: 47544443 ("s1gw: add TC_e_rab_setup_failure")
---
M s1gw/S1GW_Tests.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index 6623b1f..43cbe74 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -507,7 +507,7 @@
setup_rsp := tr_S1AP_RABSetupRsp(g_pars.mme_ue_id, g_pars.idx,
rab_setup_items := omit,
rab_failed_items := tr_E_RABList(item));
- f_ConnHdlr_rx_s1ap_from_enb(s1ap_pdu);
+ f_ConnHdlr_rx_s1ap_from_enb(s1ap_pdu, setup_rsp);
f_ConnHdlr_s1ap_disconnect();
f_ConnHdlr_s1ap_unregister(g_pars.genb_id);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42342?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: I6dbe272af4302c83ac26db9b7da5a7f7bc96daa7
Gerrit-Change-Number: 42342
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42345?usp=email )
Change subject: s1gw: f_ConnHdlr_conn_track_disable(): set conn_track := null
......................................................................
s1gw: f_ConnHdlr_conn_track_disable(): set conn_track := null
After deactivate, conn_track still holds the now-dead reference.
A second call (which can happen if any test explicitly calls this
before f_ConnHdlr_s1ap_disconnect()) will attempt to deactivate an
already-inactive default, which is a TTCN-3 runtime error.
Change-Id: I0b71b543fc7c4e87a86381cc3be23728e75cb59b
Fixes: adc942a94 ("s1gw: track eNB connection, fail immediately on loss")
---
M s1gw/S1GW_ConnHdlr.ttcn
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn
index 3decbcf..298a983 100644
--- a/s1gw/S1GW_ConnHdlr.ttcn
+++ b/s1gw/S1GW_ConnHdlr.ttcn
@@ -113,6 +113,7 @@
function f_ConnHdlr_conn_track_disable() runs on ConnHdlr {
if (conn_track != null) {
deactivate(conn_track);
+ conn_track := null;
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42345?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: I0b71b543fc7c4e87a86381cc3be23728e75cb59b
Gerrit-Change-Number: 42345
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>