Change in osmo-gsm-tester[master]: iperf3: add modifier to adjust the duration of the iperf run

[srs_andre]

srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17651 )


Change subject: iperf3: add modifier to adjust the duration of the iperf run
......................................................................

iperf3: add modifier to adjust the duration of the iperf run

the time is passed as a string param but is currently just
converted to seconds. We plan to add a conversion to accept
values such as 30m or 2h

Change-Id: Iff28816f83670751e9e91de31ec59b1b0ad8fc0d
---
M example/defaults.conf
A example/scenarios/mod-iperf3-time at .conf
M src/osmo_gsm_tester/iperf3.py
M src/osmo_gsm_tester/resource.py
4 files changed, 16 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/51/17651/1

diff --git a/example/defaults.conf b/example/defaults.conf
index 2708b18..4c33765 100644
--- a/example/defaults.conf
+++ b/example/defaults.conf
@@ -112,3 +112,6 @@
   airplane_t_on_ms: -1
   airplane_t_off_ms: -1
   num_carriers: 1
+
+iperf3cli:
+  time: 60
diff --git a/example/scenarios/mod-iperf3-time at .conf b/example/scenarios/mod-iperf3-time at .conf
new file mode 100644
index 0000000..fcf6f3c
--- /dev/null
+++ b/example/scenarios/mod-iperf3-time at .conf
@@ -0,0 +1,3 @@
+modifiers:
+  iperf3cli:
+  - time: ${param1}
diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py
index be4dd6f..6e97a59 100644
--- a/src/osmo_gsm_tester/iperf3.py
+++ b/src/osmo_gsm_tester/iperf3.py
@@ -20,7 +20,7 @@
 import os
 import json
 
-from . import log, util, process, pcap_recorder, run_node, remote
+from . import log, util, config, process, pcap_recorder, run_node, remote
 
 def iperf3_result_to_json(file):
     with open(file) as f:
@@ -155,14 +155,19 @@
         return locally
 
     def prepare_test_proc(self, downlink=False, netns=None, time_sec=10):
-        self.log('Starting iperf3-client connecting to %s:%d' % (self.server.addr(), self.server.port()))
+        values = dict(iperf3cli=config.get_defaults('iperf3cli'))
+        config.overlay(values, dict(iperf3cli=self.suite_run.config().get('iperf3cli', {})))
+        time_sec_final = int(values['iperf3cli'].get('time', time_sec))
+        assert(time_sec_final)
+
+        self.log('Starting iperf3-client connecting to %s:%d (time=%ds)' % (self.server.addr(), self.server.port(), time_sec_final))
         self.log_copied = False
         self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))
         self.log_file = self.run_dir.new_file(IPerf3Client.LOGFILE)
         if self.runs_locally():
-            return self.prepare_test_proc_locally(downlink, netns, time_sec)
+            return self.prepare_test_proc_locally(downlink, netns, time_sec_final)
         else:
-            return self.prepare_test_proc_remotely(downlink, netns, time_sec)
+            return self.prepare_test_proc_remotely(downlink, netns, time_sec_final)
 
     def prepare_test_proc_remotely(self, downlink, netns, time_sec):
         self.rem_host = remote.RemoteHost(self.run_dir, self._run_node.ssh_user(), self._run_node.ssh_addr())
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 3473abf..bb7b872 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -114,6 +114,7 @@
         'modem[].airplane_t_on_ms': schema.INT,
         'modem[].airplane_t_off_ms': schema.INT,
         'osmocon_phone[].serial_device': schema.STR,
+        'iperf3cli[].time': schema.STR,
     }
 
 WANT_SCHEMA = util.dict_add(

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17651
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Iff28816f83670751e9e91de31ec59b1b0ad8fc0d
Gerrit-Change-Number: 17651
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200328/bd914f92/attachment.htm>