Merge "Add name for instance in Watcher datamodel"

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"],

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,

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,