<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18535">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_srs: refactor UE state getter functions<br><br>rename UE helper functions to query RRC connected/idle state<br>and adapt tests accordingly<br><br>also add helper to retrieve assinged IP address<br><br>Change-Id: I6cd057e34b4df6a1a73695355dd6406d7e039546<br>---<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>M sysmocom/suites/4g/handover.py<br>M sysmocom/suites/4g/iperf3_dl.py<br>M sysmocom/suites/4g/iperf3_ul.py<br>M sysmocom/suites/4g/ping.py<br>5 files changed, 23 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/35/18535/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index 409021e..af26011 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -306,11 +306,27 @@</span><br><span> self.rem_host.recreate_remote_dir(self.remote_run_dir)</span><br><span> self.rem_host.scp('scp-cfg-to-remote', self.config_file, self.remote_config_file)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def is_connected(self, mcc_mnc=None):</span><br><span style="color: hsl(120, 100%, 40%);">+ def is_rrc_connected(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ ''' Check whether UE is RRC connected using console message '''</span><br><span style="color: hsl(120, 100%, 40%);">+ pos_connected = (self.process.get_stdout() or '').rfind('RRC Connected')</span><br><span style="color: hsl(120, 100%, 40%);">+ pos_released = (self.process.get_stdout() or '').rfind('RRC IDLE')</span><br><span style="color: hsl(120, 100%, 40%);">+ # return true if RRC</span><br><span style="color: hsl(120, 100%, 40%);">+ return pos_connected > pos_released</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def is_rrc_idle(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return not self.is_rrc_connected()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def is_emm_registered(self):</span><br><span> return 'Network attach successful.' in (self.process.get_stdout() or '')</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def is_attached(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return self.is_connected()</span><br><span style="color: hsl(120, 100%, 40%);">+ def get_ipv4_addr(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ ''' Return last assigned IP address '''</span><br><span style="color: hsl(120, 100%, 40%);">+ import re</span><br><span style="color: hsl(120, 100%, 40%);">+ stdout_lines = (self.process.get_stdout() or '').splitlines()</span><br><span style="color: hsl(120, 100%, 40%);">+ for line in reversed(stdout_lines):</span><br><span style="color: hsl(120, 100%, 40%);">+ if line.find('Network attach successful. IP: ') != -1:</span><br><span style="color: hsl(120, 100%, 40%);">+ ipv4_addr = re.findall( r'[0-9]+(?:\.[0-9]+){3}', line)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ipv4_addr[0]</span><br><span> </span><br><span> def running(self):</span><br><span> return not self.process.terminated()</span><br><span>diff --git a/sysmocom/suites/4g/handover.py b/sysmocom/suites/4g/handover.py</span><br><span>index b0837d8..6bb6456 100755</span><br><span>--- a/sysmocom/suites/4g/handover.py</span><br><span>+++ b/sysmocom/suites/4g/handover.py</span><br><span>@@ -46,7 +46,7 @@</span><br><span> proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), duration + 30)</span><br><span> </span><br><span> print('waiting for UE to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ue.is_connected, None)</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ue.is_rrc_connected)</span><br><span> print('UE is attached')</span><br><span> </span><br><span> rfemu_cell1 = enb.get_rfemu(0)</span><br><span>diff --git a/sysmocom/suites/4g/iperf3_dl.py b/sysmocom/suites/4g/iperf3_dl.py</span><br><span>index d90c80b..055ce97 100755</span><br><span>--- a/sysmocom/suites/4g/iperf3_dl.py</span><br><span>+++ b/sysmocom/suites/4g/iperf3_dl.py</span><br><span>@@ -26,7 +26,7 @@</span><br><span> proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_DL, ue.netns(), bitrate=max_rate)</span><br><span> </span><br><span> print('waiting for UE to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ue.is_connected, None)</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ue.is_rrc_connected)</span><br><span> print('UE is attached')</span><br><span> </span><br><span> print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns()))</span><br><span>diff --git a/sysmocom/suites/4g/iperf3_ul.py b/sysmocom/suites/4g/iperf3_ul.py</span><br><span>index 453cdfa..6e24070 100755</span><br><span>--- a/sysmocom/suites/4g/iperf3_ul.py</span><br><span>+++ b/sysmocom/suites/4g/iperf3_ul.py</span><br><span>@@ -26,7 +26,7 @@</span><br><span> proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_UL, ue.netns(), bitrate=max_rate)</span><br><span> </span><br><span> print('waiting for UE to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ue.is_connected, None)</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ue.is_rrc_connected)</span><br><span> print('UE is attached')</span><br><span> </span><br><span> print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns()))</span><br><span>diff --git a/sysmocom/suites/4g/ping.py b/sysmocom/suites/4g/ping.py</span><br><span>index c81a35d..0fb2edb 100755</span><br><span>--- a/sysmocom/suites/4g/ping.py</span><br><span>+++ b/sysmocom/suites/4g/ping.py</span><br><span>@@ -16,7 +16,7 @@</span><br><span> </span><br><span> ue.connect(enb)</span><br><span> print('waiting for UE to attach...')</span><br><span style="color: hsl(0, 100%, 40%);">-wait(ue.is_connected, None)</span><br><span style="color: hsl(120, 100%, 40%);">+wait(ue.is_rrc_connected)</span><br><span> print('UE is attached')</span><br><span> </span><br><span> proc = ue.run_netns_wait('ping', ('ping', '-c', '10', epc.tun_addr()))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18535">change 18535</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/+/18535"/><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: I6cd057e34b4df6a1a73695355dd6406d7e039546 </div>
<div style="display:none"> Gerrit-Change-Number: 18535 </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>