<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/mncc-python/+/17980">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mncc_mt_loadgen.py: add codec arg<br><br>Add codec parameter to start_call() and convenience functions mt_call()<br>and calls() with FR as default. While at it, update the help text.<br><br>Duplicate enum codec_type into mncc_mt_loadgen.py, because the enum<br>values are different from the existing enum values in the python code<br>(GSM48_BCAP_SV_EFR etc.).<br><br>Related: SYS#4924<br>Change-Id: I5879b8b9ccc63908b9f6629487e66eff1e4a1ab4<br>---<br>M mncc_mt_loadgen.py<br>M rtpsource/rtp_provider.h<br>2 files changed, 27 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/80/17980/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/mncc_mt_loadgen.py b/mncc_mt_loadgen.py</span><br><span>index fcae13f..da0e7fc 100755</span><br><span>--- a/mncc_mt_loadgen.py</span><br><span>+++ b/mncc_mt_loadgen.py</span><br><span>@@ -95,6 +95,22 @@</span><br><span> else:</span><br><span> raise Exception('ctrl', 'RtpSourceCtrlActor Received unhandled %s' % message)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# Keep in sync with enum codec_type in rtpsource/rtp_provider.h</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_ULAW = 0</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_ALAW = 1</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_GSM_FR = 2</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_GSM_EFR = 3</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_GSM_HR = 4</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_AMR_4_75 = 5</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_AMR_5_15 = 6</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_AMR_5_90 = 7</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_AMR_6_70 = 8</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_AMR_7_40 = 9</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_AMR_7_95 = 10</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_AMR_10_2 = 11</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_AMR_12_2 = 12</span><br><span style="color: hsl(120, 100%, 40%);">+CODEC_AMR_SID = 13</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> class MTCallRtpsource(pykka.ThreadingActor):</span><br><span> '''Actor to start a network-initiated MT (mobile terminated) call to a given MSISDN,</span><br><span>@@ -109,12 +125,11 @@</span><br><span> self.state = 'NULL'</span><br><span> self.rtp_msc = None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def start_call(self, msisdn_called, msisdn_calling):</span><br><span style="color: hsl(120, 100%, 40%);">+ def start_call(self, msisdn_called, msisdn_calling, codec):</span><br><span> '''Start a MT call from given [external] calling party to given mobile party MSISDN'''</span><br><span> self.msisdn_called = msisdn_called</span><br><span> self.msisdn_calling = msisdn_calling</span><br><span> # allocate a RTP connection @ rtpsource</span><br><span style="color: hsl(0, 100%, 40%);">- codec = 2 # FR, FIXME: make configurable</span><br><span> r = self.ctrl_act.ask({'type':'rtp_create', 'cname':self.callref, 'codec':codec})</span><br><span> self.ext_rtp_host = r['remote_host']</span><br><span> self.ext_rtp_port = r['remote_port']</span><br><span>@@ -173,23 +188,27 @@</span><br><span> rtpctrl_act = RtpSourceCtrlActor.start(RTPSOURCE_CTRL_IP, RTPSOURCE_CTRL_PORT)</span><br><span> </span><br><span> # convenience wrapper</span><br><span style="color: hsl(0, 100%, 40%);">-def mt_call(msisdn_called, msisdn_calling = '123456789', codecs = GSM48.AllCodecs):</span><br><span style="color: hsl(120, 100%, 40%);">+def mt_call(msisdn_called, msisdn_calling='123456789', codecs=GSM48.AllCodecs, codec=CODEC_GSM_FR):</span><br><span> call_conn = MTCallRtpsource.start(mncc_act, rtpctrl_act, codecs).proxy()</span><br><span style="color: hsl(0, 100%, 40%);">- call_conn.start_call(msisdn_called, msisdn_calling)</span><br><span style="color: hsl(120, 100%, 40%);">+ call_conn.start_call(msisdn_called, msisdn_calling, codec)</span><br><span> return call_conn</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def calls(nr, ramp=1.0):</span><br><span style="color: hsl(120, 100%, 40%);">+def calls(nr, ramp=1.0, codec=CODEC_GSM_FR):</span><br><span> for i in range(nr):</span><br><span> a = 90001 + i</span><br><span> a = str(a)</span><br><span> print("%d: mt_call(%r)" % (i, a))</span><br><span style="color: hsl(0, 100%, 40%);">- mt_call(a)</span><br><span style="color: hsl(120, 100%, 40%);">+ mt_call(a, codec=codec)</span><br><span> time.sleep(ramp)</span><br><span> </span><br><span> log.info("")</span><br><span> log.info("")</span><br><span style="color: hsl(0, 100%, 40%);">-log.info("Start calls by typing:")</span><br><span style="color: hsl(120, 100%, 40%);">+log.info("Start a single call by typing:")</span><br><span> log.info(" mt_call('90001')")</span><br><span style="color: hsl(120, 100%, 40%);">+log.info("With a specific codec (default is FR):")</span><br><span style="color: hsl(120, 100%, 40%);">+log.info(" mt_call('90001', codec=CODEC_GSM_EFR)")</span><br><span style="color: hsl(120, 100%, 40%);">+log.info("Start multiple calls with (e.g. 4 calls with EFR):")</span><br><span style="color: hsl(120, 100%, 40%);">+log.info(" calls(4, codec=CODEC_GSM_EFR)")</span><br><span> log.info("")</span><br><span> log.info("")</span><br><span> </span><br><span>diff --git a/rtpsource/rtp_provider.h b/rtpsource/rtp_provider.h</span><br><span>index 7048a3e..3dd9fa8 100644</span><br><span>--- a/rtpsource/rtp_provider.h</span><br><span>+++ b/rtpsource/rtp_provider.h</span><br><span>@@ -2,6 +2,7 @@</span><br><span> #include <stdint.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Keep in sync with CODEC_* in mncc_mt_loadgen.py */</span><br><span> enum codec_type {</span><br><span> CODEC_ULAW,</span><br><span> CODEC_ALAW,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/mncc-python/+/17980">change 17980</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/mncc-python/+/17980"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: mncc-python </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5879b8b9ccc63908b9f6629487e66eff1e4a1ab4 </div>
<div style="display:none"> Gerrit-Change-Number: 17980 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>