From 767e85ad0dcb9bcb9637188062681311fabb3307 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 3 Apr 2018 09:13:23 +0200 Subject: [PATCH] PAL Trending: download input files Change-Id: I407e3cdeb25547d46fafed702ee608f6c0e03091 Signed-off-by: Tibor Frank --- resources/tools/presentation/generator_CPTA.py | 2 +- resources/tools/presentation/input_data_files.py | 15 ++++++++++---- .../tools/presentation/specification_CPTA.yaml | 2 +- .../l2/10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.robot | 24 +++++++++++----------- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py index a1921fad9d..92244c2610 100644 --- a/resources/tools/presentation/generator_CPTA.py +++ b/resources/tools/presentation/generator_CPTA.py @@ -426,7 +426,7 @@ def _generate_all_charts(spec, input_data): # Generate the chart: period_name = "Daily" if period == 1 else \ "Weekly" if period < 20 else "Monthly" - chart["layout"]["title"] = chart["title"].format(period=period_name) + # chart["layout"]["title"] = chart["title"].format(period=period_name) _generate_chart(traces, chart["layout"], file_name="{0}-{1}-{2}{3}".format( diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py index 7e19478570..439c0d88bd 100644 --- a/resources/tools/presentation/input_data_files.py +++ b/resources/tools/presentation/input_data_files.py @@ -37,7 +37,7 @@ CHUNK_SIZE = 512 # Separator used in file names SEPARATOR = "__" -REGEX_RELEASE = re.compile(r'(\D*)(\d{4})(\D*)') +REGEX_RELEASE = re.compile(r'(\D*)(\d{4}|master)(\D*)') def download_data_files(spec): @@ -81,6 +81,13 @@ def download_data_files(spec): try: response = get(url, stream=True) code = response.status_code + # temporary workaround, remove when output.log.xml is not needed + if code != codes["OK"] and \ + spec.input["file-name"].endswith(".gz"): + url = '.'.join(url.split('.')[:-1]) + ".log.gz" + response = get(url, stream=True) + code = response.status_code + if code != codes["OK"]: logging.warning( "Jenkins: {0}: {1}.".format(code, responses[code])) @@ -139,11 +146,11 @@ def download_data_files(spec): logging.info("{0}: {1}".format(code, responses[code])) elif spec.input["file-name"].endswith(".gz"): - rename(new_name, new_name[:-7]) - with open(new_name[:-7], 'r') as xml_file: + rename(new_name, new_name[:-3]) + with open(new_name[:-3], 'r') as xml_file: with gzip.open(new_name, 'wb') as gz_file: gz_file.write(xml_file.read()) - new_name = new_name[:-7] + new_name = new_name[:-3] status = "downloaded" logging.info("{0}: {1}".format(code, responses[code])) diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml index 6101425783..6b5c7fad1f 100644 --- a/resources/tools/presentation/specification_CPTA.yaml +++ b/resources/tools/presentation/specification_CPTA.yaml @@ -179,7 +179,7 @@ - type: "input" # Ignored in debug mode general: - file-name: "output.xml.log.gz" + file-name: "output.xml.gz" file-format: ".gz" download-path: "{job}/{build}/archives/{filename}" extract: "output.xml" diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.robot index a71c5f9ea1..418081eef9 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.robot +++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.robot @@ -77,7 +77,7 @@ | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} *** Test Cases *** -| tc01-64B-1t1c-eth-l2bdscale1mmaclrn-ndrdisc +| tc01-64B-1t1c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. @@ -88,7 +88,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=${64} | wt=1 | rxq=1 -| tc02-1518B-1t1c-eth-l2bdscale1mmaclrn-ndrdisc +| tc02-1518B-1t1c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. @@ -100,7 +100,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=${1518} | wt=1 | rxq=1 -| tc03-9000B-1t1c-eth-l2bdscale1mmaclrn-ndrdisc +| tc03-9000B-1t1c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. @@ -112,7 +112,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=${9000} | wt=1 | rxq=1 -| tc04-IMIX-1t1c-eth-l2bdscale1mmaclrn-ndrdisc +| tc04-IMIX-1t1c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. @@ -125,7 +125,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=IMIX_v4_1 | wt=1 | rxq=1 -| tc05-64B-2t2c-eth-l2bdscale1mmaclrn-ndrdisc +| tc05-64B-2t2c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. @@ -137,7 +137,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=${64} | wt=2 | rxq=1 -| tc06-1518B-2t2c-eth-l2bdscale1mmaclrn-ndrdisc +| tc06-1518B-2t2c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. @@ -149,7 +149,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=${1518} | wt=2 | rxq=1 -| tc07-9000B-2t2c-eth-l2bdscale1mmaclrn-ndrdisc +| tc07-9000B-2t2c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. @@ -161,7 +161,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=${9000} | wt=2 | rxq=1 -| tc08-9000B-2t2c-eth-l2bdscale1mmaclrn-ndrdisc +| tc08-9000B-2t2c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. @@ -174,7 +174,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=IMIX_v4_1 | wt=2 | rxq=1 -| tc09-64B-4t4c-eth-l2bdscale1mmaclrn-ndrdisc +| tc09-64B-4t4c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port. @@ -186,7 +186,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=${64} | wt=4 | rxq=2 -| tc10-1518B-4t4c-eth-l2bdscale1mmaclrn-ndrdisc +| tc10-1518B-4t4c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port. @@ -198,7 +198,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=${1518} | wt=4 | rxq=2 -| tc11-9000B-4t4c-eth-l2bdscale1mmaclrn-ndrdisc +| tc11-9000B-4t4c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port. @@ -210,7 +210,7 @@ | | [Template] | Check RR for L2BD eth-l2bdscale | | framesize=${9000} | wt=4 | rxq=2 -| tc12-IMIX-4t4c-eth-l2bdscale1mmaclrn-ndrdisc +| tc12-IMIX-4t4c-eth-l2bdscale1mmaclrn-mrr | | [Documentation] | | ... | [Cfg] DUT runs L2BD switching config with with\ | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port. -- 2.16.6