X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=66f2035d1444d6f2f6939533b8ebb92b87549358;hp=a044f8b4e0623ec57fa401408ec0179da24fa157;hb=8ac495fdf576693d4c627a3211765facc688cfdc;hpb=3c1b802a13265c776bcf0712989558bd9ff0ee1a

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index a044f8b4e0..66f2035d14 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -293,6 +293,7 @@
         - 43  # NDRPDR sel
         - 38  # NDRPDR sel
         - 7   # NDRPDR sel
+        - 78  # nf-density-sel
         - 83  # nf-density-sel
 
     plot-vpp-nfv-2n-skx-mrr:
@@ -415,6 +416,7 @@
         - 12  # NDRPDR sel
         - 20  # NDRPDR sel
         - 14  # NDRPDR sel
+        - 21  # NDRPDR sel
 
     plot-vpp-hdrh-lat-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
@@ -580,6 +582,7 @@
         - 20  # perf-full-3n-skx-ip4_IX
         - 24  # perf-full-3n-skx-ip6_I
         - 25  # perf-full-3n-skx-ip6_II
+        - 21  # perf-full-3n-skx-ip4tunnels-I
         - 22  # perf-full-3n-skx-ip4tunnels-II
         - 23  # perf-full-3n-skx-ip4tunnels-III
         - 26  # perf-full-3n-skx-ip6tunnels-I
@@ -588,9 +591,14 @@
         - 30  # perf-full-3n-skx-l2_IV
         - 32  # perf-full-3n-skx-l2_VI
         - 33  # perf-full-3n-skx-l2_VII
+        - 34  # perf-full-3n-skx-l2_VIII
         - 35  # perf-full-3n-skx-l2_IX
         - 36  # perf-full-3n-skx-l2_X
         - 37  # perf-full-3n-skx-l2_XI
+        - 38  # perf-full-3n-skx-memif
+        - 39  # perf-full-3n-skx-srv6-I
+        - 40  # perf-full-3n-skx-srv6-II
+        - 43  # perf-full-3n-skx-vhost-III
 
     vpp-perf-results-2n-skx:
       # TODO: Add data:
@@ -757,9 +765,16 @@
         - 19  # NDRPDR sel
     vpp-performance-changes-3n-hsw-cmp-2:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 20  # NDRPDR sel env 2
-        - 21  # NDRPDR sel env 2
-        - 22  # NDRPDR sel env 2
+        - 20  # NDRPDR sel env 4
+        - 21  # NDRPDR sel env 4
+        - 22  # NDRPDR sel env 4
+        - 23  # NDRPDR sel env 4
+        - 24  # NDRPDR sel env 4
+        - 25  # NDRPDR sel env 4
+        - 26  # NDRPDR sel env 4
+        - 27  # NDRPDR sel env 4
+        - 28  # NDRPDR sel env 4
+        - 29  # NDRPDR sel env 4
 
     vpp-performance-changes-3n-skx-h1:
       csit-vpp-perf-verify-1908_1-3n-skx:
@@ -796,17 +811,9 @@
         - 41  # NDRPDR sel
     vpp-performance-changes-3n-skx-cmp-2:
       csit-vpp-perf-report-iterative-2005-3n-skx:
-        # TODO: Replace
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel ??? all x710 failed
-        - 33  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
+        # TODO: Add data
+        - 42  # NDRPDR sel env 4
+        - 43  # NDRPDR sel env 4
 
     vpp-performance-changes-2n-skx-h1:
       csit-vpp-perf-verify-1908_1-2n-skx:
@@ -847,7 +854,11 @@
     vpp-performance-changes-2n-skx-cmp-2:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         # TODO: Add data
-        - 88  # NDRPDR sel env 2
+        - 88  # NDRPDR sel env 4
+        - 89  # NDRPDR sel env 4
+        - 90  # NDRPDR sel env 4
+        - 92  # NDRPDR sel env 4
+        - 93  # NDRPDR sel env 4
 
 #    vpp-performance-changes-nfv-2n-skx-ref:
 #      csit-vpp-perf-verify-2001-2n-skx:
@@ -858,6 +869,7 @@
 #        - 43  # NDRPDR sel
 #        - 38  # NDRPDR sel
 #        - 7   # NDRPDR sel
+#        - 78  # nf-density-sel
 #        - 83  # nf-density-sel
 
     vpp-performance-changes-2n-clx-ref:
@@ -886,8 +898,10 @@
         - 51  # NDRPDR sel
     vpp-performance-changes-2n-clx-cmp-2:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 62  # NDRPDR sel env 2
-        - 63  # NDRPDR sel env 2
+        - 62  # NDRPDR sel env 4
+        - 63  # NDRPDR sel env 4
+        - 64  # NDRPDR sel env 4
+        - 66  # NDRPDR sel env 4
 
     vpp-performance-changes-2n-dnv-h1:
       csit-vpp-perf-verify-1908-2n-dnv:
@@ -995,14 +1009,11 @@
         - 12  # NDRPDR sel
         - 20  # NDRPDR sel
         - 14  # NDRPDR sel
+        - 21  # NDRPDR sel
     vpp-performance-changes-3n-tsh-cmp-2:
-      # TODO: replace:
+      # TODO: Add data:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 9   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 14  # NDRPDR sel
+        - 23  # NDRPDR sel env 4
 
     vpp-soak-vs-ndr-2n-skx-ref:
       csit-vpp-perf-report-iterative-2005-2n-skx:
@@ -1680,120 +1691,6 @@
       hoverlabel:
         namelength: -1
 
-#    plot-cps:
-#      titlefont:
-#        size: 18
-#      xaxis:
-#        title: "<b>Test Cases [Index]</b>"
-#        titlefont:
-#          size: 16
-#        autorange: True
-#        fixedrange: False
-#        gridcolor: "rgb(230, 230, 230)"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(220, 220, 220)"
-#        tickmode: "linear"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      yaxis:
-#        title: "<b>Connections Per Second [cps]</b>"
-#        titlefont:
-#          size: 16
-#        gridcolor: "rgb(230, 230, 230)"
-#        hoverformat: ".4s"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        rangemode: "tozero"
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(220, 220, 220)"
-#        tickformat: ".3s"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      boxmode: "group"
-#      boxgroupgap: 0.5
-#      autosize: False
-#      margin:
-#        t: 50
-#        b: 20
-#        l: 80
-#        r: 20
-#      showlegend: True
-#      legend:
-#        orientation: "h"
-#        font:
-#          size: 16
-#      width: 700
-#      height: 800
-#      paper_bgcolor: "#fff"
-#      plot_bgcolor: "#fff"
-#      hoverlabel:
-#        namelength: -1
-#
-#    plot-rps:
-#      titlefont:
-#        size: 18
-#      xaxis:
-#        title: "<b>Test Cases [Index]</b>"
-#        titlefont:
-#          size: 16
-#        autorange: True
-#        fixedrange: False
-#        gridcolor: "rgb(230, 230, 230)"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(220, 220, 220)"
-#        tickmode: "linear"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      yaxis:
-#        title: "<b>Requests Per Second [rps]</b>"
-#        titlefont:
-#          size: 16
-#        gridcolor: "rgb(230, 230, 230)"
-#        hoverformat: ".4s"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        rangemode: "tozero"
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(230, 230, 230)"
-#        tickformat: ".3s"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      boxmode: "group"
-#      boxgroupgap: 0.5
-#      autosize: False
-#      margin:
-#        t: 50
-#        b: 20
-#        l: 80
-#        r: 20
-#      showlegend: True
-#      legend:
-#        orientation: "h"
-#        font:
-#          size: 16
-#      width: 700
-#      height: 800
-#      paper_bgcolor: "#fff"
-#      plot_bgcolor: "#fff"
-#      hoverlabel:
-#        namelength: -1
-
     plot-hoststack:
       titlefont:
         size: 16
@@ -2279,9 +2176,16 @@
       - 16  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
