Improve Compute Data Model

The fields(vcpus, memory and disk_capacity) in the Watcher ComputeNode
do not take allocation ratios used for overcommit into account so there
may be disparity between this and the used count.
This patch added some new fields to solve this problem.

Partially Implements: blueprint improve-compute-data-model

Change-Id: Id33496f368fb23cb8e744c7e8451e1cd1397866b

watcher/tests/decision_engine/cluster/test_nova_cdmc.py

@@ -17,8 +17,10 @@
 # limitations under the License.
 
 import mock
+import os_resource_classes as orc
 
 from watcher.common import nova_helper
+from watcher.common import placement_helper
 from watcher.decision_engine.model.collector import nova
 from watcher.tests import base
 from watcher.tests import conf_fixture
@@ -31,8 +33,40 @@ class TestNovaClusterDataModelCollector(base.TestCase):
         self.useFixture(conf_fixture.ConfReloadFixture())
 
     @mock.patch('keystoneclient.v3.client.Client', mock.Mock())
+    @mock.patch.object(placement_helper, 'PlacementHelper')
     @mock.patch.object(nova_helper, 'NovaHelper')
-    def test_nova_cdmc_execute(self, m_nova_helper_cls):
+    def test_nova_cdmc_execute(self, m_nova_helper_cls,
+                               m_placement_helper_cls):
+        m_placement_helper = mock.Mock(name="placement_helper")
+        m_placement_helper.get_inventories.return_value = {
+            orc.VCPU: {
+                "allocation_ratio": 16.0,
+                "total": 8,
+                "reserved": 0,
+                "step_size": 1,
+                "min_unit": 1,
+                "max_unit": 8},
+            orc.MEMORY_MB: {
+                "allocation_ratio": 1.5,
+                "total": 16039,
+                "reserved": 512,
+                "step_size": 1,
+                "min_unit": 1,
+                "max_unit": 16039},
+            orc.DISK_GB: {
+                "allocation_ratio": 1.0,
+                "total": 142,
+                "reserved": 0,
+                "step_size": 1,
+                "min_unit": 1,
+                "max_unit": 142}
+        }
+        m_placement_helper.get_usages_for_resource_provider.return_value = {
+            orc.DISK_GB: 10,
+            orc.MEMORY_MB: 100,
+            orc.VCPU: 0
+        }
+        m_placement_helper_cls.return_value = m_placement_helper
         m_nova_helper = mock.Mock(name="nova_helper")
         m_nova_helper_cls.return_value = m_nova_helper
         m_nova_helper.get_service.return_value = mock.Mock(
@@ -60,9 +94,12 @@ class TestNovaClusterDataModelCollector(base.TestCase):
             service={'id': 123, 'host': 'test_hostname',
                      'disabled_reason': ''},
             memory_mb=333,
+            memory_mb_used=100,
             free_disk_gb=222,
             local_gb=111,
+            local_gb_used=10,
             vcpus=4,
+            vcpus_used=0,
             servers=None,  # Don't let the mock return a value for servers.
             **minimal_node
         )
@@ -70,9 +107,12 @@ class TestNovaClusterDataModelCollector(base.TestCase):
             service={'id': 123, 'host': 'test_hostname',
                      'disabled_reason': ''},
             memory_mb=333,
+            memory_mb_used=100,
             free_disk_gb=222,
             local_gb=111,
+            local_gb_used=10,
             vcpus=4,
+            vcpus_used=0,
             **minimal_node_with_servers)
         fake_instance = mock.Mock(
             id='ef500f7e-dac8-470f-960c-169486fce71b',
@@ -112,6 +152,18 @@ class TestNovaClusterDataModelCollector(base.TestCase):
         self.assertEqual(node.uuid, 'test_hostname')
         self.assertEqual(instance.uuid, 'ef500f7e-dac8-470f-960c-169486fce71b')
 
+        memory_total = node.memory - node.memory_mb_reserved
+        memory_free = memory_total * node.memory_ratio - node.memory_mb_used
+        self.assertEqual(node.memory_mb_free, memory_free)
+
+        disk_total = node.disk_capacity - node.disk_gb_reserved
+        disk_free = disk_total * node.disk_ratio - node.disk_gb_used
+        self.assertEqual(node.disk_gb_free, disk_free)
+
+        vcpus_total = node.vcpus - node.vcpu_reserved
+        vcpus_free = vcpus_total * node.vcpu_ratio - node.vcpus_used
+        self.assertEqual(node.vcpus_free, vcpus_free)
+
         m_nova_helper.get_compute_node_by_name.assert_called_once_with(
             minimal_node['hypervisor_hostname'], servers=True, detailed=True)
         m_nova_helper.get_instance_list.assert_called_once_with(
@@ -273,10 +325,15 @@ class TestNovaModelBuilder(base.TestCase):
         self.assertEqual(
             m_nova.return_value.get_compute_node_by_name.call_count, 2)
 
+    @mock.patch.object(placement_helper, 'PlacementHelper')
     @mock.patch.object(nova_helper, 'NovaHelper')
-    def test_add_physical_layer_with_baremetal_node(self, m_nova):
+    def test_add_physical_layer_with_baremetal_node(self, m_nova,
+                                                    m_placement_helper):
         """"""
-
+        mock_placement = mock.Mock(name="placement_helper")
+        mock_placement.get_inventories.return_value = dict()
+        mock_placement.get_usages_for_resource_provider.return_value = dict()
+        m_placement_helper.return_value = mock_placement
         m_nova.return_value.get_aggregate_list.return_value = \
             [mock.Mock(id=1, name='example'),
              mock.Mock(id=5, name='example', hosts=['hostone', 'hosttwo'])]
@@ -292,9 +349,12 @@ class TestNovaModelBuilder(base.TestCase):
             state='TEST_STATE',
             status='TEST_STATUS',
             memory_mb=333,
+            memory_mb_used=100,
             free_disk_gb=222,
             local_gb=111,
+            local_gb_used=10,
             vcpus=4,
+            vcpus_used=0,
             servers=[
                 {'name': 'fake_instance',
                  'uuid': 'ef500f7e-dac8-470f-960c-169486fce71b'}