March 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ci[master]: jobs: tweak build-discarder values
by pespin 07 Mar '23

07 Mar '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31717 ) Change subject: jobs: tweak build-discarder values ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iec5c22c7fcf6c1fd2db71611045f15dc6580ed86 Gerrit-Change-Number: 31717 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Mar 2023 11:07:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ci[master]: jobs: tweak build-discarder values
by osmith 07 Mar '23

07 Mar '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31717 ) Change subject: jobs: tweak build-discarder values ...................................................................... jobs: tweak build-discarder values Remove num-to-keep from most jobs, as this leads to keeping the build logs for a much shorter timeline than desired. For example the gerrit-binpkgs-deb job that runs for most projects when pushing patches to jenkins reaches the 120 limit in less than 24h - and so when clicking the link on a failed build from yesterday it is already deleted. Instead just keep the logs for the last 30 days, no matter how many were submitted on one day. Storing logs doesn't take up much space. Remove the artifact-days-to-keep and artifact-num-to-keep lines, as they don't have an effect. For jobs that do have artifacts, the actual value is min(days-to-keep,artifact-days-to-keep) and same with num-to-keep. While at it, increase the ttcn3-testsuites build-discarder to 120 days as this means more data will show up in the test result analyzer at which we look frequently. Change-Id: Iec5c22c7fcf6c1fd2db71611045f15dc6580ed86 --- M jobs/coverity.yml M jobs/gerrit-binpkgs.yml M jobs/gerrit-lint.yml M jobs/gerrit-pipeline-endianness.yml M jobs/gerrit-verifications-comment.yml M jobs/gerrit-verifications-dahdi.yml M jobs/gerrit-verifications.yml M jobs/master-builds-dahdi.yml M jobs/master-builds.yml M jobs/octsim_osmo-ccid-firmware.yml M jobs/ttcn3-testsuites-kernel-git.yml M jobs/ttcn3-testsuites.yml M jobs/update-osmo-ci-on-slaves.yml M jobs/update-osmo-python-on-slaves.yml 14 files changed, 27 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/31717/1 diff --git a/jobs/coverity.yml b/jobs/coverity.yml index 242d1aa..277bbf0 100644 --- a/jobs/coverity.yml +++ b/jobs/coverity.yml @@ -22,7 +22,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 30 parameters: - string: name: BRANCH diff --git a/jobs/gerrit-binpkgs.yml b/jobs/gerrit-binpkgs.yml index 247ebad..49a2b48 100644 --- a/jobs/gerrit-binpkgs.yml +++ b/jobs/gerrit-binpkgs.yml @@ -19,9 +19,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 description: | {type} package job of CI for patches sent to <a href="https://gerrit.osmocom.org">gerrit</a> diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 7b537b9..b0c9c06 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -16,9 +16,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 description: | Lint job of CI for patches sent to <a href="https://gerrit.osmocom.org">gerrit</a>. </br></br> diff --git a/jobs/gerrit-pipeline-endianness.yml b/jobs/gerrit-pipeline-endianness.yml index 809cce6..c9904f4 100644 --- a/jobs/gerrit-pipeline-endianness.yml +++ b/jobs/gerrit-pipeline-endianness.yml @@ -15,9 +15,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 description: | Run <code>struct_endianness.py</code> from libosmocore.git on patches sent to <a href="https://gerrit.osmocom.org">gerrit</a>. diff --git a/jobs/gerrit-verifications-comment.yml b/jobs/gerrit-verifications-comment.yml index f781bf8..046c986 100644 --- a/jobs/gerrit-verifications-comment.yml +++ b/jobs/gerrit-verifications-comment.yml @@ -15,9 +15,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 description: | Send start and result comments to <a href="https://gerrit.osmocom.org">gerrit</a>. </br></br> diff --git a/jobs/gerrit-verifications-dahdi.yml b/jobs/gerrit-verifications-dahdi.yml index d594378..526dc78 100644 --- a/jobs/gerrit-verifications-dahdi.yml +++ b/jobs/gerrit-verifications-dahdi.yml @@ -16,9 +16,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 description: | Pending gerrit code reviews of <a href="https://gerrit.osmocom.org/#/q/status:open+project:dahdi-linux">dahdi-linux</a> diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 2bd9296..9ab2d48 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -627,9 +627,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 description: | Pipeline of CI for patches sent to <a href="https://gerrit.osmocom.org/#/q/status:open+project:{repos}">{repos}</a> @@ -680,9 +677,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 description: | Build job of CI for patches sent to <a href="https://gerrit.osmocom.org/#/q/status:open+project:{repos}">{repos}</a> diff --git a/jobs/master-builds-dahdi.yml b/jobs/master-builds-dahdi.yml index b152805..068c92d 100644 --- a/jobs/master-builds-dahdi.yml +++ b/jobs/master-builds-dahdi.yml @@ -16,9 +16,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 description: | Automatic jenkins test job of <a href="https://gerrit.osmocom.org/#/q/status:open+project:dahdi-linux">dahdi-linux</a> diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index ab1a0e2..9e0aa1b 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -517,9 +517,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 description: | Automatic jenkins test job of <a href="{git_base_url}/{repos}">{repos}</a> diff --git a/jobs/octsim_osmo-ccid-firmware.yml b/jobs/octsim_osmo-ccid-firmware.yml index 17e3cef..efabe57 100644 --- a/jobs/octsim_osmo-ccid-firmware.yml +++ b/jobs/octsim_osmo-ccid-firmware.yml @@ -35,10 +35,7 @@ queue-scanning: DISABLED use-build-blocker: false - build-discarder: - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 days-to-keep: 30 - num-to-keep: 120 - rebuild: auto-rebuild: false rebuild-disabled: false diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index fbed5ea..ce7dd26 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -116,9 +116,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 wrappers: - ansicolor: colormap: xterm diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index cac271f..9500662 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -384,10 +384,7 @@ only-if-success: false properties: - build-discarder: - days-to-keep: 30 - num-to-keep: 120 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 + days-to-keep: 120 wrappers: - ansicolor: colormap: xterm diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 8ab1e12..749f5b1 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -18,7 +18,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 scm: - git: url: https://gerrit.osmocom.org/osmo-ci diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml index 4a2afbc..8efb141 100644 --- a/jobs/update-osmo-python-on-slaves.yml +++ b/jobs/update-osmo-python-on-slaves.yml @@ -15,7 +15,6 @@ properties: - build-discarder: days-to-keep: 30 - num-to-keep: 120 scm: - git: url: https://gerrit.osmocom.org/python/osmo-python-tests -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iec5c22c7fcf6c1fd2db71611045f15dc6580ed86 Gerrit-Change-Number: 31717 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: osmo-bts-trx: properly activate [CBCH/]BCCH/CCCH
by fixeria 07 Mar '23