-      - 20  # NDRPDR sel env 2
-      - 21  # NDRPDR sel env 2
-      - 22  # NDRPDR sel env 2
+      - 20  # NDRPDR sel env 4
+      - 21  # NDRPDR sel env 4
+      - 22  # NDRPDR sel env 4
+      - 23  # NDRPDR sel env 4
+      - 24  # NDRPDR sel env 4
+      - 25  # NDRPDR sel env 4
+      - 26  # NDRPDR sel env 4
+      - 27  # NDRPDR sel env 4
+      - 28  # NDRPDR sel env 4
+      - 29  # NDRPDR sel env 4
       - 13  # MRR
     csit-vpp-perf-verify-2005-3n-hsw:
       - 3   # hoststack
@@ -2364,6 +2268,8 @@
       - 38  # NDRPDR sel
       - 39  # NDRPDR sel
       - 41  # NDRPDR sel
+      - 42  # NDRPDR sel env 4
+      - 43  # NDRPDR sel env 4
       - 6   # MRR sel
     csit-vpp-perf-report-coverage-2005-3n-skx:
       - 10  # perf-full-3n-skx-crypto_I
@@ -2380,6 +2286,7 @@
       - 20  # perf-full-3n-skx-ip4_IX
       - 24  # perf-full-3n-skx-ip6_I
       - 25  # perf-full-3n-skx-ip6_II
+      - 21  # perf-full-3n-skx-ip4tunnels-I
       - 22  # perf-full-3n-skx-ip4tunnels-II
       - 23  # perf-full-3n-skx-ip4tunnels-III
       - 26  # perf-full-3n-skx-ip6tunnels-I
@@ -2388,9 +2295,14 @@
       - 30  # perf-full-3n-skx-l2_IV
       - 32  # perf-full-3n-skx-l2_VI
       - 33  # perf-full-3n-skx-l2_VII
+      - 34  # perf-full-3n-skx-l2_VIII
       - 35  # perf-full-3n-skx-l2_IX
       - 36  # perf-full-3n-skx-l2_X
       - 37  # perf-full-3n-skx-l2_XI
+      - 38  # perf-full-3n-skx-memif
+      - 39  # perf-full-3n-skx-srv6-I
+      - 40  # perf-full-3n-skx-srv6-II
+      - 43  # perf-full-3n-skx-vhost-III
 
     csit-vpp-perf-verify-1908_1-2n-skx:
       - 39  # NDRPDR sel - new1908.1
@@ -2427,7 +2339,11 @@
       - 75  # NDRPDR sel
       - 76  # NDRPDR sel
       - 73  # NDRPDR sel
-      - 88  # NDRPDR sel env 2
+      - 88  # NDRPDR sel env 4
+      - 89  # NDRPDR sel env 4
+      - 90  # NDRPDR sel env 4
+      - 92  # NDRPDR sel env 4
+      - 93  # NDRPDR sel env 4
       - 42  # MRR sel
       - 48  # Reconf
       - 50  # Reconf
@@ -2441,6 +2357,7 @@
       - 66  # Reconf
       - 49  # Soak
       - 54  # Soak
+      - 78  # nf-density-sel
       - 83  # nf-density-sel
     csit-vpp-perf-report-coverage-2005-2n-skx:
       - 11  # perf-full-2n-skx-ip4_I
@@ -2488,8 +2405,10 @@
       - 43  # NDRPDR sel
       - 50  # NDRPDR sel
       - 51  # NDRPDR sel
-      - 62  # NDRPDR sel env 2
-      - 63  # NDRPDR sel env 2
+      - 62  # NDRPDR sel env 4
+      - 63  # NDRPDR sel env 4
+      - 64  # NDRPDR sel env 4
+      - 66  # NDRPDR sel env 4
       - 12  # MRR
       - 42  # Reconf
       - 45  # Reconf
@@ -2556,6 +2475,8 @@
       - 12  # NDRPDR sel
       - 20  # NDRPDR sel
       - 14  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel env 4
       - 10  # MRR sel
 
     csit-vpp-perf-verify-1908-3n-dnv:
