From: Perry Gagne pgagne@redhat.com
It seems at some point Recipe.ping_evaluate_and_report was renamed to ping_report_and_evaluate
Also the ping_config argument is no longer required.
The IPSec recipes where overriding this method, but the method signatures where never updated.
Updated the method signatures to match Recipe.ping_report_and_evaluate
Perry Gagne (2): Recipes.ENRT.IpsecEspAeadRecipe: update ping report and evaluate method signature Recipes.ENRT.IpsecEspAhCompRecipe: update ping report and evaluate method signature
lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 6 +++--- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
From: Perry Gagne pgagne@redhat.com
Signed-off-by: Perry Gagne pgagne@redhat.com --- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py index 845796c..b2a6a74 100644 --- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py @@ -177,9 +177,9 @@ class IpsecEspAeadRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
return (ping_result, pa_config, pa_result)
- def ping_evaluate_and_report(self, ping_config, result): - super().ping_report_and_evaluate(result[0]) - self.packet_assert_evaluate_and_report(result[1], result[2]) + def ping_report_and_evaluate(self, results): + super().ping_report_and_evaluate(results[0]) + self.packet_assert_evaluate_and_report(results[1], results[2])
def get_dev_by_ip(self, netns, ip): for dev in netns.device_database:
Thu, Jun 18, 2020 at 10:52:20PM CEST, pgagne@redhat.com wrote:
From: Perry Gagne pgagne@redhat.com
Signed-off-by: Perry Gagne pgagne@redhat.com
lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py index 845796c..b2a6a74 100644 --- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py @@ -177,9 +177,9 @@ class IpsecEspAeadRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
return (ping_result, pa_config, pa_result)
- def ping_evaluate_and_report(self, ping_config, result):
super().ping_report_and_evaluate(result[0])self.packet_assert_evaluate_and_report(result[1], result[2])
def ping_report_and_evaluate(self, results):
super().ping_report_and_evaluate(results[0])self.packet_assert_evaluate_and_report(results[1], results[2])def get_dev_by_ip(self, netns, ip): for dev in netns.device_database:
-- 2.26.2 _______________________________________________ LNST-developers mailing list -- lnst-developers@lists.fedorahosted.org To unsubscribe send an email to lnst-developers-leave@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/lnst-developers@lists.fedorahos...
Please hold on with applying this patch. I believe I had a valid reason for being careful with this change. Give me few days to review this.
Thanks, Jan
Mon, Jun 22, 2020 at 11:32:13AM CEST, jtluka@redhat.com wrote:
Thu, Jun 18, 2020 at 10:52:20PM CEST, pgagne@redhat.com wrote:
From: Perry Gagne pgagne@redhat.com
Signed-off-by: Perry Gagne pgagne@redhat.com
lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py index 845796c..b2a6a74 100644 --- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py @@ -177,9 +177,9 @@ class IpsecEspAeadRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
return (ping_result, pa_config, pa_result)
- def ping_evaluate_and_report(self, ping_config, result):
super().ping_report_and_evaluate(result[0])self.packet_assert_evaluate_and_report(result[1], result[2])
def ping_report_and_evaluate(self, results):
super().ping_report_and_evaluate(results[0])self.packet_assert_evaluate_and_report(results[1], results[2])def get_dev_by_ip(self, netns, ip): for dev in netns.device_database:
-- 2.26.2 _______________________________________________ LNST-developers mailing list -- lnst-developers@lists.fedorahosted.org To unsubscribe send an email to lnst-developers-leave@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/lnst-developers@lists.fedorahos...
Please hold on with applying this patch. I believe I had a valid reason for being careful with this change. Give me few days to review this.
Thanks, Jan
So, I think the patches are ok. They fix a real issue.
Ack to series.
However the code of this recipe should be reworked to reuse as much as possible from the base classes. This is meant as a fix sometime in the future, not an urgent matter.
An example of the issues with the current implementation is that with the current state it's not possible to determine/select whether IPv4 or IPv6 is tested during the ping_test.
-Jan
From: Perry Gagne pgagne@redhat.com
Signed-off-by: Perry Gagne pgagne@redhat.com --- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py index a788143..65e480b 100644 --- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py @@ -207,8 +207,8 @@ class IpsecEspAhCompRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe, result += ((ping_result2, pa_config2, pa_result2),) return result
- def ping_evaluate_and_report(self, ping_config, result): - for res in result: + def ping_report_and_evaluate(self, results): + for res in results: super().ping_report_and_evaluate(res[0]) self.packet_assert_evaluate_and_report(res[1], res[2])
On Thu, Jun 18, 2020 at 04:52:19PM -0400, pgagne@redhat.com wrote:
From: Perry Gagne pgagne@redhat.com
It seems at some point Recipe.ping_evaluate_and_report was renamed to ping_report_and_evaluate
Also the ping_config argument is no longer required.
The IPSec recipes where overriding this method, but the method signatures where never updated.
Updated the method signatures to match Recipe.ping_report_and_evaluate
Perry Gagne (2): Recipes.ENRT.IpsecEspAeadRecipe: update ping report and evaluate method signature Recipes.ENRT.IpsecEspAhCompRecipe: update ping report and evaluate method signature
lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 6 +++--- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
-- 2.26.2 _______________________________________________ LNST-developers mailing list -- lnst-developers@lists.fedorahosted.org To unsubscribe send an email to lnst-developers-leave@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/lnst-developers@lists.fedorahos...
pushed, thanks.
-Ondrej
lnst-developers@lists.fedorahosted.org
-
Jan Tluka -
Ondrej Lichtner -
pgagne＠redhat.com