setting of machine requirements is now moved so it's
run after executing setup phase of PyRecipe and has
been removed from NTC __init__()
in _prepare_network() mreq dict is used instead of
parsed xml recipe and method's been reworked a bit
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
lnst/Controller/NetTestController.py | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index fdaf532..ae5559a 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -90,9 +90,6 @@ class NetTestController:
sp = SlavePool(pools, pool_checks)
self._slave_pool = sp
- mreq = self._get_machine_requirements()
- sp.set_machine_requirements(mreq)
-
modules_dirs = lnst_config.get_option('environment',
'module_dirs')
tools_dirs = lnst_config.get_option('environment', 'tool_dirs')
@@ -119,21 +116,21 @@ class NetTestController:
raise NetTestError(msg)
def _prepare_network(self, resource_sync=True):
- recipe = self._recipe
+ mreq = Task.get_mreq()
machines = self._machines
for m_id in machines.keys():
self._prepare_machine(m_id, resource_sync)
- for machine_xml_data in recipe["machines"]:
- m_id = machine_xml_data["id"]
+ for machine_id, machine_data in mreq.iteritems():
+ m_id = machine_id
m = machines[m_id]
namespaces = set()
- for iface_xml_data in machine_xml_data["interfaces"]:
- self._prepare_interface(m_id, iface_xml_data)
+ for if_id, iface_data in machine_data["interfaces"].iteritems():
+ self._prepare_interface(m_id, if_id, iface_data)
- if iface_xml_data["netns"] != None:
- namespaces.add(iface_xml_data["netns"])
+ if iface_data["netns"] != None:
+ namespaces.add(iface_data["netns"])
if len(namespaces) > 0:
m.disable_nm()
--
2.4.11