From 1fba19c24561524c95c803b97a7fc9605e7bf207 Mon Sep 17 00:00:00 2001 From: shivam Date: Fri, 22 Jul 2022 13:56:26 +0530 Subject: [PATCH] fixed the broken pip creation imports Signed-off-by: shivam --- lf_libs/__pycache__/lf_libs.cpython-39.pyc | Bin 0 -> 13398 bytes lf_libs/lf_libs.py | 4 +++- lf_libs/lf_tests.py | 12 ++++++------ to_pip.sh | 16 ++++++++++++---- 4 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 lf_libs/__pycache__/lf_libs.cpython-39.pyc diff --git a/lf_libs/__pycache__/lf_libs.cpython-39.pyc b/lf_libs/__pycache__/lf_libs.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..60cdded911830f9c861bbdc1485bad4c4fba2828 GIT binary patch literal 13398 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 literal 0 HcmV?d00001 diff --git a/lf_libs/lf_libs.py b/lf_libs/lf_libs.py index 8d9b63bf..38b0a98d 100644 --- a/lf_libs/lf_libs.py +++ b/lf_libs/lf_libs.py @@ -114,7 +114,7 @@ class lf_libs: """ wave2_radios = [] - """ + """lf_tests ax radio - supports (2.4G and 5gHz Band) Maximum 64 Station per radio """ @@ -433,3 +433,5 @@ class SCP_File: with SCPClient(ssh.get_transport()) as scp: scp.get(remote_path=self.remote_path, local_path=self.local_path, recursive=True) scp.close() + + diff --git a/lf_libs/lf_tests.py b/lf_libs/lf_tests.py index 5cb19a79..55730d5f 100644 --- a/lf_libs/lf_tests.py +++ b/lf_libs/lf_tests.py @@ -24,10 +24,10 @@ create_chamberview = importlib.import_module("py-scripts.create_chamberview") CreateChamberview = create_chamberview.CreateChamberview sta_connect2 = importlib.import_module("py-scripts.sta_connect2") StaConnect2 = sta_connect2.StaConnect2 -lf_libs_module = importlib.import_module("lf_libs") -lf_libs = lf_libs_module.lf_libs -Report = lf_libs.Report -SCP_File = lf_libs.SCP_File +lf_library = importlib.import_module("lf_libs") +lf_libs = lf_library.lf_libs +Report = lf_library.Report +SCP_File = lf_library.SCP_File class lf_tests(lf_libs): @@ -208,7 +208,7 @@ if __name__ == '__main__': "username": "tip@ucentral.com", "password": "OpenWifi%123" }, - "access_point": [ + "device_under_tests": [ { "model": "hfcl_ion4", "mode": "wifi5", @@ -238,7 +238,7 @@ if __name__ == '__main__': } } - obj = lf_tests(lf_data=dict(basic_02["traffic_generator"]), dut_data=list(basic_02["access_point"]), + obj = lf_tests(lf_data=dict(basic_02["traffic_generator"]), dut_data=list(basic_02["device_under_tests"]), log_level=logging.DEBUG) # obj.read_cv_scenario() # obj.setup_dut() diff --git a/to_pip.sh b/to_pip.sh index 04b9aec7..7e7225cb 100755 --- a/to_pip.sh +++ b/to_pip.sh @@ -86,7 +86,16 @@ __license__ = ''" > __init__.py sed -i -- 's/from LANforge/from py_json.LANforge/g' *.py sed -i -- 's/from py_json/from .py_json/g' *.py -cd py_scripts || exit 1 +sed -i -- 's/py-scripts/py_scripts/g' *.py +cd lf_libs || exit 1 +sed -i -- 's/py-scripts/py_scripts/g' *.py +sed -i -- 's/py-json/py_json/g' *.py +echo "from .lf_libs import lf_libs +from .lf_tests import lf_tests +from .lf_libs import Report +from .lf_libs import SCP_File +" > __init__.py +cd ../py_scripts || exit 1 echo "#from .connection_test import ConnectionTest from .create_bond import CreateBond @@ -98,7 +107,6 @@ from .create_macvlan import CreateMacVlan from .create_qvlan import CreateQVlan from .create_station import CreateStation from .create_vap import CreateVAP -from .csv_convert import CSVParcer from .csv_to_influx import CSVtoInflux from .csv_to_grafana import UseGrafana from .example_security_connection import IPv4Test @@ -154,7 +162,6 @@ from .wlan_capacity_calculator import main as WlanCapacityCalculator from .ws_generic_monitor_test import WS_Listener" > __init__.py # Fix files in py_scripts -sed -i -- 's/import importlib/ /g' *.py sed -i -- 's/import realm/ /g' create_vap.py lf_dut_sta_vap_test.py lf_sniff_radio.py run_cv_scenario.py sta_connect.py station_layer3.py test_client_admission.py sed -i -- 's/import realm/from realm import Realm/g' lf_atten_mod_test.py lf_multipsk.py test_fileio.py test_ip_connection.py test_ipv4_ttls.py test_l3_WAN_LAN.py test_l3_unicast_traffic_gen.py test_l4.py testgroup.py sed -i -- 's/realm.Realm/Realm/g' lf_atten_mod_test.py lf_multipsk.py lf_sniff_radio.py station_layer3.py test_client_admission.py test_fileio.py test_ip_connection.py @@ -168,7 +175,7 @@ sed -i -- 's/import wlan_theoretical_sta/from wlan_theoretical_sta import abg11_ sed -i -- 's/sys.path.append(os.path.join(os.path.abspath(__file__ + "..\/..\/..\/")))/ /g' *.py #Change importlib to pip compliant method -sed -i -- 's/import importlib/ /g' *.py +sed -i -- 's/lf_logger_config = importlib.import_module("py-scripts.lf_logger_config")/from lanforge_scripts.py_scripts.lf_logger_config import lf_logger_config/g' *.py sed -i -- 's/influx = importlib.import_module("py-scripts.influx_utils")/from lanforge_scripts.py_scripts.influx_utils import RecordInflux/g' *.py sed -i -- 's/RecordInflux = influx.RecordInflux/ /g' *.py sed -i -- 's/create_chamberview_dut = importlib.import_module("py-scripts.create_chamberview_dut")/import create_chamberview_dut/g' *.py @@ -459,6 +466,7 @@ if [[ $ARCHIVE -eq 1 ]]; then mv py_json lanforge_scripts mv py_dashboard lanforge_scripts mv py_scripts lanforge_scripts + mv lf_libs lanforge_scripts mv label-printer lanforge_scripts/label_printer mv "auto-install-gui.py" "auto_install_gui.py" for i in "${py_modules[@]}"; do