C-Dash: Add VPP Device coverage data

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

2 files changed, 8 insertions, 93 deletions

diff --git a/csit.infra.dash/app/cdash/data/data.py b/csit.infra.dash/app/cdash/data/data.py
index c8d5907200..a0d698e2b0 100644
--- a/csit.infra.dash/app/cdash/data/data.py
+++ b/csit.infra.dash/app/cdash/data/data.py
@@ -122,7 +122,6 @@ class Data:
     def _create_dataframe_from_parquet(
             path, partition_filter=None,
             columns=None,
-            categories=None,
             validate_schema=False,
             last_modified_begin=None,
             last_modified_end=None,
@@ -141,8 +140,6 @@ class Data:
             extracted from S3. This function MUST return a bool, True to read
             the partition or False to ignore it. Ignored if dataset=False.
         :param columns: Names of columns to read from the file(s).
-        :param categories: List of columns names that should be returned as
-            pandas.Categorical.
         :param validate_schema: Check that individual file schemas are all the
             same / compatible. Schemas within a folder prefix should all be the
             same. Disable if you have schemas that are different and want to
@@ -156,7 +153,6 @@ class Data:
         :type path: Union[str, List[str]]
         :type partition_filter: Callable[[Dict[str, str]], bool], optional
         :type columns: List[str], optional
-        :type categories: List[str], optional
         :type validate_schema: bool, optional
         :type last_modified_begin: datetime, optional
         :type last_modified_end: datetime, optional
@@ -177,7 +173,6 @@ class Data:
                 use_threads=True,
                 dataset=True,
                 columns=columns,
-                categories=categories,
                 partition_filter=partition_filter,
                 last_modified_begin=last_modified_begin,
                 last_modified_end=last_modified_end
@@ -234,7 +229,6 @@ class Data:
                 path=data_set["path"],
                 partition_filter=partition_filter,
                 columns=data_set.get("columns", None),
-                categories=data_set.get("categories", None),
                 days=time_period
             )
 
diff --git a/csit.infra.dash/app/cdash/data/data.yaml b/csit.infra.dash/app/cdash/data/data.yaml
index 975241b84e..8beee0bacc 100644
--- a/csit.infra.dash/app/cdash/data/data.yaml
+++ b/csit.infra.dash/app/cdash/data/data.yaml
@@ -7,9 +7,6 @@
     - build
     - start_time
     - duration
-  categories:
-    - job
-    - build
 - data_type: trending
   partition: test_type
   partition_name: mrr
@@ -28,12 +25,6 @@
     - result_receive_rate_rate_stdev
     - result_receive_rate_rate_unit
     - telemetry
-  categories:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - version
 - data_type: trending
   partition: test_type
   partition_name: ndrpdr
@@ -63,12 +54,6 @@
     - result_latency_forward_pdr_10_hdrh
     - result_latency_forward_pdr_0_hdrh
     - telemetry
-  categories:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - version
 - data_type: trending
   partition: test_type
   partition_name: hoststack
@@ -91,13 +76,6 @@
     - telemetry
     - test_id
     - version
-  categories:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - tg_type
-    - version
 - data_type: iterative
   partition: test_type
   partition_name: mrr
@@ -117,12 +95,6 @@
     - result_receive_rate_rate_stdev
     - result_receive_rate_rate_unit
     - result_receive_rate_rate_values
-  categories:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - version
 - data_type: iterative
   partition: test_type
   partition_name: mrr
@@ -142,12 +114,6 @@
     - result_receive_rate_rate_stdev
     - result_receive_rate_rate_unit
     - result_receive_rate_rate_values
-  categories:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - version
 - data_type: iterative
   partition: test_type
   partition_name: mrr
@@ -167,12 +133,6 @@
     - result_receive_rate_rate_stdev
     - result_receive_rate_rate_unit
     - result_receive_rate_rate_values
-  categories:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - version
 - data_type: iterative
   partition: test_type
   partition_name: ndrpdr
@@ -202,12 +162,6 @@
     - result_latency_forward_pdr_50_unit
     - result_latency_forward_pdr_10_hdrh
     - result_latency_forward_pdr_0_hdrh
-  categories:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - version
 - data_type: iterative
   partition: test_type
   partition_name: ndrpdr
@@ -237,12 +191,6 @@
     - result_latency_forward_pdr_50_unit
     - result_latency_forward_pdr_10_hdrh
     - result_latency_forward_pdr_0_hdrh
-  categories:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - version
 - data_type: iterative
   partition: test_type
   partition_name: ndrpdr
@@ -272,12 +220,6 @@
     - result_latency_forward_pdr_50_unit
     - result_latency_forward_pdr_10_hdrh
     - result_latency_forward_pdr_0_hdrh
-  categories:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - version
 - data_type: iterative
   partition: test_type
   partition_name: hoststack
@@ -301,13 +243,6 @@
     - telemetry
     - test_id
     - version
-  categories:
-    - job
-    - build
-    - dut_type
-    - dut_version
-    - tg_type
-    - version
 - data_type: coverage
   partition: test_type
   partition_name: ndrpdr
@@ -335,30 +270,16 @@
     - result_latency_forward_pdr_90_hdrh
     - result_latency_forward_pdr_50_hdrh
     - result_latency_forward_pdr_10_hdrh
-  categories:
+- data_type: coverage
+  partition: test_type
+  partition_name: device
+  release: rls2302
+  path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2302
+  columns:
     - job
     - build
     - dut_type
     - dut_version
-    - tg_type
+    - passed
+    - test_id
     - version
-# - data_type: coverage
-#   partition: test_type
-#   partition_name: device
-#   release: rls2302
-#   path: s3://fdio-docs-s3-cloudfront-index/csit/parquet/coverage_rls2302
-#   columns:
-#     - job
-#     - build
-#     - dut_type
-#     - dut_version
-#     - start_time
-#     - passed
-#     - test_id
-#     - version
-#   categories:
-#     - job
-#     - build
-#     - dut_type
-#     - dut_version
-#     - version