[PATCH v3 14/17] RecipeCommon.Ping.Recipe: split report and evaluate

The report part will now add result about the ping command status. The evaluation part will be handled separately by configured Ping evaluators. Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt; --- lnst/RecipeCommon/Ping/Recipe.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/lnst/RecipeCommon/Ping/Recipe.py b/lnst/RecipeCommon/Ping/Recipe.py index 2ca86e07..128d7356 100644 --- a/lnst/RecipeCommon/Ping/Recipe.py +++ b/lnst/RecipeCommon/Ping/Recipe.py @@ -72,7 +72,7 @@ class PingTestAndEvaluate(BaseRecipe): pingjob.kill() for pingconf, pingjob in ping_array: - result = pingjob.result + result = (pingjob.passed, pingjob.result) results[pingconf] = result return results @@ -88,15 +88,20 @@ class PingTestAndEvaluate(BaseRecipe): self.single_ping_report_and_evaluate(pingconf, result) def single_ping_report_and_evaluate(self, ping_config, result): + self.single_ping_report(ping_config, result) + + self.single_ping_evaluate(ping_config, result) + + def single_ping_report(self, ping_config, result): fmt = "From: <{0.client.hostid} ({0.client_bind})> To: " \ "<{0.destination.hostid} ({0.destination_address})>" description = fmt.format(ping_config) - if result["rate"] > 50: - message = "Ping successful --- " + description - self.add_result(True, message, result) - else: - message = "Ping unsuccessful --- " + description - self.add_result(False, message, result) + message = "Ping result --- " + description + self.add_result(result[0], message, result[1]) + + def single_ping_evaluate(self, ping_config, result): + for evaluator in ping_config.evaluators: + evaluator.evaluate_results(self, result[1]) def _generate_ping_kwargs(self, ping_config): kwargs = dict(dst=ping_config.destination_address, -- 2.21.1