openstack
/
watcher
Code Issues Proposed changes

Merge "Fix damodel list return None error When has a compute node"

This commit is contained in:
Zuul 2019-09-23 08:46:56 +00:00 committed by Gerrit Code Review
parent d11f43638c 2b63a35e86
commit d13adb4e3c
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/decision_engine/model/model_root.py
View File

@ -257,6 +257,10 @@ class ModelRoot(nx.DiGraph, base.Model):
new_name = "node_"+str(field)
in_dict[new_name] = cn[field]
node_instances = self.get_node_instances(cn)
if not node_instances:
deep_in_dict = in_dict.copy()
ret_list.append(deep_in_dict)
continue
for instance in sorted(node_instances, key=lambda x: x.uuid):
for field in instance.fields:
new_name = "server_"+str(field)

11
watcher/tests/decision_engine/model/test_model.py
View File

@ -85,6 +85,17 @@ class TestModel(base.TestCase):
result_keys = result[0].keys()
self.assertEqual(sorted(expected_keys), sorted(result_keys))
# test compute node has no instance
mock_instances.return_value = []
expected_keys = ['node_uuid']
result = model_root.ModelRoot().to_list()
self.assertEqual(1, len(result))
result_keys = result[0].keys()
self.assertEqual(expected_keys, list(result_keys))
def test_get_node_by_instance_uuid(self):
model = model_root.ModelRoot()
uuid_ = "{0}".format(uuidutils.generate_uuid())