diff --git a/py-dashboard/InfluxRequest.py b/py-dashboard/InfluxRequest.py index 917a17a0..37838159 100644 --- a/py-dashboard/InfluxRequest.py +++ b/py-dashboard/InfluxRequest.py @@ -14,6 +14,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')) + + import requests import json import influxdb_client diff --git a/py-json/LANforge/lfcli_base.py b/py-json/LANforge/lfcli_base.py index f204a728..3b838aa4 100644 --- a/py-json/LANforge/lfcli_base.py +++ b/py-json/LANforge/lfcli_base.py @@ -1,9 +1,11 @@ #!env /usr/bin/python import sys +import signal import traceback # Extend this class to use common set of debug and request features for your script from pprint import pprint +import time import random import string import datetime @@ -12,6 +14,7 @@ import LANforge.LFUtils from LANforge.LFUtils import * from LANforge import LFRequest import LANforge.LFRequest +import csv import pandas as pd import os diff --git a/py-json/base_profile.py b/py-json/base_profile.py index 521073c3..c6291e30 100644 --- a/py-json/base_profile.py +++ b/py-json/base_profile.py @@ -1,10 +1,15 @@ #!/usr/bin/env python3 - +import re +import time +import pprint +import csv import datetime import random import string +import pprint from pprint import pprint +#from LANforge.lfcriteria import LFCriteria class BaseProfile: def __init__(self, local_realm, debug=False): diff --git a/py-json/cv_dut_profile.py b/py-json/cv_dut_profile.py index 63e1e308..74a6606b 100644 --- a/py-json/cv_dut_profile.py +++ b/py-json/cv_dut_profile.py @@ -1,3 +1,5 @@ +import time + # !/usr/bin/env python3 # ---- ---- ---- ---- LANforge Base Imports ---- ---- ---- ---- from LANforge.lfcli_base import LFCliBase diff --git a/py-json/cv_test_manager.py b/py-json/cv_test_manager.py index 1642b6b4..fa9a89fe 100644 --- a/py-json/cv_test_manager.py +++ b/py-json/cv_test_manager.py @@ -10,9 +10,11 @@ import os if 'py-dashboard' not in sys.path: sys.path.append(os.path.join(os.path.abspath('..'), 'py-dashboard')) +from LANforge.lfcli_base import LFCliBase from realm import Realm import json from pprint import pprint +import argparse from cv_test_reports import lanforge_reports as lf_rpt from InfluxRequest import * import os.path diff --git a/py-json/dut_profile.py b/py-json/dut_profile.py index 5bd84a12..edc6afa6 100644 --- a/py-json/dut_profile.py +++ b/py-json/dut_profile.py @@ -2,7 +2,9 @@ #!/usr/bin/env python3 from LANforge.lfcli_base import LFCliBase from LANforge import add_dut +import pprint from pprint import pprint +import time import base64 diff --git a/py-json/fio_endp_profile.py b/py-json/fio_endp_profile.py index da831fea..10329895 100644 --- a/py-json/fio_endp_profile.py +++ b/py-json/fio_endp_profile.py @@ -1,7 +1,11 @@ #!/usr/bin/env python3 from LANforge.lfcli_base import LFCliBase +import pprint +from pprint import pprint import time +# Class: FIOEndpProfile(LFCliBase) +# # Written by Candela Technologies Inc. # Updated by: diff --git a/py-json/gen_cxprofile.py b/py-json/gen_cxprofile.py index 59774d60..0bea33a6 100644 --- a/py-json/gen_cxprofile.py +++ b/py-json/gen_cxprofile.py @@ -1,6 +1,8 @@ #!/usr/bin/env python3 +from LANforge.lfcli_base import LFCliBase +import pprint from pprint import pprint from LANforge.lfcli_base import LFCliBase import csv diff --git a/py-json/http_profile.py b/py-json/http_profile.py index 619baa1b..6da182e8 100644 --- a/py-json/http_profile.py +++ b/py-json/http_profile.py @@ -1,6 +1,9 @@ #!/usr/bin/env python3 from LANforge.lfcli_base import LFCliBase +import port_utils from port_utils import PortUtils +from pprint import pprint +import pprint import time class HTTPProfile(LFCliBase): diff --git a/py-json/l3_cxprofile.py b/py-json/l3_cxprofile.py index c169da42..b33327c7 100644 --- a/py-json/l3_cxprofile.py +++ b/py-json/l3_cxprofile.py @@ -1,4 +1,5 @@ # !/usr/bin/env python3 +import pprint from pprint import pprint from LANforge.lfcli_base import LFCliBase import csv diff --git a/py-json/l3_cxprofile2.py b/py-json/l3_cxprofile2.py index 7aa45007..0eb67df4 100644 --- a/py-json/l3_cxprofile2.py +++ b/py-json/l3_cxprofile2.py @@ -1,9 +1,17 @@ #!/usr/bin/env python3 +import re +import time +import pprint from lfdata import LFDataCollection from base_profile import BaseProfile +import os +import datetime +import base64 import csv from pprint import pprint import time +import random +import string import datetime diff --git a/py-json/l4_cxprofile.py b/py-json/l4_cxprofile.py index a809c6de..87e327ca 100644 --- a/py-json/l4_cxprofile.py +++ b/py-json/l4_cxprofile.py @@ -1,11 +1,15 @@ #!/usr/bin/env python3 from LANforge.lfcli_base import LFCliBase +import pprint +from pprint import pprint import requests import pandas as pd import time import datetime import ast +import csv +import os class L4CXProfile(LFCliBase): def __init__(self, lfclient_host, lfclient_port, local_realm, debug_=False): diff --git a/py-json/lf_attenmod.py b/py-json/lf_attenmod.py index 9ab60152..33b7f2b3 100644 --- a/py-json/lf_attenmod.py +++ b/py-json/lf_attenmod.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from LANforge.lfcli_base import LFCliBase from LANforge import LFRequest +from LANforge import LFUtils import time diff --git a/py-json/lfdata.py b/py-json/lfdata.py index 27aff5f2..12935ed0 100644 --- a/py-json/lfdata.py +++ b/py-json/lfdata.py @@ -1,6 +1,17 @@ #!/usr/bin/env python3 - +import re +import time +import pprint +from pprint import pprint +import os import datetime +import base64 +import xlsxwriter +import pandas as pd +import requests +import ast +import csv + # LFData class actions: # - Methods to collect data/store data (use from monitor instance) - used by Profile class. @@ -86,3 +97,6 @@ class LFDataCollection: temp_list.append(merge[name]) return temp_list + +#class WebSocket(): + \ No newline at end of file diff --git a/py-json/mac_vlan_profile.py b/py-json/mac_vlan_profile.py index 800c03a4..edfbdc82 100644 --- a/py-json/mac_vlan_profile.py +++ b/py-json/mac_vlan_profile.py @@ -1,7 +1,10 @@ #!/usr/bin/env python3 from LANforge.lfcli_base import LFCliBase -from LANforge import LFRequest, LFUtils, set_port +from LANforge import LFRequest +from LANforge import LFUtils +from LANforge import set_port +import pprint from pprint import pprint import time diff --git a/py-json/multicast_profile.py b/py-json/multicast_profile.py index 2b2711a6..ca99872d 100644 --- a/py-json/multicast_profile.py +++ b/py-json/multicast_profile.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from LANforge.lfcli_base import LFCliBase +import pprint from pprint import pprint diff --git a/py-json/qvlan_profile.py b/py-json/qvlan_profile.py index ccd711ed..c968cee7 100644 --- a/py-json/qvlan_profile.py +++ b/py-json/qvlan_profile.py @@ -1,7 +1,10 @@ #!/usr/bin/env python3 from LANforge.lfcli_base import LFCliBase -from LANforge import LFRequest, LFUtils, set_port +from LANforge import LFRequest +from LANforge import LFUtils +from LANforge import set_port +import pprint from pprint import pprint import time diff --git a/py-json/realm.py b/py-json/realm.py index 40dd37c1..02f825b3 100755 --- a/py-json/realm.py +++ b/py-json/realm.py @@ -36,6 +36,7 @@ from lfdata import LFDataCollection # ---- ---- ---- ---- Other Imports ---- ---- ---- ---- import re import time +import pprint from pprint import pprint diff --git a/py-json/realm_test.py b/py-json/realm_test.py index 89e4aafc..acb6f8f6 100755 --- a/py-json/realm_test.py +++ b/py-json/realm_test.py @@ -1,7 +1,10 @@ #!/usr/bin/env python3 +import pprint import time from pprint import pprint +import realm from realm import Realm +import LANforge from LANforge import LFUtils localrealm = Realm("localhost", 8080, True) diff --git a/py-json/show_ports.py b/py-json/show_ports.py index a346e1e2..35a976e1 100644 --- a/py-json/show_ports.py +++ b/py-json/show_ports.py @@ -8,6 +8,7 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit() +import json import pprint from LANforge import LFRequest diff --git a/py-json/station_profile.py b/py-json/station_profile.py index 06c5f7a3..9e99f9c7 100644 --- a/py-json/station_profile.py +++ b/py-json/station_profile.py @@ -1,5 +1,10 @@ # !/usr/bin/env python3 -from LANforge import LFRequest, LFUtils, set_port, add_sta +from LANforge.lfcli_base import LFCliBase +from LANforge import LFRequest +from LANforge import LFUtils +from LANforge import set_port +from LANforge import add_sta +import pprint from pprint import pprint import time # Uncomment below to include autogen library. diff --git a/py-json/test_base.py b/py-json/test_base.py index aa349e66..5187a94b 100644 --- a/py-json/test_base.py +++ b/py-json/test_base.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +from lfdata import LFDataCollection +#import lfreporting class TestBase: def __init__(self): diff --git a/py-json/test_group_profile.py b/py-json/test_group_profile.py index b09af7ee..fe08363d 100644 --- a/py-json/test_group_profile.py +++ b/py-json/test_group_profile.py @@ -1,5 +1,8 @@ #!/usr/bin/env python3 from LANforge.lfcli_base import LFCliBase +import pprint +from pprint import pprint +import time class TestGroupProfile(LFCliBase): diff --git a/py-json/test_histogram.py b/py-json/test_histogram.py index c49bc2f0..b6bf3cd0 100755 --- a/py-json/test_histogram.py +++ b/py-json/test_histogram.py @@ -2,7 +2,9 @@ """ ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- internal test driving LFUtils.expand_endp_histogram ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- """ +import LANforge from LANforge import LFUtils +import pprint distrib_load = { "histo_category_width" : 3, diff --git a/py-json/test_utility.py b/py-json/test_utility.py index 942cd587..a18cb8d6 100644 --- a/py-json/test_utility.py +++ b/py-json/test_utility.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 """ Candela Technologies Inc. @@ -10,10 +9,19 @@ Date : """ import sys +from pprint import pprint +from uuid import uuid1 if 'py-json' not in sys.path: sys.path.append('../py-json') +from LANforge import LFUtils +from LANforge import lfcli_base from LANforge.lfcli_base import LFCliBase +from LANforge.LFUtils import * +import realm +from realm import PortUtils +import argparse +import datetime import time import matplotlib.pyplot as plt import threading diff --git a/py-json/vap_profile.py b/py-json/vap_profile.py index 6699f7ea..573dc157 100644 --- a/py-json/vap_profile.py +++ b/py-json/vap_profile.py @@ -1,7 +1,11 @@ #!/usr/bin/env python3 from LANforge.lfcli_base import LFCliBase -from LANforge import add_vap, set_wifi_radio, set_port, LFUtils, LFRequest +from LANforge import LFRequest +from LANforge import add_vap, set_wifi_radio +from LANforge import set_port +from LANforge import LFUtils +import pprint from pprint import pprint import time diff --git a/py-json/wifi_monitor_profile.py b/py-json/wifi_monitor_profile.py index 774a3c8e..1a7ad13e 100644 --- a/py-json/wifi_monitor_profile.py +++ b/py-json/wifi_monitor_profile.py @@ -1,9 +1,16 @@ #!/usr/bin/env python3 -from LANforge import add_monitor, LFUtils +from LANforge.lfcli_base import LFCliBase +from LANforge import add_monitor +from LANforge.add_monitor import * +from LANforge import LFUtils +import pprint +from pprint import pprint import time from LANforge.set_wifi_radio import set_radio_mode + + class WifiMonitor: def __init__(self, lfclient_url, local_realm, up=True, debug_=False, resource_=1): self.debug = debug_ diff --git a/py-json/ws-sta-monitor.py b/py-json/ws-sta-monitor.py index fc739281..e5a9a5eb 100755 --- a/py-json/ws-sta-monitor.py +++ b/py-json/ws-sta-monitor.py @@ -16,6 +16,7 @@ if sys.version_info[0] != 3: import argparse import json import logging +import pprint import traceback import time from time import sleep