From: Ondrej Lichtner <olichtne(a)redhat.com>
Move the NetworkFlowTest class from the IperfFlowMeasurement module to
the more generic BaseFlowMeasurement module from where it can be reused
by other derived classes.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
.../Perf/Measurements/BaseFlowMeasurement.py | 18 +++++++++++++++
.../Perf/Measurements/IperfFlowMeasurement.py | 23 +------------------
2 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
b/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
index 203e104..da0b5f4 100644
--- a/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
+++ b/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
@@ -52,6 +52,24 @@ class Flow(object):
def parallel_streams(self):
return self._parallel_streams
+class NetworkFlowTest(object):
+ def __init__(self, flow, server_job, client_job):
+ self._flow = flow
+ self._server_job = server_job
+ self._client_job = client_job
+
+ @property
+ def flow(self):
+ return self._flow
+
+ @property
+ def server_job(self):
+ return self._server_job
+
+ @property
+ def client_job(self):
+ return self._client_job
+
class FlowMeasurementResults(object):
def __init__(self, flow):
self._flow = flow
diff --git a/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
b/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
index c792e9d..5267ae2 100644
--- a/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
+++ b/lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
@@ -8,6 +8,7 @@ from lnst.Controller.RecipeResults import ResultLevel
from lnst.RecipeCommon.Perf.Results import PerfInterval
from lnst.RecipeCommon.Perf.Results import SequentialPerfResult
from lnst.RecipeCommon.Perf.Results import ParallelPerfResult
+from lnst.RecipeCommon.Perf.Measurements.BaseFlowMeasurement import NetworkFlowTest
from lnst.RecipeCommon.Perf.Measurements.BaseFlowMeasurement import BaseFlowMeasurement
from lnst.RecipeCommon.Perf.Measurements.BaseFlowMeasurement import
FlowMeasurementResults
@@ -133,25 +134,3 @@ class IperfFlowMeasurement(BaseFlowMeasurement):
else:
cpu_percent =
job.result["data"]["end"]["cpu_utilization_percent"]["host_total"]
return PerfInterval(cpu_percent, 1, "cpu_percent")
-
-class NetworkFlowTest(object):
- def __init__(self, flow, server_job, client_job):
- self._flow = flow
- self._server_job = server_job
- self._client_job = client_job
-
- @property
- def flow(self):
- return self._flow
-
- @property
- def server_job(self):
- return self._server_job
-
- @property
- def client_job(self):
- return self._client_job
-
- @property
- def duration(self):
- return self._flow.duration
--
2.19.1