This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Pau Espin Pedrol gerrit-no-reply at lists.osmocom.orgPau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/11516 Change subject: Integrate mass LU test to run fine under osmo-gsm-tester ...................................................................... Integrate mass LU test to run fine under osmo-gsm-tester Change-Id: I6748fce6ca25c7d4daedafe87b6b77c471d17bf9 --- M src/osmo_gsm_tester/ms_driver.py M src/osmo_ms_driver/location_update_test.py M src/osmo_ms_driver/starter.py 3 files changed, 67 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/16/11516/1 diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py index 808989e..d23defc 100644 --- a/src/osmo_gsm_tester/ms_driver.py +++ b/src/osmo_gsm_tester/ms_driver.py @@ -62,8 +62,8 @@ self._test_duration = timedelta(seconds=120) self._cdf = cdfs["ease_in_out"](self._time_start, self._time_step) self._loop = SimpleLoop() - self._suite_run.remember_to_stop(self) self._test_case = None + self.event_server_sk_tmp_dir = None if len(self.event_server_path().encode()) > 107: raise log.Error('Path for event_server socket is longer than max allowed len for unix socket path (107):', self.event_server_path()) @@ -82,7 +82,7 @@ self._ev_server = EventServer("ev_server", event_server_path) self._ev_server.listen(self._loop) - self._test_case = MassUpdateLocationTest("mass", self._num_ms, self._cdf, self._ev_server, self.event_server_sk_tmp_dir) + self._test_case = MassUpdateLocationTest(self._suite_run, "mass", self._num_ms, self._cdf, self._ev_server, self.event_server_sk_tmp_dir) # TODO: We should pass subscribers down to the test and not get it from # there. diff --git a/src/osmo_ms_driver/location_update_test.py b/src/osmo_ms_driver/location_update_test.py index 010c278..07f90de 100644 --- a/src/osmo_ms_driver/location_update_test.py +++ b/src/osmo_ms_driver/location_update_test.py @@ -56,8 +56,9 @@ TEMPLATE_LUA = "osmo-mobile-lu.lua" TEMPLATE_CFG = "osmo-mobile.cfg" - def __init__(self, name, number_of_ms, cdf_function, event_server, tmp_dir): + def __init__(self, suite_run, name, number_of_ms, cdf_function, event_server, tmp_dir): super().__init__(log.C_RUN, name) + self._suite_run = suite_run self._number_of_ms = number_of_ms self._cdf = cdf_function self._cdf.set_target(number_of_ms) @@ -71,10 +72,10 @@ for i in range(0, number_of_ms): ms_name = "%.5d" % i - phy = OsmoVirtPhy(ms_name, tmp_dir) + phy = OsmoVirtPhy(self._suite_run, ms_name, tmp_dir) self._phys.append(phy) - launcher = OsmoMobile(ms_name, tmp_dir, self.TEMPLATE_LUA, + launcher = OsmoMobile(self._suite_run, ms_name, tmp_dir, self.TEMPLATE_LUA, self.TEMPLATE_CFG, imsi_gen, phy.phy_filename(), event_server.server_path()) diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py index 86ad446..5790df3 100644 --- a/src/osmo_ms_driver/starter.py +++ b/src/osmo_ms_driver/starter.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from osmo_gsm_tester import log, template +from osmo_gsm_tester import log, template, process, util import os import os.path @@ -27,18 +27,20 @@ #_devnull = open('/dev/stdout', 'w') class Launcher(log.Origin): - def __init__(self, base_name, name_number, tmp_dir): - super().__init__(log.C_RUN, "{}/{}".format(base_name, name_number)) + def __init__(self, suite_run, base_name, name_number, tmp_dir): + super().__init__(log.C_RUN, "{}_{}".format(base_name, name_number)) self._name_number = name_number self._tmp_dir = tmp_dir + self.suite_run = suite_run def name_number(self): return self._name_number class OsmoVirtPhy(Launcher): - def __init__(self, name_number, tmp_dir): - super().__init__("osmo-ms-virt-phy", name_number, tmp_dir) + def __init__(self, suite_run, name_number, tmp_dir): + super().__init__(suite_run, "osmo-ms-virt-phy", name_number, tmp_dir) self._phy_filename = os.path.join(self._tmp_dir, "osmocom_l2_" + self._name_number) + self._vphy_proc = None def phy_filename(self): return self._phy_filename @@ -47,10 +49,30 @@ if len(self._phy_filename.encode()) > 107: raise log.Error('Path for unix socket is longer than max allowed len for unix socket path (107):', self._phy_filename) - self.log("Starting virtphy process") - args = ["virtphy", "--l1ctl-sock=" + self._phy_filename] - self.log(' '.join(args)) - self._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull) + self.log('Starting virtphy') + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + + inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb'))) + + binary = inst.child('bin', 'virtphy') + if not os.path.isfile(binary): + raise RuntimeError('Binary missing: %r' % binary) + lib = inst.child('lib') + if not os.path.isdir(lib): + raise RuntimeError('No lib/ in %r' % inst) + + #pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, + # 'host %s and port not 22' % self.addr()) + + env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + + self.dbg(run_dir=self.run_dir, binary=binary, env=env) + self._vphy_proc = process.Process(self.name(), self.run_dir, + (binary, "--l1ctl-sock=" + self._phy_filename), + env=env) + self.suite_run.remember_to_stop(self._vphy_proc) + # TODO: Add some way to set Process stderr and stdout to NULL + self._vphy_proc.launch() def verify_ready(self): while True: @@ -61,17 +83,18 @@ def kill(self): """Clean up things.""" if self._vphy_proc: - self._vphy_proc.kill() + self._vphy_proc.terminate() class OsmoMobile(Launcher): - def __init__(self, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path): - super().__init__("osmo-ms-mob", name_number, tmp_dir) + def __init__(self, suite_run, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path): + super().__init__(suite_run, "osmo-ms-mob", name_number, tmp_dir) self._lua_template = lua_tmpl self._cfg_template = cfg_tmpl self._imsi_ki_generator = imsi_ki_generator self._phy_filename = phy_filename self._ev_server_path = ev_server_path self._imsi, self._ki = next(self._imsi_ki_generator) + self._omob_proc = None def imsi(self): return self._imsi @@ -113,13 +136,33 @@ lua_filename = self.write_lua_cfg() mob_filename = self.write_mob_cfg(lua_filename, self._phy_filename) - self.log("Starting process") - # Let the kernel pick an unused port for the VTY. - args = ["mobile", "-c", mob_filename, "--vty-port=0"] - self.log(' '.join(args)) - self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull) + + self.log('Starting mobile') + self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) + + inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb'))) + + binary = inst.child('bin', 'mobile') + if not os.path.isfile(binary): + raise RuntimeError('Binary missing: %r' % binary) + lib = inst.child('lib') + if not os.path.isdir(lib): + raise RuntimeError('No lib/ in %r' % inst) + + #pcap_recorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'), None, + # 'host %s and port not 22' % self.addr()) + + env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } + + self.dbg(run_dir=self.run_dir, binary=binary, env=env) + self._omob_proc = process.Process(self.name(), self.run_dir, + (binary, "-c", mob_filename, "--vty-port=0"), + env=env) + self.suite_run.remember_to_stop(self._omob_proc) + # TODO: Add some way to set Process stderr and stdout to NULL + self._omob_proc.launch() def kill(self): """Clean up things.""" if self._omob_proc: - self._omob_proc.kill() + self._omob_proc.terminate() -- To view, visit https://gerrit.osmocom.org/11516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6748fce6ca25c7d4daedafe87b6b77c471d17bf9 Gerrit-Change-Number: 11516 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181030/833a277b/attachment.htm>