x/gantt
Code Issues Proposed changes

Merge "Misc typos in nova"

Browse Source
This commit is contained in:
Jenkins
2013-12-06 13:34:32 +00:00
committed by Gerrit Code Review
parent 65065ebe8e 6731dbd971
commit f9fbabf153
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/availability_zones.py
View File

@@ -97,7 +97,7 @@ def get_host_availability_zone(context, host, conductor_api=None):
def get_availability_zones(context, get_only_available=False): def get_availability_zones(context, get_only_available=False):
"""Return available and unavailable zones on demands. """Return available and unavailable zones on demand.
:param get_only_available: flag to determine whether to return :param get_only_available: flag to determine whether to return
available zones only, default False indicates return both available zones only, default False indicates return both

16
nova/exception.py
View File

@@ -596,7 +596,7 @@ class NoMoreNetworks(NovaException):
class NetworkNotFoundForProject(NotFound): class NetworkNotFoundForProject(NotFound):
msg_fmt = _("Either Network uuid %(network_uuid)s is not present or " msg_fmt = _("Either network uuid %(network_uuid)s is not present or "
"is not assigned to the project %(project_id)s.") "is not assigned to the project %(project_id)s.")
@@ -1248,7 +1248,7 @@ class InstanceUserDataMalformed(NovaException):
class UnexpectedTaskStateError(NovaException): class UnexpectedTaskStateError(NovaException):
msg_fmt = _("unexpected task state: expecting %(expected)s but " msg_fmt = _("Unexpected task state: expecting %(expected)s but "
"the actual state is %(actual)s") "the actual state is %(actual)s")
@@ -1266,7 +1266,7 @@ class InstanceActionEventNotFound(NovaException):
class UnexpectedVMStateError(NovaException): class UnexpectedVMStateError(NovaException):
msg_fmt = _("unexpected VM state: expecting %(expected)s but " msg_fmt = _("Unexpected VM state: expecting %(expected)s but "
"the actual state is %(actual)s") "the actual state is %(actual)s")
@@ -1421,24 +1421,24 @@ class PciDeviceNotFound(NovaException):
class PciDeviceInvalidStatus(NovaException): class PciDeviceInvalidStatus(NovaException):
msg_fmt = _( msg_fmt = _(
"PCI Device %(compute_node_id)s:%(address)s is %(status)s " "PCI device %(compute_node_id)s:%(address)s is %(status)s "
"instead of %(hopestatus)s") "instead of %(hopestatus)s")
class PciDeviceInvalidOwner(NovaException): class PciDeviceInvalidOwner(NovaException):
msg_fmt = _( msg_fmt = _(
"PCI Device %(compute_node_id)s:%(address)s is owned by %(owner)s " "PCI device %(compute_node_id)s:%(address)s is owned by %(owner)s "
"instead of %(hopeowner)s") "instead of %(hopeowner)s")
class PciDeviceRequestFailed(NovaException): class PciDeviceRequestFailed(NovaException):
msg_fmt = _( msg_fmt = _(
"PCI Device request (%requests)s failed") "PCI device request (%requests)s failed")
class PciDevicePoolEmpty(NovaException): class PciDevicePoolEmpty(NovaException):
msg_fmt = _( msg_fmt = _(
"Attempt to consume PCI Device %(compute_node_id)s:%(address)s " "Attempt to consume PCI device %(compute_node_id)s:%(address)s "
"from empty pool") "from empty pool")
@@ -1484,4 +1484,4 @@ class PciDeviceUnsupportedHypervisor(NovaException):
class KeyManagerError(NovaException): class KeyManagerError(NovaException):
msg_fmt = _("key manager error: %(reason)s") msg_fmt = _("Key manager error: %(reason)s")