From 99cd00980587a87ca71f3f391e81eb87ac2c29aa Mon Sep 17 00:00:00 2001 From: licanwei Date: Mon, 12 Aug 2019 15:02:43 +0800 Subject: [PATCH] Remove unused disk_capacity field The fields disk and disk_capacity have the same value, we just need one, so remove disk_capacity field. Partially Implements: blueprint improve-compute-data-model Change-Id: If3d385c5e61713bbdc85e22f10cd75e161ff79f0 --- watcher/decision_engine/model/collector/nova.py | 7 ------- watcher/decision_engine/model/element/instance.py | 3 +-- watcher/decision_engine/model/element/node.py | 3 +-- watcher/decision_engine/model/notification/nova.py | 7 ------- watcher/tests/decision_engine/cluster/test_nova_cdmc.py | 2 +- .../model/notification/test_nova_notifications.py | 6 ++---- watcher/tests/decision_engine/model/test_element.py | 4 ---- 7 files changed, 5 insertions(+), 27 deletions(-) diff --git a/watcher/decision_engine/model/collector/nova.py b/watcher/decision_engine/model/collector/nova.py index c580c7462..f38f76a5d 100644 --- a/watcher/decision_engine/model/collector/nova.py +++ b/watcher/decision_engine/model/collector/nova.py @@ -349,13 +349,7 @@ class NovaModelBuilder(base.BaseModelBuilder): "memory": memory_mb, "memory_ratio": memory_ratio, "memory_mb_reserved": memory_mb_reserved, - # The node.free_disk_gb does not take allocation ratios used - # for overcommit into account so this value may be negative. - # We do not need this field and plan to set disk to total disk - # capacity and then remove disk_capacity. "disk": disk_capacity, - # TODO(licanwei): remove and replace by disk field - "disk_capacity": disk_capacity, "disk_gb_reserved": disk_gb_reserved, "disk_ratio": disk_ratio, "vcpus": vcpus, @@ -408,7 +402,6 @@ class NovaModelBuilder(base.BaseModelBuilder): "name": instance.name, "memory": flavor["ram"], "disk": flavor["disk"], - "disk_capacity": flavor["disk"], "vcpus": flavor["vcpus"], "state": getattr(instance, "OS-EXT-STS:vm_state"), "metadata": instance.metadata, diff --git a/watcher/decision_engine/model/element/instance.py b/watcher/decision_engine/model/element/instance.py index ae5631648..f2e9aeadf 100644 --- a/watcher/decision_engine/model/element/instance.py +++ b/watcher/decision_engine/model/element/instance.py @@ -49,8 +49,7 @@ class Instance(compute_resource.ComputeResource): "name": wfields.StringField(), "state": wfields.StringField(default=InstanceState.ACTIVE.value), "memory": wfields.NonNegativeIntegerField(), - "disk": wfields.IntegerField(), - "disk_capacity": wfields.NonNegativeIntegerField(), + "disk": wfields.NonNegativeIntegerField(), "vcpus": wfields.NonNegativeIntegerField(), "metadata": wfields.JsonField(), "project_id": wfields.UUIDField(), diff --git a/watcher/decision_engine/model/element/node.py b/watcher/decision_engine/model/element/node.py index a8d6aa308..74b6d3895 100644 --- a/watcher/decision_engine/model/element/node.py +++ b/watcher/decision_engine/model/element/node.py @@ -40,8 +40,7 @@ class ComputeNode(compute_resource.ComputeResource): "state": wfields.StringField(default=ServiceState.ONLINE.value), "memory": wfields.NonNegativeIntegerField(), "memory_mb_reserved": wfields.NonNegativeIntegerField(), - "disk": wfields.IntegerField(), - "disk_capacity": wfields.NonNegativeIntegerField(), + "disk": wfields.NonNegativeIntegerField(), "disk_gb_reserved": wfields.NonNegativeIntegerField(), "vcpus": wfields.NonNegativeIntegerField(), "vcpu_reserved": wfields.NonNegativeIntegerField(), diff --git a/watcher/decision_engine/model/notification/nova.py b/watcher/decision_engine/model/notification/nova.py index 4871cb41d..eb776f2f1 100644 --- a/watcher/decision_engine/model/notification/nova.py +++ b/watcher/decision_engine/model/notification/nova.py @@ -90,7 +90,6 @@ class NovaNotification(base.NotificationEndpoint): 'memory': memory_mb, 'vcpus': num_cores, 'disk': disk_gb, - 'disk_capacity': disk_gb, 'metadata': instance_metadata, 'project_id': instance_data['tenant_id'] }) @@ -173,13 +172,7 @@ class NovaNotification(base.NotificationEndpoint): "memory": memory_mb, "memory_ratio": memory_ratio, "memory_mb_reserved": memory_mb_reserved, - # The node.free_disk_gb does not take allocation ratios used - # for overcommit into account so this value may be negative. - # We do not need this field and plan to set disk to total disk - # capacity and then remove disk_capacity. "disk": disk_capacity, - # TODO(licanwei): remove and replace by disk field - "disk_capacity": disk_capacity, "disk_gb_reserved": disk_gb_reserved, "disk_ratio": disk_ratio, "vcpus": vcpus, diff --git a/watcher/tests/decision_engine/cluster/test_nova_cdmc.py b/watcher/tests/decision_engine/cluster/test_nova_cdmc.py index 1468fa308..97775ec6e 100644 --- a/watcher/tests/decision_engine/cluster/test_nova_cdmc.py +++ b/watcher/tests/decision_engine/cluster/test_nova_cdmc.py @@ -155,7 +155,7 @@ class TestNovaClusterDataModelCollector(base.TestCase): memory_total = (node.memory-node.memory_mb_reserved)*node.memory_ratio self.assertEqual(node.memory_mb_capacity, memory_total) - disk_total = (node.disk_capacity-node.disk_gb_reserved)*node.disk_ratio + disk_total = (node.disk-node.disk_gb_reserved)*node.disk_ratio self.assertEqual(node.disk_gb_capacity, disk_total) vcpus_total = (node.vcpus-node.vcpu_reserved)*node.vcpu_ratio diff --git a/watcher/tests/decision_engine/model/notification/test_nova_notifications.py b/watcher/tests/decision_engine/model/notification/test_nova_notifications.py index 386210d05..3de95c3f4 100644 --- a/watcher/tests/decision_engine/model/notification/test_nova_notifications.py +++ b/watcher/tests/decision_engine/model/notification/test_nova_notifications.py @@ -331,7 +331,7 @@ class TestNovaNotifications(NotificationTestCase): self.assertEqual(element.InstanceState.PAUSED.value, instance0.state) self.assertEqual(1, instance0.vcpus) - self.assertEqual(1, instance0.disk_capacity) + self.assertEqual(1, instance0.disk) self.assertEqual(512, instance0.memory) m_get_compute_node_by_hostname.assert_called_once_with('Node_2') @@ -339,7 +339,6 @@ class TestNovaNotifications(NotificationTestCase): self.assertEqual(7777, node_2.memory) self.assertEqual(42, node_2.vcpus) self.assertEqual(1337, node_2.disk) - self.assertEqual(1337, node_2.disk_capacity) @mock.patch.object(nova_helper, "NovaHelper") def test_instance_update_node_notfound_set_unmapped( @@ -372,7 +371,6 @@ class TestNovaNotifications(NotificationTestCase): self.assertEqual(element.InstanceState.PAUSED.value, instance0.state) self.assertEqual(1, instance0.vcpus) self.assertEqual(1, instance0.disk) - self.assertEqual(1, instance0.disk_capacity) self.assertEqual(512, instance0.memory) m_get_compute_node_by_hostname.assert_any_call('Node_2') @@ -440,7 +438,7 @@ class TestNovaNotifications(NotificationTestCase): self.assertEqual(element.InstanceState.ACTIVE.value, instance0.state) self.assertEqual(1, instance0.vcpus) - self.assertEqual(1, instance0.disk_capacity) + self.assertEqual(1, instance0.disk) self.assertEqual(512, instance0.memory) def test_nova_instance_delete_end(self): diff --git a/watcher/tests/decision_engine/model/test_element.py b/watcher/tests/decision_engine/model/test_element.py index 93ff6936a..91dbb737f 100644 --- a/watcher/tests/decision_engine/model/test_element.py +++ b/watcher/tests/decision_engine/model/test_element.py @@ -32,7 +32,6 @@ class TestElement(base.TestCase): 'memory': 111, 'vcpus': 222, 'disk': 333, - 'disk_capacity': 444, })), ("ComputeNode_with_some_fields", dict( cls=element.Instance, @@ -41,7 +40,6 @@ class TestElement(base.TestCase): 'state': 'state', 'vcpus': 222, 'disk': 333, - 'disk_capacity': 444, })), ("Instance_with_all_fields", dict( cls=element.Instance, @@ -53,7 +51,6 @@ class TestElement(base.TestCase): 'memory': 111, 'vcpus': 222, 'disk': 333, - 'disk_capacity': 444, })), ("Instance_with_some_fields", dict( cls=element.Instance, @@ -62,7 +59,6 @@ class TestElement(base.TestCase): 'state': 'state', 'vcpus': 222, 'disk': 333, - 'disk_capacity': 444, })), ]