update old entries

project-koku · May 8, 2024 · fe61bc4 · fe61bc4
1 parent f985fc7
commit fe61bc4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/koku/masu/database/ocp_report_db_accessor.py b/koku/masu/database/ocp_report_db_accessor.py
@@ -904,13 +904,17 @@ def populate_node_table(self, cluster, nodes):
                     resource_id=node[1],
                     node_capacity_cpu_cores=node[2],
                     node_role=node[3],
-                    arch=node[4],
+                    architecture=node[4],
                     cluster=cluster,
                 )
             # if the node entry already exists but does not have a role assigned, update the node role
-            elif not tmp_node.node_role:
+            if not tmp_node.node_role:
                 tmp_node.node_role = node[3]
-                tmp_node.save()
+                tmp_node.save(update_fields=["node_role"])
+            # if the node entry already exists but does not have an architecture, update the architecture
+            if not tmp_node.architecture:
+                tmp_node.architecture = node[4]
+                tmp_node.save(update_fields=["architecture"])
 
     def populate_pvc_table(self, cluster, pvcs):
         """Get or create an entry in the OCP cluster table."""

diff --git a/...reporting/migrations/0319_ocpnode_arch.py → ...reporting/migrations/0320_ocpnode_arch.py b/...reporting/migrations/0319_ocpnode_arch.py → ...reporting/migrations/0320_ocpnode_arch.py
@@ -5,13 +5,13 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("reporting", "0318_ocpazurecomputesummaryp_subscription_name_and_more"),
+        ("reporting", "0319_node_network_costs"),
     ]
 
     operations = [
         migrations.AddField(
             model_name="ocpnode",
-            name="arch",
+            name="architecture",
             field=models.TextField(null=True),
         ),
     ]
diff --git a/koku/reporting/provider/ocp/models.py b/koku/reporting/provider/ocp/models.py
@@ -268,7 +268,7 @@ class Meta:
     node_capacity_cpu_cores = models.DecimalField(max_digits=18, decimal_places=2, null=True)
     cluster = models.ForeignKey("OCPCluster", on_delete=models.CASCADE)
     node_role = models.TextField(null=True)
-    arch = models.TextField(null=True)
+    architecture = models.TextField(null=True)
 
 
 class OCPNetworkSummaryP(models.Model):