openstack
/
nova
Code Issues Proposed changes

Merge "Remove old compat code from servers ViewBuilder._get_metadata"

This commit is contained in:
Jenkins 2017-10-04 21:43:06 +00:00 committed by Gerrit Code Review
parent 399b38c68c 205c4984c9
commit d79f79abc2
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nova/api/openstack/compute/views/servers.py
View File

@ -26,7 +26,6 @@ from nova.api.openstack.compute.views import images as views_images
from nova import context as nova_context
from nova import exception
from nova import objects
from nova.objects import base as obj_base
from nova.policies import flavor_extra_specs as fes_policies
from nova import utils
@ -223,12 +222,7 @@ class ViewBuilder(common.ViewBuilder):
@staticmethod
def _get_metadata(instance):
# FIXME(danms): Transitional support for objects
metadata = instance.get('metadata')
if isinstance(instance, obj_base.NovaObject):
return metadata or {}
else:
return utils.instance_meta(instance)
return instance.metadata or {}
@staticmethod
def _get_vm_status(instance):