LNST-developers October 2018

lnst-developers@lists.fedorahosted.org

11 participants
23 discussions

Start a nNew thread

开本地发票13883169292
by szhly＠szonline.net 02 Oct '18

02 Oct '18

你好有正规住宿费,餐费,广告费,建筑材料,工程,技术服务费等各行业发票可以开价格优惠,有需要请找:13883169292 郝立恒 (加微信同号)

1 0

[PATCH] recipes: switchdev: sharedbuffer: Support pool 8
by Petr Machata 02 Oct '18

02 Oct '18

Pool #8 was recently introduced to mlxsw to support MC-aware regime of the switch. Pool 8 is configured differently from the other pools, with infinite size, and statically-determined quotas. Tweak the sharedbuffer test to handle this case. Signed-off-by: Petr Machata <petrm(a)mellanox.com> --- recipes/switchdev/sharedbuffer.py | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/recipes/switchdev/sharedbuffer.py b/recipes/switchdev/sharedbuffer.py index 28a6f44..4393770 100644 --- a/recipes/switchdev/sharedbuffer.py +++ b/recipes/switchdev/sharedbuffer.py @@ -13,6 +13,9 @@ from TestLib import TestLib from time import sleep import random +CELL_SIZE = 288 # Least common multiple of cell sizes of Spectrum and + # Spectrum-2, which are, respectively, 96 and 144. + class RandomValuePicker: def __init__(self, pools): self._pools = {"ingress": [], "egress": []} @@ -27,9 +30,11 @@ class RandomValuePicker: # support static threshold only for now return "static" - def _get_th(self): - # support dynamic threshold only for now - return random.randint(3,16) + def _get_th(self, pool): + th = random.randint(3,16) + if pool == 8: # Pool 8 has static quotas. + th *= CELL_SIZE + return th def _get_pool(self, direction): arr = self._pools[direction] @@ -40,14 +45,17 @@ class RandomValuePicker: return (self._get_size(), self._get_thtype()) if isinstance(objid, TcBind): pool = self._get_pool(objid["type"]) - th = self._get_th() + th = self._get_th(pool) return (pool, th) if isinstance(objid, PortPool): - return (self._get_th(),) + return (self._get_th(objid["pool"]),) class RecordValuePickerException(Exception): pass +class SkipTest(Exception): + pass + class RecordValuePicker: def __init__(self, objlist): self._recs = [] @@ -55,6 +63,9 @@ class RecordValuePicker: self._recs.append({"objid": item, "value": item.var_tuple()}) def get_value(self, objid): + if isinstance(objid, Pool) and objid["pool"] == 8: + # Pool 8 is reported with infinite size, which can't be reset. + raise SkipTest() for rec in self._recs: if rec["objid"].weak_eq(objid): return rec["value"] @@ -124,7 +135,10 @@ def get_pools(sw, dlname, direction=None): def do_check_pools(tl, sw, dlname, pools, vp): for pool in pools: pre_pools = get_pools(sw, dlname) - (size, thtype) = vp.get_value(pool) + try: + (size, thtype) = vp.get_value(pool) + except SkipTest: + continue pool.dl_set(sw, dlname, size, thtype) post_pools = get_pools(sw, dlname) pool = post_pools.get_by(pool) -- 2.4.11

1 0

[PATCH] recipes: regression_tests: added nperf_protocols alias to ipsec tests
by Jan Tluka 01 Oct '18

01 Oct '18

