commit 563fd024c1fdbda4a556db9f078236019cdc81d5
Author: Artem Savkov <asavkov(a)redhat.com>
Date: Thu Oct 23 11:56:43 2014 +0200
Multiple parameter recipes fix.
Parameters iteration cycle in SetupMapper._check_interface_compatibility()
lacks 'iteritems' method call resulting in ValueError exception:
Traceback (most recent call last):
File "/usr/bin/lnst-ctl", line 102, in get_recipe_result
nettestctl.provision_machines()
File "/usr/lib/python2.6/site-packages/lnst/Controller/NetTestController.py", line 213, in provision_machines
if not sp.provision_machines(machines):
File "/usr/lib/python2.6/site-packages/lnst/Controller/SlavePool.py", line 226, in provision_machines
res = mapper.match()
File "/usr/lib/python2.6/site-packages/lnst/Controller/SlavePool.py", line 399, in match
if self._if_match():
File "/usr/lib/python2.6/site-packages/lnst/Controller/SlavePool.py", line 469, in _if_match
if self._check_interface_compatibility(req_if, pool_if):
File "/usr/lib/python2.6/site-packages/lnst/Controller/SlavePool.py", line 544, in _check_interface_compatibility
for param, value in req_if["params"]:
ValueError: too many values to unpack
Introduced in 2cc9c639ea139a4ca339850371ed65dbcd9ca93e: "SlavePool:
SetupMapper reimplementation"
Signed-off-by: Artem Savkov <asavkov(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
lnst/Controller/SlavePool.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/lnst/Controller/SlavePool.py b/lnst/Controller/SlavePool.py
index a29d727..87a2b33 100644
--- a/lnst/Controller/SlavePool.py
+++ b/lnst/Controller/SlavePool.py
@@ -540,7 +540,7 @@ class SetupMapper(object):
if mapping[0] == pool_if["network"] and\
req_label != req_if["network"]:
return False
- for param, value in req_if["params"]:
+ for param, value in req_if["params"].iteritems():
if param in pool_if["params"] and\
value != pool_if["params"][param]:
return False