<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11771">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">iperf3: Allow changing port of iperf3 server<br><br>This way several servers can run sharing same IP address.<br><br>default port variable is moved inside class to be available to tests.<br><br>Change-Id: Id4eae7cefbb1a18ecf2676f9cb22c60cc91cec7c<br>---<br>M src/osmo_gsm_tester/iperf3.py<br>1 file changed, 6 insertions(+), 4 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/71/11771/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py</span><br><span>index 894b10f..d0cf806 100644</span><br><span>--- a/src/osmo_gsm_tester/iperf3.py</span><br><span>+++ b/src/osmo_gsm_tester/iperf3.py</span><br><span>@@ -22,9 +22,6 @@</span><br><span> </span><br><span> from . import log, util, process, pcap_recorder</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFAULT_SRV_PORT = 5003</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def iperf3_result_to_json(file):</span><br><span>     with open(file) as f:</span><br><span>             # Sometimes iperf3 provides 2 dictionaries, the 2nd one being an error about being interrupted (by us).</span><br><span>@@ -37,6 +34,8 @@</span><br><span> </span><br><span> class IPerf3Server(log.Origin):</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    DEFAULT_SRV_PORT = 5003</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def __init__(self, suite_run, ip_address):</span><br><span>         super().__init__(log.C_RUN, 'iperf3-srv_%s' % ip_address.get('addr'))</span><br><span>         self.run_dir = None</span><br><span>@@ -44,7 +43,7 @@</span><br><span>         self.process = None</span><br><span>         self.suite_run = suite_run</span><br><span>         self.ip_address = ip_address</span><br><span style="color: hsl(0, 100%, 40%);">-        self._port = DEFAULT_SRV_PORT</span><br><span style="color: hsl(120, 100%, 40%);">+        self._port = IPerf3Server.DEFAULT_SRV_PORT</span><br><span> </span><br><span>     def start(self):</span><br><span>         self.log('Starting iperf3-srv')</span><br><span>@@ -62,6 +61,9 @@</span><br><span>         self.suite_run.remember_to_stop(self.process)</span><br><span>         self.process.launch()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def set_port(self, port):</span><br><span style="color: hsl(120, 100%, 40%);">+        self._port = port</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def stop(self):</span><br><span>         self.suite_run.stop_process(self.process)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11771">change 11771</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/11771"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Id4eae7cefbb1a18ecf2676f9cb22c60cc91cec7c </div>
<div style="display:none"> Gerrit-Change-Number: 11771 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>