<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24185">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">open5gs: fix stopping of open5gs components after test finishes<br><br>use RemoteProcessSafeExit() for launching all open5gs components<br>to make sure they are stopped at the end as well.<br><br>Change-Id: Ia1439577d60f9694da70c4e42c621100c8ef295e<br>---<br>M src/osmo_gsm_tester/obj/hss_open5gs.py<br>M src/osmo_gsm_tester/obj/mme_open5gs.py<br>M src/osmo_gsm_tester/obj/pcrf_open5gs.py<br>M src/osmo_gsm_tester/obj/sgwc_open5gs.py<br>M src/osmo_gsm_tester/obj/sgwu_open5gs.py<br>M src/osmo_gsm_tester/obj/smf_open5gs.py<br>M src/osmo_gsm_tester/obj/upf_open5gs.py<br>7 files changed, 14 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/85/24185/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/hss_open5gs.py b/src/osmo_gsm_tester/obj/hss_open5gs.py</span><br><span>index 211d09a..8ffb3b0 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/hss_open5gs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/hss_open5gs.py</span><br><span>@@ -75,8 +75,9 @@</span><br><span>         remote_binary = self.remote_inst.child('bin', Open5gsHSS.BINFILE)</span><br><span> </span><br><span>         args = (remote_binary, '-c', self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        remote_run_dir = util.Dir(util.Dir(Open5gsHSS.REMOTE_DIR).child(Open5gsHSS.BINFILE))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        self.process = self.rem_host.RemoteProcess(Open5gsHSS.BINFILE, args, remote_env=remote_env)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.process = self.rem_host.RemoteProcessSafeExit(Open5gsHSS.BINFILE, remote_run_dir, args, remote_env=remote_env)</span><br><span>         self.testenv.remember_to_stop(self.process)</span><br><span>         self.process.launch()</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/mme_open5gs.py b/src/osmo_gsm_tester/obj/mme_open5gs.py</span><br><span>index 0b3d633..25202f5 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/mme_open5gs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/mme_open5gs.py</span><br><span>@@ -81,8 +81,9 @@</span><br><span>         self.rem_host.setcap_net_admin(remote_binary)</span><br><span> </span><br><span>         args = (remote_binary, '-c', self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        remote_run_dir = util.Dir(util.Dir(Open5gsMME.REMOTE_DIR).child(Open5gsMME.BINFILE))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        self.process = self.rem_host.RemoteProcess(Open5gsMME.BINFILE, args)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.process = self.rem_host.RemoteProcessSafeExit(Open5gsMME.BINFILE, remote_run_dir, args)</span><br><span>         self.testenv.remember_to_stop(self.process)</span><br><span>         self.process.launch()</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/pcrf_open5gs.py b/src/osmo_gsm_tester/obj/pcrf_open5gs.py</span><br><span>index 4f93a47..5383b4f 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/pcrf_open5gs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/pcrf_open5gs.py</span><br><span>@@ -75,8 +75,9 @@</span><br><span>         remote_binary = self.remote_inst.child('bin', Open5gsPCRF.BINFILE)</span><br><span> </span><br><span>         args = (remote_binary, '-c', self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        remote_run_dir = util.Dir(util.Dir(Open5gsPCRF.REMOTE_DIR).child(Open5gsPCRF.BINFILE))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        self.process = self.rem_host.RemoteProcess(Open5gsPCRF.BINFILE, args, remote_env=remote_env)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.process = self.rem_host.RemoteProcessSafeExit(Open5gsPCRF.BINFILE, remote_run_dir, args, remote_env=remote_env)</span><br><span>         self.testenv.remember_to_stop(self.process)</span><br><span>         self.process.launch()</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/sgwc_open5gs.py b/src/osmo_gsm_tester/obj/sgwc_open5gs.py</span><br><span>index efc4568..394f1e7 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/sgwc_open5gs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/sgwc_open5gs.py</span><br><span>@@ -72,8 +72,9 @@</span><br><span>         remote_binary = self.remote_inst.child('bin', Open5gsSGWC.BINFILE)</span><br><span> </span><br><span>         args = (remote_binary, '-c', self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        remote_run_dir = util.Dir(util.Dir(Open5gsSGWC.REMOTE_DIR).child(Open5gsSGWC.BINFILE))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        self.process = self.rem_host.RemoteProcess(Open5gsSGWC.BINFILE, args, remote_env=remote_env)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.process = self.rem_host.RemoteProcessSafeExit(Open5gsSGWC.BINFILE, remote_run_dir, args, remote_env=remote_env)</span><br><span>         self.testenv.remember_to_stop(self.process)</span><br><span>         self.process.launch()</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/sgwu_open5gs.py b/src/osmo_gsm_tester/obj/sgwu_open5gs.py</span><br><span>index b97dd92..79fab8d 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/sgwu_open5gs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/sgwu_open5gs.py</span><br><span>@@ -72,8 +72,9 @@</span><br><span>         remote_binary = self.remote_inst.child('bin', Open5gsSGWU.BINFILE)</span><br><span> </span><br><span>         args = (remote_binary, '-c', self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        remote_run_dir = util.Dir(util.Dir(Open5gsSGWU.REMOTE_DIR).child(Open5gsSGWU.BINFILE))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        self.process = self.rem_host.RemoteProcess(Open5gsSGWU.BINFILE, args, remote_env=remote_env)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.process = self.rem_host.RemoteProcessSafeExit(Open5gsSGWU.BINFILE, remote_run_dir, args, remote_env=remote_env)</span><br><span>         self.testenv.remember_to_stop(self.process)</span><br><span>         self.process.launch()</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/smf_open5gs.py b/src/osmo_gsm_tester/obj/smf_open5gs.py</span><br><span>index 5241dc2..eda1aa2 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/smf_open5gs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/smf_open5gs.py</span><br><span>@@ -75,8 +75,9 @@</span><br><span>         remote_binary = self.remote_inst.child('bin', Open5gsSMF.BINFILE)</span><br><span> </span><br><span>         args = (remote_binary, '-c', self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        remote_run_dir = util.Dir(util.Dir(Open5gsSMF.REMOTE_DIR).child(Open5gsSMF.BINFILE))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        self.process = self.rem_host.RemoteProcess(Open5gsSMF.BINFILE, args, remote_env=remote_env)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.process = self.rem_host.RemoteProcessSafeExit(Open5gsSMF.BINFILE, remote_run_dir, args, remote_env=remote_env)</span><br><span>         self.testenv.remember_to_stop(self.process)</span><br><span>         self.process.launch()</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/obj/upf_open5gs.py b/src/osmo_gsm_tester/obj/upf_open5gs.py</span><br><span>index f22a6d7..78a520f 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/upf_open5gs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/upf_open5gs.py</span><br><span>@@ -79,8 +79,9 @@</span><br><span>         self.rem_host.setcap_net_admin(remote_binary)</span><br><span> </span><br><span>         args = (remote_binary, '-c', self.remote_config_file)</span><br><span style="color: hsl(120, 100%, 40%);">+        remote_run_dir = util.Dir(util.Dir(Open5gsUPF.REMOTE_DIR).child(Open5gsUPF.BINFILE))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        self.process = self.rem_host.RemoteProcess(Open5gsUPF.BINFILE, args)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.process = self.rem_host.RemoteProcessSafeExit(Open5gsUPF.BINFILE, remote_run_dir, args)</span><br><span>         self.testenv.remember_to_stop(self.process)</span><br><span>         self.process.launch()</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24185">change 24185</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24185"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia1439577d60f9694da70c4e42c621100c8ef295e </div>
<div style="display:none"> Gerrit-Change-Number: 24185 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>