[COST-5315] Return network_unattributed_distributed costs in the OCP costs API (#5231)

* Add network_unattributed_distributed to reports/openshift/costs/ API

* Add test for expected distributed cost values

---------

Co-authored-by: Cody Myers <[email protected]>

Author: samdoran

koku/api/report/ocp/provider_map.py

@@ -245,6 +245,7 @@ def __init__(self, provider, report_type, schema_name):
                             + self.distributed_unattributed_storage_cost,
                             "cost_platform_distributed": self.distributed_platform_cost,
                             "cost_worker_unallocated_distributed": self.distributed_worker_cost,
+                            "cost_network_unattributed_distributed": self.distributed_unattributed_network_cost,
                             "cost_storage_unattributed_distributed": self.distributed_unattributed_storage_cost,
                         },
                         "default_ordering": {"cost_total": "desc"},
@@ -274,6 +275,7 @@ def __init__(self, provider, report_type, schema_name):
                             + self.distributed_unattributed_network_cost,
                             "cost_platform_distributed": self.distributed_platform_cost,
                             "cost_worker_unallocated_distributed": self.distributed_worker_cost,
+                            "cost_network_unattributed_distributed": self.distributed_unattributed_network_cost,
                             "cost_storage_unattributed_distributed": self.distributed_unattributed_storage_cost,
                             # the `currency_annotation` is inserted by the `annotations` property of the query-handler
                             "cost_units": Coalesce("currency_annotation", Value("USD", output_field=CharField())),

koku/api/report/ocp/query_handler.py

@@ -75,6 +75,7 @@ def __init__(self, parameters):
             "cost_usage": {"key": "usage", "group": "cost"},
             "cost_platform_distributed": {"key": "platform_distributed", "group": "cost"},
             "cost_worker_unallocated_distributed": {"key": "worker_unallocated_distributed", "group": "cost"},
+            "cost_network_unattributed_distributed": {"key": "network_unattributed_distributed", "group": "cost"},
             "cost_storage_unattributed_distributed": {"key": "storage_unattributed_distributed", "group": "cost"},
             "cost_total_distributed": {"key": "distributed", "group": "cost"},
             "cost_total": {"key": "total", "group": "cost"},

koku/api/report/test/ocp/view/test_views.py

@@ -593,8 +593,19 @@ def test_execute_query_ocp_costs_group_by_project__distributed_costs(self):
                 .get("total")
             )
             expected_total = cost if cost is not None else 0
-        total = data.get("meta", {}).get("total", {}).get("cost", {}).get("total", {}).get("value", 0)
+        meta_total_cost = data.get("meta", {}).get("total", {}).get("cost", {})
+        total = meta_total_cost.get("total", {}).get("value", 0)
         distributed_cost = data.get("meta", {}).get("total", {}).get("cost", {}).get("distributed", {}).get("value", 0)
+        expected_dist_cost_keys = {
+            "platform_distributed",
+            "worker_unallocated_distributed",
+            "network_unattributed_distributed",
+            "storage_unattributed_distributed",
+        }
+        self.assertTrue(
+            expected_dist_cost_keys.issubset(meta_total_cost),
+            f"Missing {expected_dist_cost_keys.difference(meta_total_cost)}",
+        )
         self.assertNotEqual(total, Decimal(0))
         self.assertNotEqual(distributed_cost, Decimal(0))
         self.assertAlmostEqual(distributed_cost, expected_total, 6)