Change in osmo-bsc[master]: vty: ensure that all warning messages are prefixed with '%%'

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

fixeria gerrit-no-reply at lists.osmocom.org
Sun Aug 9 11:29:26 UTC 2020


fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19550 )


Change subject: vty: ensure that all warning messages are prefixed with '%%'
......................................................................

vty: ensure that all warning messages are prefixed with '%%'

Change-Id: I6f2348c481ed43904d05b42fd7d5ce04dedbf46b
---
M src/osmo-bsc/bsc_vty.c
1 file changed, 57 insertions(+), 55 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/19550/1

diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index e4842f7..c1228be 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -1771,7 +1771,7 @@
 		}
 
 		if (!new_bts) {
-			vty_out(vty, "Unable to trigger handover, specified bts #%u does not exist %s",
+			vty_out(vty, "%% Unable to trigger handover, specified bts #%u does not exist %s",
 				bts_nr_new, VTY_NEWLINE);
 			return CMD_WARNING;
 		}
@@ -1793,7 +1793,7 @@
 		}
 	}
 
-	vty_out(vty, "Unable to trigger %s, specified connection (bts=%u,trx=%u,ts=%u,ss=%u) does not exist%s",
+	vty_out(vty, "%% Unable to trigger %s, specified connection (bts=%u,trx=%u,ts=%u,ss=%u) does not exist%s",
 		action, bts_nr, trx_nr, ts_nr, ss_nr, VTY_NEWLINE);
 
 	return CMD_WARNING;
@@ -1865,7 +1865,7 @@
 		random_idx %= count;
 	}
 
-	vty_out(vty, "Cannot find any ongoing voice calls%s", VTY_NEWLINE);
+	vty_out(vty, "%% Cannot find any ongoing voice calls%s", VTY_NEWLINE);
 	return NULL;
 }
 
@@ -1892,7 +1892,7 @@
 			return bts;
 		}
 	}
-	vty_out(vty, "Cannot find any BTS (other than BTS %u) with free %s lchan%s",
+	vty_out(vty, "%% Cannot find any BTS (other than BTS %u) with free %s lchan%s",
 		not_this_bts? not_this_bts->nr : 255, gsm_lchant_name(free_type), VTY_NEWLINE);
 	return NULL;
 }
@@ -2036,7 +2036,7 @@
 
 	page_group = gsm0502_calc_paging_group(&bts->si_common.chan_desc,
 						str_to_imsi(argv[1]));
