dexter has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31440 )
Change subject: trau_pcu_ericsson_test: replace 64K CS1/CS2 testvectors ......................................................................
trau_pcu_ericsson_test: replace 64K CS1/CS2 testvectors
The CS1/CS2 testvectors for the 64K TRAU frame decoder are valid but the contained MAC block consits of noise. At the time when the test data was sampled it was not possible to get TRAU frames with valid content from the CCU. This has changed, so lets update the testvectors with ones that contain valid data.
Change-Id: I0b8aef1ce1eca5b10601a0a655f7e3b00915d3cc Related: OS#5198 --- M tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c M tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok 2 files changed, 101 insertions(+), 85 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved
diff --git a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c index 986ab79..6c28269 100644 --- a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c +++ b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c @@ -1140,8 +1140,7 @@ int rc; struct er_gprs_trau_frame frame;
- /* TRAU frame with CS1 block and correct CRC. CS1 one data itsself is - * noise. */ + /* TRAU frame with valid CS1 block and correct CRC */ const ubit_t bits_cs1[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1152,44 +1151,46 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 1, 0, 0, - 0, 1, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 1, 0, 1, 1, 1, - 1, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 1, 1, 1, 1, 0, - 1, 1, 1, 0, 1, 1, 1, 0, - 1, 0, 1, 0, 0, 1, 1, 1, - 1, 0, 1, 0, 0, 0, 1, 0, - 1, 0, 0, 1, 1, 0, 0, 1, - 1, 1, 1, 1, 0, 0, 0, 1, - 1, 0, 1, 0, 1, 1, 1, 0, - 0, 0, 1, 1, 0, 1, 0, 1, - 1, 0, 1, 1, 0, 0, 0, 1, + 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, - 0, 0, 1, 1, 0, 1, 0, 1, - 1, 0, 0, 1, 1, 1, 0, 1, - 1, 1, 1, 0, 0, 1, 1, 1, - 0, 1, 1, 1, 0, 0, 1, 0, - 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 1, - 1, 0, 1, 0, 1, 0, 1, 0, - 0, 1, 1, 0, 1, 1, 0, 1, - 1, 0, 0, 0, 1, 1, 0, 0, - 0, 1, 1, 1, 1, 0, 0, 0, - 1, 1, 1, 0, 0, 0, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 1, - 1, 0, 0, 1, 1, 1, 0, 0, - 0, 0, 1, 1, 0, 1, 0, 1, - 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 1, 1, 1, 0, 0, + 0, 0, 0, 0, 1, 0, 1, 1, + 1, 0, 0, 0, 0, 0, 0, 1, + 0, 0, 0, 0, 1, 0, 1, 0, + 1, 0, 1, 1, 1, 0, 1, 0, + 0, 0, 1, 1, 1, 0, 1, 1, + 0, 1, 1, 1, 1, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 0, 1, + 0, 1, 1, 0, 1, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + /* [...] shortened since decode won't access filler bits after + * the TRAU frame. */ };
+ /* TRAU frame with valid CS2 block and correct CRC */ const ubit_t bits_cs2[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1199,52 +1200,51 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 1, 0, 1, 1, 1, 0, - 1, 1, 0, 1, 0, 0, 0, 0, - 0, 0, 0, 1, 1, 0, 1, 0, - 1, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 1, 1, 1, 1, 0, 1, - 1, 1, 1, 0, 1, 1, 1, 1, - 1, 0, 1, 0, 0, 0, 0, 1, - 0, 1, 0, 1, 1, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 1, 0, - 1, 1, 0, 0, 1, 1, 1, 0, - 1, 0, 1, 0, 0, 0, 0, 0, - 0, 1, 0, 1, 0, 1, 1, 1, - 0, 1, 0, 0, 1, 1, 1, 1, - 1, 0, 0, 0, 0, 0, 0, 0, - 1, 1, 0, 0, 1, 0, 0, 1, - 1, 0, 1, 1, 0, 1, 0, 1, - 0, 0, 1, 0, 0, 1, 1, 0, - 0, 0, 0, 1, 0, 1, 0, 1, - 0, 0, 1, 0, 0, 0, 0, 0, - 1, 0, 0, 1, 0, 0, 1, 0, - 0, 0, 0, 1, 1, 0, 1, 1, - 0, 0, 0, 1, 1, 1, 0, 0, - 1, 0, 0, 0, 1, 1, 0, 0, - 0, 0, 1, 1, 1, 0, 0, 0, + 1, 0, 1, 0, 1, 1, 0, 1, + 1, 1, 0, 1, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 1, 0, 0, - 0, 1, 1, 1, 1, 1, 1, 0, - 1, 0, 0, 1, 1, 1, 0, 1, - 1, 0, 0, 1, 0, 1, 1, 1, - 0, 0, 0, 1, 1, 0, 1, 1, - 0, 1, 0, 0, 0, 1, 1, 1, - 0, 1, 0, 0, 1, 1, 1, 1, - 0, 1, 0, 1, 0, 0, 1, 0, - 0, 1, 1, 1, 0, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 1, 0, - 1, 0, 0, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 1, 1, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 1, 0, + 0, 1, 0, 0, 1, 0, 0, 0, + 0, 0, 1, 0, 1, 1, 1, 0, + 1, 1, 1, 0, 0, 1, 0, 0, + 1, 1, 1, 0, 1, 0, 0, 1, + 1, 1, 1, 0, 1, 0, 1, 1, + 1, 0, 0, 1, 1, 0, 1, 1, + 1, 1, 0, 1, 1, 0, 1, 1, + 1, 1, 0, 1, 1, 0, 1, 1, + 1, 0, 0, 1, 1, 0, 0, 0, + 1, 1, 0, 1, 1, 0, 1, 0, + 1, 0, 0, 1, 1, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 1, 1, + 0, 0, 0, 1, 1, 0, 1, 1, + 1, 1, 0, 1, 1, 0, 1, 0, + 1, 1, 0, 1, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 1, 0, 0, + 1, 1, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 1, 1, + 0, 1, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, /* [...] shortened since decode won't access filler bits after * the TRAU frame. */ }; diff --git a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok index 6d93eed..3d9666c 100644 --- a/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok +++ b/tests/trau_pcu_ericsson/trau_pcu_ericsson_test.ok @@ -2521,23 +2521,23 @@ ccu_data_ind.tav=00 ccu_data_ind.dbe=0 ccu_data_ind.cs_hdr=1 - ccu_data_ind.gprs.rx_lev=0 - ccu_data_ind.gprs.est_acc_del_dev=3 - ccu_data_ind.u.gprs.block_qual=7 - ccu_data_ind.u.gprs.parity_ok=0 + ccu_data_ind.gprs.rx_lev=63 + ccu_data_ind.gprs.est_acc_del_dev=0 + ccu_data_ind.u.gprs.block_qual=0 + ccu_data_ind.u.gprs.parity_ok=1 ccu_data_ind.u.data_len=23 - ccu_data_ind.data=dd9517653ed6b1367eb0e69e3b9df90356d9c6781c02e6 + ccu_data_ind.data=40074275717b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b
==> er_gprs_trau_frame_decode_64k_FT_DATA_test (CS2) - ccu_data_ind.tav=01 + ccu_data_ind.tav=02 ccu_data_ind.dbe=0 ccu_data_ind.cs_hdr=2 - ccu_data_ind.gprs.rx_lev=0 + ccu_data_ind.gprs.rx_lev=63 ccu_data_ind.gprs.est_acc_del_dev=0 - ccu_data_ind.u.gprs.block_qual=5 - ccu_data_ind.u.gprs.parity_ok=0 + ccu_data_ind.u.gprs.block_qual=0 + ccu_data_ind.u.gprs.parity_ok=1 ccu_data_ind.u.data_len=34 - ccu_data_ind.data=f3de176a2008cd15a8cb074cb692a1122461e3c470f8bff8e5a6638bcb2bb903653f + ccu_data_ind.data=00010449d09d5c5e676f6f676c6503636f6d0000010001881c802b2b2b2b2b2b2b00
==> er_gprs_trau_frame_decode_64k_FT_DATA_test (AB) ccu_data_ind.tav=01