Merge "Check resource class before using"

2019-07-29 03:45:25 +00:00
parent c0bba3ecf3 0986168fe6
commit 503e67f82e
2 changed files with 30 additions and 19 deletions
--- a/watcher/tests/decision_engine/cluster/test_nova_cdmc.py
+++ b/watcher/tests/decision_engine/cluster/test_nova_cdmc.py
@@ -335,7 +335,7 @@ class TestNovaModelBuilder(base.TestCase):
        """"""
        mock_placement = mock.Mock(name="placement_helper")
        mock_placement.get_inventories.return_value = dict()
-        mock_placement.get_usages_for_resource_provider.return_value = dict()
+        mock_placement.get_usages_for_resource_provider.return_value = None
        m_placement_helper.return_value = mock_placement
        m_nova.return_value.get_aggregate_list.return_value = \
            [mock.Mock(id=1, name='example'),