cellular-infrastructure
/
osmo-gsm-tester
mirror of https://gerrit.osmocom.org/osmo-gsm-tester
9
0
Fork 0
Code Issues Releases Wiki Activity

open5gs: fix stopping of open5gs components after test finishes 

use RemoteProcessSafeExit() for launching all open5gs components
to make sure they are stopped at the end as well.

Change-Id: Ia1439577d60f9694da70c4e42c621100c8ef295e
This commit is contained in:
Andre Puschmann 2021-05-10 16:41:48 +02:00
parent b9c9612fc1
commit 9d75ccb9c8
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/osmo_gsm_tester/obj/hss_open5gs.py
View File

@ -75,8 +75,9 @@ class Open5gsHSS(log.Origin):
remote_binary = self.remote_inst.child('bin', Open5gsHSS.BINFILE)
args = (remote_binary, '-c', self.remote_config_file)
remote_run_dir = util.Dir(util.Dir(Open5gsHSS.REMOTE_DIR).child(Open5gsHSS.BINFILE))
self.process = self.rem_host.RemoteProcess(Open5gsHSS.BINFILE, args, remote_env=remote_env)
self.process = self.rem_host.RemoteProcessSafeExit(Open5gsHSS.BINFILE, remote_run_dir, args, remote_env=remote_env)
self.testenv.remember_to_stop(self.process)
self.process.launch()

3
src/osmo_gsm_tester/obj/mme_open5gs.py
View File

@ -81,8 +81,9 @@ class Open5gsMME(log.Origin):
self.rem_host.setcap_net_admin(remote_binary)
args = (remote_binary, '-c', self.remote_config_file)
remote_run_dir = util.Dir(util.Dir(Open5gsMME.REMOTE_DIR).child(Open5gsMME.BINFILE))
self.process = self.rem_host.RemoteProcess(Open5gsMME.BINFILE, args)
self.process = self.rem_host.RemoteProcessSafeExit(Open5gsMME.BINFILE, remote_run_dir, args)
self.testenv.remember_to_stop(self.process)
self.process.launch()

3
src/osmo_gsm_tester/obj/pcrf_open5gs.py
View File

@ -75,8 +75,9 @@ class Open5gsPCRF(log.Origin):
remote_binary = self.remote_inst.child('bin', Open5gsPCRF.BINFILE)
args = (remote_binary, '-c', self.remote_config_file)
remote_run_dir = util.Dir(util.Dir(Open5gsPCRF.REMOTE_DIR).child(Open5gsPCRF.BINFILE))
self.process = self.rem_host.RemoteProcess(Open5gsPCRF.BINFILE, args, remote_env=remote_env)
self.process = self.rem_host.RemoteProcessSafeExit(Open5gsPCRF.BINFILE, remote_run_dir, args, remote_env=remote_env)
self.testenv.remember_to_stop(self.process)
self.process.launch()

3
src/osmo_gsm_tester/obj/sgwc_open5gs.py
View File

@ -72,8 +72,9 @@ class Open5gsSGWC(log.Origin):
remote_binary = self.remote_inst.child('bin', Open5gsSGWC.BINFILE)
args = (remote_binary, '-c', self.remote_config_file)
remote_run_dir = util.Dir(util.Dir(Open5gsSGWC.REMOTE_DIR).child(Open5gsSGWC.BINFILE))
self.process = self.rem_host.RemoteProcess(Open5gsSGWC.BINFILE, args, remote_env=remote_env)
self.process = self.rem_host.RemoteProcessSafeExit(Open5gsSGWC.BINFILE, remote_run_dir, args, remote_env=remote_env)
self.testenv.remember_to_stop(self.process)
self.process.launch()

3
src/osmo_gsm_tester/obj/sgwu_open5gs.py
View File

@ -72,8 +72,9 @@ class Open5gsSGWU(log.Origin):
remote_binary = self.remote_inst.child('bin', Open5gsSGWU.BINFILE)
args = (remote_binary, '-c', self.remote_config_file)
remote_run_dir = util.Dir(util.Dir(Open5gsSGWU.REMOTE_DIR).child(Open5gsSGWU.BINFILE))
self.process = self.rem_host.RemoteProcess(Open5gsSGWU.BINFILE, args, remote_env=remote_env)
self.process = self.rem_host.RemoteProcessSafeExit(Open5gsSGWU.BINFILE, remote_run_dir, args, remote_env=remote_env)
self.testenv.remember_to_stop(self.process)
self.process.launch()

3
src/osmo_gsm_tester/obj/smf_open5gs.py
View File

@ -75,8 +75,9 @@ class Open5gsSMF(log.Origin):
remote_binary = self.remote_inst.child('bin', Open5gsSMF.BINFILE)
args = (remote_binary, '-c', self.remote_config_file)
remote_run_dir = util.Dir(util.Dir(Open5gsSMF.REMOTE_DIR).child(Open5gsSMF.BINFILE))
self.process = self.rem_host.RemoteProcess(Open5gsSMF.BINFILE, args, remote_env=remote_env)
self.process = self.rem_host.RemoteProcessSafeExit(Open5gsSMF.BINFILE, remote_run_dir, args, remote_env=remote_env)
self.testenv.remember_to_stop(self.process)
self.process.launch()

3
src/osmo_gsm_tester/obj/upf_open5gs.py
View File

@ -79,8 +79,9 @@ class Open5gsUPF(log.Origin):
self.rem_host.setcap_net_admin(remote_binary)
args = (remote_binary, '-c', self.remote_config_file)
remote_run_dir = util.Dir(util.Dir(Open5gsUPF.REMOTE_DIR).child(Open5gsUPF.BINFILE))
self.process = self.rem_host.RemoteProcess(Open5gsUPF.BINFILE, args)
self.process = self.rem_host.RemoteProcessSafeExit(Open5gsUPF.BINFILE, remote_run_dir, args)
self.testenv.remember_to_stop(self.process)
self.process.launch()