Default behaviour of ipsec_aead and ipsec_esp_ah_comp has not been changed and both TCP_STREAM and UDP_STREAM test is ran. With the nperf_protocols alias a user can override which of these performance tests is ran. For example nperf_protocols='udp' would run only UDP_STREAM and skip TCP_STREAM test. Signed-off-by: Jan Tluka <jtluka(a)redhat.com> --- recipes/regression_tests/phase3/ipsec_esp_aead.py | 311 +++++++++++---------- recipes/regression_tests/phase3/ipsec_esp_aead.xml | 1 + .../regression_tests/phase3/ipsec_esp_ah_comp.py | 311 +++++++++++---------- .../regression_tests/phase3/ipsec_esp_ah_comp.xml | 1 + 4 files changed, 316 insertions(+), 308 deletions(-) diff --git a/recipes/regression_tests/phase3/ipsec_esp_aead.py b/recipes/regression_tests/phase3/ipsec_esp_aead.py index 0082dd3..3c5028e 100644 --- a/recipes/regression_tests/phase3/ipsec_esp_aead.py +++ b/recipes/regression_tests/phase3/ipsec_esp_aead.py @@ -54,6 +54,7 @@ nperf_debug = ctl.get_alias("nperf_debug") nperf_max_dev = ctl.get_alias("nperf_max_dev") nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") +nperf_protocols = ctl.get_alias("nperf_protocols") ipsec_mode = ctl.get_alias("ipsec_mode") official_result = bool_it(ctl.get_alias("official_result")) @@ -216,85 +217,86 @@ for algo, key_len, icv_len in algorithm: dump.intr() # prepare PerfRepo result for tcp - result_tcp = perf_api.new_result("tcp_ipv4_id", - "tcp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_tcp.add_tag(product_name) - - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - result_tcp.set_parameter('ipsec_algorithm', algo) - result_tcp.set_parameter('key_length', key_len) - result_tcp.set_parameter('iv_length', icv_len) - result_tcp.set_parameter('msg_size', nperf_msg_size) - result_tcp.set_parameter('ipsec_mode', ipsec_mode) - - baseline = perf_api.get_baseline_of_result(result_tcp) - baseline = perfrepo_baseline_to_dict(baseline) - - - tcp_res_data = netperf((m1, m1_if, 0, {"scope": 0}), - (m2, m2_if, 0, {"scope": 0}), - client_opts={"duration" : netperf_duration, - "testname" : "TCP_STREAM", - "confidence" : nperf_confidence, - "num_parallel" : nperf_num_parallel, - "cpu_util" : nperf_cpu_util, - "runs": nperf_max_runs, - "debug": nperf_debug, - "max_deviation": nperf_max_dev, - "msg_size" : nperf_msg_size, - "netperf_opts": nperf_opts}, - baseline = baseline, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp, official_result) + if nperf_protocols.find("tcp") > -1: + result_tcp = perf_api.new_result("tcp_ipv4_id", + "tcp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_tcp.add_tag(product_name) + + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + result_tcp.set_parameter('ipsec_algorithm', algo) + result_tcp.set_parameter('key_length', key_len) + result_tcp.set_parameter('iv_length', icv_len) + result_tcp.set_parameter('msg_size', nperf_msg_size) + result_tcp.set_parameter('ipsec_mode', ipsec_mode) + + baseline = perf_api.get_baseline_of_result(result_tcp) + baseline = perfrepo_baseline_to_dict(baseline) + + tcp_res_data = netperf((m1, m1_if, 0, {"scope": 0}), + (m2, m2_if, 0, {"scope": 0}), + client_opts={"duration" : netperf_duration, + "testname" : "TCP_STREAM", + "confidence" : nperf_confidence, + "num_parallel" : nperf_num_parallel, + "cpu_util" : nperf_cpu_util, + "runs": nperf_max_runs, + "debug": nperf_debug, + "max_deviation": nperf_max_dev, + "msg_size" : nperf_msg_size, + "netperf_opts": nperf_opts}, + baseline = baseline, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp, official_result) # prepare PerfRepo result for udp - result_udp = perf_api.new_result("udp_ipv4_id", - "udp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_udp.add_tag(product_name) - - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - result_udp.set_parameter('ipsec_algorithm', algo) - result_udp.set_parameter('key_length', key_len) - result_udp.set_parameter('iv_length', icv_len) - result_udp.set_parameter('msg_size', nperf_msg_size) - result_udp.set_parameter('ipsec_mode', ipsec_mode) - - baseline = perf_api.get_baseline_of_result(result_udp) - baseline = perfrepo_baseline_to_dict(baseline) - - udp_res_data = netperf((m1, m1_if, 0, {"scope": 0}), - (m2, m2_if, 0, {"scope": 0}), - client_opts={"duration" : netperf_duration, - "testname" : "UDP_STREAM", - "confidence" : nperf_confidence, - "num_parallel" : nperf_num_parallel, - "cpu_util" : nperf_cpu_util, - "runs": nperf_max_runs, - "debug": nperf_debug, - "max_deviation": nperf_max_dev, - "msg_size" : nperf_msg_size, - "netperf_opts": nperf_opts}, - baseline = baseline, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_udp, udp_res_data) - result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp, official_result) + if nperf_protocols.find("udp") > -1: + result_udp = perf_api.new_result("udp_ipv4_id", + "udp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_udp.add_tag(product_name) + + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + result_udp.set_parameter('ipsec_algorithm', algo) + result_udp.set_parameter('key_length', key_len) + result_udp.set_parameter('iv_length', icv_len) + result_udp.set_parameter('msg_size', nperf_msg_size) + result_udp.set_parameter('ipsec_mode', ipsec_mode) + + baseline = perf_api.get_baseline_of_result(result_udp) + baseline = perfrepo_baseline_to_dict(baseline) + + udp_res_data = netperf((m1, m1_if, 0, {"scope": 0}), + (m2, m2_if, 0, {"scope": 0}), + client_opts={"duration" : netperf_duration, + "testname" : "UDP_STREAM", + "confidence" : nperf_confidence, + "num_parallel" : nperf_num_parallel, + "cpu_util" : nperf_cpu_util, + "runs": nperf_max_runs, + "debug": nperf_debug, + "max_deviation": nperf_max_dev, + "msg_size" : nperf_msg_size, + "netperf_opts": nperf_opts}, + baseline = baseline, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_udp, udp_res_data) + result_udp.set_comment(pr_comment) + perf_api.save_result(result_udp, official_result) if ipv in [ 'ipv6', 'both']: configure_ipsec(algo, @@ -332,85 +334,86 @@ for algo, key_len, icv_len in algorithm: dump.intr() # prepare PerfRepo result for tcp - result_tcp = perf_api.new_result("tcp_ipv6_id", - "tcp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_tcp.add_tag(product_name) - - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - result_tcp.set_parameter('ipsec_algorithm', algo) - result_tcp.set_parameter('key_length', key_len) - result_tcp.set_parameter('iv_length', icv_len) - result_tcp.set_parameter('msg_size', nperf_msg_size) - result_tcp.set_parameter('ipsec_mode', ipsec_mode) - - baseline = perf_api.get_baseline_of_result(result_tcp) - baseline = perfrepo_baseline_to_dict(baseline) - - - tcp_res_data = netperf((m1, m1_if, 1, {"scope": 0}), - (m2, m2_if, 1, {"scope": 0}), - client_opts={"duration" : netperf_duration, - "testname" : "TCP_STREAM", - "confidence" : nperf_confidence, - "num_parallel" : nperf_num_parallel, - "cpu_util" : nperf_cpu_util, - "runs": nperf_max_runs, - "debug": nperf_debug, - "max_deviation": nperf_max_dev, - "msg_size" : nperf_msg_size, - "netperf_opts" : nperf_opts + " -6"}, - baseline = baseline, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp, official_result) + if nperf_protocols.find("tcp") > -1: + result_tcp = perf_api.new_result("tcp_ipv6_id", + "tcp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_tcp.add_tag(product_name) + + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + result_tcp.set_parameter('ipsec_algorithm', algo) + result_tcp.set_parameter('key_length', key_len) + result_tcp.set_parameter('iv_length', icv_len) + result_tcp.set_parameter('msg_size', nperf_msg_size) + result_tcp.set_parameter('ipsec_mode', ipsec_mode) + + baseline = perf_api.get_baseline_of_result(result_tcp) + baseline = perfrepo_baseline_to_dict(baseline) + + tcp_res_data = netperf((m1, m1_if, 1, {"scope": 0}), + (m2, m2_if, 1, {"scope": 0}), + client_opts={"duration" : netperf_duration, + "testname" : "TCP_STREAM", + "confidence" : nperf_confidence, + "num_parallel" : nperf_num_parallel, + "cpu_util" : nperf_cpu_util, + "runs": nperf_max_runs, + "debug": nperf_debug, + "max_deviation": nperf_max_dev, + "msg_size" : nperf_msg_size, + "netperf_opts" : nperf_opts + " -6"}, + baseline = baseline, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp, official_result) # prepare PerfRepo result for udp - result_udp = perf_api.new_result("udp_ipv6_id", - "udp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_udp.add_tag(product_name) - - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - result_udp.set_parameter('ipsec_algorithm', algo) - result_udp.set_parameter('key_length', key_len) - result_udp.set_parameter('iv_length', icv_len) - result_udp.set_parameter('msg_size', nperf_msg_size) - result_udp.set_parameter('ipsec_mode', ipsec_mode) - - baseline = perf_api.get_baseline_of_result(result_udp) - baseline = perfrepo_baseline_to_dict(baseline) - - udp_res_data = netperf((m1, m1_if, 1, {"scope": 0}), - (m2, m2_if, 1, {"scope": 0}), - client_opts={"duration" : netperf_duration, - "testname" : "UDP_STREAM", - "confidence" : nperf_confidence, - "num_parallel" : nperf_num_parallel, - "cpu_util" : nperf_cpu_util, - "runs": nperf_max_runs, - "debug": nperf_debug, - "max_deviation": nperf_max_dev, - "msg_size" : nperf_msg_size, - "netperf_opts" : nperf_opts + " -6"}, - baseline = baseline, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_udp, udp_res_data) - result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp, official_result) + if nperf_protocols.find("udp") > -1: + result_udp = perf_api.new_result("udp_ipv6_id", + "udp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_udp.add_tag(product_name) + + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + result_udp.set_parameter('ipsec_algorithm', algo) + result_udp.set_parameter('key_length', key_len) + result_udp.set_parameter('iv_length', icv_len) + result_udp.set_parameter('msg_size', nperf_msg_size) + result_udp.set_parameter('ipsec_mode', ipsec_mode) + + baseline = perf_api.get_baseline_of_result(result_udp) + baseline = perfrepo_baseline_to_dict(baseline) + + udp_res_data = netperf((m1, m1_if, 1, {"scope": 0}), + (m2, m2_if, 1, {"scope": 0}), + client_opts={"duration" : netperf_duration, + "testname" : "UDP_STREAM", + "confidence" : nperf_confidence, + "num_parallel" : nperf_num_parallel, + "cpu_util" : nperf_cpu_util, + "runs": nperf_max_runs, + "debug": nperf_debug, + "max_deviation": nperf_max_dev, + "msg_size" : nperf_msg_size, + "netperf_opts" : nperf_opts + " -6"}, + baseline = baseline, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_udp, udp_res_data) + result_udp.set_comment(pr_comment) + perf_api.save_result(result_udp, official_result) m1.run("ip xfrm policy flush") m1.run("ip xfrm state flush") diff --git a/recipes/regression_tests/phase3/ipsec_esp_aead.xml b/recipes/regression_tests/phase3/ipsec_esp_aead.xml index c37010e..3d5b34d 100644 --- a/recipes/regression_tests/phase3/ipsec_esp_aead.xml +++ b/recipes/regression_tests/phase3/ipsec_esp_aead.xml @@ -9,6 +9,7 @@ <alias name="nperf_num_parallel" value="1"/> <alias name="nperf_debug" value="0"/> <alias name="nperf_max_dev" value="20%"/> + <alias name="nperf_protocols" value="tcp udp"/> <alias name="mapping_file" value="ipsec_esp_aead.mapping"/> <alias name="net_1" value="192.168.99"/> <alias name="net6_1" value="fc00:1::"/> diff --git a/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py b/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py index c8149b9..cde0cf7 100644 --- a/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py +++ b/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py @@ -60,6 +60,7 @@ nperf_debug = ctl.get_alias("nperf_debug") nperf_max_dev = ctl.get_alias("nperf_max_dev") nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") +nperf_protocols = ctl.get_alias("nperf_protocols") ipsec_mode = ctl.get_alias("ipsec_mode") official_result = bool_it(ctl.get_alias("official_result")) @@ -317,85 +318,86 @@ for ciph_alg, ciph_len in ciphers: dump.intr() # prepare PerfRepo result for tcp - result_tcp = perf_api.new_result("tcp_ipv4_id", - "tcp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_tcp.add_tag(product_name) - - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - result_tcp.set_parameter('cipher_alg', ciph_alg) - result_tcp.set_parameter('cipher_len', ciph_len) - result_tcp.set_parameter('hash_alg', hash_alg) - result_tcp.set_parameter('msg_size', nperf_msg_size) - result_tcp.set_parameter('ipsec_mode', ipsec_mode) - - baseline = perf_api.get_baseline_of_result(result_tcp) - baseline = perfrepo_baseline_to_dict(baseline) - - - tcp_res_data = netperf((m1, m1_if, 0, {"scope": 0}), - (m2, m2_if, 0, {"scope": 0}), - client_opts={"duration" : netperf_duration, - "testname" : "TCP_STREAM", - "confidence" : nperf_confidence, - "num_parallel" : nperf_num_parallel, - "cpu_util" : nperf_cpu_util, - "runs": nperf_max_runs, - "debug": nperf_debug, - "max_deviation": nperf_max_dev, - "msg_size" : nperf_msg_size, - "netperf_opts": nperf_opts}, - baseline = baseline, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp, official_result) + if nperf_protocols.find("tcp") > -1: + result_tcp = perf_api.new_result("tcp_ipv4_id", + "tcp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_tcp.add_tag(product_name) + + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + result_tcp.set_parameter('cipher_alg', ciph_alg) + result_tcp.set_parameter('cipher_len', ciph_len) + result_tcp.set_parameter('hash_alg', hash_alg) + result_tcp.set_parameter('msg_size', nperf_msg_size) + result_tcp.set_parameter('ipsec_mode', ipsec_mode) + + baseline = perf_api.get_baseline_of_result(result_tcp) + baseline = perfrepo_baseline_to_dict(baseline) + + tcp_res_data = netperf((m1, m1_if, 0, {"scope": 0}), + (m2, m2_if, 0, {"scope": 0}), + client_opts={"duration" : netperf_duration, + "testname" : "TCP_STREAM", + "confidence" : nperf_confidence, + "num_parallel" : nperf_num_parallel, + "cpu_util" : nperf_cpu_util, + "runs": nperf_max_runs, + "debug": nperf_debug, + "max_deviation": nperf_max_dev, + "msg_size" : nperf_msg_size, + "netperf_opts": nperf_opts}, + baseline = baseline, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp, official_result) # prepare PerfRepo result for udp - result_udp = perf_api.new_result("udp_ipv4_id", - "udp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_udp.add_tag(product_name) - - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - result_udp.set_parameter('cipher_alg', ciph_alg) - result_udp.set_parameter('cipher_len', ciph_len) - result_udp.set_parameter('hash_alg', hash_alg) - result_udp.set_parameter('msg_size', nperf_msg_size) - result_udp.set_parameter('ipsec_mode', ipsec_mode) - - baseline = perf_api.get_baseline_of_result(result_udp) - baseline = perfrepo_baseline_to_dict(baseline) - - udp_res_data = netperf((m1, m1_if, 0, {"scope": 0}), - (m2, m2_if, 0, {"scope": 0}), - client_opts={"duration" : netperf_duration, - "testname" : "UDP_STREAM", - "confidence" : nperf_confidence, - "num_parallel" : nperf_num_parallel, - "cpu_util" : nperf_cpu_util, - "runs": nperf_max_runs, - "debug": nperf_debug, - "max_deviation": nperf_max_dev, - "msg_size" : nperf_msg_size, - "netperf_opts": nperf_opts}, - baseline = baseline, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_udp, udp_res_data) - result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp, official_result) + if nperf_protocols.find("udp") > -1: + result_udp = perf_api.new_result("udp_ipv4_id", + "udp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_udp.add_tag(product_name) + + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + result_udp.set_parameter('cipher_alg', ciph_alg) + result_udp.set_parameter('cipher_len', ciph_len) + result_udp.set_parameter('hash_alg', hash_alg) + result_udp.set_parameter('msg_size', nperf_msg_size) + result_udp.set_parameter('ipsec_mode', ipsec_mode) + + baseline = perf_api.get_baseline_of_result(result_udp) + baseline = perfrepo_baseline_to_dict(baseline) + + udp_res_data = netperf((m1, m1_if, 0, {"scope": 0}), + (m2, m2_if, 0, {"scope": 0}), + client_opts={"duration" : netperf_duration, + "testname" : "UDP_STREAM", + "confidence" : nperf_confidence, + "num_parallel" : nperf_num_parallel, + "cpu_util" : nperf_cpu_util, + "runs": nperf_max_runs, + "debug": nperf_debug, + "max_deviation": nperf_max_dev, + "msg_size" : nperf_msg_size, + "netperf_opts": nperf_opts}, + baseline = baseline, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_udp, udp_res_data) + result_udp.set_comment(pr_comment) + perf_api.save_result(result_udp, official_result) if ipv in [ 'ipv6', 'both']: configure_ipsec(ciph_alg, @@ -469,85 +471,86 @@ for ciph_alg, ciph_len in ciphers: dump.intr() # prepare PerfRepo result for tcp - result_tcp = perf_api.new_result("tcp_ipv6_id", - "tcp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_tcp.add_tag(product_name) - - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - result_tcp.set_parameter('cipher_alg', ciph_alg) - result_tcp.set_parameter('cipher_len', ciph_len) - result_tcp.set_parameter('hash_alg', hash_alg) - result_tcp.set_parameter('msg_size', nperf_msg_size) - result_tcp.set_parameter('ipsec_mode', ipsec_mode) - - baseline = perf_api.get_baseline_of_result(result_tcp) - baseline = perfrepo_baseline_to_dict(baseline) - - - tcp_res_data = netperf((m1, m1_if, 1, {"scope": 0}), - (m2, m2_if, 1, {"scope": 0}), - client_opts={"duration" : netperf_duration, - "testname" : "TCP_STREAM", - "confidence" : nperf_confidence, - "num_parallel" : nperf_num_parallel, - "cpu_util" : nperf_cpu_util, - "runs": nperf_max_runs, - "debug": nperf_debug, - "max_deviation": nperf_max_dev, - "msg_size" : nperf_msg_size, - "netperf_opts" : nperf_opts + " -6"}, - baseline = baseline, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp, official_result) + if nperf_protocols.find("tcp") > -1: + result_tcp = perf_api.new_result("tcp_ipv6_id", + "tcp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_tcp.add_tag(product_name) + + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + result_tcp.set_parameter('cipher_alg', ciph_alg) + result_tcp.set_parameter('cipher_len', ciph_len) + result_tcp.set_parameter('hash_alg', hash_alg) + result_tcp.set_parameter('msg_size', nperf_msg_size) + result_tcp.set_parameter('ipsec_mode', ipsec_mode) + + baseline = perf_api.get_baseline_of_result(result_tcp) + baseline = perfrepo_baseline_to_dict(baseline) + + tcp_res_data = netperf((m1, m1_if, 1, {"scope": 0}), + (m2, m2_if, 1, {"scope": 0}), + client_opts={"duration" : netperf_duration, + "testname" : "TCP_STREAM", + "confidence" : nperf_confidence, + "num_parallel" : nperf_num_parallel, + "cpu_util" : nperf_cpu_util, + "runs": nperf_max_runs, + "debug": nperf_debug, + "max_deviation": nperf_max_dev, + "msg_size" : nperf_msg_size, + "netperf_opts" : nperf_opts + " -6"}, + baseline = baseline, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp, official_result) # prepare PerfRepo result for udp - result_udp = perf_api.new_result("udp_ipv6_id", - "udp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_udp.add_tag(product_name) - - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - result_udp.set_parameter('cipher_alg', ciph_alg) - result_udp.set_parameter('cipher_len', ciph_len) - result_udp.set_parameter('hash_alg', hash_alg) - result_udp.set_parameter('msg_size', nperf_msg_size) - result_udp.set_parameter('ipsec_mode', ipsec_mode) - - baseline = perf_api.get_baseline_of_result(result_udp) - baseline = perfrepo_baseline_to_dict(baseline) - - udp_res_data = netperf((m1, m1_if, 1, {"scope": 0}), - (m2, m2_if, 1, {"scope": 0}), - client_opts={"duration" : netperf_duration, - "testname" : "UDP_STREAM", - "confidence" : nperf_confidence, - "num_parallel" : nperf_num_parallel, - "cpu_util" : nperf_cpu_util, - "runs": nperf_max_runs, - "debug": nperf_debug, - "max_deviation": nperf_max_dev, - "msg_size" : nperf_msg_size, - "netperf_opts" : nperf_opts + " -6"}, - baseline = baseline, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_udp, udp_res_data) - result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp, official_result) + if nperf_protocols.find("udp") > -1: + result_udp = perf_api.new_result("udp_ipv6_id", + "udp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_udp.add_tag(product_name) + + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + result_udp.set_parameter('cipher_alg', ciph_alg) + result_udp.set_parameter('cipher_len', ciph_len) + result_udp.set_parameter('hash_alg', hash_alg) + result_udp.set_parameter('msg_size', nperf_msg_size) + result_udp.set_parameter('ipsec_mode', ipsec_mode) + + baseline = perf_api.get_baseline_of_result(result_udp) + baseline = perfrepo_baseline_to_dict(baseline) + + udp_res_data = netperf((m1, m1_if, 1, {"scope": 0}), + (m2, m2_if, 1, {"scope": 0}), + client_opts={"duration" : netperf_duration, + "testname" : "UDP_STREAM", + "confidence" : nperf_confidence, + "num_parallel" : nperf_num_parallel, + "cpu_util" : nperf_cpu_util, + "runs": nperf_max_runs, + "debug": nperf_debug, + "max_deviation": nperf_max_dev, + "msg_size" : nperf_msg_size, + "netperf_opts" : nperf_opts + " -6"}, + baseline = baseline, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_udp, udp_res_data) + result_udp.set_comment(pr_comment) + perf_api.save_result(result_udp, official_result) m1.run("ip xfrm policy flush") m1.run("ip xfrm state flush") diff --git a/recipes/regression_tests/phase3/ipsec_esp_ah_comp.xml b/recipes/regression_tests/phase3/ipsec_esp_ah_comp.xml index 6fec4be..171249f 100644 --- a/recipes/regression_tests/phase3/ipsec_esp_ah_comp.xml +++ b/recipes/regression_tests/phase3/ipsec_esp_ah_comp.xml @@ -9,6 +9,7 @@ <alias name="nperf_num_parallel" value="1"/> <alias name="nperf_debug" value="0"/> <alias name="nperf_max_dev" value="20%"/> + <alias name="nperf_protocols" value="tcp udp"/> <alias name="mapping_file" value="ipsec_esp_ah_comp.mapping"/> <alias name="net_1" value="192.168.99"/> <alias name="net6_1" value="fc00:1::"/> -- 2.14.4

1 2

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

LNST-developers October 2018