vty: Fix typo in VTY command descrption -> description

Let's add deprecated aliases for backwards compatibility

Change-Id: I0e5da9d702910cf2571486e22a56f3ec17d0d67b

5 files changed, 42 insertions, 20 deletions

diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg
index 926951b9a..77b609464 100644
--- a/doc/examples/osmo-bsc/osmo-bsc.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc.cfg
@@ -32,9 +32,9 @@ network
   channel allocator ascending
   rach tx integer 9
   rach max transmission 7
-  channel-descrption attach 1
-  channel-descrption bs-pa-mfrms 5
-  channel-descrption bs-ag-blks-res 1
+  channel-description attach 1
+  channel-description bs-pa-mfrms 5
+  channel-description bs-ag-blks-res 1
   early-classmark-sending forbidden
   ipa unit-id 0 0
   oml ipa stream-id 255 line 0
diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
index 80a38ba27..c250fac3b 100644
--- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
@@ -31,9 +31,9 @@ network
   channel allocator ascending
   rach tx integer 9
   rach max transmission 7
-  channel-descrption attach 1
-  channel-descrption bs-pa-mfrms 5
-  channel-descrption bs-ag-blks-res 1
+  channel-description attach 1
+  channel-description bs-pa-mfrms 5
+  channel-description bs-ag-blks-res 1
   early-classmark-sending forbidden
   ipa unit-id 0 0
   oml ipa stream-id 255 line 0
diff --git a/doc/manuals/vty/bsc_vty_reference.xml b/doc/manuals/vty/bsc_vty_reference.xml
index db4f2c11e..85c0cb7e7 100644
--- a/doc/manuals/vty/bsc_vty_reference.xml
+++ b/doc/manuals/vty/bsc_vty_reference.xml
@@ -2983,24 +2983,24 @@
         <param name='7' doc='Maximum number of 7 RACH burst transmissions' />
       </params>
     </command>
-    <command id='channel-descrption attach (0|1)'>
+    <command id='channel-description attach (0|1)'>
       <params>
-        <param name='channel-descrption' doc='Channel Description' />
+        <param name='channel-description' doc='Channel Description' />
         <param name='attach' doc='Set if attachment is required' />
         <param name='0' doc='Attachment is NOT required' />
         <param name='1' doc='Attachment is required (standard)' />
       </params>
     </command>
-    <command id='channel-descrption bs-pa-mfrms &lt;2-9&gt;'>
+    <command id='channel-description bs-pa-mfrms &lt;2-9&gt;'>
       <params>
-        <param name='channel-descrption' doc='Channel Description' />
+        <param name='channel-description' doc='Channel Description' />
         <param name='bs-pa-mfrms' doc='Set number of multiframe periods for paging groups' />
         <param name='&lt;2-9&gt;' doc='Number of multiframe periods for paging groups' />
       </params>
     </command>
-    <command id='channel-descrption bs-ag-blks-res &lt;0-7&gt;'>
+    <command id='channel-description bs-ag-blks-res &lt;0-7&gt;'>
       <params>
-        <param name='channel-descrption' doc='Channel Description' />
+        <param name='channel-description' doc='Channel Description' />
         <param name='bs-ag-blks-res' doc='Set number of blocks reserved for access grant' />
         <param name='&lt;0-7&gt;' doc='Number of blocks reserved for access grant' />
       </params>
diff --git a/doc/manuals/vty/libbsc_vty_additions.xml b/doc/manuals/vty/libbsc_vty_additions.xml
index cf61961a4..dbf408014 100644
--- a/doc/manuals/vty/libbsc_vty_additions.xml
+++ b/doc/manuals/vty/libbsc_vty_additions.xml
@@ -34,7 +34,7 @@
 	  Only applies to Ericsson OML2000 based BTSs.
 	</description>
       </command>
-      <command id='channel-descrption attach (0|1)'>
+      <command id='channel-description attach (0|1)'>
         <description>
 	  Configure whether the IMSI ATTACH (and DETACH) procedures
 	  shall be used by MS in this cell.  The default should be enabled.
@@ -160,7 +160,7 @@
 	  0) - which is also the default configuration.</warning>
 	</description>
       </command>
-      <command id='channel-descrption bs-ag-blks-res &lt;0-7&gt;'>
+      <command id='channel-description bs-ag-blks-res &lt;0-7&gt;'>
 	<description>
 	  Using this command, you can specify how many blocks of the
 	  downlink CCCH should be reserved for exclusive usage as AGCH.
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 24f831378..b19c95025 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -841,11 +841,11 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts)
 		rach_max_trans_raw2val(bts->si_common.rach_control.max_trans),
 		VTY_NEWLINE);
 
