From 6e80da8b3786009bdc74f50e50b542909bd09f33 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 3 Aug 2011 10:46:51 +0200
Subject: [PATCH] Small changes in group evacuation
- Use OpPrereqError in CheckPrereq
- Clarify command synopsis
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/client/gnt_group.py | 4 +++-
lib/cmdlib.py | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/client/gnt_group.py b/lib/client/gnt_group.py
index 74a6d397e..538c1cbe9 100644
--- a/lib/client/gnt_group.py
+++ b/lib/client/gnt_group.py
@@ -212,6 +212,7 @@ def EvacuateGroup(opts, args):
return rcode
+
commands = {
"add": (
AddGroup, ARGS_ONE_GROUP, [DRY_RUN_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT],
@@ -243,7 +244,8 @@ commands = {
"evacuate": (
EvacuateGroup, [ArgGroup(min=1, max=1)],
[TO_GROUP_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT],
- "-I <iallocator> [--to <group>]", "Evacuate all instances within a group"),
+ "[-I <iallocator>] [--to <group>]",
+ "Evacuate all instances within a group"),
"list-tags": (
ListTags, ARGS_ONE_GROUP, [PRIORITY_OPT],
"<instance_name>", "List the tags of the given instance"),
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index eee643e1e..8141043f9 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -12191,7 +12191,8 @@ class LUGroupEvacuate(LogicalUnit):
if group_uuid != self.group_uuid]
if not self.target_uuids:
- raise errors.OpExecError("There are no possible target groups")
+ raise errors.OpPrereqError("There are no possible target groups",
+ errors.ECODE_INVAL)
def BuildHooksEnv(self):
"""Build hooks env.
--
GitLab