openstack/nova
Code Issues Proposed changes

Merge "Fix direct use of block_device module objects"

Browse Source
This commit is contained in:
Jenkins
2014-06-10 15:20:17 +00:00
committed by Gerrit Code Review
parent 99d6dfcc0c 3c1085f528
commit 76e866a74b
24 changed files with 186 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/api/openstack/compute/servers.py
View File

@@ -33,7 +33,7 @@ from nova import block_device
from nova import compute
from nova.compute import flavors
from nova import exception
from nova.objects import block_device as block_device_obj
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
@@ -1435,7 +1435,7 @@ class Controller(wsgi.Controller):
instance = self._get_server(context, req, id)
bdms = block_device_obj.BlockDeviceMappingList.get_by_instance_uuid(
bdms = objects.BlockDeviceMappingList.get_by_instance_uuid(
context, instance.uuid)
try: