Report: fix data set names

Signed-off-by: Tibor Frank <tifrank@cisco.com>
Change-Id: I67cbf7e7c1be4a51b62bf0ae8e860cda73e76d6b

2 files changed, 97 insertions, 97 deletions

diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 5a0701f78c..8e65323897 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -61,7 +61,7 @@
 
   # 2n-zn2
 
-  vpp-2n-zn2-hist-iter-new-env:
+  vpp-2n-zn2-hist-iter:
     csit-vpp-perf-report-iterative-2206-2n-zn2:
       - 6   # rls2202.rel NDRPDR iter env 10
       - 7   # rls2202.rel NDRPDR iter env 10
@@ -102,7 +102,7 @@
     csit-vpp-perf-report-iterative-2206-2n-zn2:
       - 51  # rls2206.rel NDRPDR iter env 10
 
-  vpp-2n-zn2-hist-iter-mrr-new-env:
+  vpp-2n-zn2-hist-iter-mrr:
     csit-vpp-perf-report-iterative-2206-2n-zn2:
       - 22  # rls2202.rel MRR iter env 10
 
@@ -168,7 +168,7 @@
 
   # 2n-clx
 
-  vpp-2n-clx-hist-iter-new-env:
+  vpp-2n-clx-hist-iter:
     csit-vpp-perf-report-iterative-2206-2n-clx:
       - 44  # rls2202.rel NDRPDR iter env 10
       - 86  # rls2202.rel NDRPDR iter env 10
@@ -229,7 +229,7 @@
     csit-vpp-perf-report-iterative-2206-2n-clx:
       - 116 # rls2206.rel NDRPDR iter env 10
 
-  vpp-2n-clx-hist-iter-mrr-new-env:
+  vpp-2n-clx-hist-iter-mrr:
     csit-vpp-perf-report-iterative-2206-2n-clx:
       - 43  # rls2202.rel MRR iter env 10
       - 160 # rls2202.rel MRR iter env 10 NAT44
@@ -357,7 +357,7 @@
 
   # 3n-tsh
 
-  vpp-3n-tsh-hist-iter-new-env:
+  vpp-3n-tsh-hist-iter:
     csit-vpp-perf-report-iterative-2206-3n-tsh:
       - 4   # rls2202.rel NDRPDR iter env 10
       - 5   # rls2202.rel NDRPDR iter env 10
@@ -398,7 +398,7 @@
     csit-vpp-perf-report-iterative-2206-3n-tsh:
       - 37  # rls2206.rel NDRPDR iter env 10
 
-  vpp-3n-tsh-hist-iter-mrr-new-env:
+  vpp-3n-tsh-hist-iter-mrr:
     csit-vpp-perf-report-iterative-2206-3n-tsh:
       - 3   # rls2202.rel MRR iter env 10
 
@@ -459,7 +459,7 @@
 
   # 2n-tx2
 
-  vpp-2n-tx2-hist-iter-new-env:
+  vpp-2n-tx2-hist-iter:
     csit-vpp-perf-report-iterative-2206-2n-tx2:
       - 4   # rls2202.rel NDRPDR iter env 10
       - 5   # rls2202.rel NDRPDR iter env 10
@@ -561,7 +561,7 @@
 
   # 3n-dnv
 
-  vpp-3n-dnv-hist-iter-new-env:
+  vpp-3n-dnv-hist-iter:
     csit-vpp-perf-report-iterative-2206-3n-dnv:
       - 4   # rls2202.rel NDRPDR iter env 10
       - 5   # rls2202.rel NDRPDR iter env 10
@@ -597,7 +597,7 @@
     csit-vpp-perf-report-iterative-2206-3n-dnv:
       - 24  # rls2206.rel NDRPDR iter env 10
 
-  vpp-3n-dnv-hist-iter-mrr-new-env:
+  vpp-3n-dnv-hist-iter-mrr:
     csit-vpp-perf-report-iterative-2206-3n-dnv:
       - 3   # rls2202.rel MRR iter env 10
 
@@ -622,7 +622,7 @@
 
   # 2n-dnv
 
-  vpp-2n-dnv-hist-iter-new-env:
+  vpp-2n-dnv-hist-iter:
     csit-vpp-perf-report-iterative-2206-2n-dnv:
       - 4   # rls2202.rel NDRPDR iter env 10
       - 5   # rls2202.rel NDRPDR iter env 10
@@ -658,7 +658,7 @@
     csit-vpp-perf-report-iterative-2206-2n-dnv:
       - 22  # rls2206.rel NDRPDR iter env 10
 
-  vpp-2n-dnv-hist-iter-mrr-new-env:
+  vpp-2n-dnv-hist-iter-mrr:
     csit-vpp-perf-report-iterative-2206-2n-dnv:
       - 3   # rls2202.rel MRR iter env 10
 
@@ -739,7 +739,7 @@
 
   # 2n-icx
 
-  vpp-2n-icx-hist-iter-new-env:
+  vpp-2n-icx-hist-iter:
     csit-vpp-perf-report-iterative-2206-2n-icx:
       - 107 # rls2202.rel NDRPDR iter env 10
       - 108 # rls2202.rel NDRPDR iter env 10
@@ -897,7 +897,7 @@
 
   # 3n-icx
 
-  vpp-3n-icx-hist-iter-new-env:
+  vpp-3n-icx-hist-iter:
     csit-vpp-perf-report-iterative-2206-3n-icx:
       - 60  # rls2202.rel NDRPDR iter env 10
       - 61  # rls2202.rel NDRPDR iter env 10
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 6a9d8ece21..aa491544ad 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -789,7 +789,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -820,7 +820,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -851,7 +851,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -882,7 +882,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -913,7 +913,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -944,7 +944,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -975,7 +975,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1006,7 +1006,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1037,7 +1037,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1068,7 +1068,7 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1099,7 +1099,7 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1130,7 +1130,7 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1161,7 +1161,7 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1192,7 +1192,7 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1223,7 +1223,7 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1254,7 +1254,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1285,7 +1285,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1316,7 +1316,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1347,7 +1347,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1378,7 +1378,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1409,7 +1409,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1508,7 +1508,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1539,7 +1539,7 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1570,7 +1570,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1601,7 +1601,7 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1632,7 +1632,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1663,7 +1663,7 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1694,7 +1694,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1725,7 +1725,7 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1756,7 +1756,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1787,7 +1787,7 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1818,7 +1818,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1849,7 +1849,7 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1880,7 +1880,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1911,7 +1911,7 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1942,7 +1942,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -1973,7 +1973,7 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2004,7 +2004,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2035,7 +2035,7 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2066,7 +2066,7 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2097,7 +2097,7 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2128,7 +2128,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-new-env"
+      data-set: "vpp-2n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2159,7 +2159,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-new-env"
+      data-set: "vpp-2n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2190,7 +2190,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-new-env"
+      data-set: "vpp-2n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2221,7 +2221,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-new-env"
+      data-set: "vpp-2n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2252,7 +2252,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-new-env"
+      data-set: "vpp-3n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2283,7 +2283,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-new-env"
+      data-set: "vpp-3n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2314,7 +2314,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-new-env"
+      data-set: "vpp-3n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2345,7 +2345,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-new-env"
+      data-set: "vpp-3n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2376,7 +2376,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2407,7 +2407,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2438,7 +2438,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2469,7 +2469,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2500,7 +2500,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2531,7 +2531,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2562,7 +2562,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2593,7 +2593,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
     - title: "2206.0-11"
@@ -2724,7 +2724,7 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -2755,7 +2755,7 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -2786,7 +2786,7 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -2817,7 +2817,7 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -2848,7 +2848,7 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -2879,7 +2879,7 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -2910,7 +2910,7 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -2941,7 +2941,7 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -2972,7 +2972,7 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3003,7 +3003,7 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3034,7 +3034,7 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3065,7 +3065,7 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3096,7 +3096,7 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-zn2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3127,7 +3127,7 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-zn2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3158,7 +3158,7 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-zn2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3189,7 +3189,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3220,7 +3220,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3251,7 +3251,7 @@
   filter: "'4T4C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3282,7 +3282,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3313,7 +3313,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3344,7 +3344,7 @@
   filter: "'4T4C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3375,7 +3375,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-tsh-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3406,7 +3406,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-tsh-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3437,7 +3437,7 @@
   filter: "'4T4C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-tsh-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3468,7 +3468,7 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-tx2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3499,7 +3499,7 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-tx2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
     - title: "2206.0-11"
@@ -3530,7 +3530,7 @@
   filter: "'4T4C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-tx2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
     - title: "2206.0-11"