[COST-5449] - Switch code to point at new EC2 table (#5318)

Author: lcouzens

koku/api/report/aws/provider_map.py

@@ -20,7 +20,7 @@
 from reporting.provider.aws.models import AWSComputeSummaryByAccountP
 from reporting.provider.aws.models import AWSComputeSummaryP
 from reporting.provider.aws.models import AWSCostEntryLineItemDailySummary
-from reporting.provider.aws.models import AWSCostEntryLineItemSummaryByEC2Compute
+from reporting.provider.aws.models import AWSCostEntryLineItemSummaryByEC2ComputeP
 from reporting.provider.aws.models import AWSCostSummaryByAccountP
 from reporting.provider.aws.models import AWSCostSummaryByRegionP
 from reporting.provider.aws.models import AWSCostSummaryByServiceP
@@ -378,7 +378,7 @@ def __init__(self, provider, report_type, schema_name, cost_type, markup_cost="m
                         "usage_units_fallback": "Hrs",
                         "sum_columns": ["usage", "cost_total", "infra_total", "sup_total"],
                         "default_ordering": {"resource_id": "desc"},
-                        "tables": {"query": AWSCostEntryLineItemSummaryByEC2Compute},
+                        "tables": {"query": AWSCostEntryLineItemSummaryByEC2ComputeP},
                         "default_time_period": {
                             "time_scope_value": "-1",
                             "time_scope_units": "month",
@@ -562,7 +562,7 @@ def __init__(self, provider, report_type, schema_name, cost_type, markup_cost="m
                 ("org_unit_id",): AWSComputeSummaryByAccountP,
             },
             "ec2_compute": {
-                "default": AWSCostEntryLineItemSummaryByEC2Compute,
+                "default": AWSCostEntryLineItemSummaryByEC2ComputeP,
             },
             "storage": {
                 "default": AWSStorageSummaryP,

koku/api/report/test/util/baker_recipes.py

@@ -43,7 +43,7 @@ def decimal_yielder():
 )
 
 aws_ec2_compute_summary = Recipe(
-    "AWSCostEntryLineItemSummaryByEC2Compute",
+    "AWSCostEntryLineItemSummaryByEC2ComputeP",
     resource_id=cycle(f"i-000000{i}" for i in range(AWS_CONSTANTS.length - 1)),
     instance_type=cycle(AWS_CONSTANTS["instance_types"]),
     operating_system=cycle(AWS_CONSTANTS["operating_systems"]),

koku/api/resource_types/aws_ec2_compute_instances/view.py

@@ -17,14 +17,14 @@
 from api.common.pagination import ResourceTypeViewPaginator
 from api.common.permissions.aws_access import AwsAccessPermission
 from api.resource_types.serializers import ResourceTypeSerializer
-from reporting.provider.aws.models import AWSCostEntryLineItemSummaryByEC2Compute
+from reporting.provider.aws.models import AWSCostEntryLineItemSummaryByEC2ComputeP
 
 
 class AWSEC2ComputeInstanceView(generics.ListAPIView):
     """API GET list view for AWS EC2 compute instances."""
 
     queryset = (
-        AWSCostEntryLineItemSummaryByEC2Compute.objects.annotate(
+        AWSCostEntryLineItemSummaryByEC2ComputeP.objects.annotate(
             value=F("resource_id"), ec2_instance_name=Coalesce(F("instance_name"), "resource_id")
         )
         .values("value", "ec2_instance_name")

koku/api/resource_types/aws_ec2_compute_os/view.py

@@ -16,14 +16,14 @@
 from api.common.pagination import ResourceTypeViewPaginator
 from api.common.permissions.aws_access import AwsAccessPermission
 from api.resource_types.serializers import ResourceTypeSerializer
-from reporting.provider.aws.models import AWSCostEntryLineItemSummaryByEC2Compute
+from reporting.provider.aws.models import AWSCostEntryLineItemSummaryByEC2ComputeP
 
 
 class AWSEC2ComputeOperatingSystemView(generics.ListAPIView):
     """API GET list view for AWS EC2 compute operating systems."""
 
     queryset = (
-        AWSCostEntryLineItemSummaryByEC2Compute.objects.annotate(value=F("operating_system"))
+        AWSCostEntryLineItemSummaryByEC2ComputeP.objects.annotate(value=F("operating_system"))
         .values("value")
         .distinct()
         .filter(operating_system__isnull=False)

koku/masu/database/__init__.py

@@ -7,7 +7,7 @@
 AWS_CUR_TABLE_MAP = {
     "bill": "reporting_awscostentrybill",
     "line_item_daily_summary": "reporting_awscostentrylineitem_daily_summary",
-    "ec2_compute_summary": "reporting_awscostentrylineitem_summary_by_ec2_compute",
+    "ec2_compute_summary": "reporting_awscostentrylineitem_summary_by_ec2_compute_p",
     "tags_summary": "reporting_awstags_summary",
     "category_summary": "reporting_awscategory_summary",
     "ocp_on_aws_daily_summary": "reporting_ocpawscostlineitem_daily_summary_p",

koku/masu/database/trino_sql/reporting_awscostentrylineitem_summary_by_ec2_compute.sql koku/masu/database/trino_sql/reporting_awscostentrylineitem_summary_by_ec2_compute_p.sql

@@ -1,4 +1,4 @@
-INSERT INTO postgres.{{schema | sqlsafe}}.reporting_awscostentrylineitem_summary_by_ec2_compute (
+INSERT INTO postgres.{{schema | sqlsafe}}.reporting_awscostentrylineitem_summary_by_ec2_compute_p (
     uuid,
     usage_start,
     usage_end,

koku/masu/test/database/test_aws_report_db_accessor.py

@@ -35,7 +35,7 @@
 from reporting.provider.all.models import TagMapping
 from reporting.provider.aws.models import AWSCostEntryBill
 from reporting.provider.aws.models import AWSCostEntryLineItemDailySummary
-from reporting.provider.aws.models import AWSCostEntryLineItemSummaryByEC2Compute
+from reporting.provider.aws.models import AWSCostEntryLineItemSummaryByEC2ComputeP
 from reporting.provider.aws.models import TRINO_MANAGED_OCP_AWS_DAILY_TABLE
 from reporting.provider.aws.models import TRINO_OCP_ON_AWS_DAILY_TABLE
 
@@ -416,7 +416,7 @@ def test_update_line_item_daily_summary_with_tag_mapping(self, mock_unleash):
         mock_unleash.return_value = True
         populated_keys = []
 
-        table_classes = [AWSCostEntryLineItemDailySummary, AWSCostEntryLineItemSummaryByEC2Compute]
+        table_classes = [AWSCostEntryLineItemDailySummary, AWSCostEntryLineItemSummaryByEC2ComputeP]
 
         for table_class in table_classes:
             with self.subTest(table_class=table_class):
@@ -503,7 +503,7 @@ def test_populate_ocp_on_aws_tag_information(self, mock_unleash):
     @patch("masu.database.aws_report_db_accessor.AWSReportDBAccessor._execute_trino_raw_sql_query")
     def test_populate_ec2_compute_summary_table_trino(self, mock_trino):
         """
-        Test that we construst our SQL and query using Trino to populate AWSCostEntryLineItemSummaryByEC2Compute.
+        Test that we construst our SQL and query using Trino to populate AWSCostEntryLineItemSummaryByEC2ComputeP.
         """
         start_date = self.dh.this_month_start.date()