[MERGED] osmo-bsc[master]: Align syntax of "handover" + "assignment" command with that...

[dexter]

dexter has submitted this change and it was merged.

Change subject: Align syntax of "handover" + "assignment"  command with that of lchan act/deact
......................................................................


Align syntax of "handover" + "assignment"  command with that of lchan act/deact

We already have other commands that operate on a given bts/trx/ts/ss,
let's make sure they have a shared/common syntax for consistency.

This also fixes the issue that the handover/assignment commands were
active already in VIEW_NODE, while they should only have been in
ENABLE_NODE.

Change-Id: I1f31e9adf9c75348809ebf9f40f6c69fab248e43
---
M src/libbsc/bsc_vty.c
1 file changed, 9 insertions(+), 7 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c
index 5ff9cb2..ae1dd93 100644
--- a/src/libbsc/bsc_vty.c
+++ b/src/libbsc/bsc_vty.c
@@ -1567,9 +1567,10 @@
 
 DEFUN(handover_subscr_conn,
       handover_subscr_conn_cmd,
-      "handover <0-255> <0-255> <0-7> <0-7> <0-255>",
+      "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> handover <0-255>",
+      "BTS related commands\n" BTS_NR_STR "Transceiver\n" TRX_NR_STR
+      "TRX Timeslot\n" TS_NR_STR "Sub-Slot Number\n" LCHAN_NR_STR
       MANUAL_HANDOVER_STR
-      "Current " BTS_TRX_TS_LCHAN_STR
       "New " BTS_NR_STR)
 {
 	return ho_or_as(vty, argv, argc);
@@ -1577,9 +1578,10 @@
 
 DEFUN(assignment_subscr_conn,
       assignment_subscr_conn_cmd,
-      "assignment <0-255> <0-255> <0-7> <0-7>",
-      MANUAL_ASSIGNMENT_STR
-      "Current " BTS_TRX_TS_LCHAN_STR)
+      "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> assignment",
+      "BTS related commands\n" BTS_NR_STR "Transceiver\n" TRX_NR_STR
+      "TRX Timeslot\n" TS_NR_STR "Sub-Slot Number\n" LCHAN_NR_STR
+      MANUAL_ASSIGNMENT_STR)
 {
 	return ho_or_as(vty, argv, argc);
 }
@@ -4700,9 +4702,7 @@
 	install_element_ve(&show_lchan_summary_cmd);
 
 	install_element_ve(&show_subscr_conn_cmd);
-	install_element_ve(&handover_subscr_conn_cmd);
 	install_element_ve(&handover_any_cmd);
-	install_element_ve(&assignment_subscr_conn_cmd);
 	install_element_ve(&assignment_any_cmd);
 
 	install_element_ve(&show_paging_cmd);
@@ -4867,6 +4867,8 @@
 	install_element(ENABLE_NODE, &pdch_act_cmd);
 	install_element(ENABLE_NODE, &lchan_act_cmd);
 	install_element(ENABLE_NODE, &lchan_mdcx_cmd);
+	install_element(ENABLE_NODE, &handover_subscr_conn_cmd);
+	install_element(ENABLE_NODE, &assignment_subscr_conn_cmd);
 	install_element(ENABLE_NODE, &smscb_cmd_cmd);
 	install_element(ENABLE_NODE, &ctrl_trap_cmd);
 

-- 
To view, visit https://gerrit.osmocom.org/6593
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f31e9adf9c75348809ebf9f40f6c69fab248e43
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>