use osmo_rat_type from libosmocore
Replace locally defined enum ran_type with libosmocore's new enum
osmo_rat_type, and value_string ran_type_names with osmo_rat_type_names.
The string representations change, which has cosmetic effects on the test suite
expectations.
Depends: I659687aef7a4d67ca372a39fef31dee07aed7631 (libosmocore)
Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index 8f256b1..a641ec2 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -126,8 +126,8 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
/* Release connection */
- expect_bssap_clear(RAN_GERAN_A);
- conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+ expect_bssap_clear(OSMO_RAT_GERAN_A);
+ conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
btw("all requests serviced, conn has been released");
bss_sends_clear_complete();
@@ -366,8 +366,8 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
/* Release connection */
- expect_bssap_clear(RAN_GERAN_A);
- conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+ expect_bssap_clear(OSMO_RAT_GERAN_A);
+ conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
btw("all requests serviced, conn has been released");
bss_sends_clear_complete();
@@ -833,7 +833,7 @@
/* implicit: net->authentication_required = true; */
net->a5_encryption_mask = (1 << 1);
- rx_from_ran = RAN_GERAN_A;
+ rx_from_ran = OSMO_RAT_GERAN_A;
btw("Location Update request causes a GSUP Send Auth Info request to HLR");
lu_result_sent = RES_NONE;
@@ -963,8 +963,8 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
/* Release connection */
- expect_bssap_clear(RAN_GERAN_A);
- conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+ expect_bssap_clear(OSMO_RAT_GERAN_A);
+ conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
btw("all requests serviced, conn has been released");
bss_sends_clear_complete();
@@ -1159,8 +1159,8 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
/* Release connection */
- expect_bssap_clear(RAN_GERAN_A);
- conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+ expect_bssap_clear(OSMO_RAT_GERAN_A);
+ conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
btw("all requests serviced, conn has been released");
bss_sends_clear_complete();
@@ -1381,8 +1381,8 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
/* Release connection */
- expect_bssap_clear(RAN_GERAN_A);
- conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+ expect_bssap_clear(OSMO_RAT_GERAN_A);
+ conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
btw("all requests serviced, conn has been released");
bss_sends_clear_complete();