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
This commit is contained in:
Pau Espin 2020-10-22 15:46:42 +02:00
parent d6deb2824f
commit a2d4e2f54e
2 changed files with 3 additions and 2 deletions

View File

@ -83,7 +83,8 @@ class eNodeB(log.Origin, metaclass=ABCMeta):
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

View File

@ -164,7 +164,7 @@ class srsENB(enb.eNodeB, srslte_common):
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)