<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/14837">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: Fix typo in VTY command descrption -> description<br><br>Let's add deprecated aliases for backwards compatibility<br><br>Change-Id: I0e5da9d702910cf2571486e22a56f3ec17d0d67b<br>---<br>M doc/examples/osmo-bsc/osmo-bsc.cfg<br>M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg<br>M doc/manuals/vty/bsc_vty_reference.xml<br>M doc/manuals/vty/libbsc_vty_additions.xml<br>M src/osmo-bsc/bsc_vty.c<br>5 files changed, 42 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg</span><br><span>index 926951b..77b6094 100644</span><br><span>--- a/doc/examples/osmo-bsc/osmo-bsc.cfg</span><br><span>+++ b/doc/examples/osmo-bsc/osmo-bsc.cfg</span><br><span>@@ -32,9 +32,9 @@</span><br><span> channel allocator ascending</span><br><span> rach tx integer 9</span><br><span> rach max transmission 7</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption attach 1</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption bs-pa-mfrms 5</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption bs-ag-blks-res 1</span><br><span style="color: hsl(120, 100%, 40%);">+ channel-description attach 1</span><br><span style="color: hsl(120, 100%, 40%);">+ channel-description bs-pa-mfrms 5</span><br><span style="color: hsl(120, 100%, 40%);">+ channel-description bs-ag-blks-res 1</span><br><span> early-classmark-sending forbidden</span><br><span> ipa unit-id 0 0</span><br><span> oml ipa stream-id 255 line 0</span><br><span>diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg</span><br><span>index 80a38ba..c250fac 100644</span><br><span>--- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg</span><br><span>+++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg</span><br><span>@@ -31,9 +31,9 @@</span><br><span> channel allocator ascending</span><br><span> rach tx integer 9</span><br><span> rach max transmission 7</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption attach 1</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption bs-pa-mfrms 5</span><br><span style="color: hsl(0, 100%, 40%);">- channel-descrption bs-ag-blks-res 1</span><br><span style="color: hsl(120, 100%, 40%);">+ channel-description attach 1</span><br><span style="color: hsl(120, 100%, 40%);">+ channel-description bs-pa-mfrms 5</span><br><span style="color: hsl(120, 100%, 40%);">+ channel-description bs-ag-blks-res 1</span><br><span> early-classmark-sending forbidden</span><br><span> ipa unit-id 0 0</span><br><span> oml ipa stream-id 255 line 0</span><br><span>diff --git a/doc/manuals/vty/bsc_vty_reference.xml b/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>index db4f2c1..85c0cb7 100644</span><br><span>--- a/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>@@ -2983,24 +2983,24 @@</span><br><span> <param name='7' doc='Maximum number of 7 RACH burst transmissions' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='channel-descrption attach (0|1)'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='channel-description attach (0|1)'></span><br><span> <params></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='channel-descrption' doc='Channel Description' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='channel-description' doc='Channel Description' /></span><br><span> <param name='attach' doc='Set if attachment is required' /></span><br><span> <param name='0' doc='Attachment is NOT required' /></span><br><span> <param name='1' doc='Attachment is required (standard)' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='channel-descrption bs-pa-mfrms <2-9>'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='channel-description bs-pa-mfrms <2-9>'></span><br><span> <params></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='channel-descrption' doc='Channel Description' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='channel-description' doc='Channel Description' /></span><br><span> <param name='bs-pa-mfrms' doc='Set number of multiframe periods for paging groups' /></span><br><span> <param name='<2-9>' doc='Number of multiframe periods for paging groups' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='channel-descrption bs-ag-blks-res <0-7>'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='channel-description bs-ag-blks-res <0-7>'></span><br><span> <params></span><br><span style="color: hsl(0, 100%, 40%);">- <param name='channel-descrption' doc='Channel Description' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='channel-description' doc='Channel Description' /></span><br><span> <param name='bs-ag-blks-res' doc='Set number of blocks reserved for access grant' /></span><br><span> <param name='<0-7>' doc='Number of blocks reserved for access grant' /></span><br><span> </params></span><br><span>diff --git a/doc/manuals/vty/libbsc_vty_additions.xml b/doc/manuals/vty/libbsc_vty_additions.xml</span><br><span>index cf61961..dbf4080 100644</span><br><span>--- a/doc/manuals/vty/libbsc_vty_additions.xml</span><br><span>+++ b/doc/manuals/vty/libbsc_vty_additions.xml</span><br><span>@@ -34,7 +34,7 @@</span><br><span> Only applies to Ericsson OML2000 based BTSs.</span><br><span> </description></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='channel-descrption attach (0|1)'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='channel-description attach (0|1)'></span><br><span> <description></span><br><span> Configure whether the IMSI ATTACH (and DETACH) procedures</span><br><span> shall be used by MS in this cell. The default should be enabled.</span><br><span>@@ -160,7 +160,7 @@</span><br><span> 0) - which is also the default configuration.</warning></span><br><span> </description></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='channel-descrption bs-ag-blks-res <0-7>'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='channel-description bs-ag-blks-res <0-7>'></span><br><span> <description></span><br><span> Using this command, you can specify how many blocks of the</span><br><span> downlink CCCH should be reserved for exclusive usage as AGCH.</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 24f8313..b19c950 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -841,11 +841,11 @@</span><br><span> rach_max_trans_raw2val(bts->si_common.rach_control.max_trans),</span><br><span> VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " channel-descrption attach %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " channel-description attach %u%s",</span><br><span> bts->si_common.chan_desc.att, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " channel-descrption bs-pa-mfrms %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " channel-description bs-pa-mfrms %u%s",</span><br><span> bts->si_common.chan_desc.bs_pa_mfrms + 2, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " channel-descrption bs-ag-blks-res %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " channel-description bs-ag-blks-res %u%s",</span><br><span> bts->si_common.chan_desc.bs_ag_blks_res, VTY_NEWLINE);</span><br><span> </span><br><span> if (bts->ccch_load_ind_thresh != 10)</span><br><span>@@ -2420,7 +2420,7 @@</span><br><span> </span><br><span> DEFUN(cfg_bts_chan_desc_att,</span><br><span> cfg_bts_chan_desc_att_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "channel-descrption attach (0|1)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "channel-description attach (0|1)",</span><br><span> CD_STR</span><br><span> "Set if attachment is required\n"</span><br><span> "Attachment is NOT required\n"</span><br><span>@@ -2430,10 +2430,17 @@</span><br><span> bts->si_common.chan_desc.att = atoi(argv[0]);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ALIAS_DEPRECATED(cfg_bts_chan_desc_att,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_chan_dscr_att_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "channel-descrption attach (0|1)",</span><br><span style="color: hsl(120, 100%, 40%);">+ CD_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set if attachment is required\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Attachment is NOT required\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Attachment is required (standard)\n");</span><br><span> </span><br><span> DEFUN(cfg_bts_chan_desc_bs_pa_mfrms,</span><br><span> cfg_bts_chan_desc_bs_pa_mfrms_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "channel-descrption bs-pa-mfrms <2-9>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "channel-description bs-pa-mfrms <2-9>",</span><br><span> CD_STR</span><br><span> "Set number of multiframe periods for paging groups\n"</span><br><span> "Number of multiframe periods for paging groups\n")</span><br><span>@@ -2444,10 +2451,16 @@</span><br><span> bts->si_common.chan_desc.bs_pa_mfrms = bs_pa_mfrms - 2;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ALIAS_DEPRECATED(cfg_bts_chan_desc_bs_pa_mfrms,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_chan_dscr_bs_pa_mfrms_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "channel-descrption bs-pa-mfrms <2-9>",</span><br><span style="color: hsl(120, 100%, 40%);">+ CD_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set number of multiframe periods for paging groups\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Number of multiframe periods for paging groups\n");</span><br><span> </span><br><span> DEFUN(cfg_bts_chan_desc_bs_ag_blks_res,</span><br><span> cfg_bts_chan_desc_bs_ag_blks_res_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "channel-descrption bs-ag-blks-res <0-7>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "channel-description bs-ag-blks-res <0-7>",</span><br><span> CD_STR</span><br><span> "Set number of blocks reserved for access grant\n"</span><br><span> "Number of blocks reserved for access grant\n")</span><br><span>@@ -2458,6 +2471,12 @@</span><br><span> bts->si_common.chan_desc.bs_ag_blks_res = bs_ag_blks_res;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ALIAS_DEPRECATED(cfg_bts_chan_desc_bs_ag_blks_res,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_chan_dscr_bs_ag_blks_res_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "channel-descrption bs-ag-blks-res <0-7>",</span><br><span style="color: hsl(120, 100%, 40%);">+ CD_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set number of blocks reserved for access grant\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Number of blocks reserved for access grant\n");</span><br><span> </span><br><span> #define CCCH_STR "Common Control Channel\n"</span><br><span> </span><br><span>@@ -5273,8 +5292,11 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_rach_tx_integer_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rach_max_trans_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_chan_desc_att_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_chan_dscr_att_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_chan_desc_bs_pa_mfrms_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_chan_dscr_bs_pa_mfrms_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_chan_desc_bs_ag_blks_res_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_chan_dscr_bs_ag_blks_res_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_ccch_load_ind_thresh_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rach_nm_b_thresh_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rach_nm_ldavg_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/14837">change 14837</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-bsc/+/14837"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0e5da9d702910cf2571486e22a56f3ec17d0d67b </div>
<div style="display:none"> Gerrit-Change-Number: 14837 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>