perf: Clean up Hoststack tests

- Update test names with clients/streams
- Convert test results to JSON output
  * iperf3 results include bits_per_second
  * vpp_echo results include both client
    and server output which includes time in seconds
    and rx_data/tx_data in bytes which can be used
    to calculate the average bits per second.
    Tx and Rx data will always be the same:
    BPS = (client tx_data * 8) / ((client time + server time) / 2)
- Fix WRK test results data formatting errors

Change-Id: Ie2aeb665e3cc0739b16f97ba2628eebe6e041d22
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/resources/tools/wrk/wrk.py b/resources/tools/wrk/wrk.py
index 381e9b9da0..85d18d4a9c 100644
--- a/resources/tools/wrk/wrk.py
+++ b/resources/tools/wrk/wrk.py
@@ -186,12 +186,12 @@ def run_wrk(tg_node, profile_name, tg_numa, test_type, warm_up=False):
     if test_type == u"cps":
         log_msg += u"Connections/sec: Avg / Stdev / Max  / +/- Stdev\n"
         for item in stats[u"rps-stats-lst"]:
-            log_msg += f"{0} / {1} / {2} / {3}\n".format(*item)
+            log_msg += u" / ".join(map(str, item)) + u"\n"
         log_msg += f"Total cps: {stats[u'rps-sum']}cps\n"
     elif test_type == u"rps":
         log_msg += u"Requests/sec: Avg / Stdev / Max  / +/- Stdev\n"
         for item in stats[u"rps-stats-lst"]:
-            log_msg += f"{0} / {1} / {2} / {3}\n".format(*item)
+            log_msg += u" / ".join(map(str, item)) + u"\n"
         log_msg += f"Total rps: {stats[u'rps-sum']}rps\n"
     elif test_type == u"bw":
         log_msg += f"Transfer/sec: {stats[u'bw-sum']}Bps"