laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/32180 )
Change subject: cosmetic: Clarify language ip.access nanoBTS vs. all IPA Abis/IP
......................................................................
cosmetic: Clarify language ip.access nanoBTS vs. all IPA Abis/IP
Don't explicitly mention ip.access/nanoBTS if we actually want to refer
to all BTSs implementing an IPA-style Abis/IP interface.
Also, remove some bogus "is_ipa_abisip_bts(bts) || is_osmobts(bts)".
is_ipa_abisip_bts includes osmobts.
Change-Id: I31696d9a21a799511741a561085686cfa0728f93
---
M doc/manuals/chapters/bts.adoc
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/bts_ctrl.c
M src/osmo-bsc/bts_trx_vty.c
M src/osmo-bsc/bts_vty.c
M src/osmo-bsc/system_information.c
6 files changed, 32 insertions(+), 17 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc
index 9107aa1..5371745 100644
--- a/doc/manuals/chapters/bts.adoc
+++ b/doc/manuals/chapters/bts.adoc
@@ -47,7 +47,7 @@
RF Nominal Power: 23 dBm, reduced by 0 dB, resulting BS power: 23 dBm
NM State: Oper 'Enabled', Admin 2, Avail 'OK'
Baseband Transceiver NM State: Oper 'Enabled', Admin 2, Avail 'OK'
- ip.access stream ID: 0x00
+ IPA Abis/IP stream ID: 0x00
----
The output can be restricted to the TRXs of one specified BTS number
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 84bea1d..e53b145 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -1269,7 +1269,7 @@
}
if (!is_ipa_abisip_bts(bts)) {
- vty_out(vty, "%% This command only works for ipaccess.%s",
VTY_NEWLINE);
+ vty_out(vty, "%% This command only works for IPA Abis/IP.%s",
VTY_NEWLINE);
return CMD_WARNING;
}
@@ -1315,8 +1315,8 @@
return CMD_WARNING;
}
- if (!is_ipa_abisip_bts(bts) || is_osmobts(bts)) {
- vty_out(vty, "%% This command only works for ipaccess
nanoBTS.%s",
+ if (!is_ipa_abisip_bts(bts)) {
+ vty_out(vty, "%% This command only works for IPA Abis/IP.%s",
VTY_NEWLINE);
return CMD_WARNING;
}
@@ -1533,7 +1533,7 @@
}
if (!is_ipa_abisip_bts(ts->trx->bts)) {
- vty_out(vty, "%% This command only works for ipaccess BTS%s",
+ vty_out(vty, "%% This command only works for IPA Abis/IP BTS%s",
VTY_NEWLINE);
return CMD_WARNING;
}
@@ -2067,7 +2067,7 @@
lchan = &ts->lchan[ss_nr];
if (!is_ipa_abisip_bts(lchan->ts->trx->bts)) {
- vty_out(vty, "%% BTS is not of ip.access type%s", VTY_NEWLINE);
+ vty_out(vty, "%% BTS is not of IPA Abis/IP type%s",
VTY_NEWLINE);
return CMD_WARNING;
}
diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c
index 7d0b4d5..3a502b1 100644
--- a/src/osmo-bsc/bts_ctrl.c
+++ b/src/osmo-bsc/bts_ctrl.c
@@ -254,7 +254,7 @@
struct gsm_bts *bts = cmd->node;
if (!is_ipa_abisip_bts(bts)) {
- cmd->reply = "BTS is not IP based";
+ cmd->reply = "BTS is not IPA Abis/IP based";
return CTRL_CMD_ERROR;
}
diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c
index ab642a4..385336b 100644
--- a/src/osmo-bsc/bts_trx_vty.c
+++ b/src/osmo-bsc/bts_trx_vty.c
@@ -754,7 +754,7 @@
net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state);
if (is_ipa_abisip_bts(trx->bts)) {
- vty_out(vty, " ip.access stream ID: 0x%02x ",
trx->rsl_tei_primary);
+ vty_out(vty, " IPA Abis/IP stream ID: 0x%02x ",
trx->rsl_tei_primary);
e1isl_dump_vty_tcp(vty, trx->rsl_link_primary);
} else {
vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE);
diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c
index dc5216f..e37cfd4 100644
--- a/src/osmo-bsc/bts_vty.c
+++ b/src/osmo-bsc/bts_vty.c
@@ -341,7 +341,7 @@
int bts_id = atoi(argv[1]);
if (!is_ipa_abisip_bts(bts)) {
- vty_out(vty, "%% BTS is not of ip.access type%s", VTY_NEWLINE);
+ vty_out(vty, "%% BTS is not of IPA Abis/IP type%s",
VTY_NEWLINE);
return CMD_WARNING;
}
@@ -371,7 +371,7 @@
struct in_addr ia;
if (!is_ipa_abisip_bts(bts)) {
- vty_out(vty, "%% BTS is not of ip.access type%s", VTY_NEWLINE);
+ vty_out(vty, "%% BTS is not of IPA Abis/IP type%s",
VTY_NEWLINE);
return CMD_WARNING;
}
@@ -467,7 +467,7 @@
int stream_id = atoi(argv[0]), linenr = atoi(argv[1]);
if (!is_ipa_abisip_bts(bts)) {
- vty_out(vty, "%% BTS is not of ip.access type%s", VTY_NEWLINE);
+ vty_out(vty, "%% BTS is not of IPA Abis/IP type%s",
VTY_NEWLINE);
return CMD_WARNING;
}
@@ -1919,8 +1919,8 @@
{
struct gsm_bts *bts = vty->index;
- if (!is_ipa_abisip_bts(bts) || is_osmobts(bts)) {
- vty_out(vty, "%% This command is only intended for ipaccess
nanoBTS. See OS#3707.%s",
+ if (!is_ipa_abisip_bts(bts)) {
+ vty_out(vty, "%% This command is only intended for IPA Abis/IP
BTS. See OS#3707.%s",
VTY_NEWLINE);
return CMD_WARNING;
}
diff --git a/src/osmo-bsc/system_information.c
b/src/osmo-bsc/system_information.c
index 9b29cff..6e82c56 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -1083,7 +1083,7 @@
memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN);
- /* ip.access nanoBTS needs l2_plen!! */
+ /* Abis/IP needs l2_plen!! */
if (is_ipa_abisip_bts(bts)) {
*output++ = GSM48_LEN2PLEN(l2_plen);
l2_plen++;
@@ -1114,7 +1114,7 @@
memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN);
- /* ip.access nanoBTS needs l2_plen!! */
+ /* Abis/IP needs l2_plen!! */
if (is_ipa_abisip_bts(bts)) {
*output++ = GSM48_LEN2PLEN(l2_plen);
l2_plen++;
@@ -1153,7 +1153,7 @@
memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN);
- /* ip.access nanoBTS needs l2_plen!! */
+ /* Abis/IP needs l2_plen!! */
if (is_ipa_abisip_bts(bts)) {
*output++ = GSM48_LEN2PLEN(l2_plen);
l2_plen++;
@@ -1188,7 +1188,7 @@
memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN);
memset(&si6_ro_info, 0, sizeof(si6_ro_info));
- /* ip.access nanoBTS needs l2_plen!! */
+ /* Abis/IP needs l2_plen!! */
if (is_ipa_abisip_bts(bts)) {
*output++ = GSM48_LEN2PLEN(l2_plen);
l2_plen++;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32180
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I31696d9a21a799511741a561085686cfa0728f93
Gerrit-Change-Number: 32180
Gerrit-PatchSet: 3
Gerrit-Owner: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
