diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-26 21:50:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-26 21:50:36 +0000 |
| commit | 66f9e085aae73ecfbf9ac3a1447917fa99d8a606 (patch) | |
| tree | dcb53582c55d51e634c8d55bc03943dc91e8f6e4 /nova/exception.py | |
| parent | c8ee0c36e5e25c95403e2a49e989c2fcf447f7ff (diff) | |
| parent | fc82c6dbbd0fa1cdc130cefea534967e273d5570 (diff) | |
Merge "Convert fixed_ips to using instance_uuid."
Diffstat (limited to 'nova/exception.py')
| -rw-r--r-- | nova/exception.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nova/exception.py b/nova/exception.py index 981363fa1..323f33c29 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -424,7 +424,7 @@ class InvalidEc2Id(Invalid): class InvalidUUID(Invalid): - message = _("Expected a uuid but received %(uuid).") + message = _("Expected a uuid but received %(uuid)s.") class ConstraintNotMet(NovaException): @@ -597,7 +597,7 @@ class FixedIpNotFoundForAddress(FixedIpNotFound): class FixedIpNotFoundForInstance(FixedIpNotFound): - message = _("Instance %(instance_id)s has zero fixed ips.") + message = _("Instance %(instance_uuid)s has zero fixed ips.") class FixedIpNotFoundForNetworkHost(FixedIpNotFound): @@ -606,7 +606,7 @@ class FixedIpNotFoundForNetworkHost(FixedIpNotFound): class FixedIpNotFoundForSpecificInstance(FixedIpNotFound): - message = _("Instance %(instance_id)s doesn't have fixed ip '%(ip)s'.") + message = _("Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'.") class FixedIpNotFoundForHost(FixedIpNotFound): @@ -619,7 +619,8 @@ class FixedIpNotFoundForNetwork(FixedIpNotFound): class FixedIpAlreadyInUse(NovaException): - message = _("Fixed IP address %(address)s is already in use.") + message = _("Fixed IP address %(address)s is already in use on instance " + "%(instance_uuid)s.") class FixedIpInvalid(Invalid): |