diff --git a/watcher/decision_engine/model/collector/nova.py b/watcher/decision_engine/model/collector/nova.py index 27b090697..750fb4266 100644 --- a/watcher/decision_engine/model/collector/nova.py +++ b/watcher/decision_engine/model/collector/nova.py @@ -344,7 +344,10 @@ class ModelBuilder(object): flavor = instance.flavor instance_attributes = { "uuid": instance.id, + # TODO(chenker) human_id is deprecated for removal. For the reason, + # please reference bug 1833665. "human_id": instance.human_id, + "name": instance.name, "memory": flavor["ram"], "disk": flavor["disk"], "disk_capacity": flavor["disk"], diff --git a/watcher/decision_engine/model/notification/nova.py b/watcher/decision_engine/model/notification/nova.py index bcd0a3522..dbf1ecce4 100644 --- a/watcher/decision_engine/model/notification/nova.py +++ b/watcher/decision_engine/model/notification/nova.py @@ -74,7 +74,12 @@ class NovaNotification(base.NotificationEndpoint): instance.update({ 'state': instance_data['state'], 'hostname': instance_data['host_name'], + # TODO(chenker) human_id is deprecated for removal. For the reason, + # please reference bug 1833665. 'human_id': instance_data['display_name'], + # this is the user-provided display name of the server which is not + # guaranteed to be unique nor is it immutable. + 'name': instance_data['display_name'], 'memory': memory_mb, 'vcpus': num_cores, 'disk': disk_gb, diff --git a/watcher/tests/decision_engine/model/test_element.py b/watcher/tests/decision_engine/model/test_element.py index 6f28ce861..7da704fdd 100644 --- a/watcher/tests/decision_engine/model/test_element.py +++ b/watcher/tests/decision_engine/model/test_element.py @@ -51,6 +51,7 @@ class TestElement(base.TestCase): 'state': 'state', 'hostname': 'hostname', 'human_id': 'human_id', + 'name': 'name', 'memory': 111, 'vcpus': 222, 'disk': 333,