07 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/31716 ) Change subject: osmo-bts-trx: properly activate [CBCH/]BCCH/CCCH ...................................................................... osmo-bts-trx: properly activate [CBCH/]BCCH/CCCH The timeslot carrying BCCH/CCCH on C0 is a bit special in a way that it's being activated implicitly - there is no explicit RSL CHANnel ACTIVation for that. This is why we have TRX_CHAN_FLAG_AUTO_ACTIVE, which marks sub-channels of BCCH/CCCH in the trx_chan_desc[]. The upcoming patch changes the burst buffer allocation strategy, so that the memory is allocated on channel activation and then free()d on channel release. This patch facilitates that by making the activation/deactivation logic consistent for all sub-channels. Change-Id: Id0c70d6a2b777a5117c85149bfa1b3a997299d1d Related: OS#1572 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c 3 files changed, 113 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/16/31716/1 diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 40b4293..01e8e2b 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -5,13 +5,6 @@ #include <osmo-bts/gsm_data.h> -/* Whether a logical channel must be activated automatically */ -#define TRX_CHAN_FLAG_AUTO_ACTIVE (1 << 0) - -/* FIXME: we should actually activate 'auto-active' channels */ -#define TRX_CHAN_IS_ACTIVE(state, chan) \ - (trx_chan_desc[chan].flags & TRX_CHAN_FLAG_AUTO_ACTIVE || (state)->active) - #define TRX_GMSK_NB_TSC(br) \ _sched_train_seq_gmsk_nb[(br)->tsc_set][(br)->tsc] @@ -192,6 +185,9 @@ /*! \brief set all matching logical channels active/inactive */ int trx_sched_set_lchan(struct gsm_lchan *lchan, uint8_t chan_nr, uint8_t link_id, bool active); +/*! \brief set all logical channels of BCCH/CCCH active/inactive */ +int trx_sched_set_bcch_ccch(struct gsm_lchan *lchan, bool active); + /*! \brief set mode of all matching logical channels to given mode(s) */ int trx_sched_set_mode(struct gsm_bts_trx_ts *ts, uint8_t chan_nr, uint8_t rsl_cmode, uint8_t tch_mode, int codecs, uint8_t codec0, uint8_t codec1, diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 14aff34..3189f07 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -150,7 +150,6 @@ .desc = "Frequency correction channel", /* Tx only, frequency correction bursts */ - .flags = TRX_CHAN_FLAG_AUTO_ACTIVE, .dl_fn = tx_fcch_fn, }, [TRXC_SCH] = { @@ -158,7 +157,6 @@ .desc = "Synchronization channel", /* Tx only, synchronization bursts */ - .flags = TRX_CHAN_FLAG_AUTO_ACTIVE, .dl_fn = tx_sch_fn, }, [TRXC_BCCH] = { @@ -169,7 +167,6 @@ /* Tx only, xCCH convolutional coding (3GPP TS 05.03, section 4.4), * regular interleaving (3GPP TS 05.02, clause 7, table 3): * a L2 frame is interleaved over 4 consecutive bursts. */ - .flags = TRX_CHAN_FLAG_AUTO_ACTIVE, .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, }, @@ -179,7 +176,6 @@ .chan_nr = RSL_CHAN_RACH, /* Rx only, RACH convolutional coding (3GPP TS 05.03, section 4.6). */ - .flags = TRX_CHAN_FLAG_AUTO_ACTIVE, .ul_fn = rx_rach_fn, }, [TRXC_CCCH] = { @@ -190,7 +186,6 @@ /* Tx only, xCCH convolutional coding (3GPP TS 05.03, section 4.4), * regular interleaving (3GPP TS 05.02, clause 7, table 3): * a L2 frame is interleaved over 4 consecutive bursts. */ - .flags = TRX_CHAN_FLAG_AUTO_ACTIVE, .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, }, @@ -575,7 +570,6 @@ .chan_nr = RSL_CHAN_OSMO_CBCH4, /* Tx only, same as for TRXC_BCCH (xCCH), see above. */ - .flags = TRX_CHAN_FLAG_AUTO_ACTIVE, .rts_fn = rts_data_fn, .dl_fn = tx_data_fn, }, @@ -1062,6 +1056,52 @@ } } +static void _trx_sched_set_lchan(struct gsm_lchan *lchan, + enum trx_chan_type chan, + bool active) +{ + struct l1sched_ts *l1ts = lchan->ts->priv; + struct l1sched_chan_state *chan_state; + + OSMO_ASSERT(l1ts != NULL); + chan_state = &l1ts->chan_state[chan]; + + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "%s %s\n", + (active) ? "Activating" : "Deactivating", + trx_chan_desc[chan].name); + + /* free burst memory, to cleanly start with burst 0 */ + if (chan_state->dl_bursts) { + talloc_free(chan_state->dl_bursts); + chan_state->dl_bursts = NULL; + } + if (chan_state->ul_bursts) { + talloc_free(chan_state->ul_bursts); + chan_state->ul_bursts = NULL; + } + if (chan_state->ul_bursts_prev) { + talloc_free(chan_state->ul_bursts_prev); + chan_state->ul_bursts_prev = NULL; + } + + if (active) { + /* Clean up everything */ + memset(chan_state, 0, sizeof(*chan_state)); + + /* Bind to generic 'struct gsm_lchan' */ + chan_state->lchan = lchan; + } else { + chan_state->ho_rach_detect = 0; + + /* Remove pending Tx prims belonging to this lchan */ + trx_sched_queue_filter(&l1ts->dl_prims, + trx_chan_desc[chan].chan_nr, + trx_chan_desc[chan].link_id); + } + + chan_state->active = active; +} + /* setting all logical channels given attributes to active/inactive */ int trx_sched_set_lchan(struct gsm_lchan *lchan, uint8_t chan_nr, uint8_t link_id, bool active) { @@ -1069,7 +1109,6 @@ uint8_t tn = L1SAP_CHAN2TS(chan_nr); uint8_t ss = l1sap_chan2ss(chan_nr); bool found = false; - int i; if (!l1ts) { LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "%s lchan with uninitialized scheduler structure\n", @@ -1083,48 +1122,15 @@ chan_nr &= ~RSL_CHAN_OSMO_VAMOS_MASK; /* look for all matching chan_nr/link_id */ - for (i = 0; i < _TRX_CHAN_MAX; i++) { - struct l1sched_chan_state *chan_state = &l1ts->chan_state[i]; - - if (trx_chan_desc[i].chan_nr != (chan_nr & RSL_CHAN_NR_MASK)) + for (enum trx_chan_type chan = 0; chan < _TRX_CHAN_MAX; chan++) { + if (trx_chan_desc[chan].chan_nr != (chan_nr & RSL_CHAN_NR_MASK)) continue; - if (trx_chan_desc[i].link_id != link_id) + if (trx_chan_desc[chan].link_id != link_id) continue; - if (chan_state->active == active) + if (l1ts->chan_state[chan].active == active) continue; found = true; - - LOGPLCHAN(lchan, DL1C, LOGL_INFO, "%s %s\n", - (active) ? "Activating" : "Deactivating", - trx_chan_desc[i].name); - /* free burst memory, to cleanly start with burst 0 */ - if (chan_state->dl_bursts) { - talloc_free(chan_state->dl_bursts); - chan_state->dl_bursts = NULL; - } - if (chan_state->ul_bursts) { - talloc_free(chan_state->ul_bursts); - chan_state->ul_bursts = NULL; - } - if (chan_state->ul_bursts_prev) { - talloc_free(chan_state->ul_bursts_prev); - chan_state->ul_bursts_prev = NULL; - } - - if (active) { - /* Clean up everything */ - memset(chan_state, 0, sizeof(*chan_state)); - - /* Bind to generic 'struct gsm_lchan' */ - chan_state->lchan = lchan; - } else { - chan_state->ho_rach_detect = 0; - - /* Remove pending Tx prims belonging to this lchan */ - trx_sched_queue_filter(&l1ts->dl_prims, chan_nr, link_id); - } - - chan_state->active = active; + _trx_sched_set_lchan(lchan, chan, active); } /* disable handover detection (on deactivation) */ @@ -1134,6 +1140,31 @@ return found ? 0 : -EINVAL; } +int trx_sched_set_bcch_ccch(struct gsm_lchan *lchan, bool active) +{ + struct l1sched_ts *l1ts = lchan->ts->priv; + static const enum trx_chan_type chans[] = { + TRXC_FCCH, + TRXC_SCH, + TRXC_BCCH, + TRXC_RACH, + TRXC_CCCH, + }; + + if (!l1ts) + return -EINVAL; + + for (unsigned int i = 0; i < ARRAY_SIZE(chans); i++) { + enum trx_chan_type chan = chans[i]; + + if (l1ts->chan_state[chan].active == active) + continue; + _trx_sched_set_lchan(lchan, chan, active); + } + + return 0; +} + /* setting all logical channels given attributes to active/inactive */ int trx_sched_set_mode(struct gsm_bts_trx_ts *ts, uint8_t chan_nr, uint8_t rsl_cmode, uint8_t tch_mode, int codecs, uint8_t codec0, uint8_t codec1, @@ -1277,7 +1308,7 @@ return 0; /* check if channel is active */ - if (!TRX_CHAN_IS_ACTIVE(&l1ts->chan_state[chan], chan)) + if (!l1ts->chan_state[chan].active) return -EINVAL; /* There is no burst, just for logging */ @@ -1334,7 +1365,7 @@ l1cs = &l1ts->chan_state[br->chan]; /* check if channel is active */ - if (!TRX_CHAN_IS_ACTIVE(l1cs, br->chan)) + if (!l1cs->active) return; /* Training Sequence Code and Set */ @@ -1523,7 +1554,7 @@ func = trx_chan_desc[bi->chan].ul_fn; /* check if channel is active */ - if (!TRX_CHAN_IS_ACTIVE(l1cs, bi->chan)) { + if (!l1cs->active) { /* handle noise measurements on dedicated and idle channels */ if (TRX_CHAN_IS_DEDIC(bi->chan) || bi->chan == TRXC_IDLE) trx_sched_noise_meas(l1cs, bi); diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 2b0c723..5df3238 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -270,11 +270,19 @@ if (rc) return NM_NACK_RES_NOTAVAIL; - /* activate lchan for CCCH */ - if (pchan == GSM_PCHAN_CCCH || pchan == GSM_PCHAN_CCCH_SDCCH4 || - pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { + /* activate lchans for [CBCH/]BCCH/CCCH */ + switch (pchan) { + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + trx_sched_set_lchan(&ts->lchan[CCCH_LCHAN], RSL_CHAN_OSMO_CBCH4, LID_DEDIC, true); + /* fall-through */ + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH: + trx_sched_set_bcch_ccch(&ts->lchan[CCCH_LCHAN], true); ts->lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML; lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE); + break; + default: + break; } slottype = transceiver_chan_types[pchan]; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id0c70d6a2b777a5117c85149bfa1b3a997299d1d Gerrit-Change-Number: 31716 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: pcu_sock: fix PCU socket accept behavior
by pespin 07 Mar '23

