[COST-7104] Fix node aggregation (#5845)

Author: myersCody

koku/api/report/ocp/provider_map.py

@@ -905,6 +905,11 @@ def __init__(self, provider, report_type, schema_name):
                             ),
                             "gpu_count_units": Value("GPUs", output_field=CharField()),
                         },
+                        "aggregate_ranks_exclusions": [
+                            "gpu_model",
+                            "gpu_vendor",
+                            "node",
+                        ],  # _aggregate_ranks_over_limit
                         "delta_key": {},
                         "filter": [],
                         "group_by": ["gpu_name"],

koku/api/report/queries.py

@@ -234,11 +234,6 @@ def is_aws(self):
         """Determine if we are working with an AWS API."""
         return "aws" in self.parameters.request.path
 
-    @property
-    def is_gpu(self):
-        """Determine if we are working with a GPU API."""
-        return "gpu" in self.parameters.request.path
-
     def initialize_totals(self):
         """Initialize the total response column values."""
         query_sum = {}
@@ -1472,7 +1467,10 @@ def _aggregate_ranks_over_limit(self, data_frame, group_by):
         drop_columns = group_by + ["rank", "source_uuid"]
         groups = ["date"]
 
-        skip_columns = ["source_uuid", "gcp_project_alias", "clusters", "gpu_vendor", "gpu_model"]
+        skip_columns = ["source_uuid", "gcp_project_alias", "clusters"]
+        aggregate_ranks_exclusions = self._mapper.report_type_map.get("aggregate_ranks_exclusions", [])
+        skip_columns.extend(aggregate_ranks_exclusions)
+
         aggs = {
             col: ["max"] if "units" in col else ["sum"] for col in self.report_annotations if col not in skip_columns
         }
@@ -1509,10 +1507,8 @@ def _aggregate_ranks_over_limit(self, data_frame, group_by):
         others_data_frame["source_uuid"] = [source_uuids] * len(others_data_frame)
         if self.is_openshift:
             others_data_frame["clusters"] = [clusters] * len(others_data_frame)
-        if self.is_gpu:
-            others_data_frame["gpu_model"] = other_str
-            others_data_frame["gpu_vendor"] = other_str
-
+        for column in aggregate_ranks_exclusions:
+            others_data_frame[column] = other_str
         return others_data_frame
 
     def date_group_data(self, data_list):