X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=33323854447c65ec06b749520bf5ce75fa539e01;hb=refs%2Fchanges%2F53%2F19953%2F1;hp=9abdf08a1f73db13aa3ab969bda6457cec40ad6d;hpb=27fff41a99dae878706ed91f54a27539229b1ba8;p=csit.git
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 9abdf08a1f..3332385444 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -143,7 +143,6 @@
- 30 # NDRPDR sel
# plot-vpp-http-server-performance:
-# # TODO: Replace with 1904 data
# # csit-vpp-perf-verify-1904-3n-hsw:
# csit-vpp-perf-verify-1810-3n-hsw:
# - 28 # WRK
@@ -158,7 +157,6 @@
# - 37 # WRK
# plot-ligato-throughput-lat-tsa-3n-hsw:
-# # TODO: Replace with 1904 data
# # csit-ligato-perf-verify-1904-3n-hsw:
# csit-ligato-perf-verify-1901-3n-hsw:
# - 8 # NDRPDR sel
@@ -229,10 +227,9 @@
- 32 # NDRPDR sel
plot-vpp-soak-2n-skx:
- # TODO: Add 1904 data
csit-vpp-perf-verify-1904-2n-skx:
- - 70 # SOAK
- - 71 # SOAK
+ - 70 # soak
+ - 71 # soak
plot-vpp-nfv-2n-skx-ndrpdr-64b:
csit-vpp-perf-verify-1904-2n-skx:
@@ -241,13 +238,24 @@
- 60 # NFV NDRPDR 64b
- 65 # NFV NDRPDR 64b
- 68 # NFV NDRPDR 64b
+ - 80 # NFV MRR NDRPDR 64b IMIX
+ - 81 # NFV MRR NDRPDR 64b IMIX
+ - 84 # NFV MRR NDRPDR 64b IMIX
+ - 85 # NFV MRR NDRPDR 64b IMIX
+ - 86 # NFV MRR NDRPDR 64b IMIX
plot-vpp-nfv-2n-skx-ndrpdr-imix:
- # TODO: Add 1904 data
csit-vpp-perf-verify-1904-2n-skx:
- 66 # NFV NDRPDR IMIX
- 67 # NFV NDRPDR IMIX
- 69 # NFV NDRPDR IMIX
+ - 82 # NFV NDRPDR IMIX
+ - 83 # NFV NDRPDR IMIX
+ - 80 # NFV MRR NDRPDR 64b IMIX
+ - 81 # NFV MRR NDRPDR 64b IMIX
+ - 84 # NFV MRR NDRPDR 64b IMIX
+ - 85 # NFV MRR NDRPDR 64b IMIX
+ - 86 # NFV MRR NDRPDR 64b IMIX
plot-vpp-nfv-2n-skx-mrr-64b:
csit-vpp-perf-verify-1904-2n-skx:
@@ -256,6 +264,11 @@
- 42 # NFV MRR 64b
- 47 # NFV MRR 64b
- 48 # NFV MRR 64b
+ - 80 # NFV MRR NDRPDR 64b IMIX
+ - 81 # NFV MRR NDRPDR 64b IMIX
+ - 84 # NFV MRR NDRPDR 64b IMIX
+ - 85 # NFV MRR NDRPDR 64b IMIX
+ - 86 # NFV MRR NDRPDR 64b IMIX
plot-vpp-nfv-2n-skx-mrr-imix:
csit-vpp-perf-verify-1904-2n-skx:
@@ -264,6 +277,11 @@
- 51 # NFV MRR IMIX
- 54 # NFV MRR IMIX
- 55 # NFV MRR IMIX
+ - 80 # NFV MRR NDRPDR 64b IMIX
+ - 81 # NFV MRR NDRPDR 64b IMIX
+ - 84 # NFV MRR NDRPDR 64b IMIX
+ - 85 # NFV MRR NDRPDR 64b IMIX
+ - 86 # NFV MRR NDRPDR 64b IMIX
plot-dpdk-throughput-latency-2n-skx:
csit-dpdk-perf-verify-1904-2n-skx:
@@ -282,7 +300,6 @@
# # Denverton:
# intel-dnv-vpp:
-# # TODO: Replace with 1904 data
# # intel-dnv-vpp-release-1904:
# intel-dnv-vpp-release-1901:
# - 1
@@ -346,9 +363,21 @@
# Results
vpp-perf-results-3n-hsw:
- # TODO: Replace with FULL 1904 data
+ # TODO: Add FULL 1904 data
csit-vpp-perf-verify-1904-3n-hsw:
- - 12 # NDRPDR sel
+ - 32 # NDRPDR full
+ - 33 # NDRPDR full
+ - 35 # NDRPDR full
+ - 36 # NDRPDR full
+ - 37 # NDRPDR full
+ - 38 # NDRPDR full
+ - 40 # NDRPDR full
+ - 45 # NDRPDR full
+ - 46 # NDRPDR full
+ - 48 # NDRPDR full
+ - 49 # NDRPDR full
+ - 50 # NDRPDR full
+ - 51 # NDRPDR full
vpp-perf-results-3n-skx:
csit-vpp-perf-verify-1904-3n-skx:
@@ -378,7 +407,7 @@
vpp-func-results-ubuntu:
csit-vpp-functional-1904-ubuntu1604-virl:
- - 29
+ - 33
vpp-func-results-centos:
csit-vpp-functional-1904-centos7-virl:
@@ -386,11 +415,10 @@
vpp-device-results-ubuntu:
csit-vpp-device-1904-ubuntu1804-1n-skx:
- - 33
+ - 32
# # VPP Ligato
# ligato-perf-results-3n-hsw:
-# # TODO: Replace with 1904 data
# # csit-ligato-perf-verify-1904-3n-hsw:
# csit-ligato-perf-verify-1901-3n-hsw:
# - 10 # NDRPDR full
@@ -435,7 +463,6 @@
# intel-dnv-vpp-release-1901:
# - 1
# intel-dnv-vpp-changes-2n-dnv-cmp:
-# # TODO: Replace with 1904 data
# # intel-dnv-vpp-release-1904:
# intel-dnv-vpp-release-1901:
# - 1
@@ -587,6 +614,37 @@
- "vpp-performance-changes-2n-skx-ref"
- "vpp-performance-changes-2n-skx-cmp"
+ vpp-soak-vs-ndr-2n-skx-ref:
+ csit-vpp-perf-verify-1904-2n-skx:
+ - 12 # NDRPDR sel
+ - 14 # NDRPDR sel
+ - 16 # NDRPDR sel
+ - 17 # NDRPDR sel
+ - 18 # NDRPDR sel
+ - 21 # NDRPDR sel
+ - 27 # NDRPDR sel
+ - 30 # NDRPDR sel
+ - 31 # NDRPDR sel
+ - 32 # NDRPDR sel
+ vpp-soak-vs-ndr-2n-skx-cmp:
+ csit-vpp-perf-verify-1904-2n-skx:
+ - 70 # soak
+ - 71 # soak
+ vpp-soak-vs-ndr-2n-skx:
+ csit-vpp-perf-verify-1904-2n-skx:
+ - 12 # NDRPDR sel
+ - 14 # NDRPDR sel
+ - 16 # NDRPDR sel
+ - 17 # NDRPDR sel
+ - 18 # NDRPDR sel
+ - 21 # NDRPDR sel
+ - 27 # NDRPDR sel
+ - 30 # NDRPDR sel
+ - 31 # NDRPDR sel
+ - 32 # NDRPDR sel
+ - 70 # soak
+ - 71 # soak
+
vpp-performance-changes-3n-hsw-mrr-h1:
csit-vpp-perf-verify-1810-3n-hsw:
- 9 # MRR sel
@@ -917,12 +975,12 @@
size: 16
zeroline: False
yaxis:
- title: "Packet Throughput [Mpps]"
+ title: "Critical Rate Lower Bound [Mpps]"
titlefont:
size: 16
gridcolor: "rgb(230, 230, 230)"
- hoverformat: ".4s"
- tickformat: ".3s"
+ hoverformat: ".4r"
+ tickformat: ".3r"
linecolor: "rgb(220, 220, 220)"
linewidth: 1
showgrid: True
@@ -1106,8 +1164,8 @@
titlefont:
size: 16
gridcolor: "rgb(230, 230, 230)"
- hoverformat: ".4s"
- tickformat: ".3s"
+ hoverformat: ".4r"
+ tickformat: ".3r"
linecolor: "rgb(220, 220, 220)"
linewidth: 1
showgrid: True
@@ -1295,7 +1353,6 @@
extract: "robot-plugin/output.xml"
builds:
-# # TODO: Add 1904 data
## intel-dnv-vpp-release-1904:
## - 1
#
@@ -1352,6 +1409,19 @@
# TODO: Add 1904 Data
csit-vpp-perf-verify-1904-3n-hsw:
- 9 # MRR sel
+ - 32 # NDRPDR full
+ - 33 # NDRPDR full
+ - 35 # NDRPDR full
+ - 36 # NDRPDR full
+ - 37 # NDRPDR full
+ - 38 # NDRPDR full
+ - 40 # NDRPDR full
+ - 45 # NDRPDR full
+ - 46 # NDRPDR full
+ - 48 # NDRPDR full
+ - 49 # NDRPDR full
+ - 50 # NDRPDR full
+ - 51 # NDRPDR full
- 11 # NDRPDR sel
- 12 # NDRPDR sel
- 20 # NDRPDR sel
@@ -1444,7 +1514,6 @@
- 40 # NDRPDR sel
- 42 # NDRPDR sel
- 43 # NDRPDR sel
- # TODO: Add 1904 data
csit-vpp-perf-verify-1904-2n-skx:
- 11 # MRR sel
- 33 # NDRPDR full
@@ -1479,8 +1548,15 @@
- 66 # NFV NDRPDR IMIX
- 67 # NFV NDRPDR IMIX
- 69 # NFV NDRPDR IMIX
- - 70 # SOAK
- - 71 # SOAK
+ - 82 # NFV NDRPDR IMIX
+ - 83 # NFV NDRPDR IMIX
+ - 80 # NFV MRR NDRPDR 64b IMIX
+ - 81 # NFV MRR NDRPDR 64b IMIX
+ - 84 # NFV MRR NDRPDR 64b IMIX
+ - 85 # NFV MRR NDRPDR 64b IMIX
+ - 86 # NFV MRR NDRPDR 64b IMIX
+ - 70 # soak
+ - 71 # soak
# csit-ligato-perf-verify-1901-3n-hsw:
# - 10 # NDRPDR full
@@ -1494,7 +1570,6 @@
# - 16 # NDRPDR sel
# - 17 # NDRPDR sel
# - 18 # NDRPDR sel
-# # TODO: Add 1904 data
## csit-ligato-perf-verify-1904-3n-hsw:
## -
@@ -1619,13 +1694,34 @@
format:
html:
- full
-# pdf:
-# - minimal
+ pdf:
+ - minimal
################################################################################
### T A B L E S ###
################################################################################
+# VPP Soak vs NDR
+- type: "table"
+ title: "VPP Soak vs NDR 2n-skx"
+ algorithm: "table_soak_vs_ndr"
+ output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-skx"
+ reference:
+ title: "NDR"
+ data: "vpp-soak-vs-ndr-2n-skx-ref"
+ compare:
+ title: "Soak"
+ data: "vpp-soak-vs-ndr-2n-skx-cmp"
+ data: "vpp-soak-vs-ndr-2n-skx"
+ include-tests: "NDR"
+ filter: "('NDRPDR' or 'SOAK')"
+ parameters:
+ - "throughput"
+ - "name"
+ - "parent"
+
+################################################################################
+
# VPP Compare NICs 3n-hsw 1t1c ndr
- type: "table"
title: "VPP Compare NICs 3n-hsw 1t1c ndr"
@@ -2944,7 +3040,7 @@
data: "data msg"
rows: "generated"
data: "vpp-perf-results-3n-hsw"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
parameters:
- "name"
- "parent"
@@ -2963,7 +3059,7 @@
data: "data msg"
rows: "generated"
data: "vpp-perf-results-3n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "name"
- "parent"
@@ -2982,7 +3078,7 @@
data: "data msg"
rows: "generated"
data: "vpp-perf-results-2n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "name"
- "parent"
@@ -3020,7 +3116,7 @@
data: "data conf-history"
rows: "generated"
data: "vpp-perf-results-3n-hsw"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
parameters:
- "parent"
- "name"
@@ -3039,7 +3135,7 @@
data: "data conf-history"
rows: "generated"
data: "vpp-perf-results-3n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "parent"
- "name"
@@ -3058,7 +3154,7 @@
data: "data conf-history"
rows: "generated"
data: "vpp-perf-results-2n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "parent"
- "name"
@@ -3096,7 +3192,7 @@
data: "data show-run"
rows: "generated"
data: "vpp-perf-results-3n-hsw"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
parameters:
- "parent"
- "name"
@@ -3115,7 +3211,7 @@
data: "data show-run"
rows: "generated"
data: "vpp-perf-results-3n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "parent"
- "name"
@@ -3134,7 +3230,7 @@
data: "data show-run"
rows: "generated"
data: "vpp-perf-results-2n-skx"
- filter: "not 'NDRCHK' and not 'PDRCHK'"
+ filter: "not 'CFS_OPT'"
parameters:
- "parent"
- "name"
@@ -3943,7 +4039,7 @@
file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |prein| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}" data: "vpp-perf-results-3n-hsw" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))" parameters: - "name" - "doc" @@ -3960,7 +4056,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}" data: "vpp-perf-results-3n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -3977,7 +4073,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}" data: "vpp-perf-results-2n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4011,7 +4107,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}" data: "vpp-perf-results-3n-hsw" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))" parameters: - "name" - "doc" @@ -4028,7 +4124,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}" data: "vpp-perf-results-3n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4045,7 +4141,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}" data: "vpp-perf-results-2n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4079,7 +4175,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}" data: "vpp-perf-results-3n-hsw" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))" parameters: - "name" - "doc" @@ -4096,7 +4192,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}" data: "vpp-perf-results-3n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4113,7 +4209,7 @@ file-header: "\n.. |br| raw:: html\n\n
\n\n\n.. |preout| raw:: html\n\n\n\n" dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}" data: "vpp-perf-results-2n-skx" - filter: "not 'NDRCHK' and not 'PDRCHK'" + filter: "not 'CFS_OPT'" parameters: - "name" - "doc" @@ -4505,50 +4601,56 @@ ### P L O T S ### ################################################################################ -# Soak test - 30min Soak Test (PLRsearch), boxes +# Soak Test (PLRsearch), boxes - type: "plot" - title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes" - algorithm: "plot_soak_boxes" + title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)" + algorithm: "plot_performance_box" output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/example-soak-boxes" + output-file: "{DIR[STATIC,VPP]}/soak-test-1" data: "plot-vpp-soak-2n-skx" - filter: "'SOAK'" + filter: "('L2BDMACLRN' or 'L2PATCH' or 'L2XCBASE') and not 'VHOST' and not 'MEMIF'" parameters: - - "throughput" - - "parent" - - "tags" -# sort: -# - "L2PATCH" -# - "L2XCBASE" -# - "L2BDMACLRN" -# - "IP4FWD" -# - "IP6FWD" - - "VHOST" + - "throughput" + - "parent" + - "tags" + sort: + - "DRV_AVF" + - "DRV_AVF" + - "DRV_AVF" + - "L2BDMACLRN" + - "L2XCBASE" + - "L2PATCH" + traces: + hoverinfo: "x+y" + boxpoints: "all" + whiskerwidth: 0 layout: - title: "30min Soak Test (PLRsearch)" + title: "2 Hours Soak Test (PLRsearch)" layout: "plot-soak-throughput" -# Soak test - example, not used +# Soak Test (PLRsearch), boxes - type: "plot" - title: "VPP Throughput: 30min Soak Test (PLRsearch) bars" - algorithm: "plot_soak_bars" + title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)" + algorithm: "plot_performance_box" output-file-type: ".html" - output-file: "{DIR[STATIC,VPP]}/example-soak-bars" + output-file: "{DIR[STATIC,VPP]}/soak-test-2" data: "plot-vpp-soak-2n-skx" - filter: "'SOAK'" + filter: "'L2BDMACLRN' and ('VHOST' or 'MEMIF') or 'IP4BASE' or 'IP6BASE'" parameters: - - "throughput" - - "parent" - - "tags" -# sort: -# - "L2PATCH" -# - "L2XCBASE" -# - "L2BDMACLRN" -# - "IP4FWD" -# - "IP6FWD" - - "VHOST" + - "throughput" + - "parent" + - "tags" + sort: + - "VHOST" + - "MEMIF" + - "IP4FWD" + - "IP6FWD" + traces: + hoverinfo: "x+y" + boxpoints: "all" + whiskerwidth: 0 layout: - title: "30min Soak Test (PLRsearch)" + title: "2 Hours Soak Test (PLRsearch)" layout: "plot-soak-throughput" ################################################################################ @@ -14258,7 +14360,6 @@ 'BASE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14285,7 +14386,6 @@ 'BASE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14312,7 +14412,6 @@ 'BASE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14339,7 +14438,6 @@ 'BASE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14367,7 +14465,6 @@ 'SCALE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14394,7 +14491,6 @@ 'SCALE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14421,7 +14517,6 @@ 'SCALE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14448,7 +14543,6 @@ 'SCALE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14475,7 +14569,6 @@ 'NDRPDR' and '1T1C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14501,7 +14594,6 @@ 'NDRPDR' and '1T1C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14527,7 +14619,6 @@ 'NDRPDR' and '2T2C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14553,7 +14644,6 @@ 'NDRPDR' and '2T2C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -21420,7 +21510,6 @@ 'BASE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21443,7 +21532,6 @@ 'BASE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21467,7 +21555,6 @@ 'SCALE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21490,7 +21577,6 @@ 'SCALE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21513,7 +21599,6 @@ 'NDRPDR' and '1T1C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21535,7 +21620,6 @@ 'NDRPDR' and '2T2C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -25702,7 +25786,6 @@ 'NDRPDR' and 'BASE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25724,7 +25807,6 @@ 'NDRPDR' and 'BASE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25747,7 +25829,6 @@ 'NDRPDR' and 'SCALE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25769,7 +25850,6 @@ 'NDRPDR' and 'SCALE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25791,7 +25871,6 @@ 'IP4FWD' and 'NDRPDR' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25812,7 +25891,6 @@ 'IP4FWD' and 'NDRPDR' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput"