commit c4ba4a6866a13e925bfc023f1fe3c5f5d5603601
author Neels Hofmeyr <nhofmeyr@sysmocom.de> Thu May 18 19:31:44 2017 +0200
committer Neels Hofmeyr <nhofmeyr@sysmocom.de> Mon May 29 00:18:43 2017 +0200
tree d249cca46b10d813cbd2533f9cd17f92613e60ef
parent 76d8103bfbaadc7a848f1f76bef4625199542916

rename more items from nitb to bsc

A NITB is a BSC + MSC, and if a BTS talks to a NITB, it talks to the BSC part
of the NITB. Hence it makes more sense to name certain things 'bsc' instead of
'nitb', to prepare for a separate BSC process appearing soon.

Change-Id: I6a0343b9243b166d4053cc44f523543f1245d772

src/osmo_gsm_tester/bts_osmotrx.py

diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py
index 70ac511..9533c68 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -23,7 +23,7 @@
 
 class OsmoBtsTrx(log.Origin):
     suite_run = None
-    nitb = None
+    bsc = None
     run_dir = None
     inst = None
     env = None
@@ -43,11 +43,11 @@
         self.env = {}
 
     def start(self):
-        if self.nitb is None:
-            raise RuntimeError('BTS needs to be added to a NITB before it can be started')
+        if self.bsc is None:
+            raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started')
         self.suite_run.poll()
 
-        self.log('Starting to connect to', self.nitb)
+        self.log('Starting to connect to', self.bsc)
         self.run_dir = util.Dir(self.suite_run.trial.get_run_dir().new_dir(self.name()))
         self.configure()
 
@@ -63,7 +63,7 @@
         self.proc_trx.log(self.proc_trx.get_stdout_tail(1))
         self.launch_process(OsmoBtsTrx.BIN_BTS_TRX, '-r', '1',
                             '-c', os.path.abspath(self.config_file),
-                            '-i', self.nitb.addr())
+                            '-i', self.bsc.addr())
         #self.launch_process(OsmoBtsTrx.BIN_PCU, '-r', '1')
         self.suite_run.poll()
 
@@ -85,14 +85,14 @@
         return proc
 
     def configure(self):
-        if self.nitb is None:
-            raise RuntimeError('BTS needs to be added to a NITB before it can be configured')
+        if self.bsc is None:
+            raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be configured')
         self.config_file = self.run_dir.new_file(OsmoBtsTrx.CONF_BTS_TRX)
         self.dbg(config_file=self.config_file)
 
         values = dict(osmo_bts_trx=config.get_defaults('osmo_bts_trx'))
         config.overlay(values, self.suite_run.config())
-        config.overlay(values, dict(osmo_bts_trx=dict(oml_remote_ip=self.nitb.addr())))
+        config.overlay(values, dict(osmo_bts_trx=dict(oml_remote_ip=self.bsc.addr())))
         config.overlay(values, dict(osmo_bts_trx=self.conf))
 
         self.dbg('OSMO-BTS-TRX CONFIG:\n' + pprint.pformat(values))
@@ -102,14 +102,14 @@
             self.dbg(r)
             f.write(r)
 
-    def conf_for_nitb(self):
-        values = config.get_defaults('nitb_bts')
+    def conf_for_bsc(self):
+        values = config.get_defaults('bsc_bts')
         config.overlay(values, config.get_defaults('osmo_bts_trx'))
         config.overlay(values, self.conf)
         self.dbg(conf=values)
         return values
 
-    def set_nitb(self, nitb):
-        self.nitb = nitb
+    def set_bsc(self, bsc):
+        self.bsc = bsc
 
 # vim: expandtab tabstop=4 shiftwidth=4