scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-01 11:18:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

sta_connect.py, lfcli_base.py: fixes inheritance mistake, continues refactoring, test now runs

Browse Source
This commit is contained in:
Jed Reynolds
2020-06-01 15:22:49 -07:00
parent 29c6c7c7b8
commit f69d4cdb90
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
py-json/LANforge/lfcli_base.py
View File

@@ -6,11 +6,14 @@ from LANforge.LFUtils import *
class LFCliBase:
def __init__(self, lfjson_host="localhost", lfjson_port=8080, _debug=False):
# do not use `super(LFCLiBase,self).__init__(self, host, port, _debugOn)
# that is py2 era syntax and will force self into the host variable, making you
# very confused.
def __init__(self, _lfjson_host, _lfjson_port, _debug=False):
self.lfjson_host = _lfjson_host
self.lfjson_port = _lfjson_port
self.debugOn = _debug
self.lfjson_host = lfjson_host
self.lfjson_port = lfjson_port
self.mgr_url = f"http://{self.lfjson_host}:{self.lfjson_port}/"
self.mgr_url = "http://%s:%s/" % (self.lfjson_host, self.lfjson_port)
def jsonPost(self, _req_url, _data):
lf_r = LFRequest.LFRequest(self.mgr_url + _req_url)
@@ -29,4 +32,18 @@ class LFCliBase:
json_response = lf_r.getAsJson(self.debugOn)
return json_response
def checkConnect(self):
print(f"Checking for LANforge GUI connection: {self.mgr_url}")
response = self.jsonGet("")
duration = 0
while (response is None) and (duration < 300):
print(f"LANforge GUI connection not found sleeping 5 seconds, tried: {self.mgr_url}")
duration += 2
time.sleep(2)
response = self.jsonGet("")
if duration >= 300:
print("Could not connect to LANforge GUI")
sys.exit(1)
# ~class

33
py-scripts/sta_connect.py
View File

@@ -14,7 +14,7 @@ if 'py-json' not in sys.path:
# from LANforge import LFRequest
from LANforge import LFUtils
# from LANforge import LFCliBase
from LANforge.LFCliBase import LFCliBase
from LANforge.lfcli_base import LFCliBase
from LANforge.LFUtils import *
if sys.version_info[0] != 3:
@@ -23,14 +23,15 @@ if sys.version_info[0] != 3:
class StaConnect(LFCliBase):
def __init__(self, lfjson_host, lfjson_port, _dut_ssid="MyAP", _dut_passwd="NA", _dut_bssid="",
def __init__(self, host, port, _dut_ssid="MyAP", _dut_passwd="NA", _dut_bssid="",
_user="", _passwd="", _sta_mode="0", _radio="wiphy0",
_resource=1, _upstream_resource=1, _upstream_port="eth2",
_sta_name="sta001", _debugOn=False):
# self.dest = "localhost" # in super
# self.port = "8080" # in super
# do not use `super(LFCLiBase,self).__init__(self, host, port, _debugOn)
# that is py2 era syntax and will force self into the host variable, making you
# very confused.
super().__init__(host, port, _debugOn)
super().__init__(self, lfjson_host, lfjson_port)
self.dut_ssid = _dut_ssid
self.dut_passwd = _dut_passwd
self.dut_bssid = _dut_bssid
@@ -55,20 +56,6 @@ class StaConnect(LFCliBase):
self.upstream_url = f"port/1/{self.upstream_resource}/{self.upstream_port}"
return self.upstream_url
def checkConnect(self):
print(f"Checking for LANforge GUI connection: {self.mgr_url}")
response = super().jsonGet("/")
duration = 0
while (response is None) and (duration < 300):
print(f"LANforge GUI connection not found sleeping 5 seconds, tried: {self.mgr_url}")
duration += 2
time.sleep(2)
response = super().jsonGet("/")
if duration >= 300:
print("Could not connect to LANforge GUI")
sys.exit(1)
# Compare pre-test values to post-test values
@staticmethod
def compareVals(name, postVal):
@@ -360,7 +347,7 @@ class StaConnect(LFCliBase):
def main():
lfjson_host = "http://localhost"
lfjson_host = "localhost"
lfjson_port = 8080
parser = argparse.ArgumentParser(
description="""LANforge Unit Test: Connect Station to AP
@@ -410,13 +397,11 @@ Example:
if args.dut_ssid is not None:
staConnect.dut_ssid = args.dut_ssid
staConnect.run()
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
if __name__ == "__main__":
main()