[M] Change in osmo-bsc[master]: nokia: rename vty settings, drop _site - gerrit-log

8 May 2026

falconia has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/42730?usp=email )
(
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: nokia: rename vty settings, drop _site
......................................................................
nokia: rename vty settings, drop _site
All Nokia-specific vty settings previously had names beginning
with nokia_site, creating needless confusion for operators of
Nokia BTS models that are newer than *Site family.  Rename these
vty settings to begin with just nokia, with nokia_site supported
as a backward compatibility alias.
Change-Id: I807c0ad14f4436a21f0be0a5ed291539cd4af7e8
---
M src/osmo-bsc/bts_vty.c
1 file changed, 57 insertions(+), 20 deletions(-)
Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c
index 3afa0cc..60a714f 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -389,10 +389,10 @@
#define NOKIA_STR "Nokia BTS related commands\n"
-DEFUN_USRATTR(cfg_bts_nokia_site_skip_reset,
-	      cfg_bts_nokia_site_skip_reset_cmd,
+DEFUN_USRATTR(cfg_bts_nokia_skip_reset,
+	      cfg_bts_nokia_skip_reset_cmd,
          X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK),
-	      "nokia_site skip-reset (0|1)",
+	      "nokia skip-reset (0|1)",
          NOKIA_STR
          "Skip the reset step during bootstrap process of this BTS\n"
          "Do NOT skip the reset\n" "Skip the reset\n")
@@ -408,10 +408,16 @@
return CMD_SUCCESS;
 }
+ALIAS_DEPRECATED(cfg_bts_nokia_skip_reset,
+		 cfg_bts_nokia_site_skip_reset_cmd,
+		 "nokia_site skip-reset (0|1)",
+		 NOKIA_STR
+		 "Skip the reset step during bootstrap process of this BTS\n"
+		 "Do NOT skip the reset\n" "Skip the reset\n");
-DEFUN_ATTR(cfg_bts_nokia_site_no_loc_rel_cnf,
-	   cfg_bts_nokia_site_no_loc_rel_cnf_cmd,
-	   "nokia_site no-local-rel-conf (0|1)",
+DEFUN_ATTR(cfg_bts_nokia_no_loc_rel_cnf,
+	   cfg_bts_nokia_no_loc_rel_cnf_cmd,
+	   "nokia no-local-rel-conf (0|1)",
       NOKIA_STR
       "Do not wait for RELease CONFirm message when releasing channel locally\n"
       "Wait for RELease CONFirm\n" "Do not wait for RELease CONFirm\n",
@@ -428,10 +434,16 @@
return CMD_SUCCESS;
 }
+ALIAS_DEPRECATED(cfg_bts_nokia_no_loc_rel_cnf,
+		 cfg_bts_nokia_site_no_loc_rel_cnf_cmd,
+		 "nokia_site no-local-rel-conf (0|1)",
+		 NOKIA_STR
+		 "Do not wait for RELease CONFirm message when releasing channel locally\n"
+		 "Wait for RELease CONFirm\n" "Do not wait for RELease CONFirm\n");
-DEFUN_ATTR(cfg_bts_nokia_site_bts_reset_timer_cnf,
-	   cfg_bts_nokia_site_bts_reset_timer_cnf_cmd,
-	   "nokia_site bts-reset-timer <15-300>",
+DEFUN_ATTR(cfg_bts_nokia_bts_reset_timer_cnf,
+	   cfg_bts_nokia_bts_reset_timer_cnf_cmd,
+	   "nokia bts-reset-timer <15-300>",
       NOKIA_STR
       "The amount of time between BTS_RESET is sent "
       "and the BTS is being bootstrapped\n"
@@ -449,11 +461,18 @@
return CMD_SUCCESS;
 }
+ALIAS_DEPRECATED(cfg_bts_nokia_bts_reset_timer_cnf,
+		 cfg_bts_nokia_site_bts_reset_timer_cnf_cmd,
+		 "nokia_site bts-reset-timer <15-300>",
+		 NOKIA_STR
+		 "The amount of time between BTS_RESET is sent "
+		 "and the BTS is being bootstrapped\n"
+		 "Timer value (in seconds, default 15)\n");
-DEFUN_USRATTR(cfg_bts_nokia_site_hopping_mode,
-		cfg_bts_nokia_site_hopping_mode_cmd,
+DEFUN_USRATTR(cfg_bts_nokia_hopping_mode,
+		cfg_bts_nokia_hopping_mode_cmd,
    	X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK),
-		"nokia_site hopping-mode (baseband|synthesizer)",
+		"nokia hopping-mode (baseband|synthesizer)",
    	NOKIA_STR
    	"Sets the hopping type for Nokia *Site\n"
    	"Baseband (BB) hopping\n"
@@ -473,11 +492,18 @@
return CMD_SUCCESS;
 }
+ALIAS_DEPRECATED(cfg_bts_nokia_hopping_mode,
+		 cfg_bts_nokia_site_hopping_mode_cmd,
+		 "nokia_site hopping-mode (baseband|synthesizer)",
+		 NOKIA_STR
+		 "Sets the hopping type for Nokia *Site\n"
+		 "Baseband (BB) hopping\n"
+		 "Synthesizer (RF) hopping\n");
-DEFUN_USRATTR(cfg_bts_nokia_site_rx_div,
-	      cfg_bts_nokia_site_rx_div_cmd,
+DEFUN_USRATTR(cfg_bts_nokia_rx_div,
+	      cfg_bts_nokia_rx_div_cmd,
          X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK),
-	      "nokia_site rx-diversity (0|1)",
+	      "nokia rx-diversity (0|1)",
          NOKIA_STR
          "Rx diversity feature\n"
          "Disable Rx diversity\n" "Enable Rx diversity\n")
@@ -493,6 +519,12 @@
return CMD_SUCCESS;
 }
+ALIAS_DEPRECATED(cfg_bts_nokia_rx_div,
+		 cfg_bts_nokia_site_rx_div_cmd,
+		 "nokia_site rx-diversity (0|1)",
+		 NOKIA_STR
+		 "Rx diversity feature\n"
+		 "Disable Rx diversity\n" "Enable Rx diversity\n");
#define OML_STR	"Organization & Maintenance Link\n"
 #define IPA_STR "A-bis/IP Specific Options\n"
@@ -4735,12 +4767,12 @@
    		bts->oml_tei, bts->oml_e1_link.e1_nr, VTY_NEWLINE);
    	break;
    case GSM_BTS_TYPE_NOKIA_SITE:
-		vty_out(vty, "  nokia_site skip-reset %d%s", bts->nokia.skip_reset, VTY_NEWLINE);
-		vty_out(vty, "  nokia_site no-local-rel-conf %d%s",
+		vty_out(vty, "  nokia skip-reset %d%s", bts->nokia.skip_reset, VTY_NEWLINE);
+		vty_out(vty, "  nokia no-local-rel-conf %d%s",
    		bts->nokia.no_loc_rel_cnf, VTY_NEWLINE);
-		vty_out(vty, "  nokia_site bts-reset-timer %d%s", bts->nokia.bts_reset_timer_cnf, VTY_NEWLINE);
-		vty_out(vty, "  nokia_site hopping-mode %s%s", get_value_string(nokia_hopping_mode_strs, bts->nokia.hopping_mode), VTY_NEWLINE);
-		vty_out(vty, "  nokia_site rx-diversity %d%s", bts->nokia.rx_diversity, VTY_NEWLINE);
+		vty_out(vty, "  nokia bts-reset-timer %d%s", bts->nokia.bts_reset_timer_cnf, VTY_NEWLINE);
+		vty_out(vty, "  nokia hopping-mode %s%s", get_value_string(nokia_hopping_mode_strs, bts->nokia.hopping_mode), VTY_NEWLINE);
+		vty_out(vty, "  nokia rx-diversity %d%s", bts->nokia.rx_diversity, VTY_NEWLINE);
/* fall through: Nokia requires "oml e1" parameters also */
    default:
@@ -4965,6 +4997,11 @@
    install_element(BTS_NODE, &cfg_bts_deprecated_unit_id_cmd);
    install_element(BTS_NODE, &cfg_bts_rsl_ip_cmd);
    install_element(BTS_NODE, &cfg_bts_deprecated_rsl_ip_cmd);
+	install_element(BTS_NODE, &cfg_bts_nokia_skip_reset_cmd);
+	install_element(BTS_NODE, &cfg_bts_nokia_no_loc_rel_cnf_cmd);
+	install_element(BTS_NODE, &cfg_bts_nokia_bts_reset_timer_cnf_cmd);
+	install_element(BTS_NODE, &cfg_bts_nokia_hopping_mode_cmd);
+	install_element(BTS_NODE, &cfg_bts_nokia_rx_div_cmd);
    install_element(BTS_NODE, &cfg_bts_nokia_site_skip_reset_cmd);
    install_element(BTS_NODE, &cfg_bts_nokia_site_no_loc_rel_cnf_cmd);
    install_element(BTS_NODE, &cfg_bts_nokia_site_bts_reset_timer_cnf_cmd);
-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/42730?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email

Gerrit-MessageType: merged
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I807c0ad14f4436a21f0be0a5ed291539cd4af7e8
Gerrit-Change-Number: 42730
Gerrit-PatchSet: 5
Gerrit-Owner: falconia falcon@freecalypso.org
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia falcon@freecalypso.org
Gerrit-Reviewer: laforge laforge@osmocom.org
Gerrit-Reviewer: pespin pespin@sysmocom.de



    