@@ -3266,17 +3187,17 @@
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 3
-      compare: 4
+      reference: 4
+      compare: 3
     - title: "Diff2"
       reference: 2
-      compare: 3
+      compare: 4
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-3n-hsw-1t1c-pdr-rca1.yaml"
@@ -3284,9 +3205,9 @@
 #      data: "rca/rca-2005-3n-hsw-1t1c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3302,17 +3223,17 @@
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 3
-      compare: 4
+      reference: 4
+      compare: 3
     - title: "Diff2"
       reference: 2
-      compare: 3
+      compare: 4
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-3n-hsw-2t2c-pdr-rca1.yaml"
@@ -3320,9 +3241,9 @@
 #      data: "rca/rca-2005-3n-hsw-2t2c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3338,17 +3259,18 @@
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 3
-      compare: 4
+    - title: "Diff1"
+      reference: 4
+      compare: 3
     - title: "Diff2"
       reference: 2
-      compare: 3
+      compare: 4
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-3n-hsw-1t1c-ndr-rca1.yaml"
@@ -3356,9 +3278,9 @@
 #      data: "rca/rca-2005-3n-hsw-1t1c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3374,17 +3296,17 @@
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 3
-      compare: 4
+      reference: 4
+      compare: 3
     - title: "Diff2"
       reference: 2
-      compare: 3
+      compare: 4
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-3n-hsw-2t2c-ndr-rca1.yaml"
@@ -3392,155 +3314,155 @@
 #      data: "rca/rca-2005-3n-hsw-2t2c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
-## VPP Performance Changes 3n-skx 2t1c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-skx 2t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-skx-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-skx-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-skx-2t1c-pdr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-skx-2t1c-pdr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-skx 4t2c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-skx 4t2c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-skx-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-skx-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-skx-4t2c-pdr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-skx-4t2c-pdr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-skx 2t1c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-skx 2t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-skx-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-skx-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-skx-2t1c-ndr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-skx-2t1c-ndr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-skx 4t2c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-skx 4t2c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-skx-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-skx-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-skx-4t2c-ndr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-skx-4t2c-ndr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
+# VPP Performance Changes 3n-skx 2t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-skx 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-skx-h1"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-skx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
+  comparisons:
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-skx-2t1c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-skx-2t1c-pdr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
+
+# VPP Performance Changes 3n-skx 4t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-skx 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-skx-h1"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-skx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
+  comparisons:
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-skx-4t2c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-skx-4t2c-pdr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
+
+# VPP Performance Changes 3n-skx 2t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-skx 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-skx-h1"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-skx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
+  comparisons:
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-skx-2t1c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-skx-2t1c-ndr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
+
+# VPP Performance Changes 3n-skx 4t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-skx 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-skx-h1"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-skx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
+  comparisons:
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-skx-4t2c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-skx-4t2c-ndr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Performance Changes 2n-skx 2t1c pdr
 - type: "table"
@@ -3554,17 +3476,17 @@
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 3
-      compare: 4
+      reference: 4
+      compare: 3
     - title: "Diff2"
       reference: 2
-      compare: 3
+      compare: 4
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-2n-skx-2t1c-pdr-rca1.yaml"
@@ -3572,9 +3494,9 @@
 #      data: "rca/rca-2005-2n-skx-2t1c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3590,17 +3512,17 @@
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 3
-      compare: 4
+      reference: 4
+      compare: 3
     - title: "Diff2"
       reference: 2
-      compare: 3
+      compare: 4
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-2n-skx-4t2c-pdr-rca1.yaml"
@@ -3608,9 +3530,9 @@
 #      data: "rca/rca-2005-2n-skx-4t2c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3626,17 +3548,17 @@
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 3
-      compare: 4
+      reference: 4
+      compare: 3
     - title: "Diff2"
       reference: 2
-      compare: 3
+      compare: 4
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-2n-skx-2t1c-ndr-rca1.yaml"
@@ -3644,9 +3566,9 @@
 #      data: "rca/rca-2005-2n-skx-2t1c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3662,17 +3584,17 @@
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 3
-      compare: 4
+      reference: 4
+      compare: 3
     - title: "Diff2"
       reference: 2
