This will be used for additional pre-configuration of the SCTP performance test.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
.../Perf/Measurements/BaseFlowMeasurement.py | 18 ++++++++++++++++--
lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 ++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
b/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
index 8c74c610..856eeba3 100644
--- a/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
+++ b/lnst/RecipeCommon/Perf/Measurements/BaseFlowMeasurement.py
@@ -8,15 +8,17 @@ from lnst.RecipeCommon.Perf.Results import SequentialPerfResult
class Flow(object):
def __init__(self,
type,
- generator, generator_bind,
- receiver, receiver_bind,
+ generator, generator_bind, generator_nic,
+ receiver, receiver_bind, receiver_nic,
msg_size, duration, parallel_streams, cpupin):
self._type = type
self._generator = generator
self._generator_bind = generator_bind
+ self._generator_nic = generator_nic
self._receiver = receiver
self._receiver_bind = receiver_bind
+ self._receiver_nic = receiver_nic
self._msg_size = msg_size
self._duration = duration
@@ -35,6 +37,10 @@ class Flow(object):
def generator_bind(self):
return self._generator_bind
+ @property
+ def generator_nic(self):
+ return self._generator_nic
+
@property
def receiver(self):
return self._receiver
@@ -43,6 +49,10 @@ class Flow(object):
def receiver_bind(self):
return self._receiver_bind
+ @property
+ def receiver_nic(self):
+ return self._receiver_nic
+
@property
def msg_size(self):
return self._msg_size
@@ -65,8 +75,10 @@ class Flow(object):
type={type},
generator={generator},
generator_bind={generator_bind},
+ generator_nic={generator_nic},
receiver={receiver},
receiver_bind={receiver_bind},
+ receiver_nic={receiver_nic},
msg_size={msg_size},
duration={duration},
parallel_streams={parallel_streams},
@@ -75,8 +87,10 @@ class Flow(object):
type=self.type,
generator=str(self.generator),
generator_bind=self.generator_bind,
+ generator_nic=self.generator_nic,
receiver=str(self.receiver),
receiver_bind=self.receiver_bind,
+ receiver_nic=self.receiver_nic,
msg_size=self.msg_size,
duration=self.duration,
parallel_streams=self.parallel_streams,
diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
index 6a287ada..f8fafc80 100644
--- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
+++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
@@ -508,7 +508,9 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate,
PerfRecipe):
cpupin = self.params.perf_tool_cpu if "perf_tool_cpu" in self.params
else None
return PerfFlow(type=perf_test,
generator=client_nic.netns, generator_bind=client_bind,
+ generator_nic=client_nic,
receiver=server_nic.netns, receiver_bind=server_bind,
+ receiver_nic=server_nic,
msg_size=msg_size,
duration=self.params.perf_duration,
parallel_streams=self.params.perf_parallel_streams,
--
2.21.3