OM2000: Remove "is-conf-req" from VTY, use "configuration-request"
This unifies the syntax a bit
diff --git a/openbsc/src/libbsc/abis_om2000_vty.c b/openbsc/src/libbsc/abis_om2000_vty.c
index a47a560..95f765e 100644
--- a/openbsc/src/libbsc/abis_om2000_vty.c
+++ b/openbsc/src/libbsc/abis_om2000_vty.c
@@ -375,12 +375,8 @@
}
-DEFUN(om2k_is_conf_req, om2k_is_conf_req_cmd,
- "is-conf-req",
- "Send IS Configuration Request\n")
+static int is_conf_req(struct gsm_bts *bts, struct vty *vty)
{
- struct oml_node_state *oms = vty->index;
- struct gsm_bts *bts = oms->bts;
struct is_conn_group *grp;
unsigned int num_grps = 0, i = 0;
struct om2k_is_conn_grp *o2grps;
@@ -403,7 +399,7 @@
om2k_fill_is_conn_grp(&o2grps[i++], grp->icp1, grp->icp2, grp->ci);
/* send the actual OML request */
- abis_om2k_tx_is_conf_req(oms->bts, o2grps, num_grps);
+ abis_om2k_tx_is_conf_req(bts, o2grps, num_grps);
talloc_free(o2grps);
@@ -420,6 +416,9 @@
struct gsm_bts_trx_ts *ts = NULL;
switch (oms->mo.class) {
+ case OM2K_MO_CLS_IS:
+ return is_conf_req(bts, vty);
+ break;
case OM2K_MO_CLS_TS:
trx = gsm_bts_trx_by_nr(bts, oms->mo.assoc_so);
if (!trx) {
@@ -503,7 +502,6 @@
install_element(OM2K_NODE, &om2k_op_info_cmd);
install_element(OM2K_NODE, &om2k_test_cmd);
install_element(OM2K_NODE, &om2k_conf_req_cmd);
- install_element(OM2K_NODE, &om2k_is_conf_req_cmd);
install_element(OM2K_NODE, &om2k_con_list_dec_cmd);
install_element(OM2K_NODE, &om2k_con_list_tei_cmd);