[PATCH] iperf: regexp update

[Artem Savkov]

Updating iperf output parsing regexp to a slightly more flexible version. This
still works with iperf2 but also enables us to use iperf3 (needs an -i 0 option
which can be added through iperf_options)
---
 test_modules/Iperf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_modules/Iperf.py b/test_modules/Iperf.py
index 8e5bd67..1d8735b 100644
--- a/test_modules/Iperf.py
+++ b/test_modules/Iperf.py
@@ -90,7 +90,7 @@ class Iperf(TestGeneric):
             logging.info("Iperf connection failed!")
             return (False, "Iperf connection failed!")
 
-        m = re.search("\[[^0-9]*[0-9]*\]\s*0.0-\s*\d*\.\d sec\s*\d*(\.\d*){0,1}\s*[
kGMT]Bytes\s*(\d*(\.\d*){0,1}\s*[ kGMT]bits\/sec)", output, re.IGNORECASE)
+        m =
re.search("\[[^0-9]*[0-9]*\]\s*0.0+-\s*\d*\.\d+\s*sec\s*\d*(\.\d*){0,1}\s*[
kGMT]Bytes\s*(\d*(\.\d*){0,1}\s*[ kGMT]bits\/sec)", output, re.IGNORECASE)
         if m is None:
             logging.info("Could not get performance throughput!")
             return (False, "Could not get performance throughput!")
-- 
2.1.0

[Jiri Pirko]

Fri, Mar 27, 2015 at 05:21:00PM CET, asavkov(a)redhat.com wrote:
> Updating iperf output parsing regexp to a slightly more flexible
> version. This
> still works with iperf2 but also enables us to use iperf3 (needs an -i 0 option
> which can be added through iperf_options) 
I'll add you signed off line manually if you are ok with that. Next
time, please add it with the patch. Thanks!


> ---
>  test_modules/Iperf.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/test_modules/Iperf.py b/test_modules/Iperf.py
> index 8e5bd67..1d8735b 100644
> --- a/test_modules/Iperf.py
> +++ b/test_modules/Iperf.py
> @@ -90,7 +90,7 @@ class Iperf(TestGeneric):
>              logging.info("Iperf connection failed!")
>              return (False, "Iperf connection failed!")
>  
> -        m = re.search("\[[^0-9]*[0-9]*\]\s*0.0-\s*\d*\.\d sec\s*\d*(\.\d*){0,1}\s*[
> kGMT]Bytes\s*(\d*(\.\d*){0,1}\s*[ kGMT]bits\/sec)", output, re.IGNORECASE)
> +        m =
> re.search("\[[^0-9]*[0-9]*\]\s*0.0+-\s*\d*\.\d+\s*sec\s*\d*(\.\d*){0,1}\s*[
> kGMT]Bytes\s*(\d*(\.\d*){0,1}\s*[ kGMT]bits\/sec)", output, re.IGNORECASE)
>          if m is None:
>              logging.info("Could not get performance throughput!")
>              return (False, "Could not get performance throughput!")
> -- 
> 2.1.0
>
> _______________________________________________
> LNST-developers mailing list
> LNST-developers(a)lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/lnst-developers

[Artem Savkov]

On Sat, Mar 28, 2015 at 10:33:25AM +0100, Jiri Pirko wrote:
>  Fri, Mar 27, 2015 at 05:21:00PM CET, asavkov(a)redhat.com wrote:
>  >Updating iperf output parsing regexp to a slightly more flexible version. This
>  >still works with iperf2 but also enables us to use iperf3 (needs an -i 0 option
>  >which can be added through iperf_options)
>  
>  I'll add you signed off line manually if you are ok with that. Next
>  time, please add it with the patch. Thanks! 
Yes, I'm ok with that. And sorry for forgetting to include it.

-- 
Regards,
  Artem