-	vty_out(vty, "  channel-descrption attach %u%s",
+	vty_out(vty, "  channel-description attach %u%s",
 		bts->si_common.chan_desc.att, VTY_NEWLINE);
-	vty_out(vty, "  channel-descrption bs-pa-mfrms %u%s",
+	vty_out(vty, "  channel-description bs-pa-mfrms %u%s",
 		bts->si_common.chan_desc.bs_pa_mfrms + 2, VTY_NEWLINE);
-	vty_out(vty, "  channel-descrption bs-ag-blks-res %u%s",
+	vty_out(vty, "  channel-description bs-ag-blks-res %u%s",
 		bts->si_common.chan_desc.bs_ag_blks_res, VTY_NEWLINE);
 
 	if (bts->ccch_load_ind_thresh != 10)
@@ -2420,7 +2420,7 @@ DEFUN(cfg_bts_rach_max_trans,
 
 DEFUN(cfg_bts_chan_desc_att,
       cfg_bts_chan_desc_att_cmd,
-      "channel-descrption attach (0|1)",
+      "channel-description attach (0|1)",
 	CD_STR
       "Set if attachment is required\n"
       "Attachment is NOT required\n"
@@ -2430,10 +2430,17 @@ DEFUN(cfg_bts_chan_desc_att,
 	bts->si_common.chan_desc.att = atoi(argv[0]);
 	return CMD_SUCCESS;
 }
+ALIAS_DEPRECATED(cfg_bts_chan_desc_att,
+		 cfg_bts_chan_dscr_att_cmd,
+		 "channel-descrption attach (0|1)",
+		 CD_STR
+		 "Set if attachment is required\n"
+		 "Attachment is NOT required\n"
+		 "Attachment is required (standard)\n");
 
 DEFUN(cfg_bts_chan_desc_bs_pa_mfrms,
       cfg_bts_chan_desc_bs_pa_mfrms_cmd,
-      "channel-descrption bs-pa-mfrms <2-9>",
+      "channel-description bs-pa-mfrms <2-9>",
 	CD_STR
       "Set number of multiframe periods for paging groups\n"
       "Number of multiframe periods for paging groups\n")
@@ -2444,10 +2451,16 @@ DEFUN(cfg_bts_chan_desc_bs_pa_mfrms,
 	bts->si_common.chan_desc.bs_pa_mfrms = bs_pa_mfrms - 2;
 	return CMD_SUCCESS;
 }
+ALIAS_DEPRECATED(cfg_bts_chan_desc_bs_pa_mfrms,
+		 cfg_bts_chan_dscr_bs_pa_mfrms_cmd,
+		 "channel-descrption bs-pa-mfrms <2-9>",
+		 CD_STR
+		 "Set number of multiframe periods for paging groups\n"
+		 "Number of multiframe periods for paging groups\n");
 
 DEFUN(cfg_bts_chan_desc_bs_ag_blks_res,
       cfg_bts_chan_desc_bs_ag_blks_res_cmd,
-      "channel-descrption bs-ag-blks-res <0-7>",
+      "channel-description bs-ag-blks-res <0-7>",
 	CD_STR
       "Set number of blocks reserved for access grant\n"
       "Number of blocks reserved for access grant\n")
@@ -2458,6 +2471,12 @@ DEFUN(cfg_bts_chan_desc_bs_ag_blks_res,
 	bts->si_common.chan_desc.bs_ag_blks_res = bs_ag_blks_res;
 	return CMD_SUCCESS;
 }
+ALIAS_DEPRECATED(cfg_bts_chan_desc_bs_ag_blks_res,
+		 cfg_bts_chan_dscr_bs_ag_blks_res_cmd,
+		 "channel-descrption bs-ag-blks-res <0-7>",
+		 CD_STR
+		 "Set number of blocks reserved for access grant\n"
+		 "Number of blocks reserved for access grant\n");
 
 #define CCCH_STR "Common Control Channel\n"
 
@@ -5273,8 +5292,11 @@ int bsc_vty_init(struct gsm_network *network)
 	install_element(BTS_NODE, &cfg_bts_rach_tx_integer_cmd);
 	install_element(BTS_NODE, &cfg_bts_rach_max_trans_cmd);
 	install_element(BTS_NODE, &cfg_bts_chan_desc_att_cmd);
+	install_element(BTS_NODE, &cfg_bts_chan_dscr_att_cmd);
 	install_element(BTS_NODE, &cfg_bts_chan_desc_bs_pa_mfrms_cmd);
+	install_element(BTS_NODE, &cfg_bts_chan_dscr_bs_pa_mfrms_cmd);
 	install_element(BTS_NODE, &cfg_bts_chan_desc_bs_ag_blks_res_cmd);
+	install_element(BTS_NODE, &cfg_bts_chan_dscr_bs_ag_blks_res_cmd);
 	install_element(BTS_NODE, &cfg_bts_ccch_load_ind_thresh_cmd);
 	install_element(BTS_NODE, &cfg_bts_rach_nm_b_thresh_cmd);
 	install_element(BTS_NODE, &cfg_bts_rach_nm_ldavg_cmd);