Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused disk_capacity field

Browse Source 
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
This commit is contained in:
licanwei
2019-08-12 15:02:43 +08:00
parent d55bb1fa95
commit 99cd009805
7 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
watcher/decision_engine/model/collector/nova.py
View File

@@ -349,13 +349,7 @@ class NovaModelBuilder(base.BaseModelBuilder):
"memory": memory_mb, "memory": memory_mb,
"memory_ratio": memory_ratio, "memory_ratio": memory_ratio,
"memory_mb_reserved": memory_mb_reserved, "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, "disk": disk_capacity,
# TODO(licanwei): remove and replace by disk field
"disk_capacity": disk_capacity,
"disk_gb_reserved": disk_gb_reserved, "disk_gb_reserved": disk_gb_reserved,
"disk_ratio": disk_ratio, "disk_ratio": disk_ratio,
"vcpus": vcpus, "vcpus": vcpus,
@@ -408,7 +402,6 @@ class NovaModelBuilder(base.BaseModelBuilder):
"name": instance.name, "name": instance.name,
"memory": flavor["ram"], "memory": flavor["ram"],
"disk": flavor["disk"], "disk": flavor["disk"],
"disk_capacity": flavor["disk"],
"vcpus": flavor["vcpus"], "vcpus": flavor["vcpus"],
"state": getattr(instance, "OS-EXT-STS:vm_state"), "state": getattr(instance, "OS-EXT-STS:vm_state"),
"metadata": instance.metadata, "metadata": instance.metadata,

3
watcher/decision_engine/model/element/instance.py
View File

@@ -49,8 +49,7 @@ class Instance(compute_resource.ComputeResource):
"name": wfields.StringField(), "name": wfields.StringField(),
"state": wfields.StringField(default=InstanceState.ACTIVE.value), "state": wfields.StringField(default=InstanceState.ACTIVE.value),
"memory": wfields.NonNegativeIntegerField(), "memory": wfields.NonNegativeIntegerField(),
"disk": wfields.IntegerField(), "disk": wfields.NonNegativeIntegerField(),
"disk_capacity": wfields.NonNegativeIntegerField(),
"vcpus": wfields.NonNegativeIntegerField(), "vcpus": wfields.NonNegativeIntegerField(),
"metadata": wfields.JsonField(), "metadata": wfields.JsonField(),
"project_id": wfields.UUIDField(), "project_id": wfields.UUIDField(),

3
watcher/decision_engine/model/element/node.py
View File

@@ -40,8 +40,7 @@ class ComputeNode(compute_resource.ComputeResource):
"state": wfields.StringField(default=ServiceState.ONLINE.value), "state": wfields.StringField(default=ServiceState.ONLINE.value),
"memory": wfields.NonNegativeIntegerField(), "memory": wfields.NonNegativeIntegerField(),
"memory_mb_reserved": wfields.NonNegativeIntegerField(), "memory_mb_reserved": wfields.NonNegativeIntegerField(),
"disk": wfields.IntegerField(), "disk": wfields.NonNegativeIntegerField(),
"disk_capacity": wfields.NonNegativeIntegerField(),
"disk_gb_reserved": wfields.NonNegativeIntegerField(), "disk_gb_reserved": wfields.NonNegativeIntegerField(),
"vcpus": wfields.NonNegativeIntegerField(), "vcpus": wfields.NonNegativeIntegerField(),
"vcpu_reserved": wfields.NonNegativeIntegerField(), "vcpu_reserved": wfields.NonNegativeIntegerField(),

7
watcher/decision_engine/model/notification/nova.py
View File

@@ -90,7 +90,6 @@ class NovaNotification(base.NotificationEndpoint):
'memory': memory_mb, 'memory': memory_mb,
'vcpus': num_cores, 'vcpus': num_cores,
'disk': disk_gb, 'disk': disk_gb,
'disk_capacity': disk_gb,
'metadata': instance_metadata, 'metadata': instance_metadata,
'project_id': instance_data['tenant_id'] 'project_id': instance_data['tenant_id']
}) })
@@ -173,13 +172,7 @@ class NovaNotification(base.NotificationEndpoint):
"memory": memory_mb, "memory": memory_mb,
"memory_ratio": memory_ratio, "memory_ratio": memory_ratio,
"memory_mb_reserved": memory_mb_reserved, "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, "disk": disk_capacity,
# TODO(licanwei): remove and replace by disk field
"disk_capacity": disk_capacity,
"disk_gb_reserved": disk_gb_reserved, "disk_gb_reserved": disk_gb_reserved,
"disk_ratio": disk_ratio, "disk_ratio": disk_ratio,
"vcpus": vcpus, "vcpus": vcpus,

