From: Ondrej Lichtner <olichtne(a)redhat.com&gt; This should solve race conditions that occur when creating interfaces of the same kind when the name of the first one is not yet recognized by LNST as used. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- lnst/Slave/InterfaceManager.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py index 489c697..a557322 100644 --- a/lnst/Slave/InterfaceManager.py +++ b/lnst/Slave/InterfaceManager.py @@ -194,6 +194,9 @@ class InterfaceManager(object): for device in self._devices.itervalues(): if name == device.get_name(): return True + for device in self._tmp_mapping.itervalues(): + if name == device.get_name(): + return True return False def _assign_name_generic(self, prefix): -- 1.9.3

From: Ondrej Lichtner <olichtne(a)redhat.com&gt; This patch moves the log creation of the first recipe match before the creation of the NetTestController object. Without this some logs were misplaced. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt; --- lnst-ctl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lnst-ctl b/lnst-ctl index 5f3b22f..d249c32 100755 --- a/lnst-ctl +++ b/lnst-ctl @@ -87,6 +87,13 @@ def get_recipe_result(action, file_path, log_ctl, res_serializer, reduce_sync, multi_match): retval = RETVAL_PASS + matches = 1 + no_match = False + + log_ctl.set_recipe(file_path, expand="match_%d" % matches) + recipe_head_log_entry(file_path, matches) + res_serializer.add_recipe(file_path, matches) + nettestctl = NetTestController(file_path, log_ctl, res_serializer=res_serializer, pool_checks=pool_checks, @@ -94,15 +101,10 @@ def get_recipe_result(action, file_path, log_ctl, res_serializer, defined_aliases=defined_aliases, overriden_aliases=overriden_aliases, reduce_sync=reduce_sync) - matches = 1 - no_match = False while True: res = {} if matches == 1: try: - log_ctl.set_recipe(file_path, expand="match_%d" % matches) - recipe_head_log_entry(file_path, matches) - res_serializer.add_recipe(file_path, matches) nettestctl.provision_machines() nettestctl.print_match_description() res = exec_action(action, nettestctl) -- 1.9.3