diff options
| author | Michael Still <mikal@stillhq.com> | 2012-07-04 14:42:08 +1000 |
|---|---|---|
| committer | Michael Still <mikal@stillhq.com> | 2012-07-26 21:22:04 +1000 |
| commit | fc82c6dbbd0fa1cdc130cefea534967e273d5570 (patch) | |
| tree | db0df1ad88ae8eab2f6911de0e63ce13341d351d /nova/exception.py | |
| parent | e238e07692c747ddcb0c70452578a812836cea67 (diff) | |
Convert fixed_ips to using instance_uuid.
This should be the second last blueprint finish-uuid-conversion change.
Change-Id: Idd47c5ed3c30af24d60eb23b8e3881d61b4c7976
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 b63406427..69c28e59b 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -423,7 +423,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): @@ -596,7 +596,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): @@ -605,7 +605,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): @@ -618,7 +618,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): |