Change in osmo-bsc[master]: neighbor_ident_vty.c: fix CI format, should be 16bit

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.org
Wed Aug 29 01:11:51 UTC 2018 

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

Change subject: neighbor_ident_vty.c: fix CI format, should be 16bit
......................................................................

neighbor_ident_vty.c: fix CI format, should be 16bit

In the 'lac-ci' and 'cgi' neighbor identity VTY parameters, fix the CI part to
<0-65535>.

Use 65535 as CI in the neighbor_ident.vty test to verify the range.

Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f
---
M src/osmo-bsc/neighbor_ident_vty.c
M tests/neighbor_ident.vty
2 files changed, 16 insertions(+), 16 deletions(-)

Approvals:
  Neels Hofmeyr: 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 993e0b4..28f4afd 100644
--- a/src/osmo-bsc/neighbor_ident_vty.c
+++ b/src/osmo-bsc/neighbor_ident_vty.c
@@ -77,7 +77,7 @@
 #define LAC_PARAMS "lac <0-65535>"
 #define LAC_DOC "Neighbor cell by LAC\n" "LAC\n"
 
-#define LAC_CI_PARAMS "lac-ci <0-65535> <0-255>"
+#define LAC_CI_PARAMS "lac-ci <0-65535> <0-65535>"
 #define LAC_CI_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n"
 
 #define LOCAL_BTS_PARAMS "bts <0-255>"
@@ -379,7 +379,7 @@
 }
 
 DEFUN(cfg_neighbor_add_cgi_arfcn_bsic, cfg_neighbor_add_cgi_arfcn_bsic_cmd,
-	NEIGHBOR_ADD_CMD "cgi <0-999> <0-999> <0-65535> <0-255> " NEIGHBOR_IDENT_VTY_KEY_PARAMS,
+	NEIGHBOR_ADD_CMD "cgi <0-999> <0-999> <0-65535> <0-65535> " NEIGHBOR_IDENT_VTY_KEY_PARAMS,
 	NEIGHBOR_ADD_DOC "Neighbor cell by cgi\n" "MCC\n" "MNC\n" "LAC\n" "CI\n" NEIGHBOR_IDENT_VTY_KEY_DOC)
 {
 	struct neighbor_ident_key nik;
diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty
index 692d894..bbdb461 100644
--- a/tests/neighbor_ident.vty
+++ b/tests/neighbor_ident.vty
@@ -38,7 +38,7 @@
 OsmoBSC(config-net-bts)# type sysmobts
 OsmoBSC(config-net-bts)# base_station_id_code 12
 OsmoBSC(config-net-bts)# location_area_code 22
-OsmoBSC(config-net-bts)# cell_identity 32
+OsmoBSC(config-net-bts)# cell_identity 65535
 OsmoBSC(config-net-bts)# trx 0
 OsmoBSC(config-net-bts-trx)# arfcn 42
 OsmoBSC(config-net-bts-trx)# exit
@@ -68,7 +68,7 @@
 ...
  bts 2
 ...
-  cell_identity 32
+  cell_identity 65535
   location_area_code 22
   base_station_id_code 12
 ...
@@ -82,10 +82,10 @@
 ...
   neighbor add bts <0-255>
   neighbor add lac <0-65535>
-  neighbor add lac-ci <0-65535> <0-255>
+  neighbor add lac-ci <0-65535> <0-65535>
   neighbor add lac <0-65535> arfcn <0-1023> bsic (<0-63>|any)
-  neighbor add lac-ci <0-65535> <0-255> arfcn <0-1023> bsic (<0-63>|any)
-  neighbor add cgi <0-999> <0-999> <0-65535> <0-255> arfcn <0-1023> bsic (<0-63>|any)
+  neighbor add lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any)
+  neighbor add 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)
 ...
@@ -106,7 +106,7 @@
 % BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11
 
 OsmoBSC(config-net-bts)# neighbor add lac 22
-% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 32 and ARFCN 42 BSIC 12
+% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12
 
 OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 42
 % BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry
@@ -148,7 +148,7 @@
  bts 0
 ... !neighbor add
   neighbor add lac-ci 21 31
-  neighbor add lac-ci 22 32
+  neighbor add lac-ci 22 65535
   neighbor add cgi 023 42 423 5 arfcn 23 bsic 42
   neighbor add cgi 023 042 423 6 arfcn 23 bsic 42
   neighbor add cgi 023 042 234 56 arfcn 23 bsic 42
@@ -179,7 +179,7 @@
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor add
   neighbor add lac-ci 21 31
-  neighbor add lac-ci 22 32
+  neighbor add lac-ci 22 65535
   neighbor add lac 456 arfcn 123 bsic 45
   neighbor add lac-ci 789 10 arfcn 423 bsic any
   neighbor add lac-ci 789 10 arfcn 423 bsic 63
@@ -192,7 +192,7 @@
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor add
   neighbor add lac-ci 21 31
-  neighbor add lac-ci 22 32
+  neighbor add lac-ci 22 65535
   neighbor add lac-ci 789 10 arfcn 423 bsic any
   neighbor add lac-ci 789 10 arfcn 423 bsic 63
   neighbor add lac-ci 789 10 arfcn 423 bsic 1
@@ -204,7 +204,7 @@
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor add
   neighbor add lac-ci 21 31
-  neighbor add lac-ci 22 32
+  neighbor add lac-ci 22 65535
   neighbor add lac-ci 789 10 arfcn 423 bsic 63
   neighbor add lac-ci 789 10 arfcn 423 bsic 1
 ... !neighbor add
@@ -215,7 +215,7 @@
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor add
   neighbor add lac-ci 21 31
-  neighbor add lac-ci 22 32
+  neighbor add lac-ci 22 65535
   neighbor add lac-ci 789 10 arfcn 423 bsic 1
 ... !neighbor add
 
@@ -225,7 +225,7 @@
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor add
   neighbor add lac-ci 21 31
-  neighbor add lac-ci 22 32
+  neighbor add lac-ci 22 65535
 ... !neighbor add
 
 OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any
@@ -233,7 +233,7 @@
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor add
-  neighbor add lac-ci 22 32
+  neighbor add lac-ci 22 65535
 ... !neighbor add
 
 OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any
@@ -241,7 +241,7 @@
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor add
-  neighbor add lac-ci 22 32
+  neighbor add lac-ci 22 65535
 ... !neighbor add
 
 OsmoBSC(config-net-bts)# neighbor del arfcn 42 bsic 12

-- 
To view, visit https://gerrit.osmocom.org/10633
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: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f
Gerrit-Change-Number: 10633
Gerrit-PatchSet: 2
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/20180829/9d3591bd/attachment.htm>

More information about the gerrit-log mailing list