From e0ff9f30a49cf23f70e424db071f033effd62a00 Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Tue, 1 Feb 2022 14:50:08 -0800 Subject: [PATCH] example-security-connection: Add exit code logic. And clean up stations on exit if --noclean was not selected. Signed-off-by: Ben Greear --- py-scripts/create_vap.py | 1 + py-scripts/example_security_connection.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/py-scripts/create_vap.py b/py-scripts/create_vap.py index d9751030..443cebce 100755 --- a/py-scripts/create_vap.py +++ b/py-scripts/create_vap.py @@ -225,6 +225,7 @@ Command example: create_vaps.append(create_vap) # TODO: Add logic to clean up vap, unless --noclean option is specified. + # TODO: Set radio back to previous channel. any_failed = False for v in create_vaps: diff --git a/py-scripts/example_security_connection.py b/py-scripts/example_security_connection.py index f14ed3a8..61768ebd 100755 --- a/py-scripts/example_security_connection.py +++ b/py-scripts/example_security_connection.py @@ -4,15 +4,16 @@ import os import importlib import argparse import logging +from time import sleep + +logger = logging.getLogger(__name__) if sys.version_info[0] != 3: - print("This script requires Python 3") + logger.critical("This script requires Python 3") exit(1) - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -logger = logging.getLogger(__name__) lf_logger_config = importlib.import_module("py-scripts.lf_logger_config") LFUtils = importlib.import_module("py-json.LANforge.LFUtils") realm = importlib.import_module("py-json.realm") @@ -148,6 +149,14 @@ def main(): ip_test.timeout = 60 ip_test.build() + if not args.noclean: + sleep(5) + ip_test.cleanup(station_list) + + if ip_test.passes(): + ip_test.exit_success() + else: + ip_test.exit_fail() if __name__ == "__main__": main()