cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

vty: add attributes to VTY commands indicating when they apply 

Change-Id: I3bf9223295fc4a2fcb4046a1f29f792ff6a41d51
Related: SYS#4937, OS#1601
This commit is contained in:
Vadim Yanitskiy 2020-08-16 17:09:15 +07:00 committed by laforge
parent a88fa1f12f
commit d3d8e91bda
5 changed files with 1190 additions and 912 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/osmocom/bsc/vty.h
View File

@ -35,4 +35,11 @@ int bsc_vty_init_extra(void);
struct gsm_network *gsmnet_from_vty(struct vty *vty); struct gsm_network *gsmnet_from_vty(struct vty *vty);
enum bsc_vty_cmd_attr {
BSC_VTY_ATTR_RESTART_ABIS_OML_LINK = 0,
BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK,
BSC_VTY_ATTR_NEW_LCHAN,
/* NOTE: up to 32 entries */
};
#endif #endif

75
src/osmo-bsc/abis_om2000_vty.c
View File

@ -41,6 +41,8 @@
#include <osmocom/vty/logging.h> #include <osmocom/vty/logging.h>
#include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/telnet_interface.h>
#define X(x) (1 << x)
static struct cmd_node om2k_node = { static struct cmd_node om2k_node = {
OM2K_NODE, OM2K_NODE,
"%s(om2k)# ", "%s(om2k)# ",
@ -343,10 +345,11 @@ static int con_group_del_path(struct con_group *cg, uint16_t ccp,
return -ENOENT; return -ENOENT;
} }
DEFUN(cfg_om2k_con_group, cfg_om2k_con_group_cmd, DEFUN_ATTR(cfg_om2k_con_group, cfg_om2k_con_group_cmd,
"con-connection-group <1-31>", "con-connection-group <1-31>",
"Configure a CON (Concentrator) Connection Group\n" "Configure a CON (Concentrator) Connection Group\n"
"CON Connection Group Number\n") "CON Connection Group Number\n",
CMD_ATTR_IMMEDIATE)
{ {
struct gsm_bts *bts = vty->index; struct gsm_bts *bts = vty->index;
struct con_group *cg; struct con_group *cg;
@ -371,10 +374,11 @@ DEFUN(cfg_om2k_con_group, cfg_om2k_con_group_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(del_om2k_con_group, del_om2k_con_group_cmd, DEFUN_ATTR(del_om2k_con_group, del_om2k_con_group_cmd,
"del-connection-group <1-31>", "del-connection-group <1-31>",
"Delete a CON (Concentrator) Connection Group\n" "Delete a CON (Concentrator) Connection Group\n"
"CON Connection Group Number\n") "CON Connection Group Number\n",
CMD_ATTR_IMMEDIATE)
{ {
struct gsm_bts *bts = vty->index; struct gsm_bts *bts = vty->index;
int rc; int rc;
@ -402,9 +406,10 @@ DEFUN(del_om2k_con_group, del_om2k_con_group_cmd,
"CON Connection Point\n" \ "CON Connection Point\n" \
"Contiguity Index\n" \ "Contiguity Index\n" \
DEFUN(cfg_om2k_con_path_dec, cfg_om2k_con_path_dec_cmd, DEFUN_USRATTR(cfg_om2k_con_path_dec, cfg_om2k_con_path_dec_cmd,
"con-path (add|del) <0-2047> <0-255> deconcentrated <0-63>", X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK),
CON_PATH_HELP "De-concentrated in/outlet\n" "TEI Value\n") "con-path (add|del) <0-2047> <0-255> deconcentrated <0-63>",
CON_PATH_HELP "De-concentrated in/outlet\n" "TEI Value\n")
{ {
struct con_group *cg = vty->index; struct con_group *cg = vty->index;
uint16_t ccp = atoi(argv[1]); uint16_t ccp = atoi(argv[1]);
@ -424,9 +429,10 @@ DEFUN(cfg_om2k_con_path_dec, cfg_om2k_con_path_dec_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(cfg_om2k_con_path_conc, cfg_om2k_con_path_conc_cmd, DEFUN_USRATTR(cfg_om2k_con_path_conc, cfg_om2k_con_path_conc_cmd,
"con-path (add|del) <0-2047> <0-255> concentrated <1-16>", X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK),
CON_PATH_HELP "Concentrated in/outlet\n" "Tag Number\n") "con-path (add|del) <0-2047> <0-255> concentrated <1-16>",
CON_PATH_HELP "Concentrated in/outlet\n" "Tag Number\n")
{ {
struct con_group *cg = vty->index; struct con_group *cg = vty->index;
uint16_t ccp = atoi(argv[1]); uint16_t ccp = atoi(argv[1]);
@ -446,11 +452,12 @@ DEFUN(cfg_om2k_con_path_conc, cfg_om2k_con_path_conc_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(cfg_bts_alt_mode, cfg_bts_alt_mode_cmd, DEFUN_USRATTR(cfg_bts_alt_mode, cfg_bts_alt_mode_cmd,
"abis-lower-transport (single-timeslot|super-channel)", X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK),
"Configure thee Abis Lower Transport\n" "abis-lower-transport (single-timeslot|super-channel)",
"Single Timeslot (classic Abis)\n" "Configure thee Abis Lower Transport\n"
"SuperChannel (Packet Abis)\n") "Single Timeslot (classic Abis)\n"
"SuperChannel (Packet Abis)\n")
{ {
struct gsm_bts *bts = vty->index; struct gsm_bts *bts = vty->index;
@ -468,15 +475,16 @@ DEFUN(cfg_bts_alt_mode, cfg_bts_alt_mode_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(cfg_bts_om2k_version_limit, cfg_bts_om2k_version_limit_cmd, DEFUN_USRATTR(cfg_bts_om2k_version_limit, cfg_bts_om2k_version_limit_cmd,
"om2000 version-limit (oml|rsl) gen <0-99> rev <0-99>", X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK),
"Configure OM2K specific parameters\n" "om2000 version-limit (oml|rsl) gen <0-99> rev <0-99>",
"Configure optional maximum protocol version to negotiate\n" "Configure OM2K specific parameters\n"
"Limit OML IWD version\n" "Limit RSL IWD version\n" "Configure optional maximum protocol version to negotiate\n"
"Generation limit\n" "Limit OML IWD version\n" "Limit RSL IWD version\n"
"Generation number to limit to (inclusive)\n" "Generation limit\n"
"Revision limit\n" "Generation number to limit to (inclusive)\n"
"Revision number to limit to (inclusive)\n") "Revision limit\n"
"Revision number to limit to (inclusive)\n")
{ {
struct gsm_bts *bts = vty->index; struct gsm_bts *bts = vty->index;
int iwd; int iwd;
@ -502,11 +510,12 @@ DEFUN(cfg_bts_om2k_version_limit, cfg_bts_om2k_version_limit_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(cfg_bts_is_conn_list, cfg_bts_is_conn_list_cmd, DEFUN_USRATTR(cfg_bts_is_conn_list, cfg_bts_is_conn_list_cmd,
"is-connection-list (add|del) <0-2047> <0-2047> <0-255>", X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK),
"Interface Switch Connection List\n" "is-connection-list (add|del) <0-2047> <0-2047> <0-255>",
"Add to IS list\n" "Delete from IS list\n" "Interface Switch Connection List\n"
"ICP1\n" "ICP2\n" "Contiguity Index\n") "Add to IS list\n" "Delete from IS list\n"
"ICP1\n" "ICP2\n" "Contiguity Index\n")
{ {
struct gsm_bts *bts = vty->index; struct gsm_bts *bts = vty->index;
uint16_t icp1 = atoi(argv[1]); uint16_t icp1 = atoi(argv[1]);

1980
src/osmo-bsc/bsc_vty.c
View File

File diff suppressed because it is too large Load Diff

27
src/osmo-bsc/handover_vty.c
View File

@ -47,10 +47,10 @@ static struct handover_cfg *ho_cfg_from_vty(struct vty *vty)
VTY_CMD_PREFIX, VTY_CMD, VTY_CMD_ARG, VTY_ARG_EVAL, \ VTY_CMD_PREFIX, VTY_CMD, VTY_CMD_ARG, VTY_ARG_EVAL, \
VTY_WRITE_FMT, VTY_WRITE_CONV, \ VTY_WRITE_FMT, VTY_WRITE_CONV, \
VTY_DOC) \ VTY_DOC) \
DEFUN(cfg_ho_##NAME, cfg_ho_##NAME##_cmd, \ DEFUN_ATTR(cfg_ho_##NAME, cfg_ho_##NAME##_cmd, \
VTY_CMD_PREFIX VTY_CMD " (" VTY_CMD_ARG "|default)", \ VTY_CMD_PREFIX VTY_CMD " (" VTY_CMD_ARG "|default)", \
VTY_DOC \ VTY_DOC \
"Use default (" #DEFAULT_VAL "), remove explicit setting on this node\n") \ "Use default (" #DEFAULT_VAL "), remove explicit setting on this node\n", CMD_ATTR_IMMEDIATE) \
{ \ { \
struct handover_cfg *ho = ho_cfg_from_vty(vty); \ struct handover_cfg *ho = ho_cfg_from_vty(vty); \
const char *val = argv[0]; \ const char *val = argv[0]; \
@ -104,15 +104,16 @@ static inline const char *congestion_check_interval2a(int val)
return str; return str;
} }
DEFUN(cfg_net_ho_congestion_check_interval, cfg_net_ho_congestion_check_interval_cmd, DEFUN_ATTR(cfg_net_ho_congestion_check_interval, cfg_net_ho_congestion_check_interval_cmd,
"handover2 congestion-check (disabled|<1-999>|now)", "handover2 congestion-check (disabled|<1-999>|now)",
HO_CFG_STR_HANDOVER2 HO_CFG_STR_HANDOVER2
"Configure congestion check interval\n" "Configure congestion check interval\n"
"Disable congestion checking, do not handover based on cell load. Note: there is one global congestion check" "Disable congestion checking, do not handover based on cell load. Note: there is one global congestion check"
" interval, i.e. contrary to other handover2 settings, this is not configurable per individual cell.\n" " interval, i.e. contrary to other handover2 settings, this is not configurable per individual cell.\n"
"Congestion check interval in seconds (default " "Congestion check interval in seconds (default "
OSMO_STRINGIFY_VAL(HO_CFG_CONGESTION_CHECK_DEFAULT) ")\n" OSMO_STRINGIFY_VAL(HO_CFG_CONGESTION_CHECK_DEFAULT) ")\n"
"Manually trigger a congestion check to run right now\n") "Manually trigger a congestion check to run right now\n",
CMD_ATTR_IMMEDIATE)
{ {
if (!strcmp(argv[0], "now")) { if (!strcmp(argv[0], "now")) {
hodec2_congestion_check(gsmnet_from_vty(vty)); hodec2_congestion_check(gsmnet_from_vty(vty));

13
src/osmo-bsc/osmo_bsc_main.c
View File

@ -642,6 +642,19 @@ static struct vty_app_info vty_info = {
.version = PACKAGE_VERSION, .version = PACKAGE_VERSION,
.go_parent_cb = bsc_vty_go_parent, .go_parent_cb = bsc_vty_go_parent,
.is_config_node = bsc_vty_is_config_node, .is_config_node = bsc_vty_is_config_node,
.usr_attr_desc = {
[BSC_VTY_ATTR_RESTART_ABIS_OML_LINK] = \
"This command applies on A-bis OML link (re)establishment",
[BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK] = \
"This command applies on A-bis RSL link (re)establishment",
[BSC_VTY_ATTR_NEW_LCHAN] = \
"This command applies for newly created lchans",
},
.usr_attr_letters = {
[BSC_VTY_ATTR_RESTART_ABIS_OML_LINK] = 'o',
[BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK] = 'r',
[BSC_VTY_ATTR_NEW_LCHAN] = 'l',
},
}; };
extern int bsc_shutdown_net(struct gsm_network *net); extern int bsc_shutdown_net(struct gsm_network *net);