[lnst] SlavePool: machine parameter fix
by Jiří Pírko
commit 00c487f5787ef2051a299a82c601ca006908fce2
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Thu Oct 23 13:32:55 2014 +0200
SlavePool: machine parameter fix
This is a followup to the previous patch that was posted by Artem.
The same error he found also appears in the check_machine_compatibility
method.
Signed-off-by: Ondrej Lichtner <olichtne(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 87a2b33..53f402f 100644
--- a/lnst/Controller/SlavePool.py
+++ b/lnst/Controller/SlavePool.py
@@ -525,7 +525,7 @@ class SetupMapper(object):
def _check_machine_compatibility(self, req_id, pool_id):
req_machine = self._mreqs[req_id]
pool_machine = self._pool[pool_id]
- for param, value in req_machine["params"]:
+ for param, value in req_machine["params"].iteritems():
if param in pool_machine["params"] and\
value != pool_machine["params"][param]:
return False
9 years, 6 months
[PATCH] SlavePool: machine parameter fix
by Ondrej Lichtner
From: Ondrej Lichtner <olichtne(a)redhat.com>
This is a followup to the previous patch that was posted by Artem.
The same error he found also appears in the check_machine_compatibility
method.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
lnst/Controller/SlavePool.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lnst/Controller/SlavePool.py b/lnst/Controller/SlavePool.py
index 87a2b33..53f402f 100644
--- a/lnst/Controller/SlavePool.py
+++ b/lnst/Controller/SlavePool.py
@@ -525,7 +525,7 @@ class SetupMapper(object):
def _check_machine_compatibility(self, req_id, pool_id):
req_machine = self._mreqs[req_id]
pool_machine = self._pool[pool_id]
- for param, value in req_machine["params"]:
+ for param, value in req_machine["params"].iteritems():
if param in pool_machine["params"] and\
value != pool_machine["params"][param]:
return False
--
1.9.3
9 years, 6 months
[lnst] Multiple parameter recipes fix.
by Jiří Pírko
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
9 years, 6 months
[PATCH] Multiple parameter recipes fix.
by Artem Savkov
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>
---
lnst/Controller/SlavePool.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
1.9.3
9 years, 6 months
[PATCH] add missing Netperf module to setup.py
by Jan Tluka
The Netperf module is missing in to be installed bits.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
setup.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/setup.py b/setup.py
index 4fbcf57..371fbc0 100755
--- a/setup.py
+++ b/setup.py
@@ -111,6 +111,7 @@ TEST_MODULES = [
"test_modules/Iperf.py",
"test_modules/Multicast.py",
"test_modules/NetCat.py",
+ "test_modules/Netperf.py",
"test_modules/PacketAssert.py",
"test_modules/PktCounter.py",
"test_modules/PktgenTx.py"]
--
1.9.3
9 years, 6 months
[lnst] add missing Netperf module to setup.py
by Jiří Pírko
commit 161245dea55a8737c6f823684b1c1327a0a2e315
Author: Jan Tluka <jtluka(a)redhat.com>
Date: Tue Oct 21 17:12:18 2014 +0200
add missing Netperf module to setup.py
The Netperf module is missing in to be installed bits.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
setup.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/setup.py b/setup.py
index 4fbcf57..371fbc0 100755
--- a/setup.py
+++ b/setup.py
@@ -111,6 +111,7 @@ TEST_MODULES = [
"test_modules/Iperf.py",
"test_modules/Multicast.py",
"test_modules/NetCat.py",
+ "test_modules/Netperf.py",
"test_modules/PacketAssert.py",
"test_modules/PktCounter.py",
"test_modules/PktgenTx.py"]
9 years, 6 months