X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=f7457720bda852895e5b803a9ec31f4e7b2bb82c;hp=5d3342138d77c704b4004941113821b51d222818;hb=1c0948c3615cbb32be51716da1978e609371dc48;hpb=36b2dffd55dee362d96aae98d563a0c2b475573e

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 5d3342138d..f7457720bd 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,19 @@
     # 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
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
@@ -378,7 +405,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 +413,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 +461,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 +612,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 +973,12 @@
           size: 16
         zeroline: False
       yaxis:
-        title: "<b>Packet Throughput [Mpps]</b>"
+        title: "<b>Critical Rate Lower Bound [Mpps]</b>"
         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 +1162,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 +1351,6 @@
     extract: "robot-plugin/output.xml"
 
   builds:
-#    # TODO: Add 1904 data
 ##    intel-dnv-vpp-release-1904:
 ##      - 1
 #
@@ -1352,6 +1407,17 @@
     # 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
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 20  # NDRPDR sel
@@ -1444,8 +1510,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 +1544,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 +1566,6 @@
 #      - 16  # NDRPDR sel
 #      - 17  # NDRPDR sel
 #      - 18  # NDRPDR sel
-#    # TODO: Add 1904 data
 ##    csit-ligato-perf-verify-1904-3n-hsw:
 ##      -
 
@@ -1625,6 +1697,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 +3036,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 +3055,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 +3074,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 +3112,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 +3131,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 +3150,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 +3188,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 +3207,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 +3226,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 +4035,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\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 +4052,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\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 +4069,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\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 +4103,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\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 +4120,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\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 +4137,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\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 +4171,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\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 +4188,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\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 +4205,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\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 +4597,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 +14356,6 @@
            'BASE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14284,7 +14382,6 @@
            'BASE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14311,7 +14408,6 @@
            'BASE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14338,7 +14434,6 @@
            'BASE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14366,7 +14461,6 @@
            'SCALE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14393,7 +14487,6 @@
            'SCALE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14420,7 +14513,6 @@
            'SCALE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14447,7 +14539,6 @@
            'SCALE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14474,7 +14565,6 @@
            'NDRPDR' and
            '1T1C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14500,7 +14590,6 @@
            'NDRPDR' and
            '1T1C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14526,7 +14615,6 @@
            'NDRPDR' and
            '2T2C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -14552,7 +14640,6 @@
            'NDRPDR' and
            '2T2C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -21419,7 +21506,6 @@
            'BASE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -21442,7 +21528,6 @@
            'BASE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -21466,7 +21551,6 @@
            'SCALE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -21489,7 +21573,6 @@
            'SCALE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -21512,7 +21595,6 @@
            'NDRPDR' and
            '1T1C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -21534,7 +21616,6 @@
            'NDRPDR' and
            '2T2C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
@@ -25701,7 +25782,6 @@
            'NDRPDR' and
            'BASE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25723,7 +25803,6 @@
            'NDRPDR' and
            'BASE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25746,7 +25825,6 @@
            'NDRPDR' and
            'SCALE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25768,7 +25846,6 @@
            'NDRPDR' and
            'SCALE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25790,7 +25867,6 @@
            'IP4FWD' and
            'NDRPDR' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -25811,7 +25887,6 @@
            'IP4FWD' and
            'NDRPDR' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"