August 2022 - gerrit-log - lists.osmocom.org

Change in osmo-msc[master]: Add ESME-specific logging

by daniel

Attention is currently required from: pespin, msuraev. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28845 ) Change subject: Add ESME-specific logging ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie5ddde762350385f8d18ee1d441584a41b0290ec Gerrit-Change-Number: 28845 Gerrit-PatchSet: 11 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Aug 2022 14:50:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Test sneding Unknwon TAI List to osmo-cbc

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 to look at the new patch set (#2). Change subject: cbc: Test sneding Unknwon TAI List to osmo-cbc ...................................................................... cbc: Test sneding Unknwon TAI List to osmo-cbc Related: OS#4945 Change-Id: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca --- M cbc/CBC_Tests.ttcn M cbc/MME_ConnectionHandler.ttcn M library/sbcap/SBC_AP_Templates.ttcn 3 files changed, 80 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/28893/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca Gerrit-Change-Number: 28893 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28896 ) Change subject: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo ...................................................................... Patch Set 1: (8 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/1252bd37_30f85a79 PS1, Line 9: In OM2000 a separate bb_trxc MO does not exist to archive better "does not exit. To achive" Missing dot Typo in "archive". https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/78831608_250a8938 PS1, Line 10: compatibilty towards classic ABIS and its MOs lets mirror the nmstate of Abis let's https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/a2281b72_281f9b6d PS1, Line 11: the trx MO to the trxc_mo to make it look like if it were present. BB_TRANSC MO to the RCARRIER MO File src/osmo-bsc/abis_om2000.c: https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/6d4c3908_f1552f05 PS1, Line 1011: switch (mo_state) { Move this to a function: mo2nm_state(uint8_t mo_state). Then, "nsd.new_state.availability = mo2nm_state(mo_state);" https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/ddc40cab_4bccd52d PS1, Line 1032: duplicate_trxc_nm_state(bts, mo); This looks wrong, you should emit signals for both NM objects not only one? You could do something like this after emitting the signal: if (mo->class == OM2K_MO_CLS_TRXC) { struct gsm_nm_state *bbtransc_nm_state = nm_state = &trx->bb_transc.mo.nm_state; /* Update current state before emitting signal: */ bbtransc_nm_state->availability = nsd.new_state.availability; osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd); } https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/eb830fe4_207f08a6 PS1, Line 1058: duplicate_trxc_nm_state(bts, mo); Same, simply explicitly set bb_transc_nm_state->operational = new_state.operational; https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/ea0e51bd_1294e48c PS1, Line 1059: } Not directly related to this patch but indirectly related to have stuff working as expected: AFAICT you are missing a "osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd);" here. https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/06e4ee92_b9d2332c PS1, Line 2245: otfp->trx->bb_transc.mo.nm_state.administrative = NM_STATE_UNLOCKED; Not directly related to this patch but indirectly related to have stuff working as expected: AFAICT you are missing a "osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd);" here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Gerrit-Change-Number: 28896 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Aug 2022 13:57:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: bts_trx_vty: do not print nmstate of bb_trxc mo

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28895 ) Change subject: bts_trx_vty: do not print nmstate of bb_trxc mo ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/osmo-bsc/bts_trx_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/28895/comment/fe5345ee_37402efb PS1, Line 743: if (!is_ericsson_bts(trx->bts)) { Since you are implementing BBTRANSC for OM2000 in next patch, I don't see a reason to have this. It's like going backwards, we should go to a unified interface instead. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0f5501f6fbc7ce6d5457676b16c7f93f70db5763 Gerrit-Change-Number: 28895 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Aug 2022 13:42:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: fix missing signal

by pespin

Attention is currently required from: neels, laforge, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28838 ) Change subject: abis_om2000: fix missing signal ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I305df5b2f962473e33e32484c42a79ff96e53e1a Gerrit-Change-Number: 28838 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Aug 2022 13:41:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: bts_trx_vty: do not print nmstate of bb_trxc mo

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28895 ) Change subject: bts_trx_vty: do not print nmstate of bb_trxc mo ...................................................................... bts_trx_vty: do not print nmstate of bb_trxc mo The OM2000 model does not have a separate bb_transc MO, we should exclude it from 'show trx' Change-Id: I0f5501f6fbc7ce6d5457676b16c7f93f70db5763 Related: OS#5101 --- M src/osmo-bsc/bts_trx_vty.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/28895/1 diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index bd13a05..e128de6 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -738,8 +738,13 @@ net_dump_nmstate(vty, &trx->mo.nm_state); if (print_rsl) vty_out(vty, " RSL State: %s%s", trx->rsl_link_primary? "connected" : "disconnected", VTY_NEWLINE); - vty_out(vty, " Baseband Transceiver NM State: "); - net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state); + + /* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO */ + if (!is_ericsson_bts(trx->bts)) { + vty_out(vty, " Baseband Transceiver NM State: "); + net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state); + } + if (is_ipaccess_bts(trx->bts)) { vty_out(vty, " ip.access stream ID: 0x%02x ", trx->rsl_tei_primary); e1isl_dump_vty_tcp(vty, trx->rsl_link_primary); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0f5501f6fbc7ce6d5457676b16c7f93f70db5763 Gerrit-Change-Number: 28895 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28896 ) Change subject: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo ...................................................................... abis_om2000: duplicate nmstate of bb_trxc mo to trx mo In OM2000 a separate bb_trxc MO does not exist to archive better compatibilty towards classic ABIS and its MOs lets mirror the nmstate of the trx MO to the trxc_mo to make it look like if it were present. Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Related: OS#5634 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/28896/1 diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 5026b5e..f61b684 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -51,11 +51,13 @@ static inline void abis_om2000_fsm_becomes_enabled(struct gsm_bts_trx *trx) { nm_obj_fsm_becomes_enabled_disabled(trx->bts, trx, NM_OC_RADIO_CARRIER, true); + nm_obj_fsm_becomes_enabled_disabled(trx->bts, &trx->bb_transc, NM_OC_BASEB_TRANSC, true); } static inline void abis_om2000_fsm_becomes_disabled(struct gsm_bts_trx *trx) { nm_obj_fsm_becomes_enabled_disabled(trx->bts, trx, NM_OC_RADIO_CARRIER, false); + nm_obj_fsm_becomes_enabled_disabled(trx->bts, &trx->bb_transc, NM_OC_BASEB_TRANSC, false); } /* FIXME: move to libosmocore */ @@ -876,6 +878,25 @@ return mo_buf; } +/* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO, + * for compatibility reasons we pretend to have it anyway and mirror the + * mo state of the TRXC on it. */ +static void duplicate_trxc_nm_state(struct gsm_bts *bts, const struct abis_om2k_mo *mo) +{ + struct gsm_bts_trx *trx; + + if (mo->class != OM2K_MO_CLS_TRXC) + return; + + trx = gsm_bts_trx_num(bts, mo->inst); + if (!trx) + return; + + printf("dup!\n"); + memcpy(&trx->bb_transc.mo.nm_state, &trx->mo.nm_state, sizeof(trx->bb_transc.mo.nm_state)); + +} + /* resolve the gsm_nm_state data structure for a given MO */ static struct gsm_nm_state *mo2nm_state(struct gsm_bts *bts, const struct abis_om2k_mo *mo) { @@ -1008,6 +1029,7 @@ /* Update current state before emitting signal: */ nm_state->availability = nsd.new_state.availability; + duplicate_trxc_nm_state(bts, mo); osmo_signal_dispatch(SS_NM, S_NM_STATECHG, &nsd); } @@ -1033,6 +1055,7 @@ } nm_state->operational = new_state.operational; + duplicate_trxc_nm_state(bts, mo); } static int abis_om2k_sendmsg(struct gsm_bts *bts, struct msgb *msg) @@ -2216,6 +2239,11 @@ /* See e1_config:bts_isdn_sign_link() / OS#4914 */ otfp->trx->mo.nm_state.administrative = NM_STATE_UNLOCKED; + /* The OM2000 -> 12.21 mapping we do doesn't have separate bb_transc MO, + * for compatibility reasons we pretend to have it anyway and mirror the + * mo state of the TRXC on it. */ + otfp->trx->bb_transc.mo.nm_state.administrative = NM_STATE_UNLOCKED; + abis_om2000_fsm_becomes_enabled(otfp->trx); if (fi->proc.parent) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Gerrit-Change-Number: 28896 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: fix missing signal

