<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20654">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests/power_test: move bts/trx/ts/lchan init to init_test()<br><br>This would allow us to introduce additional test cases.<br><br>Change-Id: I00569de378f7c3ca7cc6885fc2bdf25fbc637831<br>Related: SYS#4916<br>---<br>M tests/power/power_test.c<br>M tests/power/power_test.err<br>M tests/power/power_test.ok<br>3 files changed, 58 insertions(+), 43 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/power/power_test.c b/tests/power/power_test.c</span><br><span>index 6cc06a3..0d3457a 100644</span><br><span>--- a/tests/power/power_test.c</span><br><span>+++ b/tests/power/power_test.c</span><br><span>@@ -27,6 +27,32 @@</span><br><span> </span><br><span> #include <stdio.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_bts *g_bts = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_bts_trx *g_trx = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void init_test(const char *name)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_trx != NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(g_trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_bts != NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(g_bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts = talloc_zero(tall_bts_ctx, struct gsm_bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(g_bts != NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&g_bts->trx_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_trx = gsm_bts_trx_alloc(g_bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(g_trx != NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_trx->ms_pwr_ctl_soft = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts->ul_power_target = -75,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts->band = GSM_BAND_1800,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_bts->c0 = g_trx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\nStarting test case '%s'\n", name);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static inline void apply_power_test(struct gsm_lchan *lchan, int rxlev, int exp_ret, uint8_t exp_current)</span><br><span> {</span><br><span> int ret = lchan_ms_pwr_ctrl(lchan, lchan->ms_power_ctrl.current, rxlev);</span><br><span>@@ -38,24 +64,11 @@</span><br><span> </span><br><span> static void test_power_loop(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts bts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx trx;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx_ts ts;</span><br><span> struct gsm_lchan *lchan;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- memset(&bts, 0, sizeof(bts));</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&trx, 0, sizeof(trx));</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&ts, 0, sizeof(ts));</span><br><span style="color: hsl(120, 100%, 40%);">+ init_test(__func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = &g_trx->ts[0].lchan[0];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan = &ts.lchan[0];</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->ts = &ts;</span><br><span style="color: hsl(0, 100%, 40%);">- ts.trx = &trx;</span><br><span style="color: hsl(0, 100%, 40%);">- trx.bts = &bts;</span><br><span style="color: hsl(0, 100%, 40%);">- bts.band = GSM_BAND_1800;</span><br><span style="color: hsl(0, 100%, 40%);">- trx.ms_pwr_ctl_soft = true;</span><br><span style="color: hsl(0, 100%, 40%);">- bts.ul_power_target = -75;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->state = LCHAN_S_NONE;</span><br><span> lchan->ms_power_ctrl.current = ms_pwr_ctl_lvl(GSM_BAND_1800, 0);</span><br><span> OSMO_ASSERT(lchan->ms_power_ctrl.current == 15);</span><br><span> lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 26);</span><br><span>@@ -76,7 +89,7 @@</span><br><span> apply_power_test(lchan, -90, 1, 5);</span><br><span> </span><br><span> /* Check good RSSI value keeps it at same power level: */</span><br><span style="color: hsl(0, 100%, 40%);">- apply_power_test(lchan, bts.ul_power_target, 0, 5);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, g_bts->ul_power_target, 0, 5);</span><br><span> </span><br><span> apply_power_test(lchan, -90, 1, 3);</span><br><span> apply_power_test(lchan, -90, 1, 2); /* .max is pwr lvl 2 */</span><br><span>@@ -94,7 +107,7 @@</span><br><span> apply_power_test(lchan, -90, 0, 29);</span><br><span> </span><br><span> /* Check good RSSI value keeps it at same power level: */</span><br><span style="color: hsl(0, 100%, 40%);">- apply_power_test(lchan, bts.ul_power_target, 0, 29);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, g_bts->ul_power_target, 0, 29);</span><br><span> </span><br><span> /* Now go down, steps are double size in this direction: */</span><br><span> apply_power_test(lchan, -45, 1, 1);</span><br><span>@@ -102,13 +115,13 @@</span><br><span> apply_power_test(lchan, -45, 1, 9);</span><br><span> </span><br><span> /* Go down only one level down and up: */</span><br><span style="color: hsl(0, 100%, 40%);">- apply_power_test(lchan, bts.ul_power_target + 2, 1, 10);</span><br><span style="color: hsl(0, 100%, 40%);">- apply_power_test(lchan, bts.ul_power_target - 2, 1, 9);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, g_bts->ul_power_target + 2, 1, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, g_bts->ul_power_target - 2, 1, 9);</span><br><span> </span><br><span> /* Check if BSC requesting a low max power is applied after loop calculation: */</span><br><span> lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 2);</span><br><span> OSMO_ASSERT(lchan->ms_power_ctrl.max == 14);</span><br><span style="color: hsl(0, 100%, 40%);">- apply_power_test(lchan, bts.ul_power_target + 2, 1, 14);</span><br><span style="color: hsl(120, 100%, 40%);">+ apply_power_test(lchan, g_bts->ul_power_target + 2, 1, 14);</span><br><span> /* Set back a more normal max: */</span><br><span> lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(GSM_BAND_1800, 30);</span><br><span> OSMO_ASSERT(lchan->ms_power_ctrl.max == 0);</span><br><span>diff --git a/tests/power/power_test.err b/tests/power/power_test.err</span><br><span>index 4aa0374..e4d821a 100644</span><br><span>--- a/tests/power/power_test.err</span><br><span>+++ b/tests/power/power_test.err</span><br><span>@@ -1,23 +1,23 @@</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Keeping MS power at control level 15, 0 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -60 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 15 (0 dBm) to 13, 4 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 13 (4 dBm) to 11, 8 dBm (rx-ms-pwr-lvl 13, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 11 (8 dBm) to 9, 12 dBm (rx-ms-pwr-lvl 11, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 9 (12 dBm) to 7, 16 dBm (rx-ms-pwr-lvl 9, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 7 (16 dBm) to 5, 20 dBm (rx-ms-pwr-lvl 7, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Keeping MS power at control level 5, 20 dBm (rx-ms-pwr-lvl 5, max-ms-pwr-lvl 2, rx-current -75 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 5 (20 dBm) to 3, 24 dBm (rx-ms-pwr-lvl 5, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 3 (24 dBm) to 2, 26 dBm (rx-ms-pwr-lvl 3, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Keeping MS power at control level 2, 26 dBm (rx-ms-pwr-lvl 2, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 2 (26 dBm) to 0, 30 dBm (rx-ms-pwr-lvl 2, max-ms-pwr-lvl 0, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Keeping MS power at control level 0, 30 dBm (rx-ms-pwr-lvl 0, max-ms-pwr-lvl 0, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 0 (30 dBm) to 30, 34 dBm (rx-ms-pwr-lvl 0, max-ms-pwr-lvl 29, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 30 (34 dBm) to 29, 36 dBm (rx-ms-pwr-lvl 30, max-ms-pwr-lvl 29, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Keeping MS power at control level 29, 36 dBm (rx-ms-pwr-lvl 29, max-ms-pwr-lvl 29, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Keeping MS power at control level 29, 36 dBm (rx-ms-pwr-lvl 29, max-ms-pwr-lvl 29, rx-current -75 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Lowering MS power from control level 29 (36 dBm) to 1, 28 dBm (rx-ms-pwr-lvl 29, max-ms-pwr-lvl 29, rx-current -45 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Lowering MS power from control level 1 (28 dBm) to 5, 20 dBm (rx-ms-pwr-lvl 1, max-ms-pwr-lvl 29, rx-current -45 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Lowering MS power from control level 5 (20 dBm) to 9, 12 dBm (rx-ms-pwr-lvl 5, max-ms-pwr-lvl 29, rx-current -45 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Lowering MS power from control level 9 (12 dBm) to 10, 10 dBm (rx-ms-pwr-lvl 9, max-ms-pwr-lvl 29, rx-current -73 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Raising MS power from control level 10 (10 dBm) to 9, 12 dBm (rx-ms-pwr-lvl 10, max-ms-pwr-lvl 29, rx-current -77 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Lowering MS power from control level 9 (12 dBm) to 14, 2 dBm (rx-ms-pwr-lvl 9, max-ms-pwr-lvl 14, rx-current -73 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(0, 100%, 40%);">-(null) Lowering MS power from control level 14 (2 dBm) to 15, 0 dBm (rx-ms-pwr-lvl 14, max-ms-pwr-lvl 0, rx-current -40 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 15, 0 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -60 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 15 (0 dBm) to 13, 4 dBm (rx-ms-pwr-lvl 15, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 13 (4 dBm) to 11, 8 dBm (rx-ms-pwr-lvl 13, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 11 (8 dBm) to 9, 12 dBm (rx-ms-pwr-lvl 11, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 9 (12 dBm) to 7, 16 dBm (rx-ms-pwr-lvl 9, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 7 (16 dBm) to 5, 20 dBm (rx-ms-pwr-lvl 7, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 5, 20 dBm (rx-ms-pwr-lvl 5, max-ms-pwr-lvl 2, rx-current -75 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 5 (20 dBm) to 3, 24 dBm (rx-ms-pwr-lvl 5, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 3 (24 dBm) to 2, 26 dBm (rx-ms-pwr-lvl 3, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 2, 26 dBm (rx-ms-pwr-lvl 2, max-ms-pwr-lvl 2, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 2 (26 dBm) to 0, 30 dBm (rx-ms-pwr-lvl 2, max-ms-pwr-lvl 0, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 0, 30 dBm (rx-ms-pwr-lvl 0, max-ms-pwr-lvl 0, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 0 (30 dBm) to 30, 34 dBm (rx-ms-pwr-lvl 0, max-ms-pwr-lvl 29, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 30 (34 dBm) to 29, 36 dBm (rx-ms-pwr-lvl 30, max-ms-pwr-lvl 29, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 29, 36 dBm (rx-ms-pwr-lvl 29, max-ms-pwr-lvl 29, rx-current -90 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 29, 36 dBm (rx-ms-pwr-lvl 29, max-ms-pwr-lvl 29, rx-current -75 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Lowering MS power from control level 29 (36 dBm) to 1, 28 dBm (rx-ms-pwr-lvl 29, max-ms-pwr-lvl 29, rx-current -45 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Lowering MS power from control level 1 (28 dBm) to 5, 20 dBm (rx-ms-pwr-lvl 1, max-ms-pwr-lvl 29, rx-current -45 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Lowering MS power from control level 5 (20 dBm) to 9, 12 dBm (rx-ms-pwr-lvl 5, max-ms-pwr-lvl 29, rx-current -45 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Lowering MS power from control level 9 (12 dBm) to 10, 10 dBm (rx-ms-pwr-lvl 9, max-ms-pwr-lvl 29, rx-current -73 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Raising MS power from control level 10 (10 dBm) to 9, 12 dBm (rx-ms-pwr-lvl 10, max-ms-pwr-lvl 29, rx-current -77 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Lowering MS power from control level 9 (12 dBm) to 14, 2 dBm (rx-ms-pwr-lvl 9, max-ms-pwr-lvl 14, rx-current -73 dBm, rx-target -75 dBm)</span><br><span style="color: hsl(120, 100%, 40%);">+(bts=0,trx=0,ts=0,ss=0) Lowering MS power from control level 14 (2 dBm) to 15, 0 dBm (rx-ms-pwr-lvl 14, max-ms-pwr-lvl 0, rx-current -40 dBm, rx-target -75 dBm)</span><br><span>diff --git a/tests/power/power_test.ok b/tests/power/power_test.ok</span><br><span>index 335a3d3..e325bb7 100644</span><br><span>--- a/tests/power/power_test.ok</span><br><span>+++ b/tests/power/power_test.ok</span><br><span>@@ -1,4 +1,6 @@</span><br><span> Testing power loop...</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Starting test case 'test_power_loop'</span><br><span> power control [0]: MS current power 15</span><br><span> power control [1]: MS current power 13</span><br><span> power control [1]: MS current power 11</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20654">change 20654</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/20654"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I00569de378f7c3ca7cc6885fc2bdf25fbc637831 </div>
<div style="display:none"> Gerrit-Change-Number: 20654 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>