commit fe4d49a78a553aedc6f795416c4d2e8ec778296c
Author: Jiri Pirko <jiri(a)resnulli.us>
Date: Mon Sep 29 14:07:23 2014 +0200
lnst-ctl: move NetTestController contruction into get_recipe_result
and avoid unnecessary long arg lines
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
lnst-ctl | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/lnst-ctl b/lnst-ctl
index 0ee16f1..b4912c0 100755
--- a/lnst-ctl
+++ b/lnst-ctl
@@ -69,17 +69,7 @@ def store_alias(alias_def, aliases_dict):
aliases_dict[name] = value
-def process_recipe(action, file_path, log_ctl, res_serializer,
- pool_checks, packet_capture,
- defined_aliases, overriden_aliases,
- reduce_sync):
- nettestctl = NetTestController(file_path, log_ctl,
- res_serializer=res_serializer,
- pool_checks=pool_checks,
- packet_capture=packet_capture,
- defined_aliases=defined_aliases,
- overriden_aliases=overriden_aliases,
- reduce_sync=reduce_sync)
+def exec_action(action, nettestctl):
if action == "run":
return nettestctl.run_recipe()
elif action == "config_only":
@@ -97,12 +87,16 @@ def get_recipe_result(action, file_path, log_ctl, res_serializer,
retval = RETVAL_PASS
+ nettestctl = NetTestController(file_path, log_ctl,
+ res_serializer=res_serializer,
+ pool_checks=pool_checks,
+ packet_capture=packet_capture,
+ defined_aliases=defined_aliases,
+ overriden_aliases=overriden_aliases,
+ reduce_sync=reduce_sync)
res = {}
try:
- res = process_recipe(action, file_path, log_ctl, res_serializer,
- pool_checks, packet_capture,
- defined_aliases, overriden_aliases,
- reduce_sync):
+ res = exec_action(action, nettestctl)
except Exception as err:
log_exc_traceback()
logging.error(err)
Show replies by date