bts_*: Add incrementing bvci and rac values

Change-Id: Ie65d7d33322c775a1040b5c81f367d882a7c2c5b
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py
index 6d4f634..9b1f077 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -32,7 +32,9 @@
     trx = None
     pcu_sk_tmp_dir = None
     lac = None
+    rac = None
     cellid = None
+    bvci = None
     proc_bts = None
     _pcu = None
 
@@ -147,8 +149,12 @@
         config.overlay(values, config.get_defaults('osmo_bts_trx'))
         if self.lac is not None:
             config.overlay(values, { 'location_area_code': self.lac })
+        if self.rac is not None:
+            config.overlay(values, { 'routing_area_code': self.rac })
         if self.cellid is not None:
             config.overlay(values, { 'cell_identity': self.cellid })
+        if self.bvci is not None:
+            config.overlay(values, { 'bvci': self.bvci })
         config.overlay(values, self.conf)
 
         sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client()
@@ -171,9 +177,15 @@
     def set_lac(self, lac):
         self.lac = lac
 
+    def set_rac(self, rac):
+        self.rac = rac
+
     def set_cellid(self, cellid):
         self.cellid = cellid
 
+    def set_bvci(self, bvci):
+        self.bvci = bvci
+
 class OsmoTrx(log.Origin):
     suite_run = None
     run_dir = None