x/vmware-nsx
Code Issues Proposed changes

Merge "Add missing conversion specifiers in exception messages."

Browse Source
This commit is contained in:
Jenkins 2012-08-17 14:43:59 +00:00 committed by Gerrit Code Review
commit 09749a9e5a
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
quantum/common/exceptions.py
View File

@ -103,13 +103,13 @@ class MacAddressInUse(InUse):
class HostRoutesExhausted(QuantumException):
# NOTE(xchenum): probably make sense to use quota exceeded exception?
message = _("Unable to complete operation for %(subnet_id)s. "
"The number of host routes exceeds the limit %(quota).")
"The number of host routes exceeds the limit %(quota)s.")
class DNSNameServersExhausted(QuantumException):
# NOTE(xchenum): probably make sense to use quota exceeded exception?
message = _("Unable to complete operation for %(subnet_id)s. "
"The number of DNS nameservers exceeds the limit %(quota).")
"The number of DNS nameservers exceeds the limit %(quota)s.")
class IpAddressInUse(InUse):
@ -211,8 +211,8 @@ class InvalidQuotaValue(QuantumException):
class InvalidSharedSetting(QuantumException):
message = _("Unable to reconfigure sharing settings for network"
"%(network). Multiple tenants are using it")
message = _("Unable to reconfigure sharing settings for network "
"%(network)s. Multiple tenants are using it")
class InvalidExtenstionEnv(QuantumException):

24
quantum/plugins/cisco/common/cisco_exceptions.py
View File

@ -76,14 +76,14 @@ class NetworkVlanBindingAlreadyExists(exceptions.QuantumException):
class PortProfileAlreadyExists(exceptions.QuantumException):
"""Port profile cannot be created since it already exisits"""
message = _("PortProfile %(pp_name) for %(tenant_id)s "
message = _("PortProfile %(pp_name)s for %(tenant_id)s "
"already exists")
class PortProfileBindingAlreadyExists(exceptions.QuantumException):
"""Binding cannot be created, since it already exists"""
message = _("PortProfileBinding for port profile %(pp_id)s to "
"port %(port_id) already exists")
"port %(port_id)s already exists")
class VlanIDNotFound(exceptions.QuantumException):
@ -134,52 +134,52 @@ class CredentialAlreadyExists(exceptions.QuantumException):
class NexusPortBindingNotFound(exceptions.QuantumException):
"""NexusPort Binding is not present"""
message = _("Nexus Port Binding %(port_id) is not present")
message = _("Nexus Port Binding %(port_id)s is not present")
class NexusPortBindingAlreadyExists(exceptions.QuantumException):
"""NexusPort Binding alredy exists"""
message = _("Nexus Port Binding %(port_id) already exists")
message = _("Nexus Port Binding %(port_id)s already exists")
class UcsmBindingNotFound(exceptions.QuantumException):
"""Ucsm Binding is not present"""
message = _("Ucsm Binding with ip %(ucsm_ip) is not present")
message = _("Ucsm Binding with ip %(ucsm_ip)s is not present")
class UcsmBindingAlreadyExists(exceptions.QuantumException):
"""Ucsm Binding already exists"""
message = _("Ucsm Binding with ip %(ucsm_ip) already exists")
message = _("Ucsm Binding with ip %(ucsm_ip)s already exists")
class DynamicVnicNotFound(exceptions.QuantumException):
"""Ucsm Binding is not present"""
message = _("Dyanmic Vnic %(vnic_id) is not present")
message = _("Dyanmic Vnic %(vnic_id)s is not present")
class DynamicVnicAlreadyExists(exceptions.QuantumException):
"""Ucsm Binding already exists"""
message = _("Dynamic Vnic with name %(device_name) already exists")
message = _("Dynamic Vnic with name %(device_name)s already exists")
class BladeNotFound(exceptions.QuantumException):
"""Blade is not present"""
message = _("Blade %(blade_id) is not present")
message = _("Blade %(blade_id)s is not present")
class BladeAlreadyExists(exceptions.QuantumException):
"""Blade already exists"""
message = _("Blade with mgmt_ip %(mgmt_ip) already exists")
message = _("Blade with mgmt_ip %(mgmt_ip)s already exists")
class PortVnicBindingAlreadyExists(exceptions.QuantumException):
"""PortVnic Binding already exists"""
message = _("PortVnic Binding %(port_id) already exists")
message = _("PortVnic Binding %(port_id)s already exists")
class PortVnicNotFound(exceptions.QuantumException):
"""PortVnic Binding is not present"""
message = _("PortVnic Binding %(port_id) is not present")
message = _("PortVnic Binding %(port_id)s is not present")
class InvalidAttach(exceptions.QuantumException):