07 Mar '23

Attention is currently required from: msuraev, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31678 ) Change subject: pcu_sock: fix PCU socket accept behavior ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Hmm. I think I am misunderstanding something. […] I guess disabling is made to avoid flooding if there's some process restarting trying to reconnect all the time. And yes, my understanding is that existing prior behavior is fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I695b93fd8109ef4943f36716563c147927611e85 Gerrit-Change-Number: 31678 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Mar 2023 10:54:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: ts_102_222: Implement support for RESIZE FILE for an EF
by laforge 07 Mar '23

07 Mar '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/31715 to look at the new patch set (#3). Change subject: ts_102_222: Implement support for RESIZE FILE for an EF ...................................................................... ts_102_222: Implement support for RESIZE FILE for an EF This adds pySim-shell support for the RESIZE FILE command in order to change the size of linear fixed or transparent EF. Change-Id: I03fbb683e26231c75f345330ac5f914ac88bbe7a --- M docs/shell.rst M pySim/commands.py M pySim/ts_102_222.py 3 files changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/31715/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I03fbb683e26231c75f345330ac5f914ac88bbe7a Gerrit-Change-Number: 31715 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: ts_102_222: Implement support for RESIZE FILE for an EF
by laforge 07 Mar '23

07 Mar '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/31715 to look at the new patch set (#2). Change subject: ts_102_222: Implement support for RESIZE FILE for an EF ...................................................................... ts_102_222: Implement support for RESIZE FILE for an EF This adds pySim-shell support for the RESIZE FILE command in order to change the size of linear fixed or transparent EF. Change-Id: I03fbb683e26231c75f345330ac5f914ac88bbe7a --- M docs/shell.rst M pySim/commands.py M pySim/ts_102_222.py 3 files changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/31715/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I03fbb683e26231c75f345330ac5f914ac88bbe7a Gerrit-Change-Number: 31715 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: ts_102_222: Implement support for RESIZE FILE for an EF
by laforge 07 Mar '23

