openstack/nova
Code Issues Proposed changes

Merge "Changes block_device_mapping extension into v2.1"

Browse Source
This commit is contained in:
Jenkins
2014-08-31 02:22:39 +00:00
committed by Gerrit Code Review
parent 43f2193130 e2fd04e281
commit 87fdd60f43
4 changed files with 49 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/compute/plugins/v3/block_device_mapping.py
View File

@@ -22,7 +22,7 @@ from nova import block_device
from nova import exception
ALIAS = "os-block-device-mapping"
ATTRIBUTE_NAME = "%s:block_device_mapping" % ALIAS
ATTRIBUTE_NAME = "block_device_mapping_v2"
class BlockDeviceMapping(extensions.V3APIExtensionBase):

3
nova/api/openstack/compute/plugins/v3/servers.py
View File

@@ -545,7 +545,8 @@ class ServersController(wsgi.Controller):
exception.SecurityGroupNotFound,
exception.PortRequiresFixedIP,
exception.NetworkRequiresSubnet,
exception.NetworkNotFound) as error:
exception.NetworkNotFound,
exception.InvalidBDMVolumeNotBootable) as error:
raise exc.HTTPBadRequest(explanation=error.format_message())
except (exception.PortInUse,
exception.NetworkAmbiguous,