[COST-6089] - Fix node hour tag rates (#5551)

* [COST-6089] - Fix node hour tag rates

Author: lcouzens

koku/api/metrics/constants.py

@@ -36,7 +36,6 @@
     OCP_METRIC_MEM_GB_EFFECTIVE_USAGE_HOUR: MEM,
     OCP_METRIC_STORAGE_GB_USAGE_MONTH: STORAGE,
     OCP_METRIC_STORAGE_GB_REQUEST_MONTH: STORAGE,
-    OCP_NODE_CORE_HOUR: CPU,
     OCP_CLUSTER_CORE_HOUR: CPU,
 }
 
@@ -83,9 +82,13 @@
     OCP_CLUSTER_CORE_HOUR,
 )
 
-COST_MODEL_MONTHLY_RATES = (
+COST_MODEL_NODE_RATES = {
     OCP_NODE_MONTH,
     OCP_NODE_CORE_MONTH,
+    OCP_NODE_CORE_HOUR,
+}
+
+COST_MODEL_MONTHLY_RATES = (
     OCP_CLUSTER_MONTH,
     OCP_PVC_MONTH,
     OCP_VM_MONTH,

koku/masu/database/ocp_report_db_accessor.py

@@ -532,7 +532,7 @@ def populate_monthly_cost_sql(self, cost_type, rate_type, rate, start_date, end_
         LOG.info(log_json(msg="populating monthly costs", context=ctx))
         self._prepare_and_execute_raw_sql_query(table_name, sql, sql_params, operation="INSERT")
 
-    def populate_monthly_tag_cost_sql(  # noqa: C901
+    def populate_tag_cost_sql(
         self, cost_type, rate_type, tag_key, case_dict, start_date, end_date, distribution, provider_uuid
     ):
         """
@@ -563,8 +563,8 @@ def populate_monthly_tag_cost_sql(  # noqa: C901
         cpu_case, memory_case, volume_case = case_dict.get("cost")
         labels = case_dict.get("labels")
 
-        if cost_type in ("Node", "Node_Core_Month"):
-            sql = pkgutil.get_data("masu.database", "sql/openshift/cost_model/monthly_cost_node_by_tag.sql")
+        if "Node" in cost_type:
+            sql = pkgutil.get_data("masu.database", "sql/openshift/cost_model/node_cost_by_tag.sql")
         elif cost_type == "PVC":
             sql = pkgutil.get_data(
                 "masu.database", "sql/openshift/cost_model/monthly_cost_persistentvolumeclaim_by_tag.sql"
@@ -593,7 +593,7 @@ def populate_monthly_tag_cost_sql(  # noqa: C901
             sql_params["unallocated_cost_model_memory_cost"] = unallocated_memory_case
             sql_params["unallocated_cost_model_volume_cost"] = unallocated_volume_case
 
-        LOG.info(log_json(msg="populating monthly tag costs", context=ctx))
+        LOG.info(log_json(msg="populating tag costs", context=ctx))
         self._prepare_and_execute_raw_sql_query(table_name, sql, sql_params, operation="INSERT")
 
     def populate_usage_costs(self, rate_type, rates, start_date, end_date, provider_uuid):

koku/masu/database/sql/openshift/cost_model/default_infrastructure_tag_rates.sql

@@ -79,7 +79,6 @@ FROM (
             WHEN {{metric}}='memory_gb_effective_usage_per_hour' THEN sum(lids.pod_effective_usage_memory_gigabyte_hours)
             WHEN {{metric}}='storage_gb_usage_per_month' THEN sum(lids.persistentvolumeclaim_usage_gigabyte_months)
             WHEN {{metric}}='storage_gb_request_per_month' THEN sum(lids.volume_request_storage_gigabyte_months)
-            WHEN {{metric}}='node_core_cost_per_hour' THEN sum(lids.pod_effective_usage_cpu_core_hours)
         END as usage,
         lids.cost_category_id
     FROM {{schema | sqlsafe}}.reporting_ocpusagelineitem_daily_summary AS lids

koku/masu/database/sql/openshift/cost_model/default_supplementary_tag_rates.sql

@@ -79,7 +79,6 @@ FROM (
             WHEN {{metric}}='memory_gb_effective_usage_per_hour' THEN sum(lids.pod_effective_usage_memory_gigabyte_hours)
             WHEN {{metric}}='storage_gb_usage_per_month' THEN sum(lids.persistentvolumeclaim_usage_gigabyte_months)
             WHEN {{metric}}='storage_gb_request_per_month' THEN sum(lids.volume_request_storage_gigabyte_months)
-            WHEN {{metric}}='node_core_cost_per_hour' THEN sum(lids.pod_effective_usage_cpu_core_hours)
         END as usage,
         lids.cost_category_id
     FROM {{schema | sqlsafe}}.reporting_ocpusagelineitem_daily_summary AS lids

koku/masu/database/sql/openshift/cost_model/infrastructure_tag_rates.sql

@@ -78,7 +78,6 @@ FROM (
             WHEN {{metric}}='memory_gb_effective_usage_per_hour' THEN sum(lids.pod_effective_usage_memory_gigabyte_hours)
             WHEN {{metric}}='storage_gb_usage_per_month' THEN sum(lids.persistentvolumeclaim_usage_gigabyte_months)
             WHEN {{metric}}='storage_gb_request_per_month' THEN sum(lids.volume_request_storage_gigabyte_months)
-            WHEN {{metric}}='node_core_cost_per_hour' THEN sum(lids.pod_effective_usage_cpu_core_hours)
         END as usage,
         cost_category_id
     FROM {{schema | sqlsafe}}.reporting_ocpusagelineitem_daily_summary AS lids

koku/masu/database/sql/openshift/cost_model/monthly_cost_node_by_tag.sql renamed to koku/masu/database/sql/openshift/cost_model/node_cost_by_tag.sql

@@ -78,7 +78,6 @@ FROM (
             WHEN {{metric}}='memory_gb_effective_usage_per_hour' THEN sum(lids.pod_effective_usage_memory_gigabyte_hours)
             WHEN {{metric}}='storage_gb_usage_per_month' THEN sum(lids.persistentvolumeclaim_usage_gigabyte_months)
             WHEN {{metric}}='storage_gb_request_per_month' THEN sum(lids.volume_request_storage_gigabyte_months)
-            WHEN {{metric}}='node_core_cost_per_hour' THEN sum(lids.pod_effective_usage_cpu_core_hours)
         END as usage,
         lids.cost_category_id
     FROM {{schema | sqlsafe}}.reporting_ocpusagelineitem_daily_summary AS lids