<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11974">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move command processing into shared function<br><br>Change-Id: I4e40607a9aa5e03a7b3f5b68e4261828209a5813<br>---<br>M osmopy/trap_helper.py<br>M scripts/ctrl2cgi.py<br>M scripts/soap.py<br>3 files changed, 19 insertions(+), 15 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/74/11974/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 6f4b95d..d07ebd3 100644</span><br><span>--- a/osmopy/trap_helper.py</span><br><span>+++ b/osmopy/trap_helper.py</span><br><span>@@ -24,6 +24,7 @@</span><br><span> </span><br><span> import sys, os, datetime, signal, logging, logging.handlers</span><br><span> from functools import partial</span><br><span style="color: hsl(120, 100%, 40%);">+from osmopy.osmo_ipa import Ctrl</span><br><span> from osmopy.twisted_ipa import CTRL</span><br><span> from twisted.internet import defer</span><br><span> </span><br><span>@@ -56,6 +57,17 @@</span><br><span>     loc = split_type(v)</span><br><span>     return loc[-1]</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def comm_proc(comm, f, log):</span><br><span style="color: hsl(120, 100%, 40%);">+    """</span><br><span style="color: hsl(120, 100%, 40%);">+    Command processor: takes function f to run for each command</span><br><span style="color: hsl(120, 100%, 40%);">+    """</span><br><span style="color: hsl(120, 100%, 40%);">+    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(120, 100%, 40%);">+    log.debug("BSC %s commands: %r" % (bsc_id, comm))</span><br><span style="color: hsl(120, 100%, 40%);">+    for t in comm:</span><br><span style="color: hsl(120, 100%, 40%);">+        (_, m) = Ctrl().cmd(*t.split())</span><br><span style="color: hsl(120, 100%, 40%);">+        f(m)</span><br><span style="color: hsl(120, 100%, 40%);">+    return bsc_id</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def make_params(bsc, data):</span><br><span>     """</span><br><span>     Make parameters for request</span><br><span>diff --git a/scripts/ctrl2cgi.py b/scripts/ctrl2cgi.py</span><br><span>index c566a7c..6818b2a 100755</span><br><span>--- a/scripts/ctrl2cgi.py</span><br><span>+++ b/scripts/ctrl2cgi.py</span><br><span>@@ -22,14 +22,14 @@</span><br><span>  */</span><br><span> """</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-__version__ = "0.0.3" # bump this on every non-trivial change</span><br><span style="color: hsl(120, 100%, 40%);">+__version__ = "0.0.4" # bump this on every non-trivial change</span><br><span> </span><br><span> from twisted.internet import defer, reactor</span><br><span> from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version</span><br><span> from osmopy.osmo_ipa import Ctrl</span><br><span> from treq import post, collect</span><br><span> from functools import partial</span><br><span style="color: hsl(0, 100%, 40%);">-from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params</span><br><span style="color: hsl(120, 100%, 40%);">+from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params, comm_proc</span><br><span> from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available</span><br><span> import argparse, datetime, signal, sys, os, logging, logging.handlers</span><br><span> import hashlib</span><br><span>@@ -45,11 +45,7 @@</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%);">-    bsc_id = decoded.get('commands')[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, decoded.get('commands')))</span><br><span style="color: hsl(0, 100%, 40%);">-    for t in decoded.get('commands'): # Process commands format</span><br><span style="color: hsl(0, 100%, 40%);">-        (_, m) = Ctrl().cmd(*t.split())</span><br><span style="color: hsl(0, 100%, 40%);">-        f(m)</span><br><span style="color: hsl(120, 100%, 40%);">+    comm_proc(decoded.get('commands'), f, log)</span><br><span> </span><br><span> def gen_hash(params, skey):</span><br><span>     input = ''</span><br><span>diff --git a/scripts/soap.py b/scripts/soap.py</span><br><span>index 75acd89..6bf786c 100755</span><br><span>--- a/scripts/soap.py</span><br><span>+++ b/scripts/soap.py</span><br><span>@@ -22,7 +22,7 @@</span><br><span>  */</span><br><span> """</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-__version__ = "0.7.1" # bump this on every non-trivial change</span><br><span style="color: hsl(120, 100%, 40%);">+__version__ = "0.7.2" # bump this on every non-trivial change</span><br><span> </span><br><span> from twisted.internet import defer, reactor</span><br><span> from osmopy.twisted_ipa import CTRL, IPAFactory, __version__ as twisted_ipa_version</span><br><span>@@ -30,7 +30,7 @@</span><br><span> from treq import post, collect</span><br><span> from suds.client import Client</span><br><span> from functools import partial</span><br><span style="color: hsl(0, 100%, 40%);">-from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params</span><br><span style="color: hsl(120, 100%, 40%);">+from osmopy.trap_helper import reloader, debug_init, get_type, get_r, p_h, make_params, comm_proc</span><br><span> from distutils.version import StrictVersion as V # FIXME: use NormalizedVersion from PEP-386 when available</span><br><span> import argparse, datetime, signal, sys, os, logging, logging.handlers</span><br><span> </span><br><span>@@ -40,15 +40,11 @@</span><br><span> </span><br><span> def handle_reply(p, f, log, r):</span><br><span>     """</span><br><span style="color: hsl(0, 100%, 40%);">-    Reply handler: takes function p to process raw SOAP server reply r, function f to run for each command and verbosity flag v</span><br><span style="color: hsl(120, 100%, 40%);">+    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 = repl.commands[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(120, 100%, 40%);">+    bsc_id = comm_proc(repl.commands, 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 style="color: hsl(0, 100%, 40%);">-    log.debug("BSC %s commands: %s" % (bsc_id, repl.commands))</span><br><span style="color: hsl(0, 100%, 40%);">-    for t in repl.commands: # Process OpenBscCommands format from .wsdl</span><br><span style="color: hsl(0, 100%, 40%);">-        (_, m) = Ctrl().cmd(*t.split())</span><br><span style="color: hsl(0, 100%, 40%);">-        f(m)</span><br><span> </span><br><span> </span><br><span> class Trap(CTRL):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11974">change 11974</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/11974"/><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: I4e40607a9aa5e03a7b3f5b68e4261828209a5813 </div>
<div style="display:none"> Gerrit-Change-Number: 11974 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>