msc_vlr_tests: confirm crcx by RAN/CN side separately
Upcoming patch 'do CN CRCX first' changes the ordering of MGCP. To
properly show the change in behavior in the msc_vlr_test_call, first
clarify which side is expected to do MGCP when.
Related: SYS#5066
Change-Id: I972e7426006e5b62f81ccfe4fa224ee9eed7a7ac
diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c
index ab92433..84614dc 100644
--- a/tests/msc_vlr/msc_vlr_test_call.c
+++ b/tests/msc_vlr/msc_vlr_test_call.c
@@ -218,7 +218,7 @@
btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN");
expect_crcx(RTP_TO_RAN);
mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc);
- OSMO_ASSERT(got_crcx);
+ OSMO_ASSERT(crcx_scheduled(RTP_TO_RAN));
btw("MGW acknowledges the CRCX, triggering Assignment");
expect_iu_rab_assignment();
@@ -228,7 +228,7 @@
btw("Assignment succeeds, triggering CRCX to CN");
expect_crcx(RTP_TO_CN);
ms_sends_assignment_complete("AMR");
- OSMO_ASSERT(got_crcx);
+ OSMO_ASSERT(crcx_scheduled(RTP_TO_CN));
btw("CN RTP address is available, trigger MNCC_RTP_CREATE");
cc_to_mncc_expect_tx("", MNCC_RTP_CREATE);
@@ -351,7 +351,7 @@
"0406600402000581" /* Bearer Capability */
"15020100" /* Call Control Capabilities */
"40080402600400021f00" /* Supported Codec List */);
- OSMO_ASSERT(got_crcx);
+ OSMO_ASSERT(crcx_scheduled(RTP_TO_RAN));
OSMO_ASSERT(cc_to_mncc_tx_confirmed);
btw("MNCC sends MNCC_RTP_CREATE");
@@ -365,7 +365,7 @@
btw("Assignment completes, triggering CRCX to CN");
expect_crcx(RTP_TO_CN);
ms_sends_assignment_complete("AMR");
- OSMO_ASSERT(got_crcx);
+ OSMO_ASSERT(crcx_scheduled(RTP_TO_CN));
btw("When the CN side RTP address is known, send MNCC_RTP_CREATE");
cc_to_mncc_expect_tx("", MNCC_RTP_CREATE);
@@ -472,7 +472,7 @@
"0406600402000581" /* Bearer Capability */
"15020100" /* Call Control Capabilities */
"40080402600400021f00" /* Supported Codec List */);
- OSMO_ASSERT(got_crcx);
+ OSMO_ASSERT(crcx_scheduled(RTP_TO_RAN));
OSMO_ASSERT(cc_to_mncc_tx_confirmed);
btw("MNCC sends MNCC_RTP_CREATE");
@@ -486,7 +486,7 @@
btw("Assignment completes, triggering CRCX to CN");
expect_crcx(RTP_TO_CN);
ms_sends_assignment_complete("AMR");
- OSMO_ASSERT(got_crcx);
+ OSMO_ASSERT(crcx_scheduled(RTP_TO_CN));
btw("When the CN side RTP address is known, send MNCC_RTP_CREATE");
cc_to_mncc_expect_tx("", MNCC_RTP_CREATE);
@@ -573,7 +573,7 @@
btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN");
expect_crcx(RTP_TO_RAN);
mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc);
- OSMO_ASSERT(got_crcx);
+ OSMO_ASSERT(crcx_scheduled(RTP_TO_RAN));
btw("MGW acknowledges the CRCX, triggering Assignment");
expect_iu_rab_assignment();
@@ -583,7 +583,7 @@
btw("Assignment succeeds, triggering CRCX to CN");
expect_crcx(RTP_TO_CN);
ms_sends_assignment_complete("AMR");
- OSMO_ASSERT(got_crcx);
+ OSMO_ASSERT(crcx_scheduled(RTP_TO_CN));
btw("CN RTP address is available, trigger MNCC_RTP_CREATE");
cc_to_mncc_expect_tx("", MNCC_RTP_CREATE);
@@ -669,7 +669,7 @@
btw("MNCC replies with MNCC_RTP_CREATE, causing MGW endpoint CRCX to RAN");
expect_crcx(RTP_TO_RAN);
mncc_sends_to_cc(MNCC_RTP_CREATE, &mncc);
- OSMO_ASSERT(got_crcx);
+ OSMO_ASSERT(crcx_scheduled(RTP_TO_RAN));
btw("MGW acknowledges the CRCX, triggering Assignment");
expect_iu_rab_assignment();
@@ -679,7 +679,7 @@
btw("Assignment succeeds, triggering CRCX to CN");
expect_crcx(RTP_TO_CN);
ms_sends_assignment_complete("AMR");
- OSMO_ASSERT(got_crcx);
+ OSMO_ASSERT(crcx_scheduled(RTP_TO_CN));
btw("CN RTP address is available, trigger MNCC_RTP_CREATE");
cc_to_mncc_expect_tx("", MNCC_RTP_CREATE);