by dexter

Attention is currently required from: neels, laforge. Hello Jenkins Builder, neels, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/28838 to look at the new patch set (#2). Change subject: abis_om2000: fix missing signal ...................................................................... abis_om2000: fix missing signal The normal abis nm FSMs are sending S_NM_RUNNING_CHG signals that include an object class to notify other entities about state changes. This also includes paging.c, which only starts paging services when it sees NM_OC_RADIO_CARRIER becoming enabled. Change-Id: I305df5b2f962473e33e32484c42a79ff96e53e1a Fixes: I1b5b1a98115b4e9d821eb3330fc5b970a0e78a44 Related: OS#5634 --- M src/osmo-bsc/abis_om2000.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/28838/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I305df5b2f962473e33e32484c42a79ff96e53e1a Gerrit-Change-Number: 28838 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in osmo-tetra[master]: Added basic AFC as implemented by SQ5BPF into float_to_bits.c

by wbokslag

wbokslag has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28894 ) Change subject: Added basic AFC as implemented by SQ5BPF into float_to_bits.c ...................................................................... Added basic AFC as implemented by SQ5BPF into float_to_bits.c The AFC implementation by SQ5BPF as used in his fork of osmo-tetra significantly increases reception quality. A simple test yields 14545 valid CRCs as opposed to 11934 when AFC is not used. I added the AFC to float_to_bits, the functionality can be activated with the -a flag. Change-Id: I1c9343b83739108a1e423c4880e1dc7964656529 --- M src/float_to_bits.c 1 file changed, 35 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/94/28894/1 diff --git a/src/float_to_bits.c b/src/float_to_bits.c index 9ececa0..89d0421 100644 --- a/src/float_to_bits.c +++ b/src/float_to_bits.c @@ -73,25 +73,47 @@ // size of IO buffers (number of elements) #define BUF_SIZE 1024 +#define MAXVAL 5.0 + int main(int argc, char **argv) { int fd, fd_out, opt; - int opt_verbose = 0; + int opt_afc = 0; - while ((opt = getopt(argc, argv, "v")) != -1) { + float filter = 0; + float filter_val = 0.0001; + float filter_goal = 0; + int sym; + + + while ((opt = getopt(argc, argv, "vaf:F:")) != -1) { switch (opt) { case 'v': opt_verbose = 1; break; + case 'a': + opt_afc = 1; + break; + case 'f': + filter_val = atof(optarg); + break; + case 'F': + filter_goal = atof(optarg); + break; + default: exit(2); } } if (argc <= optind+1) { - fprintf(stderr, "Usage: %s [-v] <infile> <outfile>\n", argv[0]); + fprintf(stderr, "Usage: %s [-v] [-a] [-f filter_val] [-F filter_goal] <infile> <outfile>\n", argv[0]); + fprintf(stderr, "-v verbose, print bits to stdout\n"); + fprintf(stderr, "-a turn on pseudo-afc (automatic frequency correction)\n"); + fprintf(stderr, "-f pseudo-afc averaging filter constant (default 0.0001)\n"); + fprintf(stderr, "-F pseudo-afc filter goal (default: 0)\n"); exit(2); } @@ -119,7 +141,16 @@ rc /= sizeof(*fl); int i; for (i = 0; i < rc; ++i) { - int sym = process_sym_fl(fl[i]); + + if ((fl[i] > -MAXVAL) && (fl[i] < MAXVAL)) { + filter = filter * (1.0 - filter_val) + (fl[i] - filter_goal) * filter_val; + } + if (opt_afc) { + sym = process_sym_fl(fl[i]-filter); + } else { + sym = process_sym_fl(fl[i]); + } + sym_int2bits(sym, bits + i*2); //printf("%2d %1u %1u %f\n", rc, bits[0], bits[1], fl); if (opt_verbose) { -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c9343b83739108a1e423c4880e1dc7964656529 Gerrit-Change-Number: 28894 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Test sneding Unknwon TAI List to osmo-cbc

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 ) Change subject: cbc: Test sneding Unknwon TAI List to osmo-cbc ...................................................................... cbc: Test sneding Unknwon TAI List to osmo-cbc Related: OS#4945 Change-Id: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca --- M cbc/CBC_Tests.ttcn M cbc/MME_ConnectionHandler.ttcn M library/sbcap/SBC_AP_Templates.ttcn 3 files changed, 82 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/28893/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 406baed..e4c6cda 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -160,6 +160,7 @@ start_fn := refers(f_MME_ConnHdlr_start_fn_void), exp_cbs_msg := omit, write_replace_warning_ind_cause := omit, + write_repl_unknown_TAIs := omit, bcast_cell_id_list := omit }; return pars; @@ -498,6 +499,25 @@ f_shutdown_helper(); } +/* Create and delete message with MME available. MME reports + * Write-Replace-Response with Unknown TAI IE. + */ +testcase TC_ecbe_create_delete_mme_unknwon_tai() runs on test_CT { + var template (value) List_of_TAIs write_repl_unknown_TAIs; + var template (value) CBS_Message msg := t_CBSmsg(48, 16752); + + f_init(num_bsc := 0, num_mme := 1); + + write_repl_unknown_TAIs := {{ts_SBCAP_TAI(f_enc_mcc_mnc('901'H, '70'H), 1234)}}; + g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); + g_pars_MME[0].exp_cbs_msg := valueof(msg); + g_pars_MME[0].write_replace_warning_ind_cause := SBC_AP_Cause_message_accepted; + g_pars_MME[0].write_repl_unknown_TAIs := valueof(write_repl_unknown_TAIs); + f_start(); + f_create_and_delete(valueof(msg)); + f_shutdown_helper(); +} + /* Create and delete message with both BSC and MME available */ testcase TC_ecbe_create_delete_bsc_and_mme() runs on test_CT { f_init(num_bsc := 1, num_mme := 1); @@ -585,6 +605,7 @@ execute( TC_ecbe_create_delete_ci() ); execute( TC_ecbe_create_delete_lai() ); execute( TC_ecbe_create_delete_mme_indication() ); + execute( TC_ecbe_create_delete_mme_unknwon_tai() ); execute( TC_ecbe_create_delete_bsc_and_mme() ); execute( TC_ecbe_create_delete_bsc_server() ); execute( TC_ecbe_create_delete_mme_server() ); diff --git a/cbc/MME_ConnectionHandler.ttcn b/cbc/MME_ConnectionHandler.ttcn index ed0502e..4bcc853 100644 --- a/cbc/MME_ConnectionHandler.ttcn +++ b/cbc/MME_ConnectionHandler.ttcn @@ -45,6 +45,7 @@ void_fn start_fn, CBS_Message exp_cbs_msg optional, SBC_AP_Cause write_replace_warning_ind_cause optional, + List_of_TAIs write_repl_unknown_TAIs optional, CellId_Broadcast_List bcast_cell_id_list optional }; @@ -64,9 +65,16 @@ function f_sbcap_tx_write_replace_warn_resp(CBS_Message msg, integer idx := 0) runs on MME_ConnHdlr { var template (value) SBC_AP_PDU tx; - /* TODO: pass Unknown Tracking Area List as parameter above (omit by default) */ - tx := ts_SBCAP_WRITE_WARNING_RESP(int2bit(msg.msg_id, 16), - int2bit(msg.ser_nr, 16)); + if (ispresent(g_pars.write_repl_unknown_TAIs)) { + tx := ts_SBCAP_WRITE_WARNING_RESP_UNKNOWN_TAI( + int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16), + SBC_AP_Cause_message_accepted, + g_pars.write_repl_unknown_TAIs); + } else { + tx := ts_SBCAP_WRITE_WARNING_RESP(int2bit(msg.msg_id, 16), + int2bit(msg.ser_nr, 16)); + } f_SBC_AP_send(tx, idx); } diff --git a/library/sbcap/SBC_AP_Templates.ttcn b/library/sbcap/SBC_AP_Templates.ttcn index 0a9519e..7b7703d 100644 --- a/library/sbcap/SBC_AP_Templates.ttcn +++ b/library/sbcap/SBC_AP_Templates.ttcn @@ -18,6 +18,13 @@ iE_Extensions := omit } +/* 3GPP TS 36.413 9.2.3.16 */ +template (value) TAI ts_SBCAP_TAI(PLMNidentity plmn_id := '09F107'O, uint16_t tac := 1) := { + pLMNidentity := plmn_id, + tAC := int2oct(tac, 2), + iE_Extensions := omit +} + /* 3GPP TS 36.413 9.2.1.54 */ template (value) CellId_Broadcast_List_Item ts_SBCAP_CellId_Broadcast_List_Item( template (value) EUTRAN_CGI ecgi := ts_SBCAP_ECGI()) := { @@ -243,6 +250,15 @@ } } +/* +template (value) ProtocolIE_Container ts_Containerrr(integer bla) := { + id := SBC_AP_Constants.id_Unknown_Tracking_Area_List, + criticality := ignore, + value_ := { + List_of_TAIs := {} + } +}; */ + /* 4.3.4.2.3 STOP WARNING REQUEST */ template (value) SBC_AP_PDU ts_SBCAP_WRITE_WARNING_RESP(template (value) BIT16 p_msg_id, template (value) BIT16 p_ser_nr, @@ -273,6 +289,40 @@ } } +template (value) SBC_AP_PDU +ts_SBCAP_WRITE_WARNING_RESP_UNKNOWN_TAI(template (value) BIT16 p_msg_id, template (value) BIT16 p_ser_nr, + template (value) SBC_AP_Cause cause := SBC_AP_Cause_message_accepted, + template (value) List_of_TAIs unknown_tai_list := {{ts_SBCAP_TAI}}) +modifies ts_SBCAP_WRITE_WARNING_RESP := { + successfulOutcome := { + value_ := { + write_Replace_Warning_Response := { + protocolIEs := { + { + id := SBC_AP_Constants.id_Message_Identifier, + criticality := reject, + value_ := { Message_Identifier := p_msg_id } + }, { + id := SBC_AP_Constants.id_Serial_Number, + criticality := reject, + value_ := { Serial_Number := p_ser_nr } + }, { + id := SBC_AP_Constants.id_Cause, + criticality := reject, + value_ := { Cause := enum2int(valueof(cause)) } + }, { + id := SBC_AP_Constants.id_Unknown_Tracking_Area_List, + criticality := ignore, + value_ := { + List_of_TAIs := unknown_tai_list + } + } + } + } + } + } +} + template (present) SBC_AP_PDU tr_SBCAP_STOP_WARNING(template (present) BIT16 p_msg_id, template (present) BIT16 p_ser_nr) := { initiatingMessage := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca Gerrit-Change-Number: 28893 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022