07 Mar '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/31715 ) Change subject: ts_102_222: Implement support for RESIZE FILE for an EF ...................................................................... ts_102_222: Implement support for RESIZE FILE for an EF This adds pySim-shell support for the RESIZE FILE command in order to change the size of linear fixed or transparent EF. Change-Id: I03fbb683e26231c75f345330ac5f914ac88bbe7a --- M docs/shell.rst M pySim/commands.py M pySim/ts_102_222.py 3 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/31715/1 diff --git a/docs/shell.rst b/docs/shell.rst index c1f37af..9ffbac3 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -650,6 +650,12 @@ :module: pySim.ts_102_222 :func: Ts102222Commands.createdf_parser +resize_ef +~~~~~~~~~ +.. argparse:: + :module: pySim.ts_102_222 + :func: Ts102222Commands.resize_ef_parser + ARA-M commands -------------- diff --git a/pySim/commands.py b/pySim/commands.py index fa0458a..d123e67 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -457,6 +457,10 @@ """Execute CREEATE FILE command as per TS 102 222 Section 6.3""" return self._tp.send_apdu_checksw(self.cla_byte + 'e00000%02x%s' % (len(payload)//2, payload)) + def resize_file(self, payload: Hexstr): + """Execute RESIZE FILE command as per TS 102 222 Section 6.10""" + return self._tp.send_apdu_checksw('80d40000%02x%s' % (len(payload)//2, payload)) + def delete_file(self, fid): """Execute DELETE FILE command as per TS 102 222 Section 6.4""" return self._tp.send_apdu_checksw(self.cla_byte + 'e4000002' + fid) diff --git a/pySim/ts_102_222.py b/pySim/ts_102_222.py index 4843c77..c377cad 100644 --- a/pySim/ts_102_222.py +++ b/pySim/ts_102_222.py @@ -206,3 +206,20 @@ (data, sw) = self._cmd.card._scc.create_file(b2h(fcp.to_tlv())) # the newly-created file is automatically selected but our runtime state knows nothing of it self._cmd.lchan.select_file(self._cmd.lchan.selected_file) + + resize_ef_parser = argparse.ArgumentParser() + resize_ef_parser.add_argument('FILE_ID', type=str, help='File Identifier as 4-character hex string') + resize_ef_parser._action_groups.pop() + resize_ef_required = resize_ef_parser.add_argument_group('required arguments') + resize_ef_required.add_argument('--file-size', required=True, type=int, help='Size of file in octets') + + @cmd2.with_argparser(resize_ef_parser) + def do_resize_ef(self, opts): + """Resize an existing EF below the currently selected DF. Requires related privileges.""" + + ies = [FileIdentifier(decoded=opts.FILE_ID), + FileSize(decoded=opts.file_size)] + fcp = FcpTemplate(children=ies) + (data, sw) = self._cmd.card._scc.resize_file(b2h(fcp.to_tlv())) + # the resized file is automatically selected but our runtime state knows nothing of it + self._cmd.lchan.select_file(self._cmd.lchan.selected_file) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I03fbb683e26231c75f345330ac5f914ac88bbe7a Gerrit-Change-Number: 31715 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: add ran_infra.force_mgw_codecs_to_ran
by pespin 07 Mar '23

07 Mar '23

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31694 ) Change subject: add ran_infra.force_mgw_codecs_to_ran ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I37f65c36af2679ecba1040a11a9aa0eb9481d817 Gerrit-Change-Number: 31694 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Mar 2023 10:45:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: [codecs filter] MT call: apply remote call leg codecs
by pespin 07 Mar '23

07 Mar '23

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30121 ) Change subject: [codecs filter] MT call: apply remote call leg codecs ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I84d9bbca3e4061da622b1b2fc0bde8868e7e3521 Gerrit-Change-Number: 30121 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Mar 2023 10:41:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: [codecs filter] MT call: apply BSS codec list
by pespin 07 Mar '23

07 Mar '23

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30120 ) Change subject: [codecs filter] MT call: apply BSS codec list ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I530409a64d11da48518a3dc60aa3a4e47c384663 Gerrit-Change-Number: 30120 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 Mar 2023 10:39:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0