Fix direct use of block_device module objects

This replaces all uses of nova.objects.block_device.Block* with
nova.objects.Block*.

Partial-Blueprint: object-subclassing

Change-Id: I7b7641cc75bbc180abd36920deedcb097fc3ecbc
This commit is contained in:
Chris Behrens
2014-05-16 21:36:13 -07:00
parent 338c3551ab
commit 3c1085f528
24 changed files with 186 additions and 194 deletions

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
@@ -1434,7 +1434,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: