....to the new interface of ComputeIPolicySpecViolation.
This is, again, a semantic conflict introduced by the
last merge.

Signed-off-by: Klaus Aehlig <[email protected]>
---
 lib/cmdlib/common.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/cmdlib/common.py b/lib/cmdlib/common.py
index ed1f03f..d7a095f 100644
--- a/lib/cmdlib/common.py
+++ b/lib/cmdlib/common.py
@@ -622,12 +622,15 @@ def ComputeIPolicyDiskSizesViolation(ipolicy, disk_sizes,
   @return: A list of violations, or an empty list of no violations are found
 
   """
+  if disk_template != constants.DT_DISKLESS and disk_sizes == []:
+    return [constants.ISPEC_DISK_COUNT]
+  disk_templates = map (lambda _ : disk_template, disk_sizes)
   return ComputeIPolicySpecViolation(ipolicy,
                                      # mem_size, cpu_count, disk_count
                                      None, None, len(disk_sizes),
                                      None, disk_sizes, # nic_count, disk_sizes
                                      None, # spindle_use
-                                     disk_template,
+                                     disk_templates,
                                      _compute_fn=_compute_fn)
 
 
-- 
2.2.0.rc0.207.ga3a616c

Reply via email to