[MERGED] osmo-gsm-tester[master]: OsmoBtsTrx: Integrate with OsmoPcu and OsmoSgsn

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged.

Change subject: OsmoBtsTrx: Integrate with OsmoPcu and OsmoSgsn
......................................................................


OsmoBtsTrx: Integrate with OsmoPcu and OsmoSgsn

Change-Id: I777835345355538a945599fb088630af63dc9140
---
M src/osmo_gsm_tester/bts_osmotrx.py
1 file changed, 15 insertions(+), 1 deletion(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py
index d30c1ee..6d4f634 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -20,11 +20,12 @@
 import os
 import pprint
 import tempfile
-from . import log, config, util, template, process, event_loop
+from . import log, config, util, template, process, event_loop, pcu_osmo
 
 class OsmoBtsTrx(log.Origin):
     suite_run = None
     bsc = None
+    sgsn = None
     run_dir = None
     inst = None
     env = None
@@ -33,6 +34,7 @@
     lac = None
     cellid = None
     proc_bts = None
+    _pcu = None
 
     BIN_BTS_TRX = 'osmo-bts-trx'
     BIN_PCU = 'osmo-pcu'
@@ -55,6 +57,11 @@
             except OSError:
                 pass
             os.rmdir(self.pcu_sk_tmp_dir)
+
+    def pcu(self):
+        if self._pcu is None:
+            self._pcu = pcu_osmo.OsmoPcu(self.suite_run, self, self.conf)
+        return self._pcu
 
     def pcu_socket_path(self):
         return os.path.join(self.pcu_sk_tmp_dir, 'pcu_bts')
@@ -143,6 +150,10 @@
         if self.cellid is not None:
             config.overlay(values, { 'cell_identity': self.cellid })
         config.overlay(values, self.conf)
+
+        sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client()
+        config.overlay(values, sgsn_conf)
+
         self.dbg(conf=values)
         return values
 
@@ -154,6 +165,9 @@
     def set_bsc(self, bsc):
         self.bsc = bsc
 
+    def set_sgsn(self, sgsn):
+        self.sgsn = sgsn
+
     def set_lac(self, lac):
         self.lac = lac
 

-- 
To view, visit https://gerrit.osmocom.org/5007
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I777835345355538a945599fb088630af63dc9140
Gerrit-PatchSet: 6
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>