x/gantt
Code Issues Proposed changes

Merge "Rename InstanceType exceptions to Flavor"

Browse Source
This commit is contained in:
Jenkins
2013-11-22 07:07:52 +00:00
committed by Gerrit Code Review
parent 0ba5112244 7a6a8a5739
commit dffeb61c14
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
nova/exception.py
View File

@@ -898,19 +898,14 @@ class ConsoleTypeUnavailable(Invalid):
msg_fmt = _("Unavailable console type %(console_type)s.") msg_fmt = _("Unavailable console type %(console_type)s.")
class InstanceTypeNotFound(NotFound):
msg_fmt = _("Instance type %(instance_type_id)s could not be found.")
class InstanceTypeNotFoundByName(InstanceTypeNotFound):
msg_fmt = _("Instance type with name %(instance_type_name)s "
"could not be found.")
class FlavorNotFound(NotFound): class FlavorNotFound(NotFound):
msg_fmt = _("Flavor %(flavor_id)s could not be found.") msg_fmt = _("Flavor %(flavor_id)s could not be found.")
class FlavorNotFoundByName(FlavorNotFound):
msg_fmt = _("Flavor with name %(flavor_name)s could not be found.")
class FlavorAccessNotFound(NotFound): class FlavorAccessNotFound(NotFound):
msg_fmt = _("Flavor access not found for %(flavor_id)s / " msg_fmt = _("Flavor access not found for %(flavor_id)s / "
"%(project_id)s combination.") "%(project_id)s combination.")
@@ -956,8 +951,8 @@ class SchedulerHostFilterNotFound(NotFound):
msg_fmt = _("Scheduler Host Filter %(filter_name)s could not be found.") msg_fmt = _("Scheduler Host Filter %(filter_name)s could not be found.")
class InstanceTypeExtraSpecsNotFound(NotFound): class FlavorExtraSpecsNotFound(NotFound):
msg_fmt = _("Instance Type %(instance_type_id)s has no extra specs with " msg_fmt = _("Flavor %(flavor_id)s has no extra specs with "
"key %(extra_specs_key)s.") "key %(extra_specs_key)s.")
@@ -1003,12 +998,12 @@ class InstanceExists(NovaException):
msg_fmt = _("Instance %(name)s already exists.") msg_fmt = _("Instance %(name)s already exists.")
class InstanceTypeExists(NovaException): class FlavorExists(NovaException):
msg_fmt = _("Instance Type with name %(name)s already exists.") msg_fmt = _("Flavor with name %(name)s already exists.")
class InstanceTypeIdExists(NovaException): class FlavorIdExists(NovaException):
msg_fmt = _("Instance Type with ID %(flavor_id)s already exists.") msg_fmt = _("Flavor with ID %(flavor_id)s already exists.")
class FlavorAccessExists(NovaException): class FlavorAccessExists(NovaException):
@@ -1058,12 +1053,12 @@ class CannotResizeDisk(NovaException):
msg_fmt = _("Server disk was unable to be resized because: %(reason)s") msg_fmt = _("Server disk was unable to be resized because: %(reason)s")
class InstanceTypeMemoryTooSmall(NovaException): class FlavorMemoryTooSmall(NovaException):
msg_fmt = _("Instance type's memory is too small for requested image.") msg_fmt = _("Flavor's memory is too small for requested image.")
class InstanceTypeDiskTooSmall(NovaException): class FlavorDiskTooSmall(NovaException):
msg_fmt = _("Instance type's disk is too small for requested image.") msg_fmt = _("Flavor's disk is too small for requested image.")
class InsufficientFreeMemory(NovaException): class InsufficientFreeMemory(NovaException):
@@ -1150,8 +1145,8 @@ class AggregateHostExists(NovaException):
msg_fmt = _("Aggregate %(aggregate_id)s already has host %(host)s.") msg_fmt = _("Aggregate %(aggregate_id)s already has host %(host)s.")
class InstanceTypeCreateFailed(NovaException): class FlavorCreateFailed(NovaException):
msg_fmt = _("Unable to create instance type") msg_fmt = _("Unable to create flavor")
class InstancePasswordSetFailed(NovaException): class InstancePasswordSetFailed(NovaException):