summaryrefslogtreecommitdiff
path: root/nova/exception.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-08 18:05:59 +0000
committerGerrit Code Review <review@openstack.org>2016-08-08 18:05:59 +0000
commitb2adb4e850942a9361baa02662f9bfe4ebd5f077 (patch)
treed909b5ba1f77f7c1f3fac7319660b40b7805fcd0 /nova/exception.py
parent0090e660d54e69d25f2a76222553a0661b0b1699 (diff)
parentb10948913dc27b46114ad80e734aa015327fc1cf (diff)
downloadnova-b2adb4e850942a9361baa02662f9bfe4ebd5f077.tar.gz
Merge "Added better error messages during (un)pinning CPUs"
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/nova/exception.py b/nova/exception.py
index 0c742103df..37d1b7eb1b 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -1982,12 +1982,22 @@ class CPUPinningNotSupported(Invalid):
class CPUPinningInvalid(Invalid):
- msg_fmt = _("Cannot pin/unpin cpus %(requested)s from the following "
- "pinned set %(pinned)s")
+ msg_fmt = _("CPU set to pin %(requested)s must be a subset of "
+ "free CPU set %(free)s")
+
+
+class CPUUnpinningInvalid(Invalid):
+ msg_fmt = _("CPU set to unpin %(requested)s must be a subset of "
+ "pinned CPU set %(pinned)s")
class CPUPinningUnknown(Invalid):
- msg_fmt = _("CPU set to pin/unpin %(requested)s must be a subset of "
+ msg_fmt = _("CPU set to pin %(requested)s must be a subset of "
+ "known CPU set %(cpuset)s")
+
+
+class CPUUnpinningUnknown(Invalid):
+ msg_fmt = _("CPU set to unpin %(requested)s must be a subset of "
"known CPU set %(cpuset)s")