X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=033a3d7771ffb88e876702dcfb4246c5abde9a87;hb=43564923e4615cb8d147b0bc213ca83313c0599c;hp=5d3342138d77c704b4004941113821b51d222818;hpb=36b2dffd55dee362d96aae98d563a0c2b475573e;p=csit.git
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 5d3342138d..033a3d7771 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
@@ -228,11 +226,10 @@
- 31 # NDRPDR sel
- 32 # NDRPDR sel
-# plot-vpp-soak-2n-skx:
-# # TODO: Replace with 1904 data
-# # csit-vpp-perf-verify-1904-2n-skx:
-# csit-vpp-perf-verify-1901-2n-skx:
-# - 45 # SOAK sel
+ plot-vpp-soak-2n-skx:
+ csit-vpp-perf-verify-1904-2n-skx:
+ - 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,25 @@
# Results
vpp-perf-results-3n-hsw:
- # TODO: Replace with 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
+ - 52 # NDRPDR full
+ - 53 # NDRPDR full
+ - 54 # NDRPDR full
+ - 56 # NDRPDR full
+ - 58 # NDRPDR full
vpp-perf-results-3n-skx:
csit-vpp-perf-verify-1904-3n-skx:
@@ -378,7 +411,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 +419,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 +467,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 +618,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 +979,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 +1168,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 +1357,6 @@
extract: "robot-plugin/output.xml"
builds:
-# # TODO: Add 1904 data
## intel-dnv-vpp-release-1904:
## - 1
#
@@ -1349,9 +1410,26 @@
- 69 # NDRPDR LB
- 70 # NDRPDR LB
- 71 # NDRPDR LB
- # 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
+ - 52 # NDRPDR full
+ - 53 # NDRPDR full
+ - 54 # NDRPDR full
+ - 56 # NDRPDR full
+ - 58 # NDRPDR full
- 11 # NDRPDR sel
- 12 # NDRPDR sel
- 20 # NDRPDR sel
@@ -1444,8 +1522,6 @@
- 40 # NDRPDR sel
- 42 # NDRPDR sel
- 43 # NDRPDR sel
-# - 45 # SOAK
- # TODO: Add 1904 data
csit-vpp-perf-verify-1904-2n-skx:
- 11 # MRR sel
- 33 # NDRPDR full
@@ -1480,6 +1556,15 @@
- 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
+ - 70 # soak
+ - 71 # soak
# csit-ligato-perf-verify-1901-3n-hsw:
# - 10 # NDRPDR full
@@ -1493,7 +1578,6 @@
# - 16 # NDRPDR sel
# - 17 # NDRPDR sel
# - 18 # NDRPDR sel
-# # TODO: Add 1904 data
## csit-ligato-perf-verify-1904-3n-hsw:
## -
@@ -1625,6 +1709,27 @@
### 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"
@@ -2943,7 +3048,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"
@@ -2962,7 +3067,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"
@@ -2981,7 +3086,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"
@@ -3019,7 +3124,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"
@@ -3038,7 +3143,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"
@@ -3057,7 +3162,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"
@@ -3095,7 +3200,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"
@@ -3114,7 +3219,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"
@@ -3133,7 +3238,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"
@@ -3942,7 +4047,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" @@ -3959,7 +4064,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" @@ -3976,7 +4081,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" @@ -4010,7 +4115,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" @@ -4027,7 +4132,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" @@ -4044,7 +4149,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" @@ -4078,7 +4183,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" @@ -4095,7 +4200,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" @@ -4112,7 +4217,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" @@ -4504,51 +4609,57 @@ ### P L O T S ### ################################################################################ -## Soak test - 30min Soak Test (PLRsearch), boxes -#- type: "plot" -# title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes" -# algorithm: "plot_soak_boxes" -# output-file-type: ".html" -# output-file: "{DIR[STATIC,VPP]}/example-soak-boxes" -# data: "plot-vpp-soak-2n-skx" -# filter: "'SOAK'" -# parameters: -# - "throughput" -# - "parent" -# - "tags" -# sort: -# - "L2PATCH" -## - "L2XCBASE" -## - "L2BDMACLRN" -## - "IP4FWD" -## - "IP6FWD" -# - "VHOST" -# layout: -# title: "30min Soak Test (PLRsearch)" -# layout: "plot-soak-throughput" -# -## Soak test - example, not used -#- type: "plot" -# title: "VPP Throughput: 30min Soak Test (PLRsearch) bars" -# algorithm: "plot_soak_bars" -# output-file-type: ".html" -# output-file: "{DIR[STATIC,VPP]}/example-soak-bars" -# data: "plot-vpp-soak-2n-skx" -# filter: "'SOAK'" -# parameters: -# - "throughput" -# - "parent" -# - "tags" -# sort: -# - "L2PATCH" -## - "L2XCBASE" -## - "L2BDMACLRN" -## - "IP4FWD" -## - "IP6FWD" -# - "VHOST" -# layout: -# title: "30min Soak Test (PLRsearch)" -# layout: "plot-soak-throughput" +# Soak Test (PLRsearch), boxes +- type: "plot" + title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)" + algorithm: "plot_performance_box" + output-file-type: ".html" + output-file: "{DIR[STATIC,VPP]}/soak-test-1" + data: "plot-vpp-soak-2n-skx" + filter: "('L2BDMACLRN' or 'L2PATCH' or 'L2XCBASE') and not 'VHOST' and not 'MEMIF'" + parameters: + - "throughput" + - "parent" + - "tags" + sort: + - "DRV_AVF" + - "DRV_AVF" + - "DRV_AVF" + - "L2BDMACLRN" + - "L2XCBASE" + - "L2PATCH" + traces: + hoverinfo: "x+y" + boxpoints: "all" + whiskerwidth: 0 + layout: + title: "2 Hours Soak Test (PLRsearch)" + layout: "plot-soak-throughput" + +# Soak Test (PLRsearch), boxes +- type: "plot" + title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)" + algorithm: "plot_performance_box" + output-file-type: ".html" + output-file: "{DIR[STATIC,VPP]}/soak-test-2" + data: "plot-vpp-soak-2n-skx" + filter: "'L2BDMACLRN' and ('VHOST' or 'MEMIF') or 'IP4BASE' or 'IP6BASE'" + parameters: + - "throughput" + - "parent" + - "tags" + sort: + - "VHOST" + - "MEMIF" + - "IP4FWD" + - "IP6FWD" + traces: + hoverinfo: "x+y" + boxpoints: "all" + whiskerwidth: 0 + layout: + title: "2 Hours Soak Test (PLRsearch)" + layout: "plot-soak-throughput" ################################################################################ # Plots - NF Density - VSC - MRR 64b @@ -14257,7 +14368,6 @@ 'BASE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14284,7 +14394,6 @@ 'BASE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14311,7 +14420,6 @@ 'BASE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14338,7 +14446,6 @@ 'BASE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14366,7 +14473,6 @@ 'SCALE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14393,7 +14499,6 @@ 'SCALE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14420,7 +14525,6 @@ 'SCALE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14447,7 +14551,6 @@ 'SCALE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14474,7 +14577,6 @@ 'NDRPDR' and '1T1C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14500,7 +14602,6 @@ 'NDRPDR' and '1T1C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14526,7 +14627,6 @@ 'NDRPDR' and '2T2C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -14552,7 +14652,6 @@ 'NDRPDR' and '2T2C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -21419,7 +21518,6 @@ 'BASE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21442,7 +21540,6 @@ 'BASE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21466,7 +21563,6 @@ 'SCALE' and '1T1C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21489,7 +21585,6 @@ 'SCALE' and '2T2C' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21512,7 +21607,6 @@ 'NDRPDR' and '1T1C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -21534,7 +21628,6 @@ 'NDRPDR' and '2T2C' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "latency" @@ -25701,7 +25794,6 @@ 'NDRPDR' and 'BASE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25723,7 +25815,6 @@ 'NDRPDR' and 'BASE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25746,7 +25837,6 @@ 'NDRPDR' and 'SCALE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25768,7 +25858,6 @@ 'NDRPDR' and 'SCALE' and 'IPSECHW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25790,7 +25879,6 @@ 'IP4FWD' and 'NDRPDR' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput" @@ -25811,7 +25899,6 @@ 'IP4FWD' and 'NDRPDR' and 'IPSECSW' and - ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'" parameters: - "throughput"