Since aliases can now only be specified via command line option, we can
use only defined_aliases and thus remove overriden_aliases completely.
This patch removes overriden_aliases from lnst-ctl and
NetTestController's __init__ function.
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
lnst-ctl | 5 ++---
lnst/Controller/NetTestController.py | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/lnst-ctl b/lnst-ctl
index 93b084b..c8a229f 100755
--- a/lnst-ctl
+++ b/lnst-ctl
@@ -142,7 +142,7 @@ def exec_action(action, nettestctl):
def get_recipe_result(action, file_path, log_ctl, res_serializer,
pool_checks, packet_capture,
- defined_aliases, overriden_aliases,
+ defined_aliases,
reduce_sync, multi_match, pools):
retval = RETVAL_PASS
@@ -161,7 +161,6 @@ def get_recipe_result(action, file_path, log_ctl, res_serializer,
pool_checks=pool_checks,
packet_capture=packet_capture,
defined_aliases=defined_aliases,
- overriden_aliases=overriden_aliases,
reduce_sync=reduce_sync,
restrict_pools=pools,
multi_match=multi_match)
@@ -413,7 +412,7 @@ def main():
for recipe_file in recipe_files:
rv = get_recipe_result(action, recipe_file, log_ctl, res_serializer,
pool_checks, packet_capture,
- defined_aliases, overriden_aliases,
+ defined_aliases,
reduce_sync, multi_match, pools)
if rv > retval:
retval = rv
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index 135bbf6..5de40ac 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -55,9 +55,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
--
2.4.11