[PATCH v2 1/4] lnst.Recipes.ENRT.BaseEnrtRecipe: ping_interval should be FloatParam

From: Ondrej Lichtner

Signed-off-by: Ondrej Lichtner 
---
 lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
index 5862311..fb3aae4 100644
--- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
+++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
@@ -29,7 +29,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe):
     ping_parallel = BoolParam(default=False)
     ping_bidirect = BoolParam(default=False)
     ping_count = IntParam(default=100)
-    ping_interval = StrParam(default=0.2)
+    ping_interval = FloatParam(default=0.2)
     ping_psize = IntParam(default=None)

#common perf test params

[PATCH v2 2/4] lnst.Recipes.ENRT.BaseEnrtRecipe: fix ping_psize default value

From: Ondrej Lichtner

Default value for an IntParam should be an integer value, not "None".
Choosing 56 here as that is also the default value that the ping command
uses.

Signed-off-by: Ondrej Lichtner 
---
 lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
index fb3aae4..85f5ee4 100644
--- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
+++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
@@ -30,7 +30,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe):
     ping_bidirect = BoolParam(default=False)
     ping_count = IntParam(default=100)
     ping_interval = FloatParam(default=0.2)
-    ping_psize = IntParam(default=None)
+    ping_psize = IntParam(default=56)

#common perf test params
     perf_tests = Param(default=("tcp_stream", "udp_stream", "sctp_stream"))

[PATCH v2 3/4] lnst.Common.Parameters: type check default param value

From: Ondrej Lichtner

Signed-off-by: Ondrej Lichtner 
---
 lnst/Common/Parameters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnst/Common/Parameters.py b/lnst/Common/Parameters.py
index b8d85cd..e56c32d 100644
--- a/lnst/Common/Parameters.py
+++ b/lnst/Common/Parameters.py
@@ -27,7 +27,7 @@ class Param(object):
     def __init__(self, mandatory=False, **kwargs):
         self.mandatory = mandatory
         if "default" in kwargs:
-            self.default = kwargs["default"]
+            self.default = self.type_check(kwargs["default"])

def type_check(self, value):
         return value

[PATCH v2 4/4] lnst.Recipes.ENRT.BaseEnrtRecipe: move sub config description

From: Ondrej Lichtner

Base sub configuration header creation should be part of the
BaseSubConfigMixin class not the BaseEnrtRecipe class.

Signed-off-by: Ondrej Lichtner 
---
 lnst/Recipes/ENRT/BaseEnrtRecipe.py                  | 3 ---
 lnst/Recipes/ENRT/ConfigMixins/BaseSubConfigMixin.py | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
index 85f5ee4..a90c837 100644
--- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
+++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
@@ -92,9 +92,6 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe):
         description = self.generate_sub_configuration_description(config)
         self.add_result(True, "\n".join(description))

-    def generate_sub_configuration_description(self, config):
-        return ["Sub configuration description:"]
-
     def do_tests(self, recipe_config):
         self.do_ping_tests(recipe_config)
         self.do_perf_tests(recipe_config)
diff --git a/lnst/Recipes/ENRT/ConfigMixins/BaseSubConfigMixin.py b/lnst/Recipes/ENRT/ConfigMixins/BaseSubConfigMixin.py
index 0e16670..6974d16 100644
--- a/lnst/Recipes/ENRT/ConfigMixins/BaseSubConfigMixin.py
+++ b/lnst/Recipes/ENRT/ConfigMixins/BaseSubConfigMixin.py
@@ -6,7 +6,7 @@ class BaseSubConfigMixin(object):
         pass

def generate_sub_configuration_description(self, config):
-        return []
+        return ["Sub configuration description:"]

def remove_sub_configuration(self, config):
         return

[Jan Tluka]

