Change in osmo-bsc[master]: vty: write local neighbors by bts nr, not lac-ci

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11127 )

Change subject: vty: write local neighbors by bts nr, not lac-ci
......................................................................

vty: write local neighbors by bts nr, not lac-ci

Change-Id: I35783f9624eacbdffccdb59a0179ffda54a26990
---
M src/osmo-bsc/neighbor_ident_vty.c
M tests/neighbor_ident.vty
2 files changed, 15 insertions(+), 17 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 d0c23a8..409153b 100644
--- a/src/osmo-bsc/neighbor_ident_vty.c
+++ b/src/osmo-bsc/neighbor_ident_vty.c
@@ -495,9 +495,7 @@
 	struct gsm_bts_ref *neigh;
 
 	llist_for_each_entry(neigh, &bts->local_neighbors, entry) {
-		vty_out(vty, "%sneighbor lac-ci %u %u%s",
-			indent, neigh->bts->location_area_code, neigh->bts->cell_identity,
-			VTY_NEWLINE);
+		vty_out(vty, "%sneighbor bts %u%s", indent, neigh->bts->nr, VTY_NEWLINE);
 	}
 }
 
diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty
index 02b0f50..4f86383 100644
--- a/tests/neighbor_ident.vty
+++ b/tests/neighbor_ident.vty
@@ -241,8 +241,8 @@
 ... !neighbor 
  bts 0
 ... !neighbor 
-  neighbor lac-ci 21 31
-  neighbor lac-ci 22 65535
+  neighbor bts 1
+  neighbor bts 2
   neighbor cgi 023 42 423 5 arfcn 23 bsic 42
   neighbor cgi 023 042 423 6 arfcn 23 bsic 42
   neighbor cgi 023 042 234 56 arfcn 23 bsic 42
@@ -272,8 +272,8 @@
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor 
-  neighbor lac-ci 21 31
-  neighbor lac-ci 22 65535
+  neighbor bts 1
+  neighbor bts 2
   neighbor lac 456 arfcn 123 bsic 45
   neighbor lac-ci 789 10 arfcn 423 bsic any
   neighbor lac-ci 789 10 arfcn 423 bsic 63
@@ -285,8 +285,8 @@
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor 
-  neighbor lac-ci 21 31
-  neighbor lac-ci 22 65535
+  neighbor bts 1
+  neighbor bts 2
   neighbor lac-ci 789 10 arfcn 423 bsic any
   neighbor lac-ci 789 10 arfcn 423 bsic 63
   neighbor lac-ci 789 10 arfcn 423 bsic 1
@@ -297,8 +297,8 @@
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor 
-  neighbor lac-ci 21 31
-  neighbor lac-ci 22 65535
+  neighbor bts 1
+  neighbor bts 2
   neighbor lac-ci 789 10 arfcn 423 bsic 63
   neighbor lac-ci 789 10 arfcn 423 bsic 1
 ... !neighbor 
@@ -308,8 +308,8 @@
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor 
-  neighbor lac-ci 21 31
-  neighbor lac-ci 22 65535
+  neighbor bts 1
+  neighbor bts 2
   neighbor lac-ci 789 10 arfcn 423 bsic 1
 ... !neighbor 
 
@@ -318,8 +318,8 @@
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor 
-  neighbor lac-ci 21 31
-  neighbor lac-ci 22 65535
+  neighbor bts 1
+  neighbor bts 2
 ... !neighbor 
 
 OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any
@@ -327,7 +327,7 @@
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor 
-  neighbor lac-ci 22 65535
+  neighbor bts 2
 ... !neighbor 
 
 OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any
@@ -335,7 +335,7 @@
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor 
-  neighbor lac-ci 22 65535
+  neighbor bts 2
 ... !neighbor 
 
 OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 12

-- 
To view, visit https://gerrit.osmocom.org/11127
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: I35783f9624eacbdffccdb59a0179ffda54a26990
Gerrit-Change-Number: 11127
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/fe1de231/attachment.htm>