From 4b2f38dd607835ec26f010f09ab3df5be766f57f Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 9 Oct 2008 11:29:32 +0000
Subject: [PATCH] Move instance hypervisor check to ExpandNames
This check can be done earlier, in ExpandNames, and is needed here for
the hypervisor parameter check.
Reviewed-by: ultrotter
---
lib/cmdlib.py | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index eaefed1d8..a8d20a9c3 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3175,15 +3175,27 @@ class LUCreateInstance(LogicalUnit):
if not hasattr(self.op, attr):
setattr(self.op, attr, None)
+ # cheap checks, mostly valid constants given
+
# verify creation mode
if self.op.mode not in (constants.INSTANCE_CREATE,
constants.INSTANCE_IMPORT):
raise errors.OpPrereqError("Invalid instance creation mode '%s'" %
self.op.mode)
+
# disk template and mirror node verification
if self.op.disk_template not in constants.DISK_TEMPLATES:
raise errors.OpPrereqError("Invalid disk template name")
+ if self.op.hypervisor is None:
+ self.op.hypervisor = self.cfg.GetHypervisorType()
+
+ enabled_hvs = self.cfg.GetClusterInfo().enabled_hypervisors
+ if self.op.hypervisor not in enabled_hvs:
+ raise errors.OpPrereqError("Selected hypervisor (%s) not enabled in the"
+ " cluster (%s)" % (self.op.hypervisor,
+ ",".join(enabled_hvs)))
+
#### instance parameters check
# instance name verification
@@ -3348,18 +3360,6 @@ class LUCreateInstance(LogicalUnit):
raise errors.OpPrereqError("Cluster does not support lvm-based"
" instances")
- # cheap checks (from the config only)
-
- if self.op.hypervisor is None:
- self.op.hypervisor = self.cfg.GetHypervisorType()
-
- enabled_hvs = self.cfg.GetClusterInfo().enabled_hypervisors
- if self.op.hypervisor not in enabled_hvs:
- raise errors.OpPrereqError("Selected hypervisor (%s) not enabled in the"
- " cluster (%s)" % (self.op.hypervisor,
- ",".join(enabled_hvs)))
-
- # costly checks (from nodes)
if self.op.mode == constants.INSTANCE_IMPORT:
src_node = self.op.src_node
--
GitLab