Merge "Optimize hypervisor API calls"

watcher/tests/common/test_nova_helper.py

@@ -123,7 +123,6 @@ class TestNovaHelper(base.TestCase):
         hypervisor = self.fake_hypervisor(hypervisor_id, hypervisor_name)
         self.fake_nova_hypervisor_list(
             nova_util,
-            fake_find=hypervisor,
             fake_list=[hypervisor])
         nova_util.nova.hypervisors.search.return_value = [hypervisor]
         # verify that the compute node can be obtained normally by name

watcher/tests/decision_engine/cluster/test_model_builder.py

@@ -168,8 +168,8 @@ class TestModelBuilder(base.BaseTestCase):
         t_nova_cluster = nova.ModelBuilder(mock.Mock())
         t_nova_cluster.execute(m_scope)
         m_nova.return_value.get_compute_node_by_name.assert_any_call(
-            'hostone', servers=True)
+            'hostone', servers=True, detailed=True)
         m_nova.return_value.get_compute_node_by_name.assert_any_call(
-            'hosttwo', servers=True)
+            'hosttwo', servers=True, detailed=True)
         self.assertEqual(
             m_nova.return_value.get_compute_node_by_name.call_count, 2)

watcher/tests/decision_engine/cluster/test_nova_cdmc.py

@@ -66,7 +66,14 @@ class TestNovaClusterDataModelCollector(base.TestCase):
             servers=None,  # Don't let the mock return a value for servers.
             **minimal_node
         )
-        fake_compute_node_with_servers = mock.Mock(**minimal_node_with_servers)
+        fake_detailed_node = mock.Mock(
+            service={'id': 123, 'host': 'test_hostname',
+                     'disabled_reason': ''},
+            memory_mb=333,
+            free_disk_gb=222,
+            local_gb=111,
+            vcpus=4,
+            **minimal_node_with_servers)
         fake_instance = mock.Mock(
             id='ef500f7e-dac8-470f-960c-169486fce71b',
             human_id='fake_instance',
@@ -77,11 +84,10 @@ class TestNovaClusterDataModelCollector(base.TestCase):
         setattr(fake_instance, 'OS-EXT-STS:vm_state', 'VM_STATE')
         # Returns the hypervisors with details (service) but no servers.
         m_nova_helper.get_compute_node_list.return_value = [fake_compute_node]
-        # Returns the hypervisor with servers but no details (service).
+        # Returns the hypervisor with servers and details (service).
         m_nova_helper.get_compute_node_by_name.return_value = [
-            fake_compute_node_with_servers]
+            fake_detailed_node]
         # Returns the hypervisor with details (service) but no servers.
-        m_nova_helper.get_compute_node_by_id.return_value = fake_compute_node
         m_nova_helper.get_instance_list.return_value = [fake_instance]
 
         m_config = mock.Mock()
@@ -105,5 +111,7 @@ class TestNovaClusterDataModelCollector(base.TestCase):
         self.assertEqual(node.uuid, 'test_hostname')
         self.assertEqual(instance.uuid, 'ef500f7e-dac8-470f-960c-169486fce71b')
 
+        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(
             {'host': fake_compute_node.service['host']})