Revert "Update py_json files to be compatible with pip standards"

This reverts commit 0be47c82de.

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

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
 

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):

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

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

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
 
 

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:

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

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):

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

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
 
 

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):

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
 
 

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():
+     

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
 

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
 
 

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
 

py-json/realm.py

@@ -36,6 +36,7 @@ from lfdata import LFDataCollection
 # ---- ---- ---- ---- Other Imports ---- ---- ---- ----
 import re
 import time
+import pprint
 from pprint import pprint
 
 

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)

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
 

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.

py-json/test_base.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+from lfdata import LFDataCollection
+#import lfreporting
 
 class TestBase:
     def __init__(self):

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):

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,

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

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
 

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_

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