Max has uploaded this change for review. ( https://gerrit.osmocom.org/13164
Change subject: Add test for MS mode and (M)CS settings
......................................................................
Add test for MS mode and (M)CS settings
Right now set_mode() on GprsMs behaves in pretty counter-intuitive way:
* it's possible to set current DL MCS higher than max value
* EGPRS and EGPRS_GMSK have the same max DL MCS
* setting EGPRS* mode drops current/max MCS values to unknown
Let's capture this in a unit-test before attempting any further
modifications.
Change-Id: Ibf917f4b49d927a21cbd467775806fa6ea06a6a6
---
M tests/ms/MsTest.cpp
M tests/ms/MsTest.err
M tests/ms/MsTest.ok
3 files changed, 88 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/64/13164/1
diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp
index 728daf6..78a931b 100644
--- a/tests/ms/MsTest.cpp
+++ b/tests/ms/MsTest.cpp
@@ -515,6 +515,74 @@
printf("=== end %s ===\n", __func__);
}
+static void dump_ms(const GprsMs *ms, const char *pref)
+{
+ printf("%s MS DL %s/%s, UL %s/%s, mode %s, <%s>\n", pref,
+ mcs_name(ms->current_cs_dl()), mcs_name(ms->max_cs_dl()),
+ mcs_name(ms->current_cs_ul()), mcs_name(ms->max_cs_ul()),
+ mode_name(ms->mode()),
+ ms->is_idle() ? "IDLE" : "ACTIVE");
+}
+
+static void test_ms_mcs_mode()
+{
+ BTS the_bts;
+ gprs_rlcmac_bts *bts = the_bts.bts_data();
+ uint32_t tlli = 0xdeadbeef;
+
+ gprs_rlcmac_dl_tbf *dl_tbf;
+ GprsMs *ms1, *ms2;
+
+ printf("=== start %s ===\n", __func__);
+
+ ms1 = new GprsMs(&the_bts, tlli);
+ dump_ms(ms1, "1: no BTS defaults ");
+
+ bts->initial_cs_dl = 4;
+ bts->initial_cs_ul = 1;
+ bts->cs_downgrade_threshold = 0;
+
+ ms2 = new GprsMs(&the_bts, tlli + 1);
+ dump_ms(ms2, "2: with BTS defaults");
+
+ dl_tbf = talloc_zero(tall_pcu_ctx, struct gprs_rlcmac_dl_tbf);
+ new (dl_tbf) gprs_rlcmac_dl_tbf(NULL);
+
+ dl_tbf->set_ms(ms2);
+ dump_ms(ms2, "2: after TBF attach ");
+
+ ms1->set_mode(EGPRS);
+ dump_ms(ms1, "1: after mode set ");
+
+ ms2->set_mode(EGPRS);
+ dump_ms(ms2, "2: after mode set ");
+
+ ms1->set_current_cs_dl(MCS7);
+ dump_ms(ms1, "1: after MCS set ");
+
+ ms2->set_current_cs_dl(MCS8);
+ dump_ms(ms2, "2: after MCS set ");
+
+ ms1->set_mode(EGPRS_GMSK);
+ dump_ms(ms1, "1: after mode set ");
+
+ ms2->set_mode(EGPRS_GMSK);
+ dump_ms(ms2, "2: after mode set ");
+
+ ms2->detach_tbf(dl_tbf);
+ dump_ms(ms2, "2: after TBF detach ");
+
+ ms1->set_mode(GPRS);
+ dump_ms(ms1, "1: after mode set ");
+
+ ms2->set_mode(GPRS);
+ dump_ms(ms2, "2: after mode set ");
+
+ talloc_free(dl_tbf);
+
+ printf("=== end %s ===\n", __func__);
+}
+
int main(int argc, char **argv)
{
struct vty_app_info pcu_vty_info = {0};
@@ -540,6 +608,7 @@
test_ms_storage();
test_ms_timeout();
test_ms_cs_selection();
+ test_ms_mcs_mode();
if (getenv("TALLOC_REPORT_FULL"))
talloc_report_full(tall_pcu_ctx, stderr);
diff --git a/tests/ms/MsTest.err b/tests/ms/MsTest.err
index a2e4a0c..193d9a3 100644
--- a/tests/ms/MsTest.err
+++ b/tests/ms/MsTest.err
@@ -56,3 +56,8 @@
Destroying MS object, TLLI = 0xffeeddbb
Creating MS object, TLLI = 0xffeeddbb
Attaching TBF to MS object, TLLI = 0xffeeddbb, TBF = TBF(TFI=0 TLLI=0xffeeddbb
DIR=DL STATE=NULL)
+Creating MS object, TLLI = 0xdeadbeef
+Creating MS object, TLLI = 0xdeadbef0
+Attaching TBF to MS object, TLLI = 0xdeadbef0, TBF = TBF(TFI=0 TLLI=0xdeadbef0
DIR=DL STATE=NULL)
+Detaching TBF from MS object, TLLI = 0xdeadbef0, TBF = TBF(TFI=0
TLLI=0xdeadbef0 DIR=DL STATE=NULL)
+Destroying MS object, TLLI = 0xdeadbef0
diff --git a/tests/ms/MsTest.ok b/tests/ms/MsTest.ok
index f14cceb..75c2aec 100644
--- a/tests/ms/MsTest.ok
+++ b/tests/ms/MsTest.ok
@@ -18,3 +18,17 @@
=== end test_ms_timeout ===
=== start test_ms_cs_selection ===
=== end test_ms_cs_selection ===
+=== start test_ms_mcs_mode ===
+1: no BTS defaults MS DL UNKNOWN/UNKNOWN, UL UNKNOWN/UNKNOWN, mode GPRS,
<IDLE>
+2: with BTS defaults MS DL CS-4/CS-4, UL CS-1/CS-4, mode GPRS, <IDLE>
+2: after TBF attach MS DL CS-4/CS-4, UL CS-1/CS-4, mode GPRS, <ACTIVE>
+1: after mode set MS DL UNKNOWN/UNKNOWN, UL UNKNOWN/UNKNOWN, mode EGPRS,
<IDLE>
+2: after mode set MS DL UNKNOWN/UNKNOWN, UL UNKNOWN/UNKNOWN, mode EGPRS,
<ACTIVE>
+1: after MCS set MS DL MCS-7/MCS-4, UL UNKNOWN/UNKNOWN, mode EGPRS, <IDLE>
+2: after MCS set MS DL MCS-8/MCS-4, UL UNKNOWN/UNKNOWN, mode EGPRS,
<ACTIVE>
+1: after mode set MS DL MCS-7/MCS-4, UL UNKNOWN/UNKNOWN, mode
EGPRS_GMSK-only, <IDLE>
+2: after mode set MS DL MCS-8/MCS-4, UL UNKNOWN/UNKNOWN, mode
EGPRS_GMSK-only, <ACTIVE>
+2: after TBF detach MS DL MCS-8/MCS-4, UL UNKNOWN/UNKNOWN, mode
EGPRS_GMSK-only, <IDLE>
+1: after mode set MS DL CS-4/CS-4, UL CS-1/CS-4, mode GPRS, <IDLE>
+2: after mode set MS DL CS-4/CS-4, UL CS-1/CS-4, mode GPRS, <IDLE>
+=== end test_ms_mcs_mode ===
--
To view, visit https://gerrit.osmocom.org/13164
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf917f4b49d927a21cbd467775806fa6ea06a6a6
Gerrit-Change-Number: 13164
Gerrit-PatchSet: 1
Gerrit-Owner: Max <msur...@sysmocom.de>
