diff options
| -rw-r--r-- | doc/examples/osmo-bsc/osmo-bsc-minimal.cfg | 2 | ||||
| -rw-r--r-- | doc/examples/osmo-bsc/osmo-bsc.cfg | 4 | ||||
| -rw-r--r-- | doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg | 4 | ||||
| -rw-r--r-- | doc/manuals/chapters/bts-examples.adoc | 8 | ||||
| -rw-r--r-- | doc/manuals/vty/bsc_vty_reference.xml | 6 | ||||
| -rw-r--r-- | doc/manuals/vty/libbsc_vty_additions.xml | 6 | ||||
| -rw-r--r-- | src/osmo-bsc/bsc_vty.c | 39 |
7 files changed, 47 insertions, 22 deletions
diff --git a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg index 850e29c84..f2597b846 100644 --- a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg @@ -5,7 +5,7 @@ network type sysmobts band GSM-1800 location_area_code 23 - ip.access unit_id 1800 0 + ipa unit-id 1800 0 trx 0 rf_locked 0 arfcn 868 diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index eec154db7..926951b9a 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -36,8 +36,8 @@ network channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 early-classmark-sending forbidden - ip.access unit_id 0 0 - oml ip.access stream_id 255 line 0 + ipa unit-id 0 0 + oml ipa stream-id 255 line 0 codec-support fr gprs mode none trx 0 diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index fd3a34950..80a38ba27 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -35,8 +35,8 @@ network channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 early-classmark-sending forbidden - ip.access unit_id 0 0 - oml ip.access stream_id 255 line 0 + ipa unit-id 0 0 + oml ipa stream-id 255 line 0 codec-support fr gprs mode none trx 0 diff --git a/doc/manuals/chapters/bts-examples.adoc b/doc/manuals/chapters/bts-examples.adoc index 2dd8b375c..58cb3ab17 100644 --- a/doc/manuals/chapters/bts-examples.adoc +++ b/doc/manuals/chapters/bts-examples.adoc @@ -35,8 +35,8 @@ network channel allocator ascending rach tx integer 9 rach max transmission 7 - ip.access unit_id 1801 0 <4> - oml ip.access stream_id 255 line 0 + ipa unit-id 1801 0 <4> + oml ipa stream-id 255 line 0 gprs mode none trx 0 rf_locked 0 @@ -113,8 +113,8 @@ network channel allocator ascending rach tx integer 9 rach max transmission 7 - ip.access unit_id 1800 0 <1> - oml ip.access stream_id 255 line 0 + ipa unit-id 1800 0 <1> + oml ipa stream-id 255 line 0 gprs mode none trx 0 rf_locked 0 diff --git a/doc/manuals/vty/bsc_vty_reference.xml b/doc/manuals/vty/bsc_vty_reference.xml index 9992267fb..4d25e6989 100644 --- a/doc/manuals/vty/bsc_vty_reference.xml +++ b/doc/manuals/vty/bsc_vty_reference.xml @@ -2884,7 +2884,7 @@ <param name='<0-63>' doc='BSIC of this BTS' /> </params> </command> - <command id='ip.access unit_id <0-65534> <0-255>'> + <command id='ipa unit-id <0-65534> <0-255>'> <params> <param name='ip.access' doc='Abis/IP specific options' /> <param name='unit_id' doc='Set the IPA BTS Unit ID' /> @@ -2892,7 +2892,7 @@ <param name='<0-255>' doc='Unit ID (BTS)' /> </params> </command> - <command id='ip.access rsl-ip A.B.C.D'> + <command id='ipa rsl-ip A.B.C.D'> <params> <param name='ip.access' doc='Abis/IP specific options' /> <param name='rsl-ip' doc='Set the IPA RSL IP Address of the BSC' /> @@ -2922,7 +2922,7 @@ <param name='<15-100>' doc='and the BTS is being bootstrapped.' /> </params> </command> - <command id='oml ip.access stream_id <0-255> line E1_LINE'> + <command id='oml ipa stream-id <0-255> line E1_LINE'> <params> <param name='oml' doc='Organization & Maintenance Link' /> <param name='ip.access' doc='A-bis/IP Specific Options' /> diff --git a/doc/manuals/vty/libbsc_vty_additions.xml b/doc/manuals/vty/libbsc_vty_additions.xml index 868539850..cf61961a4 100644 --- a/doc/manuals/vty/libbsc_vty_additions.xml +++ b/doc/manuals/vty/libbsc_vty_additions.xml @@ -11,7 +11,7 @@ <child_of nodeid='14' /> <name>BTS Configuration</name> <description>This is the configuration of a single BTS.</description> - <command id='oml ip.access stream_id <0-255> line E1_LINE'> + <command id='oml ipa stream-id <0-255> line E1_LINE'> <description> Set the IPA stream identifier for the OML link within the IPA multiplex. Must be the same as on the BTS side. The default @@ -40,7 +40,7 @@ shall be used by MS in this cell. The default should be enabled. </description> </command> - <command id='ip.access rsl-ip A.B.C.D'> + <command id='ipa rsl-ip A.B.C.D'> <description> Configure the IP address of the BSC used for RSL. Abis/IP BTSs, including OsmoBTS and the nanoBTS will be instructed to @@ -96,7 +96,7 @@ re-selection. </description> </command> - <command id='ip.access unit_id <0-65534> <0-255>'> + <command id='ipa unit-id <0-65534> <0-255>'> <description> The ip.access unit ID is a parameter of the IPA Signalling-over-IP multiplex. It is administratively diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 111c9107e..c4e091ca7 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -897,15 +897,15 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: case GSM_BTS_TYPE_OSMOBTS: - vty_out(vty, " ip.access unit_id %u %u%s", + vty_out(vty, " ipa unit-id %u %u%s", bts->ip_access.site_id, bts->ip_access.bts_id, VTY_NEWLINE); if (bts->ip_access.rsl_ip) { struct in_addr ia; ia.s_addr = htonl(bts->ip_access.rsl_ip); - vty_out(vty, " ip.access rsl-ip %s%s", inet_ntoa(ia), + vty_out(vty, " ipa rsl-ip %s%s", inet_ntoa(ia), VTY_NEWLINE); } - vty_out(vty, " oml ip.access stream_id %u line %u%s", + vty_out(vty, " oml ipa stream-id %u line %u%s", bts->oml_tei, bts->oml_e1_link.e1_nr, VTY_NEWLINE); break; case GSM_BTS_TYPE_NOKIA_SITE: @@ -2180,7 +2180,7 @@ DEFUN(cfg_bts_bsic, DEFUN(cfg_bts_unit_id, cfg_bts_unit_id_cmd, - "ip.access unit_id <0-65534> <0-255>", + "ipa unit-id <0-65534> <0-255>", "Abis/IP specific options\n" "Set the IPA BTS Unit ID\n" "Unit ID (Site)\n" @@ -2201,9 +2201,17 @@ DEFUN(cfg_bts_unit_id, return CMD_SUCCESS; } +DEFUN_DEPRECATED(cfg_bts_unit_id, + cfg_bts_deprecated_unit_id_cmd, + "ip.access unit_id <0-65534> <0-255>", + "Abis/IP specific options\n" + "Set the IPA BTS Unit ID\n" + "Unit ID (Site)\n" + "Unit ID (BTS)\n"); + DEFUN(cfg_bts_rsl_ip, cfg_bts_rsl_ip_cmd, - "ip.access rsl-ip A.B.C.D", + "ipa rsl-ip A.B.C.D", "Abis/IP specific options\n" "Set the IPA RSL IP Address of the BSC\n" "Destination IP address for RSL connection\n") @@ -2222,6 +2230,13 @@ DEFUN(cfg_bts_rsl_ip, return CMD_SUCCESS; } +DEFUN_DEPRECATED(cfg_bts_rsl_ip, + cfg_bts_deprecated_rsl_ip_cmd, + "ip.access rsl-ip A.B.C.D", + "Abis/IP specific options\n" + "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" DEFUN(cfg_bts_nokia_site_skip_reset, @@ -2287,9 +2302,9 @@ DEFUN(cfg_bts_nokia_site_bts_reset_timer_cnf, DEFUN(cfg_bts_stream_id, cfg_bts_stream_id_cmd, - "oml ip.access stream_id <0-255> line E1_LINE", + "oml ipa stream-id <0-255> line E1_LINE", OML_STR IPA_STR - "Set the ip.access Stream ID of the OML link of this BTS\n" + "Set the ipa Stream ID of the OML link of this BTS\n" "Stream Identifier\n" "Virtual E1 Line Number\n" "Virtual E1 Line Number\n") { struct gsm_bts *bts = vty->index; @@ -2307,6 +2322,13 @@ DEFUN(cfg_bts_stream_id, return CMD_SUCCESS; } +DEFUN_DEPRECATED(cfg_bts_stream_id, + cfg_bts_deprecated_stream_id_cmd, + "oml ip.access stream_id <0-255> line E1_LINE", + OML_STR IPA_STR + "Set the ip.access Stream ID of the OML link of this BTS\n" + "Stream Identifier\n" "Virtual E1 Line Number\n" "Virtual E1 Line Number\n"); + #define OML_E1_STR OML_STR "OML E1/T1 Configuration\n" DEFUN(cfg_bts_oml_e1, @@ -5237,11 +5259,14 @@ int bsc_vty_init(struct gsm_network *network) install_element(BTS_NODE, &cfg_bts_tsc_cmd); install_element(BTS_NODE, &cfg_bts_bsic_cmd); install_element(BTS_NODE, &cfg_bts_unit_id_cmd); + 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_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); install_element(BTS_NODE, &cfg_bts_stream_id_cmd); + install_element(BTS_NODE, &cfg_bts_deprecated_stream_id_cmd); install_element(BTS_NODE, &cfg_bts_oml_e1_cmd); install_element(BTS_NODE, &cfg_bts_oml_e1_tei_cmd); install_element(BTS_NODE, &cfg_bts_challoc_cmd); |