<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12145">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Trap handlers: propagate expected BSC id to command processor<br><br>When receiving commands for particular BSC, log BSC id known at the time<br>when request was made, not the one which is part of the reply.<br><br>Change-Id: I6acdfddb9a1132f978f2b55c769559b0c29eb3e8<br>---<br>M osmopy/trap_helper.py<br>M scripts/ctrl2cgi.py<br>M scripts/soap.py<br>3 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/45/12145/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmopy/trap_helper.py b/osmopy/trap_helper.py</span><br><span>index 45dc527..b7202ac 100644</span><br><span>--- a/osmopy/trap_helper.py</span><br><span>+++ b/osmopy/trap_helper.py</span><br><span>@@ -55,12 +55,12 @@</span><br><span>     loc = split_type(v)</span><br><span>     return loc[-1]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def comm_proc(comm, f, log):</span><br><span style="color: hsl(120, 100%, 40%);">+def comm_proc(comm, bid, f, log):</span><br><span>     """</span><br><span>     Command processor: takes function f to run for each command</span><br><span>     """</span><br><span>     bsc_id = comm[0].split()[0].split('.')[3] # we expect 1st command to have net.0.bsc.666.bts.2.trx.1 location prefix format</span><br><span style="color: hsl(0, 100%, 40%);">-    log.debug("BSC %s commands: %r" % (bsc_id, comm))</span><br><span style="color: hsl(120, 100%, 40%);">+    log.debug("BSC %s commands: %r" % (bid, comm))</span><br><span>     for t in comm:</span><br><span>         (_, m) = Ctrl().cmd(*t.split())</span><br><span>         f(m)</span><br><span>diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py</span><br><span>index cd59209..addca2f 100755</span><br><span>--- a/scripts/ctrl2cgi.py</span><br><span>+++ b/scripts/ctrl2cgi.py</span><br><span>@@ -40,12 +40,12 @@</span><br><span> assert V(twisted_ipa_version) > V('0.4')</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def handle_reply(f, log, resp):</span><br><span style="color: hsl(120, 100%, 40%);">+def handle_reply(bid, f, log, resp):</span><br><span>     """</span><br><span>     Reply handler: process raw CGI server response, function f to run for each command</span><br><span>     """</span><br><span>     decoded = json.loads(resp.decode('utf-8'))</span><br><span style="color: hsl(0, 100%, 40%);">-    comm_proc(decoded.get('commands'), f, log)</span><br><span style="color: hsl(120, 100%, 40%);">+    comm_proc(decoded.get('commands'), bid, f, log)</span><br><span> </span><br><span> def gen_hash(params, skey):</span><br><span>     inp = ''</span><br><span>@@ -62,7 +62,7 @@</span><br><span> </span><br><span> def make_async_req(dst, par, f_write, f_log):</span><br><span>     d = post(dst, par)</span><br><span style="color: hsl(0, 100%, 40%);">-    d.addCallback(collect, partial(handle_reply, f_write, f_log)) # treq's collect helper is handy to get all reply content at once</span><br><span style="color: hsl(120, 100%, 40%);">+    d.addCallback(collect, partial(handle_reply, par['bsc_id'], f_write, f_log)) # treq's collect helper is handy to get all reply content at once</span><br><span>     d.addErrback(lambda e: f_log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, par['bsc_id'], dst))) # handle HTTP errors</span><br><span>     return d</span><br><span> </span><br><span>diff --git a/scripts/soap.py b/scripts/soap.py</span><br><span>index 0534000..f771530 100755</span><br><span>--- a/scripts/soap.py</span><br><span>+++ b/scripts/soap.py</span><br><span>@@ -38,12 +38,12 @@</span><br><span> assert V(twisted_ipa_version) > V('0.4')</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def handle_reply(p, f, log, r):</span><br><span style="color: hsl(120, 100%, 40%);">+def handle_reply(p, bid, f, log, r):</span><br><span>     """</span><br><span>     Reply handler: takes function p to process raw SOAP server reply r, function f to run for each command</span><br><span>     """</span><br><span>     repl = p(r) # result is expected to have both commands[] array and error string (could be None)</span><br><span style="color: hsl(0, 100%, 40%);">-    bsc_id = comm_proc(repl.commands, f, log)</span><br><span style="color: hsl(120, 100%, 40%);">+    bsc_id = comm_proc(repl.commands, bid, f, log)</span><br><span>     log.info("Received SOAP response for BSC %s with %d commands, error status: %s" % (bsc_id, len(repl.commands), repl.error))</span><br><span> </span><br><span> </span><br><span>@@ -89,7 +89,7 @@</span><br><span>         self.factory.log.debug('location-state@%s.%s.%s.%s (%s) => %s' % (net, bsc, bts, trx, params['time_stamp'], data))</span><br><span>         ctx = self.factory.client.registerSiteLocation(bsc, float(params['lon']), float(params['lat']), params['position_validity'], params['time_stamp'], params['oper_status'], params['admin_status'], params['policy_status'])</span><br><span>         d = post(self.factory.location, ctx.envelope)</span><br><span style="color: hsl(0, 100%, 40%);">-        d.addCallback(collect, partial(handle_reply, ctx.process_reply, self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx</span><br><span style="color: hsl(120, 100%, 40%);">+        d.addCallback(collect, partial(handle_reply, ctx.process_reply, params['bsc_id'], self.transport.write, self.factory.log)) # treq's collect helper is handy to get all reply content at once using closure on ctx</span><br><span>         d.addErrback(lambda e, bsc: self.factory.log.critical("HTTP POST error %s while trying to register BSC %s on %s" % (e, bsc, self.factory.location)), bsc) # handle HTTP errors</span><br><span>         # Ensure that we run only limited number of requests in parallel:</span><br><span>         yield self.factory.semaphore.acquire()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12145">change 12145</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/12145"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: python/osmo-python-tests </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I6acdfddb9a1132f978f2b55c769559b0c29eb3e8 </div>
<div style="display:none"> Gerrit-Change-Number: 12145 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>