neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35137?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: msc_vlr_test_call: drop misleading log ...................................................................... msc_vlr_test_call: drop misleading log It was true once, but not since "do CN CRCX first" Ie433db1ba0c46d4b97538a969233c155cefac21c Related: OS#6258 Change-Id: I94e430e4e5b5bf18dbb155258d82f599ada453e6 --- M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err 2 files changed, 31 insertions(+), 18 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 3b91524..1264dfd 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -242,7 +242,7 @@ BTW("a call is initiated"); - btw("CC SETUP causes CRCX towards CN"); + btw("CC SETUP causes CRCX towards CN and RAN"); expect_crcx(RTP_TO_CN); expect_crcx(RTP_TO_RAN); ms_sends_msg("0385" /* CC, seq = 2 -> 0x80 | CC Setup = 0x5 */ @@ -262,7 +262,7 @@ OSMO_ASSERT(cc_to_mncc_tx_confirmed); mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; - btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); + btw("MNCC replies with MNCC_RTP_CREATE"); mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment"); @@ -623,7 +623,7 @@ BTW("a call is initiated"); - btw("CC SETUP causes CRCX towards CN"); + btw("CC SETUP causes CRCX towards CN and RAN"); expect_crcx(RTP_TO_CN); expect_crcx(RTP_TO_RAN); ms_sends_msg("0385" /* CC, seq = 2 -> 0x80 | CC Setup = 0x5 */ @@ -643,7 +643,7 @@ OSMO_ASSERT(cc_to_mncc_tx_confirmed); mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; - btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); + btw("MNCC replies with MNCC_RTP_CREATE"); mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment"); @@ -720,7 +720,7 @@ BTW("a call is initiated"); - btw("CC SETUP causes CRCX towards CN"); + btw("CC SETUP causes CRCX towards CN and RAN"); expect_crcx(RTP_TO_CN); expect_crcx(RTP_TO_RAN); ms_sends_msg("0385" /* CC, seq = 2 -> 0x80 | CC Setup = 0x5 */ @@ -740,7 +740,7 @@ OSMO_ASSERT(cc_to_mncc_tx_confirmed); mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; - btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); + btw("MNCC replies with MNCC_RTP_CREATE"); mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); btw("MGW acknowledges the CRCX, triggering Assignment"); @@ -1232,7 +1232,7 @@ mncc.callref = mncc_rtp.callref = cc_to_mncc_tx_got_callref; VALIDATE_SDP(cc_to_mncc_tx_last_sdp, t->mo_tx_sdp_mncc_setup_ind); - btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN"); + btw("MNCC replies with MNCC_RTP_CREATE"); sdp_str_from_subtype_names(mncc_rtp.sdp, sizeof(mncc_rtp.sdp), t->mo_rx_sdp_mncc_rtp_create); mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc_rtp); diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 5758175..2c090fc 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -275,7 +275,7 @@ - a call is initiated -- CC SETUP causes CRCX towards CN +- CC SETUP causes CRCX towards CN and RAN MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_SETUP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_cc,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP @@ -321,7 +321,7 @@ a=fmtp:112 octet-align=1 a=ptime:20 -- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +- MNCC replies with MNCC_RTP_CREATE MSC <-- MNCC: callref 0x80000001: MNCC_RTP_CREATE DMNCC trans(CC:INITIATED IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000001 tid-8) rx MNCC_RTP_CREATE @@ -1767,7 +1767,7 @@ - a call is initiated -- CC SETUP causes CRCX towards CN +- CC SETUP causes CRCX towards CN and RAN MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_SETUP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_cc,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP @@ -1813,7 +1813,7 @@ a=fmtp:112 octet-align=1 a=ptime:20 -- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +- MNCC replies with MNCC_RTP_CREATE MSC <-- MNCC: callref 0x80000002: MNCC_RTP_CREATE DMNCC trans(CC:INITIATED IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000002 tid-8) rx MNCC_RTP_CREATE @@ -2221,7 +2221,7 @@ - a call is initiated -- CC SETUP causes CRCX towards CN +- CC SETUP causes CRCX towards CN and RAN MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_SETUP DREF msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_cc,rx_from_ms) DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP @@ -2267,7 +2267,7 @@ a=fmtp:112 octet-align=1 a=ptime:20 -- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +- MNCC replies with MNCC_RTP_CREATE MSC <-- MNCC: callref 0x80000003: MNCC_RTP_CREATE DMNCC trans(CC:INITIATED IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:CM_SERVICE_REQ callref-0x80000003 tid-8) rx MNCC_RTP_CREATE @@ -2616,7 +2616,7 @@ a=ptime:20 - VALIDATE_SDP OK: cc_to_mncc_tx_last_sdp == t->mo_tx_sdp_mncc_setup_ind == AMR GSM-EFR GSM GSM-HR-08 -- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +- MNCC replies with MNCC_RTP_CREATE MSC <-- MNCC: callref 0x80000004: MNCC_RTP_CREATE DMNCC trans(CC:INITIATED IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ callref-0x80000004 tid-8) rx MNCC_RTP_CREATE @@ -3230,7 +3230,7 @@ a=ptime:20 - VALIDATE_SDP OK: cc_to_mncc_tx_last_sdp == t->mo_tx_sdp_mncc_setup_ind == GSM -- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +- MNCC replies with MNCC_RTP_CREATE MSC <-- MNCC: callref 0x80000005: MNCC_RTP_CREATE DMNCC trans(CC:INITIATED IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ callref-0x80000005 tid-8) rx MNCC_RTP_CREATE @@ -3833,7 +3833,7 @@ a=ptime:20 - VALIDATE_SDP OK: cc_to_mncc_tx_last_sdp == t->mo_tx_sdp_mncc_setup_ind == GSM -- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +- MNCC replies with MNCC_RTP_CREATE MSC <-- MNCC: callref 0x80000006: MNCC_RTP_CREATE DMNCC trans(CC:INITIATED IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ callref-0x80000006 tid-8) rx MNCC_RTP_CREATE @@ -4440,7 +4440,7 @@ a=ptime:20 - VALIDATE_SDP OK: cc_to_mncc_tx_last_sdp == t->mo_tx_sdp_mncc_setup_ind == AMR GSM-EFR GSM GSM-HR-08 -- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +- MNCC replies with MNCC_RTP_CREATE MSC <-- MNCC: callref 0x80000007: MNCC_RTP_CREATE DMNCC trans(CC:INITIATED IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ callref-0x80000007 tid-8) rx MNCC_RTP_CREATE @@ -4845,7 +4845,7 @@ a=ptime:20 - VALIDATE_SDP OK: cc_to_mncc_tx_last_sdp == t->mo_tx_sdp_mncc_setup_ind == AMR GSM-EFR GSM GSM-HR-08 -- MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN +- MNCC replies with MNCC_RTP_CREATE MSC <-- MNCC: callref 0x80000008: MNCC_RTP_CREATE DMNCC trans(CC:INITIATED IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ callref-0x80000008 tid-8) rx MNCC_RTP_CREATE -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35137?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I94e430e4e5b5bf18dbb155258d82f599ada453e6 Gerrit-Change-Number: 35137 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofm...@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de> Gerrit-Reviewer: neels <nhofm...@sysmocom.de> Gerrit-Reviewer: pespin <pes...@sysmocom.de> Gerrit-MessageType: merged