From 03d122447441aa035c730420aacd0a665e889280 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Tue, 7 Aug 2018 16:13:52 +0200 Subject: sgsn: rework TC_attach_closed_add_vty to be executed in a single BSSGP_ConnHldr When stopping and starting BSSGP_ConnHdlr multiple times, there are Port connecting problems. Using a single iteration of BSSGP_ConnHldr.start() works around this problem. Change-Id: I8e5ae832f3908a172b9beb6d936074b806e0c799 --- sgsn/SGSN_Tests.ttcn | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 8094866f..3f479dae 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1766,7 +1766,7 @@ private function f_TC_attach_closed_imsi_added(charstring id) runs on BSSGP_Conn /* unregister the old IMSI */ f_bssgp_client_unregister(g_pars.imsi); /* Simulate a foreign IMSI */ - g_pars.imsi := '001010123456789'H; + g_pars.imsi := '001010123456700'H; f_bssgp_client_register(g_pars.imsi, g_pars.tlli, g_pars.bssgp_cell_id[0]); /* there is no auth */ @@ -1786,6 +1786,15 @@ private function f_TC_attach_closed_imsi_added(charstring id) runs on BSSGP_Conn } } } + +private function f_TC_attach_closed_add_vty(charstring id) runs on BSSGP_ConnHdlr { + + f_TC_attach_closed_foreign(id); + f_TC_attach_closed_imsi_added(id); + +} + + testcase TC_attach_closed_add_vty() runs on test_CT { /* VTY-> SGSN: policy close * MS -> SGSN: Attach Request @@ -1805,12 +1814,10 @@ testcase TC_attach_closed_add_vty() runs on test_CT { f_sleep(1.0); f_vty_config(SGSNVTY, "sgsn", "auth-policy closed"); f_vty_config(SGSNVTY, "sgsn", "imsi-acl del 001010123456789"); + f_vty_config(SGSNVTY, "sgsn", "imsi-acl del 001010123456700"); + f_vty_config(SGSNVTY, "sgsn", "imsi-acl add 001010123456700"); /* test with foreign IMSI: Must Reject */ - vc_conn := f_start_handler(refers(f_TC_attach_closed_foreign), testcasename(), g_gb, 9); - vc_conn.done; - f_vty_config(SGSNVTY, "sgsn", "imsi-acl add 001010123456789"); - /* test with same IMSI: Must Accept */ - vc_conn := f_start_handler(refers(f_TC_attach_closed_imsi_added), testcasename(), g_gb, 10); + vc_conn := f_start_handler(refers(f_TC_attach_closed_add_vty), testcasename(), g_gb, 9); vc_conn.done; } -- cgit v1.2.3