Merge "extend-node-status"

2017-11-29 13:35:54 +00:00
parent 17b6019ea9 74bc31e562
commit 2993dea376
14 changed files with 58 additions and 23 deletions
--- a/watcher/tests/decision_engine/cluster/test_nova_cdmc.py
+++ b/watcher/tests/decision_engine/cluster/test_nova_cdmc.py
@@ -36,7 +36,13 @@ class TestNovaClusterDataModelCollector(base.TestCase):
        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(
-            host="test_hostname")
+            id=1355,
+            host='test_hostname',
+            binary='nova-compute',
+            status='enabled',
+            state='up',
+            disabled_reason='',
+        )

        fake_compute_node = mock.Mock(
            id=1337,