This is to match Perf pattern.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
lnst/RecipeCommon/Ping.py | 6 +++---
lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +-
lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 2 +-
lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 2 +-
lnst/Recipes/ENRT/PingFloodRecipe.py | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lnst/RecipeCommon/Ping.py b/lnst/RecipeCommon/Ping.py
index 792b0e52..320e4ac5 100644
--- a/lnst/RecipeCommon/Ping.py
+++ b/lnst/RecipeCommon/Ping.py
@@ -74,11 +74,11 @@ class PingTestAndEvaluate(BaseRecipe):
ping = client.prepare_job(Ping(**kwargs))
return ping
- def ping_evaluate_and_report(self, results):
+ def ping_report_and_evaluate(self, results):
for pingconf, result in results.items():
- self.single_ping_evaluate_and_report(pingconf, result)
+ self.single_ping_report_and_evaluate(pingconf, result)
- def single_ping_evaluate_and_report(self, ping_config, result):
+ def single_ping_report_and_evaluate(self, ping_config, result):
fmt = "From: <{0.client.hostid} ({0.client_bind})> To: " \
"<{0.destination.hostid} ({0.destination_address})>"
description = fmt.format(ping_config)
diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
index edd4da70..08faa5c4 100644
--- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
+++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
@@ -99,7 +99,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate,
PerfRecipe):
def do_ping_tests(self, recipe_config):
for ping_config in self.generate_ping_configurations(recipe_config):
result = self.ping_test(ping_config)
- self.ping_evaluate_and_report(result)
+ self.ping_report_and_evaluate(result)
def do_perf_tests(self, recipe_config):
for perf_config in self.generate_perf_configurations(recipe_config):
diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
index 6d7e1c1c..014891c0 100644
--- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
+++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
@@ -186,7 +186,7 @@ class IpsecEspAeadRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
return (ping_result, pa_config, pa_result)
def ping_evaluate_and_report(self, ping_config, result):
- super().ping_evaluate_and_report(result[0])
+ super().ping_report_and_evaluate(result[0])
self.packet_assert_evaluate_and_report(result[1], result[2])
def get_dev_by_ip(self, netns, ip):
diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
index 7ecb5ae1..eb67e236 100644
--- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
+++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
@@ -217,7 +217,7 @@ class IpsecEspAhCompRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
def ping_evaluate_and_report(self, ping_config, result):
for res in result:
- super().ping_evaluate_and_report(res[0])
+ super().ping_report_and_evaluate(res[0])
self.packet_assert_evaluate_and_report(res[1], res[2])
def get_dev_by_ip(self, netns, ip):
diff --git a/lnst/Recipes/ENRT/PingFloodRecipe.py b/lnst/Recipes/ENRT/PingFloodRecipe.py
index 1b1dec41..964f956b 100644
--- a/lnst/Recipes/ENRT/PingFloodRecipe.py
+++ b/lnst/Recipes/ENRT/PingFloodRecipe.py
@@ -43,4 +43,4 @@ class PingFloodRecipe(PingTestAndEvaluate):
pcfg=PingConf(host1, ip1, host2, ip2, count = cn, interval = iv,
size = sz)
result = self.ping_test([pcfg])
- self.ping_evaluate_and_report(result)
+ self.ping_report_and_evaluate(result)
--
2.21.1