aliases will now only be taken from command
line -a (or -A) argument, so we can remove
_overriden_aliases and rework get methods
to look in dict object where they are stored
in TaskAPI in get_alias method, default argument
will be introduced as replacament for alias definition
in <define> part of XML recipe
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
lnst/Controller/NetTestController.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index 04851e1..8c1d24f 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -53,8 +53,8 @@ class NetTestController:
def __init__(self, recipe_path, log_ctl,
res_serializer=None, pool_checks=True,
packet_capture=False,
- defined_aliases=None, overriden_aliases=None,
- reduce_sync=False, restrict_pools=[], multi_match=False):
+ defined_aliases=None, reduce_sync=False,
+ restrict_pools=[], multi_match=False):
self._res_serializer = res_serializer
self._remote_capture_files = {}
self._log_ctl = log_ctl
@@ -62,6 +62,7 @@ class NetTestController:
self._msg_dispatcher = MessageDispatcher(log_ctl)
self._packet_capture = packet_capture
self._reduce_sync = reduce_sync
+ self._defined_aliases = defined_aliases
self._multi_match = multi_match
self.remove_saved_machine_config()
@@ -674,12 +675,11 @@ class NetTestController:
return packages
def _get_alias(self, alias):
- templates = self._parser._template_proc
- return templates._find_definition(alias)
+ if alias in self._defined_aliases:
+ return self._defined_aliases[alias]
def _get_aliases(self):
- templates = self._parser._template_proc
- return templates._dump_definitions()
+ return self._defined_aliases
class MessageDispatcher(ConnectionHandler):
def __init__(self, log_ctl):
--
2.4.11