Change in osmo-bsc[master]: vty: join UL/DL SACCH repetition commands together

[fixeria]

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21911 )


Change subject: vty: join UL/DL SACCH repetition commands together
......................................................................

vty: join UL/DL SACCH repetition commands together

Change-Id: Ibe98718d8f4933926eed0e622109c9c82537f526
Related: SYS#5114
---
M src/osmo-bsc/bsc_vty.c
1 file changed, 19 insertions(+), 45 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/21911/1

diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index f4d2b82..883b4fc 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -2784,11 +2784,13 @@
 	return CMD_SUCCESS;
 }
 
-DEFUN_ATTR(cfg_bts_rep_dl_sacch,
-	   cfg_bts_rep_dl_sacch_cmd,
-	   "repeat dl-sacch",
+DEFUN_ATTR(cfg_bts_rep_ul_dl_sacch,
+	   cfg_bts_rep_ul_dl_sacch_cmd,
+	   "repeat (ul-sacch|dl-sacch)",
 	   REP_ACCH_STR
-	   "Enable DL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)
+	   "Enable UL-SACCH repetition for this BTS\n"
+	   "Enable DL-SACCH repetition for this BTS\n",
+	   CMD_ATTR_IMMEDIATE)
 {
 	struct gsm_bts *bts = vty->index;
 
@@ -2798,52 +2800,26 @@
 		return CMD_WARNING;
 	}
 
-	bts->repeated_acch_policy.dl_sacch = true;
+	if (argv[0][0] == 'u')
+		bts->repeated_acch_policy.ul_sacch = true;
+	else
+		bts->repeated_acch_policy.dl_sacch = true;
 
 	return CMD_SUCCESS;
 }
 
-DEFUN_ATTR(cfg_bts_rep_no_dl_sacch,
-	   cfg_bts_rep_no_dl_sacch_cmd,
-	   "no repeat dl-sacch",
+DEFUN_ATTR(cfg_bts_rep_no_ul_dl_sacch,
+	   cfg_bts_rep_no_ul_dl_sacch_cmd,
+	   "no repeat (ul-sacch|dl-sacch)",
 	   NO_STR REP_ACCH_STR
 	   "Disable DL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)
 {
 	struct gsm_bts *bts = vty->index;
 
-	bts->repeated_acch_policy.dl_sacch = false;
-
-	return CMD_SUCCESS;
-}
-
-DEFUN_ATTR(cfg_bts_rep_ul_sacch,
-	   cfg_bts_rep_ul_sacch_cmd,
-	   "repeat ul-sacch",
-	   REP_ACCH_STR
-	   "Enable UL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)
-{
-	struct gsm_bts *bts = vty->index;
-
-	if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) {
-		vty_out(vty, "%% repeated ACCH not supported by BTS %u%s",
-			bts->nr, VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-
-	bts->repeated_acch_policy.ul_sacch = true;
-
-	return CMD_SUCCESS;
-}
-
-DEFUN_ATTR(cfg_bts_rep_no_ul_sacch,
-	   cfg_bts_rep_no_ul_sacch_cmd,
-	   "no repeat ul-sacch",
-	   NO_STR REP_ACCH_STR
-	   "Disable UL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)
-{
-	struct gsm_bts *bts = vty->index;
-
-	bts->repeated_acch_policy.ul_sacch = false;
+	if (argv[0][0] == 'u')
+		bts->repeated_acch_policy.ul_sacch = false;
+	else
+		bts->repeated_acch_policy.dl_sacch = false;
 
 	return CMD_SUCCESS;
 }
@@ -7705,10 +7681,8 @@
 	install_element(BTS_NODE, &cfg_bts_no_t3113_dynamic_cmd);
 	install_element(BTS_NODE, &cfg_bts_rep_dl_facch_cmd);
 	install_element(BTS_NODE, &cfg_bts_rep_no_dl_facch_cmd);
-	install_element(BTS_NODE, &cfg_bts_rep_dl_sacch_cmd);
-	install_element(BTS_NODE, &cfg_bts_rep_no_dl_sacch_cmd);
-	install_element(BTS_NODE, &cfg_bts_rep_ul_sacch_cmd);
-	install_element(BTS_NODE, &cfg_bts_rep_no_ul_sacch_cmd);
+	install_element(BTS_NODE, &cfg_bts_rep_ul_dl_sacch_cmd);
+	install_element(BTS_NODE, &cfg_bts_rep_no_ul_dl_sacch_cmd);
 	install_element(BTS_NODE, &cfg_bts_rep_rxqual_cmd);
 
 	neighbor_ident_vty_init(network, network->neighbor_bss_cells);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21911
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ibe98718d8f4933926eed0e622109c9c82537f526
Gerrit-Change-Number: 21911
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201230/79a3ee3f/attachment.htm>