From 9c38db0a5c7721c1193aebc60e9d3c5e3a351310 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 19 Mar 2019 15:35:30 +0100 Subject: Report: Remove VNF - add comparisons for dnv Change-Id: I123a925a3c91fba782f152b3cd73f1b63fe50c59 Signed-off-by: Tibor Frank --- resources/tools/presentation/input_data_files.py | 2 +- resources/tools/presentation/specification.yaml | 158 ++++++++++++++++++++- .../tools/presentation/specification_parser.py | 2 +- 3 files changed, 157 insertions(+), 5 deletions(-) (limited to 'resources/tools/presentation') diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py index a1ab2432a6..262c6a0a63 100644 --- a/resources/tools/presentation/input_data_files.py +++ b/resources/tools/presentation/input_data_files.py @@ -167,7 +167,7 @@ def download_and_unzip_data_file(spec, job, build, pid, log): elif job.startswith("hc2vpp-"): url = spec.environment["urls"]["URL[JENKINS,HC]"] elif job.startswith("intel-dnv-"): - url = spec.environment["urls"]["URL[VIRL,DNV]"] + url = spec.environment["urls"]["URL[VIRL,DNV]"].format(release=job[-4:]) else: raise PresentationError("No url defined for the job '{}'.". format(job)) diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml index d7898e1290..ca8caa869f 100644 --- a/resources/tools/presentation/specification.yaml +++ b/resources/tools/presentation/specification.yaml @@ -75,7 +75,7 @@ urls: URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job" URL[JENKINS,HC]: "https://jenkins.fd.io/view/hc2vpp/job" - URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/1901/robot-plugin.zip" + URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/{release}/robot-plugin.zip" # URL[VIRL,DNV]: "http://download.it/from/nexus" URL[NEXUS]: "https://docs.fd.io/csit" DIR[NEXUS]: "report/_static/archive" @@ -365,7 +365,6 @@ # Denverton: intel-dnv-vpp: - # Not used intel-dnv-vpp-release-1901: - 1 @@ -546,6 +545,16 @@ # Performance changes + intel-dnv-vpp-changes-2n-dnv-ref: + intel-dnv-vpp-release-1810: + - 1 + intel-dnv-vpp-changes-2n-dnv-cmp: + intel-dnv-vpp-release-1901: + - 1 + intel-dnv-vpp-changes-2n-dnv: + - "intel-dnv-vpp-changes-2n-dnv-ref" + - "intel-dnv-vpp-changes-2n-dnv-cmp" + vpp-performance-changes-3n-hsw-h1: csit-vpp-perf-verify-1807-3n-hsw: - 11 # NDRPDR full 1 @@ -1464,10 +1473,12 @@ builds: - # Not used intel-dnv-vpp-release-1901: - 1 + intel-dnv-vpp-release-1810: + - 1 + csit-vpp-perf-verify-1807-3n-hsw: - 8 # MRR full - 9 # MRR sel @@ -2256,6 +2267,147 @@ ################################################################################ # VPP +# VPP Performance Changes 2n-dnv 1t1c pdr +- + type: "table" + title: "VPP Performance Changes 2n-dnv 1t1c pdr" + algorithm: "table_performance_comparison" + output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-pdr" + reference: + title: "rls1810" + data: "intel-dnv-vpp-changes-2n-dnv-ref" + compare: + title: "rls1901.1" + data: "intel-dnv-vpp-changes-2n-dnv-cmp" + data: "intel-dnv-vpp-changes-2n-dnv" + include-tests: "PDR" + filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" + parameters: + - "name" + - "parent" + - "throughput" + +# VPP Performance Changes 2n-dnv 2t2c pdr +- + type: "table" + title: "VPP Performance Changes 2n-dnv 2t2c pdr" + algorithm: "table_performance_comparison" + output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-pdr" + reference: + title: "rls1810" + data: "intel-dnv-vpp-changes-2n-dnv-ref" + compare: + title: "rls1901.1" + data: "intel-dnv-vpp-changes-2n-dnv-cmp" + data: "intel-dnv-vpp-changes-2n-dnv" + include-tests: "PDR" + filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" + parameters: + - "name" + - "parent" + - "throughput" + +# VPP Performance Changes 2n-dnv 1t1c ndr +- + type: "table" + title: "VPP Performance Changes 2n-dnv 1t1c ndr" + algorithm: "table_performance_comparison" + output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-ndr" + reference: + title: "rls1810" + data: "intel-dnv-vpp-changes-2n-dnv-ref" + compare: + title: "rls1901.1" + data: "intel-dnv-vpp-changes-2n-dnv-cmp" + data: "intel-dnv-vpp-changes-2n-dnv" + include-tests: "NDR" + filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" + parameters: + - "name" + - "parent" + - "throughput" + +# VPP Performance Changes 2n-dnv 2t2c ndr +- + type: "table" + title: "VPP Performance Changes 2n-dnv 2t2c ndr" + algorithm: "table_performance_comparison" + output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-ndr" + reference: + title: "rls1810" + data: "intel-dnv-vpp-changes-2n-dnv-ref" + compare: + title: "rls1901.1" + data: "intel-dnv-vpp-changes-2n-dnv-cmp" + data: "intel-dnv-vpp-changes-2n-dnv" + include-tests: "NDR" + filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" + parameters: + - "name" + - "parent" + - "throughput" + + +# VPP Performance Changes 2n-dnv 1t1c MRR +- + type: "table" + title: "VPP Performance Changes 2n-dnv 1t1c MRR" + algorithm: "table_performance_comparison" + output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-mrr" + reference: + title: "rls1810" + data: "intel-dnv-vpp-changes-2n-dnv-ref" + compare: + title: "rls1901.1" + data: "intel-dnv-vpp-changes-2n-dnv-cmp" + data: "intel-dnv-vpp-changes-2n-dnv" + include-tests: "MRR" + filter: "'1T1C' and 'MRR'" + parameters: + - "name" + - "parent" + - "result" + +# VPP Performance Changes 2n-dnv 2t2c MRR +- + type: "table" + title: "VPP Performance Changes 2n-dnv 2t2c MRR" + algorithm: "table_performance_comparison" + output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-mrr" + reference: + title: "rls1810" + data: "intel-dnv-vpp-changes-2n-dnv-ref" + compare: + title: "rls1901.1" + data: "intel-dnv-vpp-changes-2n-dnv-cmp" + data: "intel-dnv-vpp-changes-2n-dnv" + include-tests: "MRR" + filter: "'2T2C' and 'MRR'" + parameters: + - "name" + - "parent" + - "result" + +# VPP Performance Changes 2n-dnv 4t4c MRR +- + type: "table" + title: "VPP Performance Changes 2n-dnv 4t4c MRR" + algorithm: "table_performance_comparison" + output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-4t4c-mrr" + reference: + title: "rls1810" + data: "intel-dnv-vpp-changes-2n-dnv-ref" + compare: + title: "rls1901.1" + data: "intel-dnv-vpp-changes-2n-dnv-cmp" + data: "intel-dnv-vpp-changes-2n-dnv" + include-tests: "MRR" + filter: "'4T4C' and 'MRR'" + parameters: + - "name" + - "parent" + - "result" + # VPP Performance Changes 3n-hsw 1t1c pdr - type: "table" diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py index bf538836a9..b459bd3117 100644 --- a/resources/tools/presentation/specification_parser.py +++ b/resources/tools/presentation/specification_parser.py @@ -370,7 +370,7 @@ class Specification(object): try: self._specification["environment"]["urls"] = \ - self._replace_tags(self._cfg_yaml[idx]["urls"]) + self._cfg_yaml[idx]["urls"] except KeyError: self._specification["environment"]["urls"] = None -- cgit 1.2.3-korg