[PATCH 03/12] RecipeCommon.Ping: remove ping_config from ping_evaluate_and_report

This parameter is never used. The value is a list of PingConf objects and these are available in the results parameter anyway. Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt; --- lnst/RecipeCommon/Ping.py | 2 +- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 2 +- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 2 +- lnst/Recipes/ENRT/PingFloodRecipe.py | 2 +- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 2 +- lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py | 2 +- lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py | 2 +- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 2 +- lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 2 +- lnst/Recipes/ENRT/VlansRecipe.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lnst/RecipeCommon/Ping.py b/lnst/RecipeCommon/Ping.py index 985f4073..792b0e52 100644 --- a/lnst/RecipeCommon/Ping.py +++ b/lnst/RecipeCommon/Ping.py @@ -74,7 +74,7 @@ class PingTestAndEvaluate(BaseRecipe): ping = client.prepare_job(Ping(**kwargs)) return ping - def ping_evaluate_and_report(self, ping_config, results): + def ping_evaluate_and_report(self, results): for pingconf, result in results.items(): self.single_ping_evaluate_and_report(pingconf, result) diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index 5862311b..7a8cd55e 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -102,7 +102,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(ping_config, result) + self.ping_evaluate_and_report(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 fd8b1bda..6d7e1c1c 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(ping_config, result[0]) + super().ping_evaluate_and_report(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 26ecda03..7ecb5ae1 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(ping_config, res[0]) + super().ping_evaluate_and_report(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 bb04e169..1b1dec41 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(pcfg, result) + self.ping_evaluate_and_report(result) diff --git a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py index f7c7511c..c1fc1478 100644 --- a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py +++ b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py @@ -154,7 +154,7 @@ class VirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result) def ping_test(self, ping_config, exp_fail): results = {} diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py index c12d1945..8edf4234 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py @@ -190,7 +190,7 @@ class VirtualBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result) def ping_test(self, ping_config, exp_fail): results = {} diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py index e8efd1d8..7cc9641f 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py @@ -194,7 +194,7 @@ class VirtualOvsBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result) def ping_test(self, ping_config, exp_fail): results = {} diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py b/lnst/Recipes/ENRT/VlansOverBondRecipe.py index f47d0a2c..12ce812d 100644 --- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py @@ -182,7 +182,7 @@ class VlansOverBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result) def ping_test(self, ping_config, exp_fail): results = {} diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py index 4b62be8d..679ab35f 100644 --- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py +++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py @@ -179,7 +179,7 @@ class VlansOverTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result) def ping_test(self, ping_config, exp_fail): results = {} diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py index bfaa51dd..38f1f454 100644 --- a/lnst/Recipes/ENRT/VlansRecipe.py +++ b/lnst/Recipes/ENRT/VlansRecipe.py @@ -148,7 +148,7 @@ class VlansRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result) def ping_test(self, ping_config, exp_fail): results = {} -- 2.21.1