<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21521">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use ctrl.get_var() instead of do_get() with code dup<br><br>Change-Id: I8dd6140787c6e84dff0882a1c9d5be4bdd3bbc43<br>---<br>M src/osmo_gsm_tester/obj/bsc_osmo.py<br>M src/osmo_gsm_tester/obj/msc_osmo.py<br>M src/osmo_gsm_tester/obj/nitb_osmo.py<br>3 files changed, 8 insertions(+), 46 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/21/21521/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/bsc_osmo.py b/src/osmo_gsm_tester/obj/bsc_osmo.py</span><br><span>index 636514e..62026e6 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bsc_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bsc_osmo.py</span><br><span>@@ -206,7 +206,6 @@</span><br><span> class OsmoBscCtrl(log.Origin):</span><br><span> PORT = 4249</span><br><span> BTS_OML_STATE_VAR = "bts.%d.oml-connection-state"</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_OML_STATE_RE = re.compile("GET_REPLY (\d+) bts.\d+.oml-connection-state (?P<oml_state>\w+)")</span><br><span> </span><br><span> def __init__(self, bsc):</span><br><span> self.bsc = bsc</span><br><span>@@ -217,17 +216,9 @@</span><br><span> </span><br><span> def bts_is_connected(self, bts_num):</span><br><span> with self.ctrl() as ctrl:</span><br><span style="color: hsl(0, 100%, 40%);">- ctrl.do_get(OsmoBscCtrl.BTS_OML_STATE_VAR % bts_num)</span><br><span style="color: hsl(0, 100%, 40%);">- data = ctrl.receive()</span><br><span style="color: hsl(0, 100%, 40%);">- while (len(data) > 0):</span><br><span style="color: hsl(0, 100%, 40%);">- (answer, data) = ctrl.remove_ipa_ctrl_header(data)</span><br><span style="color: hsl(0, 100%, 40%);">- answer_str = answer.decode('utf-8')</span><br><span style="color: hsl(0, 100%, 40%);">- answer_str = answer_str.replace('\n', ' ')</span><br><span style="color: hsl(0, 100%, 40%);">- res = OsmoBscCtrl.BTS_OML_STATE_RE.match(answer_str)</span><br><span style="color: hsl(0, 100%, 40%);">- if res:</span><br><span style="color: hsl(0, 100%, 40%);">- oml_state = str(res.group('oml_state'))</span><br><span style="color: hsl(0, 100%, 40%);">- if oml_state == 'connected':</span><br><span style="color: hsl(0, 100%, 40%);">- return True</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_state = ctrl.get_var(OsmoBscCtrl.BTS_OML_STATE_VAR % bts_num)</span><br><span style="color: hsl(120, 100%, 40%);">+ if oml_state == 'connected':</span><br><span style="color: hsl(120, 100%, 40%);">+ return True</span><br><span> return False</span><br><span> </span><br><span> class OsmoBscVty(log.Origin):</span><br><span>diff --git a/src/osmo_gsm_tester/obj/msc_osmo.py b/src/osmo_gsm_tester/obj/msc_osmo.py</span><br><span>index 67e1d31..726d1ff 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/msc_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/msc_osmo.py</span><br><span>@@ -169,17 +169,7 @@</span><br><span> return osmo_ctrl.OsmoCtrl(self.msc.addr(), self.PORT)</span><br><span> </span><br><span> def subscriber_list_active(self):</span><br><span style="color: hsl(0, 100%, 40%);">- aslist_str = ""</span><br><span> with self.ctrl() as ctrl:</span><br><span style="color: hsl(0, 100%, 40%);">- ctrl.do_get(self.SUBSCR_LIST_ACTIVE_VAR)</span><br><span style="color: hsl(0, 100%, 40%);">- # This is legacy code from the old osmo-gsm-tester.</span><br><span style="color: hsl(0, 100%, 40%);">- # looks like this doesn't work for long data.</span><br><span style="color: hsl(0, 100%, 40%);">- data = ctrl.receive()</span><br><span style="color: hsl(0, 100%, 40%);">- while (len(data) > 0):</span><br><span style="color: hsl(0, 100%, 40%);">- (answer, data) = ctrl.remove_ipa_ctrl_header(data)</span><br><span style="color: hsl(0, 100%, 40%);">- answer_str = answer.decode('utf-8')</span><br><span style="color: hsl(0, 100%, 40%);">- answer_str = answer_str.replace('\n', ' ')</span><br><span style="color: hsl(0, 100%, 40%);">- aslist_str = answer_str</span><br><span style="color: hsl(0, 100%, 40%);">- return aslist_str</span><br><span style="color: hsl(120, 100%, 40%);">+ return ctrl.get_var(self.SUBSCR_LIST_ACTIVE_VAR).replace('\n', ' ')</span><br><span> </span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span>diff --git a/src/osmo_gsm_tester/obj/nitb_osmo.py b/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>index a424927..e35a0f4 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>@@ -166,7 +166,6 @@</span><br><span> SUBSCR_DELETE_REPLY_RE = re.compile("SET_REPLY (\d+) %s Removed" % SUBSCR_DELETE_VAR)</span><br><span> SUBSCR_LIST_ACTIVE_VAR = 'subscriber-list-active-v1'</span><br><span> BTS_OML_STATE_VAR = "bts.%d.oml-connection-state"</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_OML_STATE_RE = re.compile("GET_REPLY (\d+) bts.\d+.oml-connection-state (?P<oml_state>\w+)")</span><br><span> </span><br><span> def __init__(self, nitb):</span><br><span> self.nitb = nitb</span><br><span>@@ -203,32 +202,14 @@</span><br><span> self.dbg('Deleted subscriber', imsi=imsi)</span><br><span> </span><br><span> def subscriber_list_active(self):</span><br><span style="color: hsl(0, 100%, 40%);">- aslist_str = ""</span><br><span> with self.ctrl() as ctrl:</span><br><span style="color: hsl(0, 100%, 40%);">- ctrl.do_get(OsmoNitbCtrl.SUBSCR_LIST_ACTIVE_VAR)</span><br><span style="color: hsl(0, 100%, 40%);">- # This is legacy code from the old osmo-gsm-tester.</span><br><span style="color: hsl(0, 100%, 40%);">- # looks like this doesn't work for long data.</span><br><span style="color: hsl(0, 100%, 40%);">- data = ctrl.receive()</span><br><span style="color: hsl(0, 100%, 40%);">- while (len(data) > 0):</span><br><span style="color: hsl(0, 100%, 40%);">- (answer, data) = ctrl.remove_ipa_ctrl_header(data)</span><br><span style="color: hsl(0, 100%, 40%);">- answer_str = answer.decode('utf-8')</span><br><span style="color: hsl(0, 100%, 40%);">- answer_str = answer_str.replace('\n', ' ')</span><br><span style="color: hsl(0, 100%, 40%);">- aslist_str = answer_str</span><br><span style="color: hsl(0, 100%, 40%);">- return aslist_str</span><br><span style="color: hsl(120, 100%, 40%);">+ return ctrl.get_var(OsmoNitbCtrl.SUBSCR_LIST_ACTIVE_VAR).replace('\n', ' ')</span><br><span> </span><br><span> def bts_is_connected(self, bts_num):</span><br><span> with self.ctrl() as ctrl:</span><br><span style="color: hsl(0, 100%, 40%);">- ctrl.do_get(OsmoNitbCtrl.BTS_OML_STATE_VAR % bts_num)</span><br><span style="color: hsl(0, 100%, 40%);">- data = ctrl.receive()</span><br><span style="color: hsl(0, 100%, 40%);">- while (len(data) > 0):</span><br><span style="color: hsl(0, 100%, 40%);">- (answer, data) = ctrl.remove_ipa_ctrl_header(data)</span><br><span style="color: hsl(0, 100%, 40%);">- answer_str = answer.decode('utf-8')</span><br><span style="color: hsl(0, 100%, 40%);">- answer_str = answer_str.replace('\n', ' ')</span><br><span style="color: hsl(0, 100%, 40%);">- res = OsmoNitbCtrl.BTS_OML_STATE_RE.match(answer_str)</span><br><span style="color: hsl(0, 100%, 40%);">- if res:</span><br><span style="color: hsl(0, 100%, 40%);">- oml_state = str(res.group('oml_state'))</span><br><span style="color: hsl(0, 100%, 40%);">- if oml_state == 'connected':</span><br><span style="color: hsl(0, 100%, 40%);">- return True</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_state = ctrl.get_var(OsmoNitbCtrl.BTS_OML_STATE_VAR % bts_num)</span><br><span style="color: hsl(120, 100%, 40%);">+ if oml_state == 'connected':</span><br><span style="color: hsl(120, 100%, 40%);">+ return True</span><br><span> return False</span><br><span> </span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21521">change 21521</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/+/21521"/><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: I8dd6140787c6e84dff0882a1c9d5be4bdd3bbc43 </div>
<div style="display:none"> Gerrit-Change-Number: 21521 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>