[COST-5575] convert uom to metric-id (#5335)

Author: maskarb

koku/subs/subs_data_messenger.py

@@ -142,7 +142,7 @@ def build_base_subs_dict(
             "instance_id": instance_id,
             "timestamp": tstamp,
             "expiration": expiration,
-            "measurements": [{"value": cpu_count, "uom": "vCPUs"}],
+            "measurements": [{"value": cpu_count, "metric_id": "vCPUs"}],
             "cloud_provider": self.provider_type,
             "hardware_type": "Cloud",
             "product_ids": product_ids,

koku/subs/test/test_subs_data_messenger.py

@@ -82,7 +82,7 @@ def test_build_base_subs_dict(self):
             "instance_id": lineitem_resourceid,
             "timestamp": lineitem_usagestartdate,
             "expiration": lineitem_usageenddate,
-            "measurements": [{"value": product_vcpu, "uom": "vCPUs"}],
+            "measurements": [{"value": product_vcpu, "metric_id": "vCPUs"}],
             "cloud_provider": "AWS",
             "hardware_type": "Cloud",
             "product_ids": product_ids,
@@ -135,7 +135,7 @@ def test_build_aws_subs_dict(self):
             "instance_id": lineitem_resourceid,
             "timestamp": lineitem_usagestartdate,
             "expiration": lineitem_usageenddate,
-            "measurements": [{"value": product_vcpu, "uom": "vCPUs"}],
+            "measurements": [{"value": product_vcpu, "metric_id": "vCPUs"}],
             "cloud_provider": "AWS",
             "hardware_type": "Cloud",
             "product_ids": product_ids,
@@ -189,7 +189,7 @@ def test_build_base_subs_dict_sap_role(self):
             "instance_id": lineitem_resourceid,
             "timestamp": lineitem_usagestartdate,
             "expiration": lineitem_usageenddate,
-            "measurements": [{"value": product_vcpu, "uom": "vCPUs"}],
+            "measurements": [{"value": product_vcpu, "metric_id": "vCPUs"}],
             "cloud_provider": "AWS",
             "hardware_type": "Cloud",
             "product_ids": product_ids,
@@ -240,7 +240,7 @@ def test_build_base_subs_dict_addon_els(self):
             "instance_id": lineitem_resourceid,
             "timestamp": lineitem_usagestartdate,
             "expiration": lineitem_usageenddate,
-            "measurements": [{"value": product_vcpu, "uom": "vCPUs"}],
+            "measurements": [{"value": product_vcpu, "metric_id": "vCPUs"}],
             "cloud_provider": "AWS",
             "hardware_type": "Cloud",
             "product_ids": product_ids,
@@ -294,7 +294,7 @@ def test_build_azure_subs_dict(self):
             "instance_id": lineitem_resourceid,
             "timestamp": lineitem_usagestartdate,
             "expiration": lineitem_usageenddate,
-            "measurements": [{"value": product_vcpu, "uom": "vCPUs"}],
+            "measurements": [{"value": product_vcpu, "metric_id": "vCPUs"}],
             "cloud_provider": "AWS",
             "hardware_type": "Cloud",
             "product_ids": product_ids,
@@ -355,7 +355,7 @@ def test_build_azure_subs_dict_sap_role(self):
             "instance_id": lineitem_resourceid,
             "timestamp": lineitem_usagestartdate,
             "expiration": lineitem_usageenddate,
-            "measurements": [{"value": product_vcpu, "uom": "vCPUs"}],
+            "measurements": [{"value": product_vcpu, "metric_id": "vCPUs"}],
             "cloud_provider": "AWS",
             "hardware_type": "Cloud",
             "product_ids": product_ids,