[PATCH] recipes: add missing hash ignores to phase1 virtual tests

[Jan Tluka]

I forgot to add tap device MAC addresses and dev names to hash_ignore in
all TCP_STREAM test. Without this patch the hashes will change between test
runs.

Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt;
---
 .../regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py   | 8 ++++++--
 recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py   | 8 ++++++--
 recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py    | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
index 4ad0dc9..266530c 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
@@ -233,7 +233,9 @@ for setting in offload_settings:
                                          hash_ignore=['kernel_release',
                                              'redhat_release',
                                              r'guest\d+\.hostname',
-                                             r'guest\d+\..*hwaddr'])
+                                             r'guest\d+\..*hwaddr',
+                                             r'host\d+\..*tap\d*\.hwaddr',
+                                             r'host\d+\..*tap\d*\.devname'])
         for offload in setting:
             result_tcp.set_parameter(offload[0], offload[1])
         result_tcp.add_tag(product_name)
@@ -287,7 +289,9 @@ for setting in offload_settings:
                                          hash_ignore=['kernel_release',
                                              'redhat_release',
                                              r'guest\d+\.hostname',
-                                             r'guest\d+\..*hwaddr'])
+                                             r'guest\d+\..*hwaddr',
+                                             r'host\d+\..*tap\d*\.hwaddr',
+                                             r'host\d+\..*tap\d*\.devname'])
         for offload in setting:
             result_tcp.set_parameter(offload[0], offload[1])
         result_tcp.add_tag(product_name)
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
index ec2400b..ee78d7d 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
@@ -161,7 +161,9 @@ for setting in offload_settings:
                                          hash_ignore=['kernel_release',
                                              'redhat_release',
                                              r'guest\d+\.hostname',
-                                             r'guest\d+\..*hwaddr'])
+                                             r'guest\d+\..*hwaddr',
+                                             r'host\d+\..*tap\d*\.hwaddr',
+                                             r'host\d+\..*tap\d*\.devname'])
         for offload in setting:
             result_tcp.set_parameter(offload[0], offload[1])
         result_tcp.add_tag(product_name)
@@ -212,7 +214,9 @@ for setting in offload_settings:
                                          hash_ignore=['kernel_release',
                                              'redhat_release',
                                              r'guest\d+\.hostname',
-                                             r'guest\d+\..*hwaddr'])
+                                             r'guest\d+\..*hwaddr',
+                                             r'host\d+\..*tap\d*\.hwaddr',
+                                             r'host\d+\..*tap\d*\.devname'])
         for offload in setting:
             result_tcp.set_parameter(offload[0], offload[1])
         result_tcp.add_tag(product_name)
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
index 8b235f8..a8d99dd 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
@@ -161,7 +161,9 @@ for setting in offload_settings:
                                          hash_ignore=['kernel_release',
                                              'redhat_release',
                                              r'guest\d+\.hostname',
-                                             r'guest\d+\..*hwaddr'])
+                                             r'guest\d+\..*hwaddr',
+                                             r'host\d+\..*tap\d*\.hwaddr',
+                                             r'host\d+\..*tap\d*\.devname'])
         for offload in setting:
             result_tcp.set_parameter(offload[0], offload[1])
         result_tcp.add_tag(product_name)
@@ -212,7 +214,9 @@ for setting in offload_settings:
                                          hash_ignore=['kernel_release',
                                              'redhat_release',
                                              r'guest\d+\.hostname',
-                                             r'guest\d+\..*hwaddr'])
+                                             r'guest\d+\..*hwaddr',
+                                             r'host\d+\..*tap\d*\.hwaddr',
+                                             r'host\d+\..*tap\d*\.devname'])
         for offload in setting:
             result_tcp.set_parameter(offload[0], offload[1])
         result_tcp.add_tag(product_name)
-- 
2.4.3

[Jiri Prochazka]

Acked-By: Jiri Prochazka <jprochaz(a)redhat.com&gt;

2015-11-16 18:50 GMT+01:00 Jan Tluka <jtluka(a)redhat.com&gt;:

>  I forgot to add tap device MAC addresses and dev names to hash_ignore
> in
>  all TCP_STREAM test. Without this patch the hashes will change between test
>  runs.
>
>  Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt;
>  ---
>   .../regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py   | 8
>  ++++++--
>   recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py   | 8
>  ++++++--
>   recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py    | 8
>  ++++++--
>   3 files changed, 18 insertions(+), 6 deletions(-)
>
>  diff --git
>  a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
>  b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
>  index 4ad0dc9..266530c 100644
>  --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
>  +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
>  @@ -233,7 +233,9 @@ for setting in offload_settings:
>                                            hash_ignore=['kernel_release',
>                                                'redhat_release',
>                                                r'guest\d+\.hostname',
>  -                                             r'guest\d+\..*hwaddr'])
>  +                                             r'guest\d+\..*hwaddr',
>  +                                             r'host\d+\..*tap\d*\.hwaddr',
>  +
>   r'host\d+\..*tap\d*\.devname'])
>           for offload in setting:
>               result_tcp.set_parameter(offload[0], offload[1])
>           result_tcp.add_tag(product_name)
>  @@ -287,7 +289,9 @@ for setting in offload_settings:
>                                            hash_ignore=['kernel_release',
>                                                'redhat_release',
>                                                r'guest\d+\.hostname',
>  -                                             r'guest\d+\..*hwaddr'])
>  +                                             r'guest\d+\..*hwaddr',
>  +                                             r'host\d+\..*tap\d*\.hwaddr',
>  +
>   r'host\d+\..*tap\d*\.devname'])
>           for offload in setting:
>               result_tcp.set_parameter(offload[0], offload[1])
>           result_tcp.add_tag(product_name)
>  diff --git
>  a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
>  b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
>  index ec2400b..ee78d7d 100644
>  --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
>  +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
>  @@ -161,7 +161,9 @@ for setting in offload_settings:
>                                            hash_ignore=['kernel_release',
>                                                'redhat_release',
>                                                r'guest\d+\.hostname',
>  -                                             r'guest\d+\..*hwaddr'])
>  +                                             r'guest\d+\..*hwaddr',
>  +                                             r'host\d+\..*tap\d*\.hwaddr',
>  +
>   r'host\d+\..*tap\d*\.devname'])
>           for offload in setting:
>               result_tcp.set_parameter(offload[0], offload[1])
>           result_tcp.add_tag(product_name)
>  @@ -212,7 +214,9 @@ for setting in offload_settings:
>                                            hash_ignore=['kernel_release',
>                                                'redhat_release',
>                                                r'guest\d+\.hostname',
>  -                                             r'guest\d+\..*hwaddr'])
>  +                                             r'guest\d+\..*hwaddr',
>  +                                             r'host\d+\..*tap\d*\.hwaddr',
>  +
>   r'host\d+\..*tap\d*\.devname'])
>           for offload in setting:
>               result_tcp.set_parameter(offload[0], offload[1])
>           result_tcp.add_tag(product_name)
>  diff --git
>  a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
>  b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
>  index 8b235f8..a8d99dd 100644
>  --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
>  +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
>  @@ -161,7 +161,9 @@ for setting in offload_settings:
>                                            hash_ignore=['kernel_release',
>                                                'redhat_release',
>                                                r'guest\d+\.hostname',
>  -                                             r'guest\d+\..*hwaddr'])
>  +                                             r'guest\d+\..*hwaddr',
>  +                                             r'host\d+\..*tap\d*\.hwaddr',
>  +
>   r'host\d+\..*tap\d*\.devname'])
>           for offload in setting:
>               result_tcp.set_parameter(offload[0], offload[1])
>           result_tcp.add_tag(product_name)
>  @@ -212,7 +214,9 @@ for setting in offload_settings:
>                                            hash_ignore=['kernel_release',
>                                                'redhat_release',
>                                                r'guest\d+\.hostname',
>  -                                             r'guest\d+\..*hwaddr'])
>  +                                             r'guest\d+\..*hwaddr',
>  +                                             r'host\d+\..*tap\d*\.hwaddr',
>  +
>   r'host\d+\..*tap\d*\.devname'])
>           for offload in setting:
>               result_tcp.set_parameter(offload[0], offload[1])
>           result_tcp.add_tag(product_name)
>  --
>  2.4.3
>  _______________________________________________
>  LNST-developers mailing list
>  lnst-developers(a)lists.fedorahosted.org
>
>  https://lists.fedorahosted.org/admin/lists/[e-mail]...
>  


-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

[Ondrej Lichtner]

On Mon, Nov 16, 2015 at 06:50:41PM +0100, Jan Tluka wrote:
>  I forgot to add tap device MAC addresses and dev names to hash_ignore
> in
>  all TCP_STREAM test. Without this patch the hashes will change between test
>  runs.
>  
>  Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt; 
Acked-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;