-	vty_out(vty, "%%Paging group for IMSI %" PRIu64 " on BTS #%d is %u%s",
+	vty_out(vty, "%% Paging group for IMSI %" PRIu64 " on BTS #%d is %u%s",
 		str_to_imsi(argv[1]), bts->nr,
 		page_group, VTY_NEWLINE);
 	return CMD_SUCCESS;
@@ -3197,7 +3197,7 @@
 	enum bts_gprs_mode mode = bts_gprs_mode_parse(argv[0], NULL);
 
 	if (!bts_gprs_mode_is_compat(bts, mode)) {
-		vty_out(vty, "This BTS type does not support %s%s", argv[0],
+		vty_out(vty, "%% This BTS type does not support %s%s", argv[0],
 			VTY_NEWLINE);
 		return CMD_WARNING;
 	}
@@ -3305,7 +3305,7 @@
 
 	type = get_string_value(osmo_sitype_strs, argv[0]);
 	if (type < 0) {
-		vty_out(vty, "Error SI Type%s", VTY_NEWLINE);
+		vty_out(vty, "%% Error SI Type%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -3328,12 +3328,12 @@
 
 	type = get_string_value(osmo_sitype_strs, argv[0]);
 	if (type < 0) {
-		vty_out(vty, "Error SI Type%s", VTY_NEWLINE);
+		vty_out(vty, "%% Error SI Type%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
 	if (!(bts->si_mode_static & (1 << type))) {
-		vty_out(vty, "SI Type %s is not configured in static mode%s",
+		vty_out(vty, "%% SI Type %s is not configured in static mode%s",
 			get_value_string(osmo_sitype_strs, type), VTY_NEWLINE);
 		return CMD_WARNING;
 	}
@@ -3344,7 +3344,7 @@
 	/* Parse the user-specified SI in hex format, [partially] overwriting padding */
 	rc = osmo_hexparse(argv[1], GSM_BTS_SI(bts, type), GSM_MACBLOCK_LEN);
 	if (rc < 0 || rc > GSM_MACBLOCK_LEN) {
-		vty_out(vty, "Error parsing HEXSTRING%s", VTY_NEWLINE);
+		vty_out(vty, "%% Error parsing HEXSTRING%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -3376,7 +3376,7 @@
 	struct gsm_bts *bts = vty->index;
 
 	if (!is_ipaccess_bts(bts) || is_sysmobts_v2(bts)) {
-		vty_out(vty, "This command is only intended for ipaccess nanoBTS. See OS#3707.%s",
+		vty_out(vty, "%% This command is only intended for ipaccess nanoBTS. See OS#3707.%s",
 			VTY_NEWLINE);
 		return CMD_WARNING;
 	}
@@ -3497,24 +3497,24 @@
 
 	switch (r) {
 	case 1:
-		vty_out(vty, "Warning: multiple threshold-high are not supported, overriding with %u%s",
+		vty_out(vty, "%% Warning: multiple threshold-high are not supported, overriding with %u%s",
 			thresh_hi, VTY_NEWLINE);
 		break;
 	case EARFCN_THRESH_LOW_INVALID:
-		vty_out(vty, "Warning: multiple threshold-low are not supported, overriding with %u%s",
+		vty_out(vty, "%% Warning: multiple threshold-low are not supported, overriding with %u%s",
 			thresh_lo, VTY_NEWLINE);
 		break;
 	case EARFCN_QRXLV_INVALID + 1:
-		vty_out(vty, "Warning: multiple QRXLEVMIN are not supported, overriding with %u%s",
+		vty_out(vty, "%% Warning: multiple QRXLEVMIN are not supported, overriding with %u%s",
 			qrx, VTY_NEWLINE);
 		break;
 	case EARFCN_PRIO_INVALID:
-		vty_out(vty, "Warning: multiple priorities are not supported, overriding with %u%s",
+		vty_out(vty, "%% Warning: multiple priorities are not supported, overriding with %u%s",
 			prio, VTY_NEWLINE);
 		break;
 	default:
 		if (r < 0) {
-			vty_out(vty, "Unable to add ARFCN %u: %s%s", arfcn, strerror(-r), VTY_NEWLINE);
+			vty_out(vty, "%% Unable to add ARFCN %u: %s%s", arfcn, strerror(-r), VTY_NEWLINE);
 			return CMD_WARNING;
 		}
 	}
@@ -3522,7 +3522,7 @@
 	if (si2q_num(bts) <= SI2Q_MAX_NUM)
 		return CMD_SUCCESS;
 
-	vty_out(vty, "Warning: not enough space in SI2quater (%u/%u used) for a given EARFCN %u%s",
+	vty_out(vty, "%% Warning: not enough space in SI2quater (%u/%u used) for a given EARFCN %u%s",
 		bts->si2q_count, SI2Q_MAX_NUM, arfcn, VTY_NEWLINE);
 	osmo_earfcn_del(e, arfcn);
 
@@ -3542,7 +3542,7 @@
 	uint16_t arfcn = atoi(argv[0]);
 	int r = osmo_earfcn_del(e, arfcn);
 	if (r < 0) {
-		vty_out(vty, "Unable to delete arfcn %u: %s%s", arfcn,
+		vty_out(vty, "%% Unable to delete arfcn %u: %s%s", arfcn,
 			strerror(-r), VTY_NEWLINE);
 		return CMD_WARNING;
 	}
@@ -3562,14 +3562,16 @@
 
 	switch(bts_uarfcn_add(bts, arfcn, scramble, atoi(argv[2]))) {
 	case -ENOMEM:
-		vty_out(vty, "Unable to add UARFCN: max number of UARFCNs (%u) reached%s", MAX_EARFCN_LIST, VTY_NEWLINE);
+		vty_out(vty, "%% Unable to add UARFCN: max number of UARFCNs (%u) reached%s",
+			MAX_EARFCN_LIST, VTY_NEWLINE);
 		return CMD_WARNING;
 	case -ENOSPC:
-		vty_out(vty, "Warning: not enough space in SI2quater for a given UARFCN (%u, %u)%s",
+		vty_out(vty, "%% Warning: not enough space in SI2quater for a given UARFCN (%u, %u)%s",
 			arfcn, scramble, VTY_NEWLINE);
 		return CMD_WARNING;
 	case -EADDRINUSE:
-		vty_out(vty, "Unable to add UARFCN: (%u, %u) is already added%s", arfcn, scramble, VTY_NEWLINE);
+		vty_out(vty, "%% Unable to add UARFCN: (%u, %u) is already added%s",
+			arfcn, scramble, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -3588,7 +3590,7 @@
 	struct gsm_bts *bts = vty->index;
 
 	if (bts_uarfcn_del(bts, atoi(argv[0]), atoi(argv[1])) < 0) {
-		vty_out(vty, "Unable to delete uarfcn: pair not found%s",
+		vty_out(vty, "%% Unable to delete uarfcn: pair not found%s",
 			VTY_NEWLINE);
 		return CMD_WARNING;
 	}
@@ -3734,9 +3736,9 @@
 	error = acc_ramp_set_step_interval(&bts->acc_ramp, atoi(argv[0]));
 	if (error != 0) {
 		if (error == -ERANGE)
-			vty_out(vty, "Unable to set ACC ramp step interval: value out of range%s", VTY_NEWLINE);
+			vty_out(vty, "%% Unable to set ACC ramp step interval: value out of range%s", VTY_NEWLINE);
 		else
-			vty_out(vty, "Unable to set ACC ramp step interval: unknown error%s", VTY_NEWLINE);
+			vty_out(vty, "%% Unable to set ACC ramp step interval: unknown error%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -3757,9 +3759,9 @@
 	error = acc_ramp_set_step_size(&bts->acc_ramp, atoi(argv[0]));
 	if (error != 0) {
 		if (error == -ERANGE)
-			vty_out(vty, "Unable to set ACC ramp step size: value out of range%s", VTY_NEWLINE);
+			vty_out(vty, "%% Unable to set ACC ramp step size: value out of range%s", VTY_NEWLINE);
 		else
-			vty_out(vty, "Unable to set ACC ramp step size: unknown error%s", VTY_NEWLINE);
+			vty_out(vty, "%% Unable to set ACC ramp step size: unknown error%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -3778,7 +3780,7 @@
 
 	rc = acc_ramp_set_chan_load_thresholds(&bts->acc_ramp, atoi(argv[0]), atoi(argv[1]));
 	if (rc < 0) {
-		vty_out(vty, "Unable to set ACC channel load thresholds%s", VTY_NEWLINE);
+		vty_out(vty, "%% Unable to set ACC channel load thresholds%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -3909,20 +3911,20 @@
 
 
 	if (!is_ipaccess_bts(bts)) {
-		vty_out(vty, "This feature is only available for IP systems.%s",
+		vty_out(vty, "%% This feature is only available for IP systems.%s",
 			VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
 	other_bts = gsm_bts_num(bts->network, dep);
 	if (!other_bts || !is_ipaccess_bts(other_bts)) {
-		vty_out(vty, "This feature is only available for IP systems.%s",
+		vty_out(vty, "%% This feature is only available for IP systems.%s",
 			VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
 	if (dep >= bts->nr) {
-		vty_out(vty, "%%Need to depend on an already declared unit.%s",
+		vty_out(vty, "%% Need to depend on an already declared unit.%s",
 			VTY_NEWLINE);
 		return CMD_WARNING;
 	}
@@ -3964,13 +3966,13 @@
 	for (i = 0; i < argc; i++) {
 		mode = atoi(argv[i]);
 		if (mode_prev > mode) {
-			vty_out(vty, "Modes must be listed in order%s",
+			vty_out(vty, "%% Modes must be listed in order%s",
 				VTY_NEWLINE);
 			return -1;
 		}
 
 		if (mode_prev == mode) {
-			vty_out(vty, "Modes must be unique %s", VTY_NEWLINE);
+			vty_out(vty, "%% Modes must be unique %s", VTY_NEWLINE);
 			return -2;
 		}
 		mode_prev = mode;
@@ -4063,7 +4065,7 @@
 	rc = gsm48_multirate_config(NULL, mr_conf, mr->ms_mode, mr->num_modes);
 	if (rc != 0) {
 		vty_out(vty,
-			"Invalid AMR multirate configuration (tch-f, ms) - check parameters%s",
+			"%% Invalid AMR multirate configuration (tch-f, ms) - check parameters%s",
 			VTY_NEWLINE);
 		vty_rc = CMD_WARNING;
 	}
@@ -4071,7 +4073,7 @@
 	rc = gsm48_multirate_config(NULL, mr_conf, mr->bts_mode, mr->num_modes);
 	if (rc != 0) {
 		vty_out(vty,
-			"Invalid AMR multirate configuration (tch-f, bts) - check parameters%s",
+			"%% Invalid AMR multirate configuration (tch-f, bts) - check parameters%s",
 			VTY_NEWLINE);
 		vty_rc = CMD_WARNING;
 	}
@@ -4081,7 +4083,7 @@
 	rc = gsm48_multirate_config(NULL, mr_conf, mr->ms_mode, mr->num_modes);
 	if (rc != 0) {
 		vty_out(vty,
-			"Invalid AMR multirate configuration (tch-h, ms) - check parameters%s",
+			"%% Invalid AMR multirate configuration (tch-h, ms) - check parameters%s",
 			VTY_NEWLINE);
 		vty_rc = CMD_WARNING;
 	}
@@ -4089,7 +4091,7 @@
 	rc = gsm48_multirate_config(NULL, mr_conf, mr->bts_mode, mr->num_modes);
 	if (rc != 0) {
 		vty_out(vty,
-			"Invalid AMR multirate configuration (tch-h, bts) - check parameters%s",
+			"%% Invalid AMR multirate configuration (tch-h, bts) - check parameters%s",
 			VTY_NEWLINE);
 		vty_rc = CMD_WARNING;
 	}
@@ -4330,7 +4332,7 @@
 		bts->T3113_dynamic = true;
 		break;
 	default:
-		vty_out(vty, "T%d cannot be set to dynamic%s", d->T, VTY_NEWLINE);
+		vty_out(vty, "%% T%d cannot be set to dynamic%s", d->T, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -4356,7 +4358,7 @@
 		bts->T3113_dynamic = false;
 		break;
 	default:
-		vty_out(vty, "T%d already is non-dynamic%s", d->T, VTY_NEWLINE);
+		vty_out(vty, "%% T%d already is non-dynamic%s", d->T, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -4613,7 +4615,7 @@
 	int enabled = atoi(argv[0]);
 
 	if (enabled && !osmo_bts_has_feature(&ts->trx->bts->model->features, BTS_FEAT_HOPPING)) {
-		vty_out(vty, "BTS model does not support hopping%s",
+		vty_out(vty, "%% BTS model does not support hopping%s",
 			VTY_NEWLINE);
 		return CMD_WARNING;
 	}
@@ -4742,19 +4744,19 @@
 
 	bts_nr = atoi(argv[0]);
 	if (bts_nr >= gsmnet->num_bts) {
-		vty_out(vty, "BTS number must be between 0 and %d. It was %d.%s",
+		vty_out(vty, "%% BTS number must be between 0 and %d. It was %d.%s",
 			gsmnet->num_bts, bts_nr, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
 	bts = gsm_bts_num(gsmnet, bts_nr);
 	if (!bts) {
-		vty_out(vty, "BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);
+		vty_out(vty, "%% BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
 	if (!is_ipaccess_bts(bts)) {
-		vty_out(vty, "This command only works for ipaccess.%s", VTY_NEWLINE);
+		vty_out(vty, "%% This command only works for ipaccess.%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -4768,7 +4770,7 @@
 			ipaccess_drop_rsl(trx, "vty");
 		}
 	} else {
-		vty_out(vty, "Argument must be 'oml# or 'rsl'.%s", VTY_NEWLINE);
+		vty_out(vty, "%% Argument must be 'oml# or 'rsl'.%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -4789,19 +4791,19 @@
 
 	bts_nr = atoi(argv[0]);
 	if (bts_nr >= gsmnet->num_bts) {
-		vty_out(vty, "BTS number must be between 0 and %d. It was %d.%s",
+		vty_out(vty, "%% BTS number must be between 0 and %d. It was %d.%s",
 			gsmnet->num_bts, bts_nr, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
 	bts = gsm_bts_num(gsmnet, bts_nr);
 	if (!bts) {
-		vty_out(vty, "BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);
+		vty_out(vty, "%% BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
 	if (!is_ipaccess_bts(bts) || is_sysmobts_v2(bts)) {
-		vty_out(vty, "This command only works for ipaccess nanoBTS.%s",
+		vty_out(vty, "%% This command only works for ipaccess nanoBTS.%s",
 			VTY_NEWLINE);
 		return CMD_WARNING;
 	}
@@ -4826,14 +4828,14 @@
 
 	bts_nr = atoi(argv[0]);
 	if (bts_nr >= gsmnet->num_bts) {
-		vty_out(vty, "BTS number must be between 0 and %d. It was %d.%s",
+		vty_out(vty, "%% BTS number must be between 0 and %d. It was %d.%s",
 			gsmnet->num_bts, bts_nr, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
 	bts = gsm_bts_num(gsmnet, bts_nr);
 	if (!bts) {
-		vty_out(vty, "BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);
+		vty_out(vty, "%% BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -4872,7 +4874,7 @@
 	}
 	rc = osmo_hexparse(argv[3], buf, sizeof(buf));
 	if (rc < 0 || rc > sizeof(buf)) {
-		vty_out(vty, "Error parsing HEXSTRING%s", VTY_NEWLINE);
+		vty_out(vty, "%% Error parsing HEXSTRING%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -4885,7 +4887,7 @@
 	else if (!strcmp(type_str, "default"))
 		cb_cmd.command = RSL_CB_CMD_TYPE_DEFAULT;
 	else {
-		vty_out(vty, "Error parsing type%s", VTY_NEWLINE);
+		vty_out(vty, "%% Error parsing type%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -4903,7 +4905,7 @@
 		cb_cmd.last_block = RSL_CB_CMD_LASTBLOCK_4;
 		break;
 	default:
-		vty_out(vty, "Error parsing LASTBLOCK%s", VTY_NEWLINE);
+		vty_out(vty, "%% Error parsing LASTBLOCK%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -5019,14 +5021,14 @@
 	rc = gsm48_multirate_config(lchan->mr_ms_lv, mr_conf, mr.ms_mode, mr.num_modes);
 	if (rc != 0) {
 		vty_out(vty,
-			"Invalid AMR multirate configuration (%s, amr mode %d, ms) - check parameters%s",
+			"%% Invalid AMR multirate configuration (%s, amr mode %d, ms) - check parameters%s",
 			gsm_lchant_name(lchan->type), amr_mode, VTY_NEWLINE);
 		vty_rc = CMD_WARNING;
 	}
 	rc = gsm48_multirate_config(lchan->mr_bts_lv, mr_conf, mr.bts_mode, mr.num_modes);
 	if (rc != 0) {
 		vty_out(vty,
-			"Invalid AMR multirate configuration (%s, amr mode %d, bts) - check parameters%s",
+			"%% Invalid AMR multirate configuration (%s, amr mode %d, bts) - check parameters%s",
 			gsm_lchant_name(lchan->type), amr_mode, VTY_NEWLINE);
 		vty_rc = CMD_WARNING;
 	}
@@ -5485,7 +5487,7 @@
 
 	msc = osmo_msc_data_alloc(bsc_gsmnet, index);
 	if (!msc) {
-		vty_out(vty, "%%Failed to allocate MSC data.%s", VTY_NEWLINE);
+		vty_out(vty, "%% Failed to allocate MSC data.%s", VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 
@@ -6141,7 +6143,7 @@
 	bsc_subscr = bsc_subscr_find_or_create_by_imsi(bsc_gsmnet->bsc_subscribers, imsi);
 
 	if (!bsc_subscr) {
-		vty_out(vty, "%%failed to enable logging for subscriber with IMSI(%s)%s",
+		vty_out(vty, "%% failed to enable logging for subscriber with IMSI(%s)%s",
 			imsi, VTY_NEWLINE);
 		return CMD_WARNING;
 	}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19550
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I6f2348c481ed43904d05b42fd7d5ce04dedbf46b
Gerrit-Change-Number: 19550
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200809/8b7ee169/attachment.htm>


More information about the gerrit-log mailing list