aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-09-21 01:43:25 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2018-09-27 03:32:35 +0200
commitc7365aef659dfb1f3a2400f3bd6863a5422f6cf5 (patch)
tree205c9696897e115eb247e16f3f447c67bdcba560 /src
parentceb4c1104c840de28bf2e3aa77f3afb20df829c6 (diff)
neighbor vty: drop keyword 'add'
When writing the neighbor configuration documentation, I noticed that 'neighbor add' and 'neighbor del' make sense from an interactive VTY POV, but when looking at a static config file, it makes more sense to simply name the neighbors without the 'add' keyword, and to use the 'no' prefix instead of the 'del' keyword. It still makes sense to tweak cosmetics like this before inter-bsc handover is used anywhere. First, remove 'add' from all 'neighbor add ...' commands. Instead, prepend "Add" to the doc string for the cell identification argument in commands that add a neighbor: -OsmoBSC(config-net-bts)# neighbor add ? - bts Neighbor cell by local BTS number +OsmoBSC(config-net-bts)# neighbor ? + bts Add Neighbor cell by local BTS number (A subsequent patch will rename 'neighbor del' to 'no neighbor'.) Change-Id: I143f21f6069d1a86096cc8240cf69eb7ea9c8ac8
Diffstat (limited to 'src')
-rw-r--r--src/osmo-bsc/neighbor_ident_vty.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c
index 28f4afd58..8db9db775 100644
--- a/src/osmo-bsc/neighbor_ident_vty.c
+++ b/src/osmo-bsc/neighbor_ident_vty.c
@@ -68,10 +68,10 @@ bool neighbor_ident_bts_parse_key_params(struct vty *vty, struct gsm_bts *bts, c
return true;
}
-#define NEIGHBOR_ADD_CMD "neighbor add "
+#define NEIGHBOR_ADD_CMD "neighbor "
#define NEIGHBOR_DEL_CMD "neighbor del "
-#define NEIGHBOR_DOC "Neighbor cell list\n"
-#define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add local or remote-BSS neighbor cell\n"
+#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 LAC_PARAMS "lac <0-65535>"
@@ -431,7 +431,7 @@ static bool write_neighbor_ident_list(const struct neighbor_ident_key *key,
return true;
#define NEIGH_BSS_WRITE(fmt, args...) do { \
- vty_out(vty, "%sneighbor add " fmt " arfcn %u ", d->indent, ## args, key->arfcn); \
+ vty_out(vty, "%sneighbor " fmt " arfcn %u ", d->indent, ## args, key->arfcn); \
if (key->bsic == BSIC_ANY) \
vty_out(vty, "bsic any"); \
else \
@@ -485,7 +485,7 @@ void neighbor_ident_vty_write_local_neighbors(struct vty *vty, const char *inden
struct gsm_bts_ref *neigh;
llist_for_each_entry(neigh, &bts->local_neighbors, entry) {
- vty_out(vty, "%sneighbor add lac-ci %u %u%s",
+ vty_out(vty, "%sneighbor lac-ci %u %u%s",
indent, neigh->bts->location_area_code, neigh->bts->cell_identity,
VTY_NEWLINE);
}