pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20838 )
Change subject: enb: Name preferrably by label, use it in remote run dir
......................................................................
enb: Name preferrably by label, use it in remote run dir
This way several ENB will place its config and logs into different dirs.
Change-Id: I9b0c74cd63bc3888f380c66d94271beafc0db915
---
M src/osmo_gsm_tester/obj/enb.py
M src/osmo_gsm_tester/obj/enb_srs.py
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
srs_andre: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py
index 3b0ae8f..3988c35 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -83,7 +83,8 @@
self._gtp_bind_addr = conf.get('gtp_bind_addr', None)
if self._gtp_bind_addr is None:
self._gtp_bind_addr = self._run_node.run_addr()
- self.set_name('%s_%s' % (name, self._run_node.run_addr()))
+ label = conf.get('label', None)
+ self.set_name('%s_%s' % (name, label if label is not None else
self._run_node.run_addr()))
self._txmode = 0
self._id = None
self._duplex = None
diff --git a/src/osmo_gsm_tester/obj/enb_srs.py
b/src/osmo_gsm_tester/obj/enb_srs.py
index 493fef2..93168bf 100644
--- a/src/osmo_gsm_tester/obj/enb_srs.py
+++ b/src/osmo_gsm_tester/obj/enb_srs.py
@@ -164,7 +164,7 @@
self.rem_host = remote.RemoteHost(self.run_dir,
self._run_node.ssh_user(), self._run_node.ssh_addr())
remote_prefix_dir = util.Dir(srsENB.REMOTE_DIR)
self.remote_inst =
util.Dir(remote_prefix_dir.child(os.path.basename(str(self.inst))))
- self.remote_run_dir =
util.Dir(remote_prefix_dir.child(srsENB.BINFILE))
+ self.remote_run_dir =
util.Dir(remote_prefix_dir.child(self.name()))
self.remote_config_file = self.remote_run_dir.child(srsENB.CFGFILE)
self.remote_config_sib_file =
self.remote_run_dir.child(srsENB.CFGFILE_SIB)
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20838
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I9b0c74cd63bc3888f380c66d94271beafc0db915
Gerrit-Change-Number: 20838
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-Reviewer: srs_andre <[email protected]>
Gerrit-MessageType: merged
