bts_*: Add incrementing bvci and rac values

Change-Id: Ie65d7d33322c775a1040b5c81f367d882a7c2c5b
diff --git a/selftest/template_test.ok b/selftest/template_test.ok
index bae21d2..c5471d0 100644
--- a/selftest/template_test.ok
+++ b/selftest/template_test.ok
@@ -51,9 +51,9 @@
   ip.access unit_id val_bts.unit_id_bts0 0
   oml ip.access stream_id val_bts.stream_id_bts0 line 0
   gprs mode gprs
-  gprs routing area 0
+  gprs routing area val_bts.routing_area_code_bts0
   gprs network-control-order nc1
-  gprs cell bvci 1800
+  gprs cell bvci val_bts.bvci_bts0
   gprs cell timer blocking-timer 3
   gprs cell timer blocking-retries 3
   gprs cell timer unblocking-retries 3
@@ -65,7 +65,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 val_bts.bvci_bts0
   gprs ns timer tns-block 3
   gprs ns timer tns-block-retries 3
   gprs ns timer tns-reset 3
@@ -73,7 +73,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 val_bts.bvci_bts0
   gprs nsvc 0 local udp port 23020
   gprs nsvc 0 remote udp port 23000
   gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts0
@@ -122,9 +122,9 @@
   ip.access unit_id val_bts.unit_id_bts1 0
   oml ip.access stream_id val_bts.stream_id_bts1 line 0
   gprs mode gprs
-  gprs routing area 0
+  gprs routing area val_bts.routing_area_code_bts1
   gprs network-control-order nc1
-  gprs cell bvci 1800
+  gprs cell bvci val_bts.bvci_bts1
   gprs cell timer blocking-timer 3
   gprs cell timer blocking-retries 3
   gprs cell timer unblocking-retries 3
@@ -136,7 +136,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 val_bts.bvci_bts1
   gprs ns timer tns-block 3
   gprs ns timer tns-block-retries 3
   gprs ns timer tns-reset 3
@@ -144,7 +144,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 val_bts.bvci_bts1
   gprs nsvc 0 local udp port 23020
   gprs nsvc 0 remote udp port 23000
   gprs nsvc 0 remote ip val_bts.sgsn_ip_addr_bts1