2
watcher/tests/decision_engine/cluster/test_nova_cdmc.py
View File

@@ -155,7 +155,7 @@ class TestNovaClusterDataModelCollector(base.TestCase):
memory_total = (node.memory-node.memory_mb_reserved)*node.memory_ratio memory_total = (node.memory-node.memory_mb_reserved)*node.memory_ratio
self.assertEqual(node.memory_mb_capacity, memory_total) 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) self.assertEqual(node.disk_gb_capacity, disk_total)
vcpus_total = (node.vcpus-node.vcpu_reserved)*node.vcpu_ratio vcpus_total = (node.vcpus-node.vcpu_reserved)*node.vcpu_ratio

6
watcher/tests/decision_engine/model/notification/test_nova_notifications.py
View File

@@ -331,7 +331,7 @@ class TestNovaNotifications(NotificationTestCase):
self.assertEqual(element.InstanceState.PAUSED.value, instance0.state) self.assertEqual(element.InstanceState.PAUSED.value, instance0.state)
self.assertEqual(1, instance0.vcpus) self.assertEqual(1, instance0.vcpus)
self.assertEqual(1, instance0.disk_capacity) self.assertEqual(1, instance0.disk)
self.assertEqual(512, instance0.memory) self.assertEqual(512, instance0.memory)
m_get_compute_node_by_hostname.assert_called_once_with('Node_2') 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(7777, node_2.memory)
self.assertEqual(42, node_2.vcpus) self.assertEqual(42, node_2.vcpus)
self.assertEqual(1337, node_2.disk) self.assertEqual(1337, node_2.disk)
self.assertEqual(1337, node_2.disk_capacity)
@mock.patch.object(nova_helper, "NovaHelper") @mock.patch.object(nova_helper, "NovaHelper")
def test_instance_update_node_notfound_set_unmapped( 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(element.InstanceState.PAUSED.value, instance0.state)
self.assertEqual(1, instance0.vcpus) self.assertEqual(1, instance0.vcpus)
self.assertEqual(1, instance0.disk) self.assertEqual(1, instance0.disk)
self.assertEqual(1, instance0.disk_capacity)
self.assertEqual(512, instance0.memory) self.assertEqual(512, instance0.memory)
m_get_compute_node_by_hostname.assert_any_call('Node_2') 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(element.InstanceState.ACTIVE.value, instance0.state)
self.assertEqual(1, instance0.vcpus) self.assertEqual(1, instance0.vcpus)
self.assertEqual(1, instance0.disk_capacity) self.assertEqual(1, instance0.disk)
self.assertEqual(512, instance0.memory) self.assertEqual(512, instance0.memory)
def test_nova_instance_delete_end(self): def test_nova_instance_delete_end(self):

4
watcher/tests/decision_engine/model/test_element.py
View File

@@ -32,7 +32,6 @@ class TestElement(base.TestCase):
'memory': 111, 'memory': 111,
'vcpus': 222, 'vcpus': 222,
'disk': 333, 'disk': 333,
'disk_capacity': 444,
})), })),
("ComputeNode_with_some_fields", dict( ("ComputeNode_with_some_fields", dict(
cls=element.Instance, cls=element.Instance,
@@ -41,7 +40,6 @@ class TestElement(base.TestCase):
'state': 'state', 'state': 'state',
'vcpus': 222, 'vcpus': 222,
'disk': 333, 'disk': 333,
'disk_capacity': 444,
})), })),
("Instance_with_all_fields", dict( ("Instance_with_all_fields", dict(
cls=element.Instance, cls=element.Instance,
@@ -53,7 +51,6 @@ class TestElement(base.TestCase):
'memory': 111, 'memory': 111,
'vcpus': 222, 'vcpus': 222,
'disk': 333, 'disk': 333,
'disk_capacity': 444,
})), })),
("Instance_with_some_fields", dict( ("Instance_with_some_fields", dict(
cls=element.Instance, cls=element.Instance,
@@ -62,7 +59,6 @@ class TestElement(base.TestCase):
'state': 'state', 'state': 'state',
'vcpus': 222, 'vcpus': 222,
'disk': 333, 'disk': 333,
'disk_capacity': 444,
})), })),
] ]