modules and tools as were used in XML recipe are not used in
PyRecipes, so they can be removed
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
lnst/Controller/NetTestController.py | 46 ------------------------------------
1 file changed, 46 deletions(-)
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index fd54a09..827a943 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -193,52 +193,6 @@ class NetTestController:
recipe_name = os.path.basename(self._recipe_path)
machine.configure(recipe_name)
- sync_table = {'module': {}, 'tools': {}}
- if resource_sync:
- for task in self._recipe['tasks']:
- res_table = copy.deepcopy(self._resource_table)
- if 'module_dir' in task:
- modules = self._load_test_modules([task['module_dir']])
- res_table['module'].update(modules)
- if 'tools_dir' in task:
- tools = self._load_test_tools([task['tools_dir']])
- res_table['tools'].update(tools)
-
- if 'commands' not in task:
- if not self._reduce_sync:
- sync_table = res_table
- break
- else:
- continue
- for cmd in task['commands']:
- if 'host' not in cmd or cmd['host'] != m_id:
- continue
- if cmd['type'] == 'test':
- mod = cmd['module']
- if mod in res_table['module']:
- sync_table['module'][mod] =
res_table['module'][mod]
- # check if test module uses some test tools
- mod_path =
res_table['module'][mod]["path"]
- mod_tools = get_module_tools(mod_path)
- for t in mod_tools:
- if t in sync_table['tools']:
- continue
- logging.debug("Adding '%s' tool as "\
- "dependency of %s test module" % (t, mod))
- sync_table['tools'][t] =
res_table['tools'][t]
- else:
- msg = "Module '%s' not found on the
controller"\
- % mod
- raise RecipeError(msg, cmd)
- if cmd['type'] == 'exec' and 'from' in cmd:
- tool = cmd['from']
- if tool in res_table['tools']:
- sync_table['tools'][tool] =
res_table['tools'][tool]
- else:
- msg = "Tool '%s' not found on the
controller" % tool
- raise RecipeError(msg, cmd)
- machine.sync_resources(sync_table)
-
def _prepare_interface(self, m_id, if_id, iface_data):
machine = self._machines[m_id]
#if_type = iface_data["type"]
--
2.4.11