bts_*: Add incrementing bvci and rac values

Change-Id: Ie65d7d33322c775a1040b5c81f367d882a7c2c5b
diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
index 2466f9f..95db16d 100644
--- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
@@ -61,9 +61,9 @@
   oml ip.access stream_id ${bts.stream_id} line 0
 % if bts.get('sgsn', False):
   gprs mode gprs
-  gprs routing area 0
+  gprs routing area ${bts.routing_area_code}
   gprs network-control-order nc1
-  gprs cell bvci 1800
+  gprs cell bvci ${bts.bvci}
   gprs cell timer blocking-timer 3
   gprs cell timer blocking-retries 3
   gprs cell timer unblocking-retries 3
@@ -75,7 +75,7 @@
   gprs cell timer resume-retries 3
   gprs cell timer capability-update-timer 10
   gprs cell timer capability-update-retries 3
-  gprs nsei 1800
+  gprs nsei ${bts.bvci}
   gprs ns timer tns-block 3
   gprs ns timer tns-block-retries 3
   gprs ns timer tns-reset 3
@@ -83,7 +83,7 @@
   gprs ns timer tns-test 30
   gprs ns timer tns-alive 3
   gprs ns timer tns-alive-retries 10
-  gprs nsvc 0 nsvci 1800
+  gprs nsvc 0 nsvci ${bts.bvci}
   gprs nsvc 0 local udp port 23020
   gprs nsvc 0 remote udp port 23000
   gprs nsvc 0 remote ip ${bts.sgsn.ip_address.addr}