From: Ondrej Lichtner <olichtne(a)redhat.com&gt; There were more copy-paste errors that resulted in the recipes failing with Exceptions. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- recipes/regression_tests/phase1/3_vlans.py | 8 ++++---- .../regression_tests/phase1/3_vlans_over_bond.py | 8 ++++---- recipes/regression_tests/phase1/bonding_test.py | 8 ++++---- .../phase1/virtual_bridge_2_vlans_over_bond.py | 4 ++-- .../phase1/virtual_bridge_vlan_in_guest.py | 8 ++++---- .../phase1/virtual_bridge_vlan_in_host.py | 8 ++++---- .../regression_tests/phase2/3_vlans_over_team.py | 8 ++++---- recipes/regression_tests/phase2/team_test.py | 24 +++++++++++----------- ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 4 ++-- .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 4 ++-- .../phase2/virtual_ovs_bridge_vlan_in_host.py | 4 ++-- 11 files changed, 44 insertions(+), 44 deletions(-) diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 1a2c834..0109ba0 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -175,7 +175,7 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -211,7 +211,7 @@ for vlan1 in vlans: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] @@ -258,7 +258,7 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -292,7 +292,7 @@ for vlan1 in vlans: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index c9d3286..4dae207 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -177,7 +177,7 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -213,7 +213,7 @@ for vlan1 in vlans: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] @@ -260,7 +260,7 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -294,7 +294,7 @@ for vlan1 in vlans: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index 29f251a..e59d830 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -158,7 +158,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -192,7 +192,7 @@ for offload in offloads: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] @@ -234,7 +234,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -267,7 +267,7 @@ for offload in offloads: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] 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 643b4b0..69e0605 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 @@ -224,7 +224,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -303,7 +303,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) 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 44e9d42..e7ef089 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -159,7 +159,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -194,7 +194,7 @@ for offload in offloads: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] @@ -236,7 +236,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -270,7 +270,7 @@ for offload in offloads: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] 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 fcfd303..1b0b119 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -156,7 +156,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -190,7 +190,7 @@ for offload in offloads: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] @@ -232,7 +232,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -265,7 +265,7 @@ for offload in offloads: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index ad1a611..86c59b0 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -179,7 +179,7 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -214,7 +214,7 @@ for vlan1 in vlans: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] @@ -260,7 +260,7 @@ for vlan1 in vlans: result_udp.set_parameter('netperf_client_on_vlan', vlan2) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -294,7 +294,7 @@ for vlan1 in vlans: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 4c04d82..6503bc9 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -164,7 +164,7 @@ for offload in offloads: result_tcp.set_parameter('netperf_client', "testmachine2") if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -198,7 +198,7 @@ for offload in offloads: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] @@ -242,7 +242,7 @@ for offload in offloads: result_tcp.set_parameter('netperf_direction', "testmachine1->testmachine2") if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -275,7 +275,7 @@ for offload in offloads: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] @@ -347,11 +347,11 @@ for offload in offloads: if udp_ipv4_id is not None: result_udp = perf_api.new_result(udp_ipv4_id, "udp_ipv4_result") result_udp.set_parameter(offload, state) - result_tcp.set_parameter('netperf_server', "testmachine1") - result_tcp.set_parameter('netperf_client', "testmachine2") + result_udp.set_parameter('netperf_server', "testmachine1") + result_udp.set_parameter('netperf_client', "testmachine2") if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -385,7 +385,7 @@ for offload in offloads: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] @@ -427,11 +427,11 @@ for offload in offloads: if udp_ipv6_id is not None: result_udp = perf_api.new_result(udp_ipv4_id, "udp_ipv6_result") result_udp.set_parameter(offload, state) - result_tcp.set_parameter('netperf_server', "testmachine2") - result_tcp.set_parameter('netperf_client', "testmachine1") + result_udp.set_parameter('netperf_server', "testmachine2") + result_udp.set_parameter('netperf_client', "testmachine1") if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -464,7 +464,7 @@ for offload in offloads: perf_api.save_result(result_tcp) if result_udp is not None and udp_res_data.get_result() is not None and\ - result_udp.get_result()['res_data'] is not None: + udp_res_data.get_result()['res_data'] is not None: rate = udp_res_data.get_result()['res_data']['rate'] deviation = udp_res_data.get_result()['res_data']['rate_deviation'] diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py index ec2f75b..a35d446 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py @@ -226,7 +226,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -305,7 +305,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py index 31d69cb..89c3469 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py @@ -158,7 +158,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -235,7 +235,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py index 05cc40b..118250b 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py @@ -155,7 +155,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) @@ -231,7 +231,7 @@ for offload in offloads: result_udp.set_parameter(offload, state) if product_name is not None: result_udp.set_tag(product_name) - res_hash = result_tcp.generate_hash(['kernel-release', + res_hash = result_udp.generate_hash(['kernel-release', 'redhat-release']) result_udp.set_tag(res_hash) -- 2.5.0