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/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.orgNeels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11125 ) Change subject: neighbor vty: rather 'no neighbor', not 'neighbor del' ...................................................................... neighbor vty: rather 'no neighbor', not 'neighbor del' Now the scheme nicely matches: bts 0 neighbor bts 1 no neighbor bts 1 Change-Id: Ib6015b8b48c1f6b98a02cb5a68e568083466e0d5 --- M src/osmo-bsc/neighbor_ident_vty.c M tests/neighbor_ident.vty 2 files changed, 23 insertions(+), 21 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 8db9db7..70240ac 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -69,10 +69,10 @@ } #define NEIGHBOR_ADD_CMD "neighbor " -#define NEIGHBOR_DEL_CMD "neighbor del " +#define NEIGHBOR_DEL_CMD "no neighbor " #define NEIGHBOR_DOC "Manage local and remote-BSS neighbor cells\n" #define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add " -#define NEIGHBOR_DEL_DOC NEIGHBOR_DOC "Remove local or remote-BSS neighbor cell\n" +#define NEIGHBOR_DEL_DOC NO_STR "Remove local or remote-BSS neighbor cell\n" #define LAC_PARAMS "lac <0-65535>" #define LAC_DOC "Neighbor cell by LAC\n" "LAC\n" diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty index 644e330..8de34d6 100644 --- a/tests/neighbor_ident.vty +++ b/tests/neighbor_ident.vty @@ -86,8 +86,8 @@ neighbor lac <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) neighbor cgi <0-999> <0-999> <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any) - neighbor del bts <0-255> - neighbor del arfcn <0-1023> bsic (<0-63>|any) + no neighbor bts <0-255> + no neighbor arfcn <0-1023> bsic (<0-63>|any) ... OsmoBSC(config-net-bts)# neighbor? @@ -98,7 +98,6 @@ lac Add Neighbor cell by LAC lac-ci Add Neighbor cell by LAC and CI cgi Add Neighbor cell by cgi - del Remove local or remote-BSS neighbor cell OsmoBSC(config-net-bts)# neighbor bts ? <0-255> BTS number @@ -157,23 +156,26 @@ OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 bsic 0 ? <cr> -OsmoBSC(config-net-bts)# neighbor del ? +OsmoBSC(config-net-bts)# no neighbor? + neighbor Remove local or remote-BSS neighbor cell + +OsmoBSC(config-net-bts)# no neighbor ? bts Neighbor cell by local BTS number arfcn ARFCN of neighbor cell -OsmoBSC(config-net-bts)# neighbor del bts ? +OsmoBSC(config-net-bts)# no neighbor bts ? <0-255> BTS number -OsmoBSC(config-net-bts)# neighbor del bts 0 ? +OsmoBSC(config-net-bts)# no neighbor bts 0 ? <cr> -OsmoBSC(config-net-bts)# neighbor del arfcn ? +OsmoBSC(config-net-bts)# no neighbor arfcn ? <0-1023> ARFCN value -OsmoBSC(config-net-bts)# neighbor del arfcn 0 ? +OsmoBSC(config-net-bts)# no neighbor arfcn 0 ? bsic BSIC of neighbor cell -OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic ? +OsmoBSC(config-net-bts)# no neighbor arfcn 0 bsic ? <0-63> BSIC value any for all BSICs / use any BSIC in this ARFCN -OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic 0 ? +OsmoBSC(config-net-bts)# no neighbor arfcn 0 bsic 0 ? <cr> OsmoBSC(config-net-bts)# show running-config @@ -257,10 +259,10 @@ OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 23 % neighbor lac-ci 789 10 arfcn 423 bsic 23 -OsmoBSC(config-net-bts)# neighbor del arfcn 99 bsic 7 +OsmoBSC(config-net-bts)# no neighbor arfcn 99 bsic 7 % Cannot remove, no such neighbor: BTS 0 to ARFCN 99 BSIC 7 -OsmoBSC(config-net-bts)# neighbor del arfcn 23 bsic 42 +OsmoBSC(config-net-bts)# no neighbor arfcn 23 bsic 42 % Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42 OsmoBSC(config-net-bts)# show running-config @@ -273,7 +275,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 123 bsic 45 +OsmoBSC(config-net-bts)# no neighbor arfcn 123 bsic 45 % Removed remote BSS neighbor BTS 0 to ARFCN 123 BSIC 45 OsmoBSC(config-net-bts)# show running-config @@ -285,7 +287,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic any +OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic any % Removed remote BSS neighbor BTS 0 to ARFCN 423 (any BSIC) OsmoBSC(config-net-bts)# show running-config @@ -296,7 +298,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 63 +OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 63 % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 63 OsmoBSC(config-net-bts)# show running-config @@ -306,7 +308,7 @@ neighbor lac-ci 789 10 arfcn 423 bsic 1 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 1 +OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 1 % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 1 OsmoBSC(config-net-bts)# show running-config @@ -315,7 +317,7 @@ neighbor lac-ci 22 65535 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any +OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any % Removed local neighbor bts 0 to bts 1 OsmoBSC(config-net-bts)# show running-config @@ -323,7 +325,7 @@ neighbor lac-ci 22 65535 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any +OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any % Cannot remove, no such neighbor: BTS 0 to ARFCN 41 (any BSIC) OsmoBSC(config-net-bts)# show running-config @@ -331,7 +333,7 @@ neighbor lac-ci 22 65535 ... !neighbor -OsmoBSC(config-net-bts)# neighbor del arfcn 42 bsic 12 +OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 12 % Removed local neighbor bts 0 to bts 2 OsmoBSC(config-net-bts)# show running-config -- To view, visit https://gerrit.osmocom.org/11125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib6015b8b48c1f6b98a02cb5a68e568083466e0d5 Gerrit-Change-Number: 11125 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180927/95def46b/attachment.htm>