From 36400e003d19b78ff1ff60b957109150f78094b8 Mon Sep 17 00:00:00 2001 From: Matthew Stidham Date: Fri, 17 Sep 2021 15:29:15 -0700 Subject: [PATCH] Making it so that lanforge-scripts can work if the repository isn't named exactly the same way Signed-off-by: Matthew Stidham --- py-dashboard/GhostRequest.py | 7 ++- py-json/LANforge/LFRequest.py | 6 +-- py-json/LANforge/LFUtils.py | 6 +-- py-json/LANforge/lf_json_autogen.py | 6 +-- py-json/LANforge/lfcli_base.py | 8 ++-- py-json/LANforge/set_port.py | 6 +-- py-json/create_wanlink.py | 8 ++-- py-json/cv_dut_profile.py | 8 ++-- py-json/cv_test_manager.py | 12 ++--- py-json/dataplane_test_profile.py | 6 +-- py-json/dut_profile.py | 8 ++-- py-json/fio_endp_profile.py | 6 +-- py-json/gen_cxprofile.py | 6 +-- py-json/http_profile.py | 8 ++-- py-json/l3_cxprofile.py | 6 +-- py-json/l3_cxprofile2.py | 8 ++-- py-json/l4_cxprofile.py | 6 +-- py-json/lf_attenmod.py | 10 ++--- py-json/lf_cv_base.py | 6 +-- py-json/mac_vlan_profile.py | 12 ++--- py-json/multicast_profile.py | 6 +-- py-json/qvlan_profile.py | 10 ++--- py-json/realm.py | 44 +++++++++---------- py-json/realm_test.py | 8 ++-- py-json/show_ports.py | 6 +-- py-json/station_profile.py | 18 ++++---- py-json/test_base.py | 6 +-- py-json/test_group_profile.py | 6 +-- py-json/test_histogram.py | 6 +-- py-json/test_utility.py | 10 ++--- py-json/vap_profile.py | 14 +++--- py-json/vr_profile2.py | 8 ++-- py-json/wifi_monitor_profile.py | 12 ++--- py-json/ws-sta-monitor.py | 6 +-- py-scripts/cicd_TipIntegration.py | 2 +- py-scripts/cicd_testrailAndInfraSetup.py | 2 +- py-scripts/connection_test.py | 10 ++--- py-scripts/create_bond.py | 10 ++--- py-scripts/create_bridge.py | 10 ++--- py-scripts/create_chamberview.py | 6 +-- py-scripts/create_chamberview_dut.py | 8 ++-- py-scripts/create_l3.py | 12 ++--- py-scripts/create_l4.py | 10 ++--- py-scripts/create_macvlan.py | 12 ++--- py-scripts/create_qvlan.py | 12 ++--- py-scripts/create_station.py | 10 ++--- py-scripts/create_station_from_df.py | 8 ++-- py-scripts/create_vap.py | 10 ++--- py-scripts/create_vr.py | 10 ++--- py-scripts/csv_convert.py | 4 +- py-scripts/csv_processor.py | 4 +- py-scripts/csv_to_grafana.py | 14 +++--- py-scripts/csv_to_influx.py | 8 ++-- py-scripts/cv_manager.py | 6 +-- py-scripts/cv_to_grafana.py | 16 +++---- py-scripts/download_test.py | 10 ++--- py-scripts/event_breaker.py | 8 ++-- py-scripts/event_flood.py | 8 ++-- py-scripts/example_security_connection.py | 10 ++--- py-scripts/ghost_profile.py | 6 +-- py-scripts/grafana_profile.py | 8 ++-- py-scripts/influx.py | 6 +-- py-scripts/layer3_test.py | 10 ++--- py-scripts/layer4_test.py | 12 ++--- py-scripts/lf_ap_auto_test.py | 6 +-- py-scripts/lf_atten_mod_test.py | 10 ++--- py-scripts/lf_dataplane_test.py | 6 +-- py-scripts/lf_dfs_test.py | 8 ++-- py-scripts/lf_dut_sta_vap_test.py | 10 ++--- py-scripts/lf_ftp.py | 14 +++--- py-scripts/lf_ftp_test.py | 12 ++--- py-scripts/lf_graph.py | 6 +-- py-scripts/lf_mesh_test.py | 6 +-- py-scripts/lf_multipsk.py | 10 ++--- py-scripts/lf_report_test.py | 8 ++-- py-scripts/lf_rvr_test.py | 6 +-- py-scripts/lf_rx_sensitivity_test.py | 6 +-- py-scripts/lf_sniff_radio.py | 10 ++--- py-scripts/lf_snp_test.py | 12 ++--- py-scripts/lf_tr398_test.py | 6 +-- py-scripts/lf_webpage.py | 12 ++--- py-scripts/lf_wifi_capacity_test.py | 8 ++-- py-scripts/measure_station_time_up.py | 10 ++--- py-scripts/modify_station.py | 8 ++-- py-scripts/modify_vap.py | 8 ++-- py-scripts/recordinflux.py | 6 +-- py-scripts/run_cv_scenario.py | 10 ++--- py-scripts/rvr_scenario.py | 10 ++--- py-scripts/scenario.py | 10 ++--- py-scripts/sta_connect.py | 10 ++--- py-scripts/sta_connect2.py | 12 ++--- py-scripts/sta_connect_bssid_mac.py | 10 ++--- py-scripts/sta_connect_example.py | 8 ++-- py-scripts/sta_connect_multi_example.py | 10 ++--- py-scripts/sta_scan_test.py | 4 +- py-scripts/station_layer3.py | 10 ++--- py-scripts/stations_connected.py | 8 ++-- py-scripts/test_1k_clients_jedtest.py | 10 ++--- py-scripts/test_client_admission.py | 10 ++--- py-scripts/test_fileio.py | 12 ++--- py-scripts/test_generic.py | 12 ++--- py-scripts/test_ip_connection.py | 10 ++--- py-scripts/test_ip_variable_time.py | 10 ++--- py-scripts/test_ipv4_ps.py | 10 ++--- py-scripts/test_ipv4_ttls.py | 12 ++--- py-scripts/test_l3_WAN_LAN.py | 10 ++--- py-scripts/test_l3_longevity.py | 16 +++---- py-scripts/test_l3_powersave_traffic.py | 12 ++--- py-scripts/test_l3_scenario_throughput.py | 10 ++--- py-scripts/test_l3_unicast_traffic_gen.py | 10 ++--- py-scripts/test_l4.py | 12 ++--- py-scripts/test_status_msg.py | 6 +-- py-scripts/test_wanlink.py | 12 ++--- py-scripts/test_wpa_passphrases.py | 10 ++--- py-scripts/testgroup.py | 10 ++--- py-scripts/testgroup2.py | 10 ++--- py-scripts/tip-cicd-sanity/Nightly_Sanity.py | 15 +++---- py-scripts/tip-cicd-sanity/Throughput_Test.py | 11 +++-- py-scripts/tip-cicd-sanity/eap_connect.py | 11 +++-- .../single_client_throughput.py | 9 ++-- py-scripts/tip_station_powersave.py | 12 ++--- py-scripts/tools/lf_qa.py | 5 +-- py-scripts/vap_stations_example.py | 8 ++-- py-scripts/wlan_capacity_calculator.py | 6 +-- py-scripts/ws_generic_monitor_test.py | 8 ++-- 125 files changed, 572 insertions(+), 578 deletions(-) diff --git a/py-dashboard/GhostRequest.py b/py-dashboard/GhostRequest.py index 790bf845..ce0dc586 100644 --- a/py-dashboard/GhostRequest.py +++ b/py-dashboard/GhostRequest.py @@ -21,11 +21,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -GrafanaRequest = importlib.import_module("lanforge-scripts.py-dashboard.GrafanaRequest") -InfluxRequest = importlib.import_module("lanforge-scripts.py-dashboard.InfluxRequest") +GrafanaRequest = importlib.import_module("py-dashboard.GrafanaRequest") +InfluxRequest = importlib.import_module("py-dashboard.InfluxRequest") RecordInflux = InfluxRequest.RecordInflux diff --git a/py-json/LANforge/LFRequest.py b/py-json/LANforge/LFRequest.py index 1efd4522..b0e881bf 100644 --- a/py-json/LANforge/LFRequest.py +++ b/py-json/LANforge/LFRequest.py @@ -14,10 +14,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") class LFRequest: diff --git a/py-json/LANforge/LFUtils.py b/py-json/LANforge/LFUtils.py index 494d83b0..850ae56d 100644 --- a/py-json/LANforge/LFUtils.py +++ b/py-json/LANforge/LFUtils.py @@ -16,10 +16,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") +LFRequest = importlib.import_module("py-json.LANforge.LFRequest") debug_printer = pprint.PrettyPrinter(indent=2) diff --git a/py-json/LANforge/lf_json_autogen.py b/py-json/LANforge/lf_json_autogen.py index 2865af89..7d3cb307 100644 --- a/py-json/LANforge/lf_json_autogen.py +++ b/py-json/LANforge/lf_json_autogen.py @@ -15,10 +15,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-json/LANforge/lfcli_base.py b/py-json/LANforge/lfcli_base.py index 451d958c..bc57ea3b 100644 --- a/py-json/LANforge/lfcli_base.py +++ b/py-json/LANforge/lfcli_base.py @@ -19,11 +19,11 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +LFRequest = importlib.import_module("py-json.LANforge.LFRequest") class LFCliBase: diff --git a/py-json/LANforge/set_port.py b/py-json/LANforge/set_port.py index 0d73daff..f6fa7f3b 100644 --- a/py-json/LANforge/set_port.py +++ b/py-json/LANforge/set_port.py @@ -6,10 +6,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) -lf_json_autogen = importlib.import_module("lanforge-scripts.py-json.LANforge.lf_json_autogen") +lf_json_autogen = importlib.import_module("py-json.LANforge.lf_json_autogen") LFJsonPost = lf_json_autogen.LFJsonPost diff --git a/py-json/create_wanlink.py b/py-json/create_wanlink.py index 19a46b95..e9fbac35 100755 --- a/py-json/create_wanlink.py +++ b/py-json/create_wanlink.py @@ -15,11 +15,11 @@ from time import sleep from urllib import error import pprint -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFRequest = importlib.import_module("py-json.LANforge.LFRequest") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") j_printer = pprint.PrettyPrinter(indent=2) # todo: this needs to change diff --git a/py-json/cv_dut_profile.py b/py-json/cv_dut_profile.py index a1dd83c2..d10f97ad 100644 --- a/py-json/cv_dut_profile.py +++ b/py-json/cv_dut_profile.py @@ -7,12 +7,12 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -add_dut = importlib.import_module("lanforge-scripts.py-json.LANforge.add_dut") +add_dut = importlib.import_module("py-json.LANforge.add_dut") add_dut_flags = add_dut.add_dut_flags diff --git a/py-json/cv_test_manager.py b/py-json/cv_test_manager.py index f9262ce6..c2f8bac8 100644 --- a/py-json/cv_test_manager.py +++ b/py-json/cv_test_manager.py @@ -15,16 +15,16 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -cv_test_reports = importlib.import_module("lanforge-scripts.py-json.cv_test_reports") +cv_test_reports = importlib.import_module("py-json.cv_test_reports") lf_rpt = cv_test_reports.lanforge_reports -InfluxRequest = importlib.import_module("lanforge-scripts.py-dashboard.InfluxRequest") +InfluxRequest = importlib.import_module("py-dashboard.InfluxRequest") influx_add_parser_args = InfluxRequest.influx_add_parser_args RecordInflux = InfluxRequest.RecordInflux diff --git a/py-json/dataplane_test_profile.py b/py-json/dataplane_test_profile.py index 8e683d80..77004472 100644 --- a/py-json/dataplane_test_profile.py +++ b/py-json/dataplane_test_profile.py @@ -7,10 +7,10 @@ import sys import os import importlib -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lf_cv_base = importlib.import_module("lanforge-scripts.py-json.lf_cv_base") +lf_cv_base = importlib.import_module("py-json.lf_cv_base") ChamberViewBase = lf_cv_base.ChamberViewBase diff --git a/py-json/dut_profile.py b/py-json/dut_profile.py index 0f6dee78..c449961a 100644 --- a/py-json/dut_profile.py +++ b/py-json/dut_profile.py @@ -7,12 +7,12 @@ from pprint import pprint import time import base64 -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -add_dut = importlib.import_module("lanforge-scripts.py-json.LANforge.add_dut") +add_dut = importlib.import_module("py-json.LANforge.add_dut") class DUTProfile(LFCliBase): diff --git a/py-json/fio_endp_profile.py b/py-json/fio_endp_profile.py index 8af64467..5b43365f 100644 --- a/py-json/fio_endp_profile.py +++ b/py-json/fio_endp_profile.py @@ -10,10 +10,10 @@ import pprint from pprint import pprint import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-json/gen_cxprofile.py b/py-json/gen_cxprofile.py index 182c4043..73dd137a 100644 --- a/py-json/gen_cxprofile.py +++ b/py-json/gen_cxprofile.py @@ -10,10 +10,10 @@ import time import datetime import json -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-json/http_profile.py b/py-json/http_profile.py index f990380c..edc367ef 100644 --- a/py-json/http_profile.py +++ b/py-json/http_profile.py @@ -6,12 +6,12 @@ from pprint import pprint import pprint import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -port_utils = importlib.import_module("lanforge-scripts.py-json.port_utils") +port_utils = importlib.import_module("py-json.port_utils") PortUtils = port_utils.PortUtils -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-json/l3_cxprofile.py b/py-json/l3_cxprofile.py index 06953f58..4e4deb3a 100644 --- a/py-json/l3_cxprofile.py +++ b/py-json/l3_cxprofile.py @@ -9,10 +9,10 @@ import pandas as pd import time import datetime -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-json/l3_cxprofile2.py b/py-json/l3_cxprofile2.py index 72980ccf..b0893cb9 100644 --- a/py-json/l3_cxprofile2.py +++ b/py-json/l3_cxprofile2.py @@ -14,11 +14,11 @@ import random import string import datetime -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfdata = importlib.import_module("lanforge-scripts.py-json.lfdata") -base_profile = importlib.import_module("lanforge-scripts.py-json.base_profile") +lfdata = importlib.import_module("py-json.lfdata") +base_profile = importlib.import_module("py-json.base_profile") BaseProfile = base_profile.BaseProfile diff --git a/py-json/l4_cxprofile.py b/py-json/l4_cxprofile.py index e68fbd88..d1aea4c3 100644 --- a/py-json/l4_cxprofile.py +++ b/py-json/l4_cxprofile.py @@ -11,10 +11,10 @@ import datetime import ast import csv -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-json/lf_attenmod.py b/py-json/lf_attenmod.py index d95e0d37..c0b5bb1c 100644 --- a/py-json/lf_attenmod.py +++ b/py-json/lf_attenmod.py @@ -4,13 +4,13 @@ import os import importlib import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFRequest = importlib.import_module("py-json.LANforge.LFRequest") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") class ATTENUATORProfile(LFCliBase): diff --git a/py-json/lf_cv_base.py b/py-json/lf_cv_base.py index 97659659..4016c03c 100644 --- a/py-json/lf_cv_base.py +++ b/py-json/lf_cv_base.py @@ -12,10 +12,10 @@ import sys import os import importlib -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-json/mac_vlan_profile.py b/py-json/mac_vlan_profile.py index 01223001..3c15a0c6 100644 --- a/py-json/mac_vlan_profile.py +++ b/py-json/mac_vlan_profile.py @@ -6,14 +6,14 @@ import pprint from pprint import pprint import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -set_port = importlib.import_module("lanforge-scripts.py-json.LANforge.set_port") +LFRequest = importlib.import_module("py-json.LANforge.LFRequest") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +set_port = importlib.import_module("py-json.LANforge.set_port") class MACVLANProfile(LFCliBase): diff --git a/py-json/multicast_profile.py b/py-json/multicast_profile.py index eab915cf..8612f280 100644 --- a/py-json/multicast_profile.py +++ b/py-json/multicast_profile.py @@ -5,10 +5,10 @@ import importlib import pprint from pprint import pprint -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-json/qvlan_profile.py b/py-json/qvlan_profile.py index b133cdbf..3c54554f 100644 --- a/py-json/qvlan_profile.py +++ b/py-json/qvlan_profile.py @@ -6,13 +6,13 @@ import pprint from pprint import pprint import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFRequest = importlib.import_module("py-json.LANforge.LFRequest") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") class QVLANProfile(LFCliBase): diff --git a/py-json/realm.py b/py-json/realm.py index b9edbafe..92ed14d7 100755 --- a/py-json/realm.py +++ b/py-json/realm.py @@ -17,49 +17,49 @@ from pprint import pprint # ---- ---- ---- ---- LANforge Base Imports ---- ---- ---- ---- -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LANforge = importlib.import_module("lanforge-scripts.py-json.LANforge") -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LANforge = importlib.import_module("py-json.LANforge") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase # ---- ---- ---- ---- Profile Imports ---- ---- ---- ---- -l3_cxprofile = importlib.import_module("lanforge-scripts.py-json.l3_cxprofile") +l3_cxprofile = importlib.import_module("py-json.l3_cxprofile") L3CXProfile = l3_cxprofile.L3CXProfile -l3_cxprofile2 = importlib.import_module("lanforge-scripts.py-json.l3_cxprofile2") +l3_cxprofile2 = importlib.import_module("py-json.l3_cxprofile2") L3CXProfile2 = l3_cxprofile2.L3CXProfile2 -l4_cxprofile = importlib.import_module("lanforge-scripts.py-json.l4_cxprofile") +l4_cxprofile = importlib.import_module("py-json.l4_cxprofile") L4CXProfile = l4_cxprofile.L4CXProfile -lf_attenmod = importlib.import_module("lanforge-scripts.py-json.lf_attenmod") +lf_attenmod = importlib.import_module("py-json.lf_attenmod") ATTENUATORProfile = lf_attenmod.ATTENUATORProfile -multicast_profile = importlib.import_module("lanforge-scripts.py-json.multicast_profile") +multicast_profile = importlib.import_module("py-json.multicast_profile") MULTICASTProfile = multicast_profile.MULTICASTProfile -http_profile = importlib.import_module("lanforge-scripts.py-json.http_profile") +http_profile = importlib.import_module("py-json.http_profile") HTTPProfile = http_profile.HTTPProfile -station_profile = importlib.import_module("lanforge-scripts.py-json.station_profile") +station_profile = importlib.import_module("py-json.station_profile") StationProfile = station_profile.StationProfile -fio_endp_profile = importlib.import_module("lanforge-scripts.py-json.fio_endp_profile") +fio_endp_profile = importlib.import_module("py-json.fio_endp_profile") FIOEndpProfile = fio_endp_profile.FIOEndpProfile -test_group_profile = importlib.import_module("lanforge-scripts.py-json.test_group_profile") +test_group_profile = importlib.import_module("py-json.test_group_profile") TestGroupProfile = test_group_profile.TestGroupProfile -dut_profile = importlib.import_module("lanforge-scripts.py-json.dut_profile") +dut_profile = importlib.import_module("py-json.dut_profile") DUTProfile = dut_profile.DUTProfile -vap_profile = importlib.import_module("lanforge-scripts.py-json.vap_profile") +vap_profile = importlib.import_module("py-json.vap_profile") VAPProfile = vap_profile.VAPProfile -mac_vlan_profile = importlib.import_module("lanforge-scripts.py-json.mac_vlan_profile") +mac_vlan_profile = importlib.import_module("py-json.mac_vlan_profile") MACVLANProfile = mac_vlan_profile.MACVLANProfile -wifi_monitor_profile = importlib.import_module("lanforge-scripts.py-json.wifi_monitor_profile") +wifi_monitor_profile = importlib.import_module("py-json.wifi_monitor_profile") WifiMonitor = wifi_monitor_profile.WifiMonitor -gen_cxprofile = importlib.import_module("lanforge-scripts.py-json.gen_cxprofile") +gen_cxprofile = importlib.import_module("py-json.gen_cxprofile") GenCXProfile = gen_cxprofile.GenCXProfile -qvlan_profile = importlib.import_module("lanforge-scripts.py-json.qvlan_profile") +qvlan_profile = importlib.import_module("py-json.qvlan_profile") QVLANProfile = qvlan_profile.QVLANProfile -port_utils = importlib.import_module("lanforge-scripts.py-json.port_utils") +port_utils = importlib.import_module("py-json.port_utils") PortUtils = port_utils.PortUtils -lfdata = importlib.import_module("lanforge-scripts.py-json.lfdata") +lfdata = importlib.import_module("py-json.lfdata") LFDataCollection = lfdata.LFDataCollection diff --git a/py-json/realm_test.py b/py-json/realm_test.py index 04ff7169..55d941c9 100755 --- a/py-json/realm_test.py +++ b/py-json/realm_test.py @@ -6,12 +6,12 @@ import pprint import time from pprint import pprint -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") localrealm = Realm("localhost", 8080, True) diff --git a/py-json/show_ports.py b/py-json/show_ports.py index bfd12802..1f18b05c 100644 --- a/py-json/show_ports.py +++ b/py-json/show_ports.py @@ -13,10 +13,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") +LFRequest = importlib.import_module("py-json.LANforge.LFRequest") def main(): diff --git a/py-json/station_profile.py b/py-json/station_profile.py index 2320d26a..b9c61251 100644 --- a/py-json/station_profile.py +++ b/py-json/station_profile.py @@ -6,26 +6,26 @@ import pprint from pprint import pprint import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -set_port = importlib.import_module("lanforge-scripts.py-json.LANforge.set_port") -add_sta = importlib.import_module("lanforge-scripts.py-json.LANforge.add_sta") +LFRequest = importlib.import_module("py-json.LANforge.LFRequest") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +set_port = importlib.import_module("py-json.LANforge.set_port") +add_sta = importlib.import_module("py-json.LANforge.add_sta") # Uncomment below to include autogen library. # if os.environ.get("LF_USE_AUTOGEN") == 1: -# lf_json_autogen = importlib.import_module("lanforge-scripts.py-json.LANforge.lf_json_autogen") +# lf_json_autogen = importlib.import_module("py-json.LANforge.lf_json_autogen") # LFJsonPost = jf_json_autogen.LFJsonPost # use the station profile to set the combination of features you want on your stations # once this combination is configured, build the stations with the build(resource, radio, number) call # build() calls will fail if the station already exists. Please survey and clean your resource # before calling build() -# realm = importlib.import_module("lanforge-scripts.py-json.realm") +# realm = importlib.import_module("py-json.realm") # Realm = realm.Realm # survey = Realm.findStations(resource=1) # Realm.removeStations(survey) diff --git a/py-json/test_base.py b/py-json/test_base.py index a2d60dad..fc6e8959 100644 --- a/py-json/test_base.py +++ b/py-json/test_base.py @@ -3,10 +3,10 @@ import sys import os import importlib -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfdata = importlib.import_module("lanforge-scripts.py-json.lfdata") +lfdata = importlib.import_module("py-json.lfdata") LFDataCollection = lfdata.LFDataCollection diff --git a/py-json/test_group_profile.py b/py-json/test_group_profile.py index 6005bd70..e9814653 100644 --- a/py-json/test_group_profile.py +++ b/py-json/test_group_profile.py @@ -6,10 +6,10 @@ import pprint from pprint import pprint import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-json/test_histogram.py b/py-json/test_histogram.py index 414f312d..c8968ace 100755 --- a/py-json/test_histogram.py +++ b/py-json/test_histogram.py @@ -7,10 +7,10 @@ import os import importlib import pprint -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") distrib_load = { diff --git a/py-json/test_utility.py b/py-json/test_utility.py index fb2d9c88..34559473 100644 --- a/py-json/test_utility.py +++ b/py-json/test_utility.py @@ -18,13 +18,13 @@ import threading import re import json -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") PortUtils = realm.PortUtils webconsole_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.getcwd()))) diff --git a/py-json/vap_profile.py b/py-json/vap_profile.py index 49a2a6c4..3901a274 100644 --- a/py-json/vap_profile.py +++ b/py-json/vap_profile.py @@ -6,15 +6,15 @@ import pprint from pprint import pprint import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") -add_vap = importlib.import_module("lanforge-scripts.py-json.LANforge.add_vap") -set_port = importlib.import_module("lanforge-scripts.py-json.LANforge.set_port") -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFRequest = importlib.import_module("py-json.LANforge.LFRequest") +add_vap = importlib.import_module("py-json.LANforge.add_vap") +set_port = importlib.import_module("py-json.LANforge.set_port") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") class VAPProfile(LFCliBase): diff --git a/py-json/vr_profile2.py b/py-json/vr_profile2.py index 59612d38..c8f1a98c 100644 --- a/py-json/vr_profile2.py +++ b/py-json/vr_profile2.py @@ -5,11 +5,11 @@ import time from pprint import pprint from random import randint -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -base_profile = importlib.import_module("lanforge-scripts.py-json.base_profile") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +base_profile = importlib.import_module("py-json.base_profile") BaseProfile = base_profile.BaseProfile diff --git a/py-json/wifi_monitor_profile.py b/py-json/wifi_monitor_profile.py index 5d023f19..7761d5a8 100644 --- a/py-json/wifi_monitor_profile.py +++ b/py-json/wifi_monitor_profile.py @@ -6,14 +6,14 @@ import pprint from pprint import pprint import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -add_monitor = importlib.import_module("lanforge-scripts.py-json.LANforge.add_monitor") -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -set_wifi_radio = importlib.import_module("lanforge-scripts.py-json.LANforge.set_wifi_radio") +add_monitor = importlib.import_module("py-json.LANforge.add_monitor") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +set_wifi_radio = importlib.import_module("py-json.LANforge.set_wifi_radio") set_radio_mode = set_wifi_radio.set_radio_mode diff --git a/py-json/ws-sta-monitor.py b/py-json/ws-sta-monitor.py index 659a87b2..f47a0661 100755 --- a/py-json/ws-sta-monitor.py +++ b/py-json/ws-sta-monitor.py @@ -29,10 +29,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") cre={ diff --git a/py-scripts/cicd_TipIntegration.py b/py-scripts/cicd_TipIntegration.py index 113716aa..25cd9812 100755 --- a/py-scripts/cicd_TipIntegration.py +++ b/py-scripts/cicd_TipIntegration.py @@ -46,7 +46,7 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) if 'py-json' not in sys.path: - sys.path.append('../py-json') + sys.path.append('../py-json') from LANforge.LFUtils import * # if you lack __init__.py in this directory you will not find sta_connect module# diff --git a/py-scripts/cicd_testrailAndInfraSetup.py b/py-scripts/cicd_testrailAndInfraSetup.py index f950446b..b7aa0a31 100755 --- a/py-scripts/cicd_testrailAndInfraSetup.py +++ b/py-scripts/cicd_testrailAndInfraSetup.py @@ -34,7 +34,7 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) if 'py-json' not in sys.path: - sys.path.append('../py-json') + sys.path.append('../py-json') from LANforge.LFUtils import * # if you lack __init__.py in this directory you will not find sta_connect module# diff --git a/py-scripts/connection_test.py b/py-scripts/connection_test.py index b5a3ddff..7327c780 100755 --- a/py-scripts/connection_test.py +++ b/py-scripts/connection_test.py @@ -20,13 +20,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm webconsole_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.getcwd()))) diff --git a/py-scripts/create_bond.py b/py-scripts/create_bond.py index 0b7ae168..ead8b1b2 100755 --- a/py-scripts/create_bond.py +++ b/py-scripts/create_bond.py @@ -20,13 +20,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/create_bridge.py b/py-scripts/create_bridge.py index 24a9a060..420d2bfc 100755 --- a/py-scripts/create_bridge.py +++ b/py-scripts/create_bridge.py @@ -14,13 +14,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/create_chamberview.py b/py-scripts/create_chamberview.py index 8a71e746..f02f4a33 100755 --- a/py-scripts/create_chamberview.py +++ b/py-scripts/create_chamberview.py @@ -41,10 +41,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cv = cv_test_manager.cv_test diff --git a/py-scripts/create_chamberview_dut.py b/py-scripts/create_chamberview_dut.py index af9bbcd1..1ca149dd 100755 --- a/py-scripts/create_chamberview_dut.py +++ b/py-scripts/create_chamberview_dut.py @@ -54,14 +54,14 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) # from cv_dut_profile import cv_dut as dut -cv_dut_profile = importlib.import_module("lanforge-scripts.py-json.cv_dut_profile") +cv_dut_profile = importlib.import_module("py-json.cv_dut_profile") dut = cv_dut_profile.cv_dut # from cv_test_manager import cv_test as cvtest -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cvtest = cv_test_manager.cv_test diff --git a/py-scripts/create_l3.py b/py-scripts/create_l3.py index ad3c69ed..d1424b1d 100755 --- a/py-scripts/create_l3.py +++ b/py-scripts/create_l3.py @@ -17,14 +17,14 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LANforge = importlib.import_module("lanforge-scripts.py-json.LANforge") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LANforge = importlib.import_module("py-json.LANforge") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm TestGroupProfile = realm.TestGroupProfile diff --git a/py-scripts/create_l4.py b/py-scripts/create_l4.py index 9fda74ed..46c4ce66 100755 --- a/py-scripts/create_l4.py +++ b/py-scripts/create_l4.py @@ -15,13 +15,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm TestGroupProfile = realm.TestGroupProfile diff --git a/py-scripts/create_macvlan.py b/py-scripts/create_macvlan.py index ef977d9a..5694f006 100755 --- a/py-scripts/create_macvlan.py +++ b/py-scripts/create_macvlan.py @@ -8,14 +8,14 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -add_file_endp = importlib.import_module("lanforge-scripts.py-json.LANforge.add_file_endp") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +add_file_endp = importlib.import_module("py-json.LANforge.add_file_endp") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/create_qvlan.py b/py-scripts/create_qvlan.py index 0e36792b..aa6ac8a1 100755 --- a/py-scripts/create_qvlan.py +++ b/py-scripts/create_qvlan.py @@ -8,14 +8,14 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -add_file_endp = importlib.import_module("lanforge-scripts.py-json.LANforge.add_file_endp") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +add_file_endp = importlib.import_module("py-json.LANforge.add_file_endp") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/create_station.py b/py-scripts/create_station.py index b622422d..55b1da06 100755 --- a/py-scripts/create_station.py +++ b/py-scripts/create_station.py @@ -12,13 +12,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/create_station_from_df.py b/py-scripts/create_station_from_df.py index ce06c923..29189dbd 100755 --- a/py-scripts/create_station_from_df.py +++ b/py-scripts/create_station_from_df.py @@ -13,12 +13,12 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/create_vap.py b/py-scripts/create_vap.py index 834fa701..5bc199a8 100755 --- a/py-scripts/create_vap.py +++ b/py-scripts/create_vap.py @@ -13,13 +13,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/create_vr.py b/py-scripts/create_vr.py index 87990cd3..3d9f2320 100755 --- a/py-scripts/create_vr.py +++ b/py-scripts/create_vr.py @@ -12,13 +12,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/csv_convert.py b/py-scripts/csv_convert.py index 242d7568..aa422ea2 100755 --- a/py-scripts/csv_convert.py +++ b/py-scripts/csv_convert.py @@ -20,8 +20,8 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) class CSVParcer(): diff --git a/py-scripts/csv_processor.py b/py-scripts/csv_processor.py index f92aad65..cb801cd4 100755 --- a/py-scripts/csv_processor.py +++ b/py-scripts/csv_processor.py @@ -12,8 +12,8 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) class L3CSVParcer(): def __init__(self,csv_file): diff --git a/py-scripts/csv_to_grafana.py b/py-scripts/csv_to_grafana.py index 2857be0a..6fe7718b 100755 --- a/py-scripts/csv_to_grafana.py +++ b/py-scripts/csv_to_grafana.py @@ -11,19 +11,19 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -csv_to_influx = importlib.import_module("lanforge-scripts.py-scripts.csv_to_influx") +csv_to_influx = importlib.import_module("py-scripts.csv_to_influx") CSVtoInflux = csv_to_influx.CSVtoInflux influx_add_parser_args = csv_to_influx.influx_add_parser_args -grafana_profile = importlib.import_module("lanforge-scripts.py-scripts.grafana_profile") +grafana_profile = importlib.import_module("py-scripts.grafana_profile") UseGrafana = grafana_profile.UseGrafana -influx = importlib.import_module("lanforge-scripts.py-scripts.influx") +influx = importlib.import_module("py-scripts.influx") RecordInflux = influx.RecordInflux -InfluxRequest = importlib.import_module("lanforge-scripts.py-dashboard.InfluxRequest") +InfluxRequest = importlib.import_module("py-dashboard.InfluxRequest") influx_add_parser_args = InfluxRequest.influx_add_parser_args diff --git a/py-scripts/csv_to_influx.py b/py-scripts/csv_to_influx.py index 087139e5..86cc9f34 100755 --- a/py-scripts/csv_to_influx.py +++ b/py-scripts/csv_to_influx.py @@ -5,13 +5,13 @@ import importlib from pathlib import Path import argparse -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cv_add_base_parser = cv_test_manager.cv_add_base_parser cv_base_adjust_parser = cv_test_manager.cv_base_adjust_parser -InfluxRequest = importlib.import_module("lanforge-scripts.py-dashboard.InfluxRequest") +InfluxRequest = importlib.import_module("py-dashboard.InfluxRequest") RecordInflux = InfluxRequest.RecordInflux influx_add_parser_args = InfluxRequest.influx_add_parser_args diff --git a/py-scripts/cv_manager.py b/py-scripts/cv_manager.py index a3d59c55..23fb486f 100755 --- a/py-scripts/cv_manager.py +++ b/py-scripts/cv_manager.py @@ -8,10 +8,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cv_test = cv_test_manager.cv_test diff --git a/py-scripts/cv_to_grafana.py b/py-scripts/cv_to_grafana.py index 610428de..8be615e3 100755 --- a/py-scripts/cv_to_grafana.py +++ b/py-scripts/cv_to_grafana.py @@ -70,20 +70,20 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lf_wifi_capacity_test = importlib.import_module("lanforge-scripts.py-scripts.lf_wifi_capacity_test") +lf_wifi_capacity_test = importlib.import_module("py-scripts.lf_wifi_capacity_test") WiFiCapacityTest = lf_wifi_capacity_test.WiFiCapacityTest -cv_test_manager = importlib.import_module("lanforge-scripts.py-scripts.cv_test_manager") -create_chamberview = importlib.import_module("lanforge-scripts.py-scripts.create_chamberview") +cv_test_manager = importlib.import_module("py-scripts.cv_test_manager") +create_chamberview = importlib.import_module("py-scripts.create_chamberview") CreateChamberview = create_chamberview.CreateChamberview DUT = create_chamberview.DUT -lf_dataplane_test = importlib.import_module("lanforge-scripts.py-scripts.lf_dataplane_test") +lf_dataplane_test = importlib.import_module("py-scripts.lf_dataplane_test") DataplaneTest = lf_dataplane_test.DataplaneTest -grafana_profile = importlib.import_module("lanforge-scripts.py-scripts.grafana_profile") +grafana_profile = importlib.import_module("py-scripts.grafana_profile") UseGrafana = grafana_profile.UseGrafana -lf_ap_auto_test = importlib.import_module("lanforge-scripts.py-scripts.lf_ap_auto_test") +lf_ap_auto_test = importlib.import_module("py-scripts.lf_ap_auto_test") def main(): diff --git a/py-scripts/download_test.py b/py-scripts/download_test.py index 3bd2abd7..ad063ce6 100644 --- a/py-scripts/download_test.py +++ b/py-scripts/download_test.py @@ -9,14 +9,14 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -influx = importlib.import_module("lanforge-scripts.py-scripts.influx") +influx = importlib.import_module("py-scripts.influx") RecordInflux = influx.RecordInflux -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/event_breaker.py b/py-scripts/event_breaker.py index 3c580b0f..0a64e0fb 100755 --- a/py-scripts/event_breaker.py +++ b/py-scripts/event_breaker.py @@ -18,12 +18,12 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/event_flood.py b/py-scripts/event_flood.py index 96dc6678..019db2bc 100755 --- a/py-scripts/event_flood.py +++ b/py-scripts/event_flood.py @@ -18,12 +18,12 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/example_security_connection.py b/py-scripts/example_security_connection.py index 64b163c0..a66ad946 100755 --- a/py-scripts/example_security_connection.py +++ b/py-scripts/example_security_connection.py @@ -10,13 +10,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/ghost_profile.py b/py-scripts/ghost_profile.py index 974569ad..5a91843a 100755 --- a/py-scripts/ghost_profile.py +++ b/py-scripts/ghost_profile.py @@ -33,11 +33,11 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) # from GhostRequest import GhostRequest -GhostRequest = importlib.import_module("lanforge-scripts.py-dashboard.GhostRequest") +GhostRequest = importlib.import_module("py-dashboard.GhostRequest") class UseGhost(GhostRequest): diff --git a/py-scripts/grafana_profile.py b/py-scripts/grafana_profile.py index 38d4910d..94741447 100755 --- a/py-scripts/grafana_profile.py +++ b/py-scripts/grafana_profile.py @@ -15,13 +15,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) # from GrafanaRequest import GrafanaRequest -GrafanaRequest = importlib.import_module("lanforge-scripts.py-dashboard.GrafanaRequest") +GrafanaRequest = importlib.import_module("py-dashboard.GrafanaRequest") GrafanaRequest = GrafanaRequest.GrafanaRequest -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-scripts/influx.py b/py-scripts/influx.py index 7d37af63..184c97a8 100755 --- a/py-scripts/influx.py +++ b/py-scripts/influx.py @@ -13,10 +13,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-scripts/layer3_test.py b/py-scripts/layer3_test.py index 8dcb8612..a58a7a88 100755 --- a/py-scripts/layer3_test.py +++ b/py-scripts/layer3_test.py @@ -10,13 +10,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/layer4_test.py b/py-scripts/layer4_test.py index 2d6604f4..972f5397 100755 --- a/py-scripts/layer4_test.py +++ b/py-scripts/layer4_test.py @@ -20,16 +20,16 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm PortUtils = realm.PortUtils -test_utility = importlib.import_module("lanforge-scripts.py-json.test_utility") +test_utility = importlib.import_module("py-json.test_utility") CreateHTML = test_utility.CreateHTML RuntimeUpdates = test_utility.RuntimeUpdates diff --git a/py-scripts/lf_ap_auto_test.py b/py-scripts/lf_ap_auto_test.py index 151fdb76..1badcc58 100755 --- a/py-scripts/lf_ap_auto_test.py +++ b/py-scripts/lf_ap_auto_test.py @@ -174,10 +174,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cvtest = cv_test_manager.cv_test cv_add_base_parser = cv_test_manager.cv_add_base_parser cv_base_adjust_parser = cv_test_manager.cv_base_adjust_parser diff --git a/py-scripts/lf_atten_mod_test.py b/py-scripts/lf_atten_mod_test.py index c56a14fa..d703bbc0 100755 --- a/py-scripts/lf_atten_mod_test.py +++ b/py-scripts/lf_atten_mod_test.py @@ -28,13 +28,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/lf_dataplane_test.py b/py-scripts/lf_dataplane_test.py index 7cc3be9c..f326ff36 100755 --- a/py-scripts/lf_dataplane_test.py +++ b/py-scripts/lf_dataplane_test.py @@ -106,10 +106,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cv_test = cv_test_manager.cv_test cv_add_base_parser = cv_test_manager.cv_add_base_parser cv_base_adjust_parser = cv_test_manager.cv_base_adjust_parser diff --git a/py-scripts/lf_dfs_test.py b/py-scripts/lf_dfs_test.py index 1a3d11a8..5ed0ff59 100755 --- a/py-scripts/lf_dfs_test.py +++ b/py-scripts/lf_dfs_test.py @@ -15,12 +15,12 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) import argparse -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm # Check for the logs channel switching time and radar detected diff --git a/py-scripts/lf_dut_sta_vap_test.py b/py-scripts/lf_dut_sta_vap_test.py index 3d648543..2254d496 100755 --- a/py-scripts/lf_dut_sta_vap_test.py +++ b/py-scripts/lf_dut_sta_vap_test.py @@ -41,13 +41,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/lf_ftp.py b/py-scripts/lf_ftp.py index 14662d2f..566abca8 100644 --- a/py-scripts/lf_ftp.py +++ b/py-scripts/lf_ftp.py @@ -18,16 +18,16 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -lf_report = importlib.import_module("lanforge-scripts.py-scripts.lf_report") -lf_graph = importlib.import_module("lanforge-scripts.py-scripts.lf_graph") +lf_report = importlib.import_module("py-scripts.lf_report") +lf_graph = importlib.import_module("py-scripts.lf_graph") class FtpTest(LFCliBase): diff --git a/py-scripts/lf_ftp_test.py b/py-scripts/lf_ftp_test.py index 923a681a..1f1fb23f 100755 --- a/py-scripts/lf_ftp_test.py +++ b/py-scripts/lf_ftp_test.py @@ -36,15 +36,15 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -ftp_html = importlib.import_module("lanforge-scripts.py-scripts.ftp_html") +ftp_html = importlib.import_module("py-scripts.ftp_html") class ftp_test(LFCliBase): diff --git a/py-scripts/lf_graph.py b/py-scripts/lf_graph.py index 3b005248..1043a580 100755 --- a/py-scripts/lf_graph.py +++ b/py-scripts/lf_graph.py @@ -28,10 +28,10 @@ import pdfkit import math from matplotlib.colors import ListedColormap -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lf_csv = importlib.import_module("lanforge-scripts.py-scripts.lf_csv") +lf_csv = importlib.import_module("py-scripts.lf_csv") lf_csv = lf_csv.lf_csv # internal candela references included during intial phases, to be deleted at future date diff --git a/py-scripts/lf_mesh_test.py b/py-scripts/lf_mesh_test.py index b6b0ae67..ccd8dabf 100755 --- a/py-scripts/lf_mesh_test.py +++ b/py-scripts/lf_mesh_test.py @@ -125,10 +125,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cvtest = cv_test_manager.cv_test cv_add_base_parser = cv_test_manager.cv_add_base_parser cv_base_adjust_parser = cv_test_manager.cv_base_adjust_parser diff --git a/py-scripts/lf_multipsk.py b/py-scripts/lf_multipsk.py index 50522e15..d5437c5c 100644 --- a/py-scripts/lf_multipsk.py +++ b/py-scripts/lf_multipsk.py @@ -30,13 +30,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/lf_report_test.py b/py-scripts/lf_report_test.py index ab06428e..0923f1e9 100755 --- a/py-scripts/lf_report_test.py +++ b/py-scripts/lf_report_test.py @@ -27,12 +27,12 @@ import pandas as pd import pdfkit import random -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lf_report = importlib.import_module("lanforge-scripts.py-scripts.lf_report") +lf_report = importlib.import_module("py-scripts.lf_report") lf_report = lf_report.lf_report -lf_graph = importlib.import_module("lanforge-scripts.py-scripts.lf_graph") +lf_graph = importlib.import_module("py-scripts.lf_graph") lf_bar_graph = lf_graph.lf_bar_graph lf_scatter_graph = lf_graph.lf_scatter_graph lf_stacked_graph = lf_graph.lf_stacked_graph diff --git a/py-scripts/lf_rvr_test.py b/py-scripts/lf_rvr_test.py index 9ace21c1..973b38a7 100755 --- a/py-scripts/lf_rvr_test.py +++ b/py-scripts/lf_rvr_test.py @@ -110,10 +110,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cvtest = cv_test_manager.cv_test cv_add_base_parser = cv_test_manager.cv_add_base_parser cv_base_adjust_parser = cv_test_manager.cv_base_adjust_parser diff --git a/py-scripts/lf_rx_sensitivity_test.py b/py-scripts/lf_rx_sensitivity_test.py index 01853127..3ce403a7 100644 --- a/py-scripts/lf_rx_sensitivity_test.py +++ b/py-scripts/lf_rx_sensitivity_test.py @@ -112,10 +112,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cv_test = cv_test_manager.cv_test cv_add_base_parser = cv_test_manager.cv_add_base_parser cv_base_adjust_parser = cv_test_manager.cv_base_adjust_parser diff --git a/py-scripts/lf_sniff_radio.py b/py-scripts/lf_sniff_radio.py index c4cc3b7c..3140866d 100755 --- a/py-scripts/lf_sniff_radio.py +++ b/py-scripts/lf_sniff_radio.py @@ -4,7 +4,7 @@ PURPOSE: THis script will sniff a Radio after changing the Radio settings. Radio settings: channel radio mode AUTO, 802.11a, 802.11b, etc... refer - lanforge-scripts/py-json/LANforge/set_wifi_radio.py for different modes + py-json/LANforge/set_wifi_radio.py for different modes EXAMPLE: python3 lf_sniff_radio.py --mgr localhost @@ -21,11 +21,11 @@ import importlib import argparse import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/lf_snp_test.py b/py-scripts/lf_snp_test.py index 1314306c..d5a54f8f 100755 --- a/py-scripts/lf_snp_test.py +++ b/py-scripts/lf_snp_test.py @@ -154,14 +154,14 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -lf_report = importlib.import_module("lanforge-scripts.py-scripts.lf_report") -# lf_graph = importlib.import_module("lanforge-scripts.py-scripts.lf_graph") +lf_report = importlib.import_module("py-scripts.lf_report") +# lf_graph = importlib.import_module("py-scripts.lf_graph") # lf_bar_graph = lf_graph.lf_bar_graph FORMAT = '%(asctime)s %(name)s %(levelname)s: %(message)s' diff --git a/py-scripts/lf_tr398_test.py b/py-scripts/lf_tr398_test.py index 37e7776b..b7b2a584 100755 --- a/py-scripts/lf_tr398_test.py +++ b/py-scripts/lf_tr398_test.py @@ -164,10 +164,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cvtest = cv_test_manager.cv_test cv_add_base_parser = cv_test_manager.cv_add_base_parser cv_base_adjust_parser = cv_test_manager.cv_base_adjust_parser diff --git a/py-scripts/lf_webpage.py b/py-scripts/lf_webpage.py index e8733d0b..43159cb6 100644 --- a/py-scripts/lf_webpage.py +++ b/py-scripts/lf_webpage.py @@ -14,15 +14,15 @@ import time import argparse import paramiko -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm PortUtils = realm.PortUtils -lf_report = importlib.import_module("lanforge-scripts.py-scripts.lf_report") -lf_graph = importlib.import_module("lanforge-scripts.py-scripts.lf_graph") +lf_report = importlib.import_module("py-scripts.lf_report") +lf_graph = importlib.import_module("py-scripts.lf_graph") class HttpDownload(Realm): diff --git a/py-scripts/lf_wifi_capacity_test.py b/py-scripts/lf_wifi_capacity_test.py index 3b10c698..a24e8c78 100755 --- a/py-scripts/lf_wifi_capacity_test.py +++ b/py-scripts/lf_wifi_capacity_test.py @@ -314,11 +314,11 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +cv_test_manager = importlib.import_module("py-json.cv_test_manager") cv_test = cv_test_manager.cv_test cv_add_base_parser = cv_test_manager.cv_add_base_parser cv_base_adjust_parser = cv_test_manager.cv_base_adjust_parser diff --git a/py-scripts/measure_station_time_up.py b/py-scripts/measure_station_time_up.py index e14f78b7..8ceb223a 100755 --- a/py-scripts/measure_station_time_up.py +++ b/py-scripts/measure_station_time_up.py @@ -16,13 +16,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/modify_station.py b/py-scripts/modify_station.py index 98fb0239..5ed0a4c3 100755 --- a/py-scripts/modify_station.py +++ b/py-scripts/modify_station.py @@ -11,12 +11,12 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/modify_vap.py b/py-scripts/modify_vap.py index 0f9bc716..5ef8438a 100755 --- a/py-scripts/modify_vap.py +++ b/py-scripts/modify_vap.py @@ -11,12 +11,12 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/recordinflux.py b/py-scripts/recordinflux.py index 80f30ffb..7493e111 100755 --- a/py-scripts/recordinflux.py +++ b/py-scripts/recordinflux.py @@ -19,10 +19,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-scripts/run_cv_scenario.py b/py-scripts/run_cv_scenario.py index d497e8b6..9eb0271c 100755 --- a/py-scripts/run_cv_scenario.py +++ b/py-scripts/run_cv_scenario.py @@ -12,13 +12,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm """ diff --git a/py-scripts/rvr_scenario.py b/py-scripts/rvr_scenario.py index a7510afd..fc133ae7 100755 --- a/py-scripts/rvr_scenario.py +++ b/py-scripts/rvr_scenario.py @@ -13,13 +13,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm """ diff --git a/py-scripts/scenario.py b/py-scripts/scenario.py index 5f51b49a..e54c60e2 100755 --- a/py-scripts/scenario.py +++ b/py-scripts/scenario.py @@ -9,13 +9,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/sta_connect.py b/py-scripts/sta_connect.py index bac8a222..4b850020 100755 --- a/py-scripts/sta_connect.py +++ b/py-scripts/sta_connect.py @@ -13,15 +13,15 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") removeCX = LFUtils.removeCX removeEndps = LFUtils.removeEndps -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm OPEN = "open" diff --git a/py-scripts/sta_connect2.py b/py-scripts/sta_connect2.py index 06a79e57..a2cbfcb5 100755 --- a/py-scripts/sta_connect2.py +++ b/py-scripts/sta_connect2.py @@ -15,17 +15,17 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") removeCX = LFUtils.removeCX removeEndps = LFUtils.removeEndps -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -influx = importlib.import_module("lanforge-scripts.py-scripts.influx") +influx = importlib.import_module("py-scripts.influx") RecordInflux = influx.RecordInflux OPEN = "open" diff --git a/py-scripts/sta_connect_bssid_mac.py b/py-scripts/sta_connect_bssid_mac.py index 7b11da56..38b34fa5 100644 --- a/py-scripts/sta_connect_bssid_mac.py +++ b/py-scripts/sta_connect_bssid_mac.py @@ -30,13 +30,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/sta_connect_example.py b/py-scripts/sta_connect_example.py index da6961b7..2365858b 100755 --- a/py-scripts/sta_connect_example.py +++ b/py-scripts/sta_connect_example.py @@ -10,13 +10,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) # if you lack __init__.py in this directory you will not find sta_connect module -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -sta_connect = importlib.import_module("lanforge-scripts.py-scripts.sta_connect") +sta_connect = importlib.import_module("py-scripts.sta_connect") StaConnect = sta_connect.StaConnect diff --git a/py-scripts/sta_connect_multi_example.py b/py-scripts/sta_connect_multi_example.py index 9a239244..a0dab444 100755 --- a/py-scripts/sta_connect_multi_example.py +++ b/py-scripts/sta_connect_multi_example.py @@ -10,14 +10,14 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) # if you lack __init__.py in this directory you will not find sta_connect module -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -sta_connect = importlib.import_module("lanforge-scripts.py-scripts.sta_connect") +sta_connect = importlib.import_module("py-scripts.sta_connect") StaConnect = sta_connect.StaConnect diff --git a/py-scripts/sta_scan_test.py b/py-scripts/sta_scan_test.py index fcd29242..50189111 100755 --- a/py-scripts/sta_scan_test.py +++ b/py-scripts/sta_scan_test.py @@ -20,10 +20,10 @@ if sys.version_info[0] != 3: exit(1) if 'py-json' not in sys.path: - sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) +sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) if 'py-dashboard' not in sys.path: - sys.path.append(os.path.join(os.path.abspath('..'), 'py-dashboard')) +sys.path.append(os.path.join(os.path.abspath('..'), 'py-dashboard')) import argparse from LANforge import LFUtils diff --git a/py-scripts/station_layer3.py b/py-scripts/station_layer3.py index b074c4b7..0db24fc7 100644 --- a/py-scripts/station_layer3.py +++ b/py-scripts/station_layer3.py @@ -9,13 +9,13 @@ import importlib import argparse import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/stations_connected.py b/py-scripts/stations_connected.py index 04a8f26c..6533c5c4 100755 --- a/py-scripts/stations_connected.py +++ b/py-scripts/stations_connected.py @@ -10,12 +10,12 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/test_1k_clients_jedtest.py b/py-scripts/test_1k_clients_jedtest.py index b9dbc9a7..b7bcef8e 100755 --- a/py-scripts/test_1k_clients_jedtest.py +++ b/py-scripts/test_1k_clients_jedtest.py @@ -11,13 +11,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/test_client_admission.py b/py-scripts/test_client_admission.py index 173d18fa..48d37120 100755 --- a/py-scripts/test_client_admission.py +++ b/py-scripts/test_client_admission.py @@ -11,13 +11,13 @@ import importlib import argparse import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/test_fileio.py b/py-scripts/test_fileio.py index a5b875a6..738ef594 100755 --- a/py-scripts/test_fileio.py +++ b/py-scripts/test_fileio.py @@ -38,15 +38,15 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -add_file_endp = importlib.import_module("lanforge-scripts.py-json.LANforge.add_file_endp") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +add_file_endp = importlib.import_module("py-json.LANforge.add_file_endp") fe_fstype = add_file_endp.fe_fstype -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/test_generic.py b/py-scripts/test_generic.py index 2fffdee5..a0ff5071 100755 --- a/py-scripts/test_generic.py +++ b/py-scripts/test_generic.py @@ -44,13 +44,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm @@ -343,7 +343,7 @@ python3 ./test_generic.py sta_list=station_list, #port_mgr_cols=port_mgr_cols, report_file=report_f, - systeminfopath=systeminfopath, + systeminfopath=systeminfopath, duration_sec=Realm.parse_time(args.test_duration).total_seconds(), monitor_interval_ms=monitor_interval, created_cx=genconnections, diff --git a/py-scripts/test_ip_connection.py b/py-scripts/test_ip_connection.py index ac17f747..0d7c2196 100755 --- a/py-scripts/test_ip_connection.py +++ b/py-scripts/test_ip_connection.py @@ -31,13 +31,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/test_ip_variable_time.py b/py-scripts/test_ip_variable_time.py index bbfa2f52..246a0b1c 100755 --- a/py-scripts/test_ip_variable_time.py +++ b/py-scripts/test_ip_variable_time.py @@ -33,11 +33,11 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm @@ -493,7 +493,7 @@ python3 ./test_ip_variable_time.py sta_list=station_list, # port_mgr_cols=port_mgr_cols, report_file=report_f, - systeminfopath=systeminfopath, + systeminfopath=systeminfopath, duration_sec=Realm.parse_time(args.test_duration).total_seconds(), monitor_interval_ms=monitor_interval, created_cx=layer3connections, diff --git a/py-scripts/test_ipv4_ps.py b/py-scripts/test_ipv4_ps.py index 264c9e49..5c7f9009 100755 --- a/py-scripts/test_ipv4_ps.py +++ b/py-scripts/test_ipv4_ps.py @@ -10,13 +10,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/test_ipv4_ttls.py b/py-scripts/test_ipv4_ttls.py index 09228af7..f0f3264a 100755 --- a/py-scripts/test_ipv4_ttls.py +++ b/py-scripts/test_ipv4_ttls.py @@ -10,15 +10,15 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -test_ip_variable_time = importlib.import_module("lanforge-scripts.py-scripts.test_ip_variable_time") +test_ip_variable_time = importlib.import_module("py-scripts.test_ip_variable_time") IPVariableTime = test_ip_variable_time.IPVariableTime diff --git a/py-scripts/test_l3_WAN_LAN.py b/py-scripts/test_l3_WAN_LAN.py index 121628d5..c66b1663 100755 --- a/py-scripts/test_l3_WAN_LAN.py +++ b/py-scripts/test_l3_WAN_LAN.py @@ -10,13 +10,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/test_l3_longevity.py b/py-scripts/test_l3_longevity.py index 8e0a4a50..eb886e73 100755 --- a/py-scripts/test_l3_longevity.py +++ b/py-scripts/test_l3_longevity.py @@ -63,17 +63,17 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lf_report = importlib.import_module("lanforge-scripts.py-scripts.lf_report") -# lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lf_report = importlib.import_module("py-scripts.lf_report") +# lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") # LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -csv_to_influx = importlib.import_module("lanforge-scripts.py-scripts.csv_to_influx") -InfluxRequest = importlib.import_module("lanforge-scripts.py-dashboard.InfluxRequest") +csv_to_influx = importlib.import_module("py-scripts.csv_to_influx") +InfluxRequest = importlib.import_module("py-dashboard.InfluxRequest") influx_add_parser_args = InfluxRequest.influx_add_parser_args diff --git a/py-scripts/test_l3_powersave_traffic.py b/py-scripts/test_l3_powersave_traffic.py index f4f2c323..ded5c400 100755 --- a/py-scripts/test_l3_powersave_traffic.py +++ b/py-scripts/test_l3_powersave_traffic.py @@ -11,15 +11,15 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -l3_cxprofile = importlib.import_module("lanforge-scripts.py-json.l3_cxprofile") +l3_cxprofile = importlib.import_module("py-json.l3_cxprofile") # Currently, this test can only be applied to UDP connections diff --git a/py-scripts/test_l3_scenario_throughput.py b/py-scripts/test_l3_scenario_throughput.py index 6d51edc1..11f5a9b8 100755 --- a/py-scripts/test_l3_scenario_throughput.py +++ b/py-scripts/test_l3_scenario_throughput.py @@ -45,13 +45,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/test_l3_unicast_traffic_gen.py b/py-scripts/test_l3_unicast_traffic_gen.py index 87ac0557..25406b45 100755 --- a/py-scripts/test_l3_unicast_traffic_gen.py +++ b/py-scripts/test_l3_unicast_traffic_gen.py @@ -10,13 +10,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/test_l4.py b/py-scripts/test_l4.py index 85290d25..943c3ec7 100755 --- a/py-scripts/test_l4.py +++ b/py-scripts/test_l4.py @@ -61,16 +61,16 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm TestGroupProfile = realm.TestGroupProfile -port_utils = importlib.import_module("lanforge-scripts.py-json.port_utils") +port_utils = importlib.import_module("py-json.port_utils") PortUtils = port_utils.PortUtils diff --git a/py-scripts/test_status_msg.py b/py-scripts/test_status_msg.py index b5a37c0f..557284d3 100755 --- a/py-scripts/test_status_msg.py +++ b/py-scripts/test_status_msg.py @@ -12,10 +12,10 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase diff --git a/py-scripts/test_wanlink.py b/py-scripts/test_wanlink.py index 0bb41963..41656f50 100755 --- a/py-scripts/test_wanlink.py +++ b/py-scripts/test_wanlink.py @@ -15,15 +15,15 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm -create_wanlink = importlib.import_module("lanforge-scripts.py-json.create_wanlink") +create_wanlink = importlib.import_module("py-json.create_wanlink") class LANtoWAN(Realm): diff --git a/py-scripts/test_wpa_passphrases.py b/py-scripts/test_wpa_passphrases.py index c748b34c..1434081e 100755 --- a/py-scripts/test_wpa_passphrases.py +++ b/py-scripts/test_wpa_passphrases.py @@ -14,13 +14,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/testgroup.py b/py-scripts/testgroup.py index f82384d1..2aa28a9b 100755 --- a/py-scripts/testgroup.py +++ b/py-scripts/testgroup.py @@ -9,13 +9,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm diff --git a/py-scripts/testgroup2.py b/py-scripts/testgroup2.py index 929296e0..889c34af 100755 --- a/py-scripts/testgroup2.py +++ b/py-scripts/testgroup2.py @@ -15,13 +15,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm TestGroupProfile = realm.TestGroupProfile diff --git a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py index c0b6d9a9..698c5fe3 100755 --- a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py +++ b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py @@ -41,23 +41,22 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) -sta_connect2 = importlib.import_module("lanforge-scripts.py-scripts.sta_connect2") +sta_connect2 = importlib.import_module("py-scripts.sta_connect2") StaConnect2 = sta_connect2.StaConnect2 -testrail_api = importlib.import_module("lanforge-scripts.py-scripts.tip-cicd-sanity.testrail_api") +testrail_api = importlib.import_module("py-scripts.tip-cicd-sanity.testrail_api") APIClient = testrail_api.APIClient -eap_connect = importlib.import_module("lanforge-scripts.py-scripts.tip-cicd-sanity.eap_connect") +eap_connect = importlib.import_module("py-scripts.tip-cicd-sanity.eap_connect") EAPConnect = eap_connect.EAPConnect -cloudsdk = importlib.import_module("lanforge-scripts.py-scripts.tip-cicd-sanity.cloudsdk") +cloudsdk = importlib.import_module("py-scripts.tip-cicd-sanity.cloudsdk") CloudSDK = cloudsdk.CloudSDK -ap_ssh = importlib.import_module("lanforge-scripts.py-scripts.tip-cicd-sanity.ap_ssh") +ap_ssh = importlib.import_module("py-scripts.tip-cicd-sanity.ap_ssh") ssh_cli_active_fw = ap_ssh.ssh_cli_active_fw iwinfo_status = ap_ssh.iwinfo_status ##Import info for lab setup and APs under test -lab_ap_info = importlib.import_module("lanforge-scripts.py-scripts.tip-cicd-sanity.lab_ap_info") +lab_ap_info = importlib.import_module("py-scripts.tip-cicd-sanity.lab_ap_info") equipment_id_dict = lab_ap_info.equipment_id_dict profile_info_dict = lab_ap_info.profile_info_dict cloud_sdk_models = lab_ap_info.cloud_sdk_models diff --git a/py-scripts/tip-cicd-sanity/Throughput_Test.py b/py-scripts/tip-cicd-sanity/Throughput_Test.py index f3dc097a..9f6cf27f 100755 --- a/py-scripts/tip-cicd-sanity/Throughput_Test.py +++ b/py-scripts/tip-cicd-sanity/Throughput_Test.py @@ -10,19 +10,18 @@ import json import os import logging -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) import single_client_throughput -single_client_throughput = importlib.import_module("lanforge-scripts.py-scripts.tip-cicd-sanity.single_client_throughput") +single_client_throughput = importlib.import_module("py-scripts.tip-cicd-sanity.single_client_throughput") import cloudsdk -cloudsdk = importlib.import_module("lanforge-scripts.py-scripts.tip-cicd-sanity.cloudsdk") +cloudsdk = importlib.import_module("py-scripts.tip-cicd-sanity.cloudsdk") from cloudsdk import CloudSDK CloudSDK = cloudsdk.CloudSDK import lab_ap_info -lab_ap_info = importlib.import_module("lanforge-scripts.py-scripts.tip-cicd-sanity.lab_ap_info") +lab_ap_info = importlib.import_module("py-scripts.tip-cicd-sanity.lab_ap_info") import throughput_profiles -throughput_profiles = importlib.import_module("lanforge-scripts.py-scripts.tip-cicd-sanity.throughput_profiles") +throughput_profiles = importlib.import_module("py-scripts.tip-cicd-sanity.throughput_profiles") cloudSDK_url=os.getenv('CLOUD_SDK_URL') station = ["tput5000"] diff --git a/py-scripts/tip-cicd-sanity/eap_connect.py b/py-scripts/tip-cicd-sanity/eap_connect.py index 452dac7d..88c10fcb 100755 --- a/py-scripts/tip-cicd-sanity/eap_connect.py +++ b/py-scripts/tip-cicd-sanity/eap_connect.py @@ -22,16 +22,15 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") removeCX = LFUtils.removeCX removeEndps = LFUtils.removeEndps -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm OPEN = "open" diff --git a/py-scripts/tip-cicd-sanity/single_client_throughput.py b/py-scripts/tip-cicd-sanity/single_client_throughput.py index fde64439..3b2319d4 100755 --- a/py-scripts/tip-cicd-sanity/single_client_throughput.py +++ b/py-scripts/tip-cicd-sanity/single_client_throughput.py @@ -33,15 +33,14 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") removeCX = LFUtils.removeCX removeEndps = LFUtils.removeEndps -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm OPEN = "open" diff --git a/py-scripts/tip_station_powersave.py b/py-scripts/tip_station_powersave.py index b65f1d79..0e9e4b2f 100755 --- a/py-scripts/tip_station_powersave.py +++ b/py-scripts/tip_station_powersave.py @@ -11,14 +11,14 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -LFRequest = importlib.import_module("lanforge-scripts.py-json.LANforge.LFRequest") -realm = importlib.import_module("lanforge-scripts.py-json.realm") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") +LFRequest = importlib.import_module("py-json.LANforge.LFRequest") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm ''' diff --git a/py-scripts/tools/lf_qa.py b/py-scripts/tools/lf_qa.py index 0c5b3b6a..84058b9f 100755 --- a/py-scripts/tools/lf_qa.py +++ b/py-scripts/tools/lf_qa.py @@ -19,10 +19,9 @@ import argparse from pathlib import Path import time -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../"))) +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) -lf_report = importlib.import_module("lanforge-scripts.py-scripts.lf_report") +lf_report = importlib.import_module("py-scripts.lf_report") lf_report = lf_report.lf_report # Any style components can be used diff --git a/py-scripts/vap_stations_example.py b/py-scripts/vap_stations_example.py index 772cd9d8..59e50d1a 100755 --- a/py-scripts/vap_stations_example.py +++ b/py-scripts/vap_stations_example.py @@ -11,13 +11,13 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -lfcli_base = importlib.import_module("lanforge-scripts.py-json.LANforge.lfcli_base") +lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") LFCliBase = lfcli_base.LFCliBase -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") +LFUtils = importlib.import_module("py-json.LANforge.LFUtils") # from generic_cx import GenericCx mgrURL = "http://localhost:8080/" diff --git a/py-scripts/wlan_capacity_calculator.py b/py-scripts/wlan_capacity_calculator.py index 0635cb9a..e99b44d5 100755 --- a/py-scripts/wlan_capacity_calculator.py +++ b/py-scripts/wlan_capacity_calculator.py @@ -11,10 +11,10 @@ import importlib import argparse from pip._internal.utils import logging -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -wlan_theoretical_sta = importlib.import_module("lanforge-scripts.py-json.wlan_theoretical_sta") +wlan_theoretical_sta = importlib.import_module("py-json.wlan_theoretical_sta") def main(): diff --git a/py-scripts/ws_generic_monitor_test.py b/py-scripts/ws_generic_monitor_test.py index c651d2bf..f688acfa 100755 --- a/py-scripts/ws_generic_monitor_test.py +++ b/py-scripts/ws_generic_monitor_test.py @@ -9,12 +9,12 @@ import os import importlib import json -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) + +sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) -ws_generic_monitor = importlib.import_module("lanforge-scripts.py-json.ws_generic_monitor") +ws_generic_monitor = importlib.import_module("py-json.ws_generic_monitor") WS_Listener = ws_generic_monitor.WS_Listener -realm = importlib.import_module("lanforge-scripts.py-json.realm") +realm = importlib.import_module("py-json.realm") Realm = realm.Realm reference = "test_ipv4_connection.py"