Review at https://gerrit.osmocom.org/4610
vty: skip installing cmds now always installed by default
vty_install_default() and install_default() will soon be deprecated.
Depends: I5021c64a787b63314e0f2f1cba0b8fc7bff4f09b
Change-Id: I5e8e9d7989ee20fe722bdd3109965d5bce9519fb
---
M src/common/vty.c
M src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c
M src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c
3 files changed, 0 insertions(+), 32 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/10/4610/1
diff --git a/src/common/vty.c b/src/common/vty.c
index 1a158db..050f922 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1073,7 +1073,6 @@
install_node(&bts_node, config_write_bts);
install_element(CONFIG_NODE, &cfg_bts_cmd);
install_element(CONFIG_NODE, &cfg_vty_telnet_port_cmd);
- install_default(BTS_NODE);
install_element(BTS_NODE, &cfg_bts_unit_id_cmd);
install_element(BTS_NODE, &cfg_bts_oml_ip_cmd);
install_element(BTS_NODE, &cfg_bts_rtp_bind_ip_cmd);
@@ -1096,7 +1095,6 @@
/* add and link to TRX config node */
install_element(BTS_NODE, &cfg_bts_trx_cmd);
install_node(&trx_node, config_write_dummy);
- install_default(TRX_NODE);
install_element(TRX_NODE, &cfg_trx_user_gain_cmd);
install_element(TRX_NODE, &cfg_trx_pr_max_initial_cmd);
@@ -1111,12 +1109,10 @@
install_element(CONFIG_NODE, &cfg_phy_cmd);
install_node(&phy_node, config_write_phy);
- install_default(PHY_NODE);
install_element(PHY_NODE, &cfg_phy_inst_cmd);
install_element(PHY_NODE, &cfg_phy_no_inst_cmd);
install_node(&phy_inst_node, config_write_dummy);
- install_default(PHY_INST_NODE);
return 0;
}
diff --git a/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c
b/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c
index 189a7e2..e1ddfc7 100644
--- a/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c
+++ b/src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c
@@ -979,95 +979,75 @@
install_node(&mgr_node, config_write_mgr);
install_element(CONFIG_NODE, &cfg_mgr_cmd);
- vty_install_default(MGR_NODE);
/* install the limit nodes */
install_node(&limit_supply_temp_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_supply_temp_cmd);
- vty_install_default(LIMIT_SUPPLY_TEMP_NODE);
install_node(&limit_soc_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_soc_temp_cmd);
- vty_install_default(LIMIT_SOC_NODE);
install_node(&limit_fpga_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_fpga_temp_cmd);
- vty_install_default(LIMIT_FPGA_NODE);
install_node(&limit_rmsdet_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_rmsdet_temp_cmd);
- vty_install_default(LIMIT_RMSDET_NODE);
install_node(&limit_ocxo_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_ocxo_temp_cmd);
- vty_install_default(LIMIT_OCXO_NODE);
install_node(&limit_tx0_temp_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_tx0_temp_cmd);
- vty_install_default(LIMIT_TX0_TEMP_NODE);
install_node(&limit_tx1_temp_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_tx1_temp_cmd);
- vty_install_default(LIMIT_TX1_TEMP_NODE);
install_node(&limit_pa0_temp_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_pa0_temp_cmd);
- vty_install_default(LIMIT_PA0_TEMP_NODE);
install_node(&limit_pa1_temp_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_pa1_temp_cmd);
- vty_install_default(LIMIT_PA1_TEMP_NODE);
install_node(&limit_supply_volt_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_supply_volt_cmd);
register_limit(LIMIT_SUPPLY_VOLT_NODE, MGR_LIMIT_TYPE_VOLT);
- vty_install_default(LIMIT_SUPPLY_VOLT_NODE);
install_node(&limit_tx0_vswr_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_tx0_vswr_cmd);
register_limit(LIMIT_TX0_VSWR_NODE, MGR_LIMIT_TYPE_VSWR);
- vty_install_default(LIMIT_TX0_VSWR_NODE);
install_node(&limit_tx1_vswr_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_tx1_vswr_cmd);
register_limit(LIMIT_TX1_VSWR_NODE, MGR_LIMIT_TYPE_VSWR);
- vty_install_default(LIMIT_TX1_VSWR_NODE);
install_node(&limit_supply_pwr_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_supply_pwr_cmd);
register_limit(LIMIT_SUPPLY_PWR_NODE, MGR_LIMIT_TYPE_PWR);
- vty_install_default(LIMIT_SUPPLY_PWR_NODE);
install_node(&limit_pa0_pwr_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_pa0_pwr_cmd);
register_limit(LIMIT_PA0_PWR_NODE, MGR_LIMIT_TYPE_PWR);
- vty_install_default(LIMIT_PA0_PWR_NODE);
install_node(&limit_pa1_pwr_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_pa1_pwr_cmd);
register_limit(LIMIT_PA1_PWR_NODE, MGR_LIMIT_TYPE_PWR);
- vty_install_default(LIMIT_PA1_PWR_NODE);
install_node(&limit_gps_fix_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_gps_fix_cmd);
- vty_install_default(LIMIT_GPS_FIX_NODE);
/* install the normal node */
install_node(&act_norm_node, config_write_dummy);
install_element(MGR_NODE, &cfg_action_normal_cmd);
register_normal_action(ACT_NORM_NODE);
- vty_install_default(ACT_NORM_NODE);
/* install the warning and critical node */
install_node(&act_warn_node, config_write_dummy);
install_element(MGR_NODE, &cfg_action_warn_cmd);
register_action(ACT_WARN_NODE);
- vty_install_default(ACT_WARN_NODE);
install_node(&act_crit_node, config_write_dummy);
install_element(MGR_NODE, &cfg_action_critical_cmd);
register_action(ACT_CRIT_NODE);
- vty_install_default(ACT_CRIT_NODE);
/* install LED pattern command for debugging purpose */
install_element_ve(&set_led_pattern_cmd);
diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c
b/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c
index cba4fbb..444ee7c 100644
--- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c
+++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c
@@ -480,45 +480,37 @@
install_node(&mgr_node, config_write_mgr);
install_element(CONFIG_NODE, &cfg_mgr_cmd);
- vty_install_default(MGR_NODE);
/* install the limit nodes */
install_node(&limit_rf_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_rf_cmd);
register_limit(LIMIT_RF_NODE);
- vty_install_default(LIMIT_RF_NODE);
install_node(&limit_digital_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_digital_cmd);
register_limit(LIMIT_DIGITAL_NODE);
- vty_install_default(LIMIT_DIGITAL_NODE);
install_node(&limit_board_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_board_cmd);
register_limit(LIMIT_BOARD_NODE);
- vty_install_default(LIMIT_BOARD_NODE);
install_node(&limit_pa_node, config_write_dummy);
install_element(MGR_NODE, &cfg_limit_pa_cmd);
register_limit(LIMIT_PA_NODE);
- vty_install_default(LIMIT_PA_NODE);
/* install the normal node */
install_node(&act_norm_node, config_write_dummy);
install_element(MGR_NODE, &cfg_action_normal_cmd);
register_normal_action(ACT_NORM_NODE);
- vty_install_default(ACT_NORM_NODE);
/* install the warning and critical node */
install_node(&act_warn_node, config_write_dummy);
install_element(MGR_NODE, &cfg_action_warn_cmd);
register_action(ACT_WARN_NODE);
- vty_install_default(ACT_WARN_NODE);
install_node(&act_crit_node, config_write_dummy);
install_element(MGR_NODE, &cfg_action_critical_cmd);
register_action(ACT_CRIT_NODE);
- vty_install_default(ACT_CRIT_NODE);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/4610
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e8e9d7989ee20fe722bdd3109965d5bce9519fb
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <[email protected]>
