Merge "Remove redundant human_id fields when creating and updating datamodel"

watcher/decision_engine/model/collector/nova.py

@@ -361,9 +361,6 @@ 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"],

watcher/decision_engine/model/element/compute_resource.py

@@ -29,5 +29,4 @@ class ComputeResource(base.Element):
 
     fields = {
         "uuid": wfields.StringField(),
-        "human_id": wfields.StringField(default=""),
     }

watcher/decision_engine/model/notification/nova.py

@@ -74,9 +74,6 @@ 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'],