falconia submitted this change.

View Change

nokia vty: change help strings away from "*Site"

Support for Nokia BTS in OsmoBSC is being expanded from just *Site
family to also include Flexi Multiradio - therefore, help strings
and error messages in vty should be changed accordingly.

FIXME: names of Nokia-specific vty settings still begin with
nokia_site, ditto for the name of the BTS model.  TODO: decide
on a proper long-term solution.

Change-Id: I55556b7b5aa5bc6efcbee815e9011497a933697c
---
M src/osmo-bsc/bts_vty.c
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c
index d69fb1f..54a9fab 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -387,7 +387,7 @@
       "Set the IPA RSL IP Address of the BSC\n"
       "Destination IP address for RSL connection\n");
 
-#define NOKIA_STR "Nokia *Site related commands\n"
+#define NOKIA_STR "Nokia BTS related commands\n"
 
 DEFUN_USRATTR(cfg_bts_nokia_site_skip_reset,
 	      cfg_bts_nokia_site_skip_reset_cmd,
@@ -400,7 +400,7 @@
 	struct gsm_bts *bts = vty->index;
 
 	if (bts->type != GSM_BTS_TYPE_NOKIA_SITE) {
-		vty_out(vty, "%% BTS is not of Nokia *Site type%s", VTY_NEWLINE);
+		vty_out(vty, "%% BTS is not of Nokia type%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -420,8 +420,7 @@
 	struct gsm_bts *bts = vty->index;
 
 	if (!is_nokia_bts(bts)) {
-		vty_out(vty, "%% BTS is not of Nokia *Site type%s",
-			VTY_NEWLINE);
+		vty_out(vty, "%% BTS is not of Nokia type%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -442,8 +441,7 @@
 	struct gsm_bts *bts = vty->index;
 
 	if (!is_nokia_bts(bts)) {
-		vty_out(vty, "%% BTS is not of Nokia *Site type%s",
-			VTY_NEWLINE);
+		vty_out(vty, "%% BTS is not of Nokia type%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -464,7 +462,7 @@
 	struct gsm_bts *bts = vty->index;
 
 	if (!is_nokia_bts(bts)) {
-		vty_out(vty, "%% BTS is not of Nokia *Site type%s", VTY_NEWLINE);
+		vty_out(vty, "%% BTS is not of Nokia type%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 

To view, visit change 42713. To unsubscribe, or for help writing mail filters, visit settings.