-      compare: 3
+      compare: 4
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-2n-skx-4t2c-ndr-rca1.yaml"
@@ -3680,9 +3602,9 @@
 #      data: "rca/rca-2005-2n-skx-4t2c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3696,17 +3618,17 @@
   columns:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 2
-      compare: 3
+      reference: 3
+      compare: 2
     - title: "Diff2"
       reference: 1
-      compare: 2
+      compare: 3
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-2n-clx-2t1c-pdr-rca1.yaml"
@@ -3714,9 +3636,9 @@
 #      data: "rca/rca-2005-2n-clx-2t1c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3730,17 +3652,17 @@
   columns:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 2
-      compare: 3
+      reference: 3
+      compare: 2
     - title: "Diff2"
       reference: 1
-      compare: 2
+      compare: 3
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-2n-clx-4t2c-pdr-rca1.yaml"
@@ -3748,9 +3670,9 @@
 #      data: "rca/rca-2005-2n-clx-4t2c-pdr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3764,17 +3686,17 @@
   columns:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 2
-      compare: 3
+      reference: 3
+      compare: 2
     - title: "Diff2"
       reference: 1
-      compare: 2
+      compare: 3
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-2n-clx-2t1c-ndr-rca1.yaml"
@@ -3782,9 +3704,9 @@
 #      data: "rca/rca-2005-2n-clx-2t1c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3798,17 +3720,17 @@
   columns:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 2
-      compare: 3
+      reference: 3
+      compare: 2
     - title: "Diff2"
       reference: 1
-      compare: 2
+      compare: 3
 #  rca:
 #    - title: "RCA1"
 #      data: "rca/rca-2005-2n-clx-4t2c-ndr-rca1.yaml"
@@ -3816,9 +3738,9 @@
 #      data: "rca/rca-2005-2n-clx-4t2c-ndr-rca2.yaml"
   legend:
     - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
 #    - 'RCA1 - root cause analysis reference for Diff1.'
 #    - 'RCA2 - root cause analysis reference for Diff2.'
 
@@ -3832,7 +3754,7 @@
   columns:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-3"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
@@ -3853,7 +3775,7 @@
   columns:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-3"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
@@ -3874,7 +3796,7 @@
   columns:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-3"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
@@ -3895,7 +3817,7 @@
   columns:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-3"
+    - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
@@ -4090,149 +4012,149 @@
     - "1908, 2001, 2005 - VPP versions tested."
     - "Diff - difference between 2001 and 2005 VPP version."
 
-## VPP Performance Changes 3n-tsh 1t1c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-tsh 1t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-tsh-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-tsh-1t1c-pdr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-tsh-1t1c-pdr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-tsh 2t2c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-tsh 2t2c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-tsh-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-tsh-2t2c-pdr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-tsh-2t2c-pdr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-tsh 1t1c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-tsh 1t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-tsh-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-tsh-1t1c-ndr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-tsh-1t1c-ndr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-tsh 2t2c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-tsh 2t2c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-tsh-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-tsh-2t2c-ndr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-tsh-2t2c-ndr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
+# VPP Performance Changes 3n-tsh 1t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-tsh 1t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C'"
+  columns:
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-tsh-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
+  comparisons:
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-tsh-1t1c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-tsh-1t1c-pdr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
+
+# VPP Performance Changes 3n-tsh 2t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-tsh 2t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C'"
+  columns:
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-tsh-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
+  comparisons:
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-tsh-2t2c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-tsh-2t2c-pdr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
+
+# VPP Performance Changes 3n-tsh 1t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-tsh 1t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C'"
+  columns:
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-tsh-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
+  comparisons:
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-tsh-1t1c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-tsh-1t1c-ndr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
+
+# VPP Performance Changes 3n-tsh 2t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-tsh 2t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C'"
+  columns:
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-3n-tsh-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
+  comparisons:
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  rca:
+#    - title: "RCA1"
+#      data: "rca/rca-2005-3n-tsh-2t2c-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-3n-tsh-2t2c-ndr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
 - type: "table"