Fri, Mar 20, 2020 at 03:13:44PM CET, [e-mail] wrote:
> From: Ondrej Lichtner
> Signed-off-by: Ondrej Lichtner
>
> lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> index 5862311..fb3aae4 100644
> --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> @@ -29,7 +29,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe):
>     ping_parallel = BoolParam(default=False)
>     ping_bidirect = BoolParam(default=False)
>     ping_count = IntParam(default=100)
> ping_interval = StrParam(default=0.2)
>
> ping_interval = FloatParam(default=0.2)
> ping_psize = IntParam(default=None)
>
> #common perf test params
>
> -- 
> 2.25.2
> _______________________________________________
> LNST-developers mailing list -- [e-mail]
> To unsubscribe send an email to [e-mail]
> 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/[e-mail]...

Ack to series.

Acked-by: Jan Tluka

[Ondrej Lichtner]

On Mon, Mar 23, 2020 at 10:22:16AM +0100, Jan Tluka wrote:
> Fri, Mar 20, 2020 at 03:13:44PM CET, [e-mail] wrote:
> > From: Ondrej Lichtner
> > Signed-off-by: Ondrej Lichtner
> >
> > lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> > index 5862311..fb3aae4 100644
> > --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> > +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> > @@ -29,7 +29,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe):
> >     ping_parallel = BoolParam(default=False)
> >     ping_bidirect = BoolParam(default=False)
> >     ping_count = IntParam(default=100)
> > ping_interval = StrParam(default=0.2)
> >
> > ping_interval = FloatParam(default=0.2)
> > ping_psize = IntParam(default=None)
> >
> > #common perf test params
> >
> > -- 
> > 2.25.2
> > _______________________________________________
> > LNST-developers mailing list -- [e-mail]
> > To unsubscribe send an email to [e-mail]
> > 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/[e-mail]...
>
> Ack to series.
>
> Acked-by: Jan Tluka

thanks, pushed.

-Ondrej

[Jan Tluka]

Fri, Mar 20, 2020 at 03:13:44PM CET, [e-mail] wrote:
> From: Ondrej Lichtner
> Signed-off-by: Ondrej Lichtner
>
> lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> index 5862311..fb3aae4 100644
> --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> @@ -29,7 +29,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe):
>     ping_parallel = BoolParam(default=False)
>     ping_bidirect = BoolParam(default=False)
>     ping_count = IntParam(default=100)
> ping_interval = StrParam(default=0.2)
>
> ping_interval = FloatParam(default=0.2)
> ping_psize = IntParam(default=None)
>
> #common perf test params

I just tried to run a recipe after applying this patch and got

File "/home/igyn/tmp/lnst/lnst/Recipes/ENRT/BaseEnrtRecipe.py", line 33, in BaseEnrtRecipe
    ping_interval = FloatParam(default=0.2)

NameError: name 'FloatParam' is not defined

You did not include FloatParam in imports.

-Jan

[Ondrej Lichtner]

On Mon, Mar 23, 2020 at 03:22:23PM +0100, Jan Tluka wrote:
> Fri, Mar 20, 2020 at 03:13:44PM CET, [e-mail] wrote:
> > From: Ondrej Lichtner
> > Signed-off-by: Ondrej Lichtner
> >
> > lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> > index 5862311..fb3aae4 100644
> > --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> > +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
> > @@ -29,7 +29,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe):
> >     ping_parallel = BoolParam(default=False)
> >     ping_bidirect = BoolParam(default=False)
> >     ping_count = IntParam(default=100)
> > ping_interval = StrParam(default=0.2)
> >
> > ping_interval = FloatParam(default=0.2)
> > ping_psize = IntParam(default=None)
> >
> > #common perf test params
>
> I just tried to run a recipe after applying this patch and got
>
> File "/home/igyn/tmp/lnst/lnst/Recipes/ENRT/BaseEnrtRecipe.py", line 33, in BaseEnrtRecipe
>     ping_interval = FloatParam(default=0.2)
>
> NameError: name 'FloatParam' is not defined
>
> You did not include FloatParam in imports.
>
> -Jan

:/ ... I thought I fixed that... must have lost it when rebasing my
working commits. Sent a patch that adds this.

-Ondrej