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

sta_connect.py: provides pass/fail methods:

Browse Source 
- passes() method counts any message not /^pass/i as failure
- rearranges guards at top
- defines fail and pass prefixes, fail messages
- removes exit() and sets _halt_on_error to False
- compareVals now using _pass() and _fail()
- changes uses of f-string to modulo-string formatting, allowing tests to run on F24
This commit is contained in:
Jed Reynolds
2020-06-04 15:06:02 -07:00
parent 194bcb7845
commit 0b8e460136
1 changed files with 84 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
py-scripts/sta_connect.py
View File

@@ -6,22 +6,20 @@
# The script will clean up the station and connections at the end of the test. # The script will clean up the station and connections at the end of the test.
import sys import sys
import argparse
if 'py-json' not in sys.path:
sys.path.append('../py-json')
# from LANforge import LFRequest
from LANforge import LFUtils
# from LANforge import LFCliBase
from LANforge.lfcli_base import LFCliBase
from LANforge.LFUtils import *
from pprint import pprint
if sys.version_info[0] != 3: if sys.version_info[0] != 3:
print("This script requires Python 3") print("This script requires Python 3")
exit(1) exit(1)
if 'py-json' not in sys.path:
sys.path.append('../py-json')
import argparse
from LANforge import LFUtils
# from LANforge import LFCliBase
from LANforge.lfcli_base import LFCliBase
from LANforge.LFUtils import *
class StaConnect(LFCliBase): class StaConnect(LFCliBase):
def __init__(self, host, port, _dut_ssid="MyAP", _dut_passwd="NA", _dut_bssid="", def __init__(self, host, port, _dut_ssid="MyAP", _dut_passwd="NA", _dut_bssid="",
@@ -31,8 +29,9 @@ class StaConnect(LFCliBase):
# do not use `super(LFCLiBase,self).__init__(self, host, port, _debugOn) # 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 # that is py2 era syntax and will force self into the host variable, making you
# very confused. # very confused.
super().__init__(host, port, _debugOn) super().__init__(host, port, _debug=_debugOn, _halt_on_error=False)
self.fail_pref = "FAILED: "
self.pass_pref = "PASSED: "
self.dut_ssid = _dut_ssid self.dut_ssid = _dut_ssid
self.dut_passwd = _dut_passwd self.dut_passwd = _dut_passwd
self.dut_bssid = _dut_bssid self.dut_bssid = _dut_bssid
@@ -49,37 +48,44 @@ class StaConnect(LFCliBase):
def getStaUrl(self): def getStaUrl(self):
if self.sta_url is None: if self.sta_url is None:
self.sta_url = f"port/1/{self.resource}/{self.sta_name}" self.sta_url = "port/1/%s/%s" % (self.resource, self.sta_name)
return self.sta_url return self.sta_url
def getUpstreamUrl(self): def getUpstreamUrl(self):
if self.upstream_url is None: if self.upstream_url is None:
self.upstream_url = f"port/1/{self.upstream_resource}/{self.upstream_port}" self.upstream_url = "port/1/%s/%s" % (self.upstream_resource, self.upstream_port)
return self.upstream_url return self.upstream_url
# Compare pre-test values to post-test values # Compare pre-test values to post-test values
# TODO: make this method add a results to an array def compareVals(self, name, postVal, print_pass=False, print_fail=True):
# the calling client should collect results from that array
@staticmethod
def compareVals(name, postVal, results=None):
# print(f"Comparing {name}") # print(f"Comparing {name}")
if postVal > 0: if postVal > 0:
print("PASSED: %s %s" % (name, postVal)) self._pass("%s %s" % (name, postVal), print_pass)
if results is not None:
results.append("PASSED: %s %s" % (name, postVal))
else: else:
print("FAILED: %s did not report traffic: %s" % (name, postVal)) self._fail("%s did not report traffic: %s" % (name, postVal), print_fail)
if results is not None:
results.append("FAILED: %s did not report traffic: %s" % (name, postVal)) # use this inside the class to log a failure result
def _fail(self, message, print_=False):
self.test_results.append(self.fail_pref + message)
if print_:
print(self.fail_pref + message)
# use this inside the class to log a pass result
def _pass(self, message, print_=False):
self.test_results.append(self.pass_pref + message)
if print_:
print(self.pass_pref + message)
def run(self): def run(self):
self.test_results = []
self.check_connect() self.check_connect()
eth1IP = self.json_get(self.getUpstreamUrl()) eth1IP = self.json_get(self.getUpstreamUrl())
if eth1IP is None: if eth1IP is None:
print("Unable to query "+self.upstream_port+", bye") self._fail("Unable to query %s, bye" % self.upstream_port, True)
sys.exit(1) return False
if eth1IP['interface']['ip'] == "0.0.0.0": if eth1IP['interface']['ip'] == "0.0.0.0":
print(f"Warning: {self.getUpstreamUrl()} lacks ip address") self._fail("Warning: %s lacks ip address" % self.getUpstreamUrl())
return False
url = self.getStaUrl() url = self.getStaUrl()
response = super().json_get(url) response = super().json_get(url)
@@ -133,6 +139,7 @@ class StaConnect(LFCliBase):
maxTime = 300 maxTime = 300
ip = "0.0.0.0" ip = "0.0.0.0"
ap = "" ap = ""
print("Waiting for %s associate to AP [%s]..." % (self.sta_name, ap))
while (ip == "0.0.0.0") and (duration < maxTime): while (ip == "0.0.0.0") and (duration < maxTime):
duration += 2 duration += 2
time.sleep(2) time.sleep(2)
@@ -155,20 +162,22 @@ class StaConnect(LFCliBase):
print(f"Connected to AP: {ap}") print(f"Connected to AP: {ap}")
if self.dut_bssid != "": if self.dut_bssid != "":
if self.dut_bssid.lower() == ap.lower(): if self.dut_bssid.lower() == ap.lower():
print(f"PASSED: Connected to BSSID: {ap}") self._pass("Connected to BSSID: " + ap)
# self.test_results.append("PASSED: )
# print("PASSED: Connected to BSSID: "+ap)
else: else:
print("FAILED: Connected to wrong BSSID, requested: %s Actual: %s" % (self.dut_bssid, ap)) self._fail("Connected to wrong BSSID, requested: %s Actual: %s" % (self.dut_bssid, ap))
else: else:
print("FAILED: Did not connect to AP") self._fail("Did not connect to AP")
sys.exit(3) return False
if ip == "0.0.0.0": if ip == "0.0.0.0":
print(f"FAILED: {self.sta_name} did not get an ip. Ending test") self._fail("%s did not get an ip. Ending test" % self.sta_name)
print("Cleaning up...") print("Cleaning up...")
removePort(self.resource, self.sta_name, self.mgr_url) removePort(self.resource, self.sta_name, self.mgr_url)
sys.exit(1) return False
else: else:
print("PASSED: Connected to AP: %s With IP: %s" % (ap, ip)) self._pass("Connected to AP: %s With IP: %s" % (ap, ip))
# create endpoints and cxs # create endpoints and cxs
# Create UDP endpoints # Create UDP endpoints
@@ -266,7 +275,6 @@ class StaConnect(LFCliBase):
} }
super().json_post(reqURL, data) super().json_post(reqURL, data)
# print("Sleeping for 15 seconds")
time.sleep(15) time.sleep(15)
# stop cx traffic # stop cx traffic
@@ -312,8 +320,7 @@ class StaConnect(LFCliBase):
ptestUDPBTX = ptestUDPB['endpoint']['tx bytes'] ptestUDPBTX = ptestUDPB['endpoint']['tx bytes']
ptestUDPBRX = ptestUDPB['endpoint']['rx bytes'] ptestUDPBRX = ptestUDPB['endpoint']['rx bytes']
except Exception as e: except Exception as e:
print("Something went wrong") super.error(e)
print(e)
print("Cleaning up...") print("Cleaning up...")
reqURL = "cli-json/rm_vlan" reqURL = "cli-json/rm_vlan"
data = { data = {
@@ -321,27 +328,27 @@ class StaConnect(LFCliBase):
"resource": self.resource, "resource": self.resource,
"port": self.sta_name "port": self.sta_name
} }
self.json_post(reqURL, data) self.json_post(reqURL, data)
removeCX(self.mgr_url, cxNames) removeCX(self.mgr_url, cxNames)
removeEndps(self.mgr_url, endpNames) removeEndps(self.mgr_url, endpNames)
sys.exit(1) return False
print("\n") # print("\n")
self.test_results = [] # self.test_results.append("Neutral message will fail")
self.compareVals("testTCP-A TX", ptestTCPATX, self.test_results) # self.test_results.append("FAILED message will fail")
self.compareVals("testTCP-A RX", ptestTCPARX, self.test_results)
self.compareVals("testTCP-B TX", ptestTCPBTX, self.test_results) self.compareVals("testTCP-A TX", ptestTCPATX)
self.compareVals("testTCP-B RX", ptestTCPBRX, self.test_results) self.compareVals("testTCP-A RX", ptestTCPARX)
self.compareVals("testUDP-A TX", ptestUDPATX, self.test_results) self.compareVals("testTCP-B TX", ptestTCPBTX)
self.compareVals("testUDP-A RX", ptestUDPARX, self.test_results) self.compareVals("testTCP-B RX", ptestTCPBRX)
self.compareVals("testUDP-B TX", ptestUDPBTX, self.test_results) self.compareVals("testUDP-A TX", ptestUDPATX)
self.compareVals("testUDP-B RX", ptestUDPBRX, self.test_results) self.compareVals("testUDP-A RX", ptestUDPARX)
print("\n")
self.compareVals("testUDP-B TX", ptestUDPBTX)
self.compareVals("testUDP-B RX", ptestUDPBRX)
# print("\n")
# remove all endpoints and cxs # remove all endpoints and cxs
LFUtils.removePort(self.resource, self.sta_name, self.mgr_url) LFUtils.removePort(self.resource, self.sta_name, self.mgr_url)
@@ -352,6 +359,30 @@ class StaConnect(LFCliBase):
def get_result_list(self): def get_result_list(self):
return self.test_results return self.test_results
def get_failed_result_list(self):
fail_list = []
for result in self.test_results:
if not result.startswith("PASS"):
fail_list.append(result)
return fail_list
def get_fail_message(self):
fail_messages = self.get_failed_result_list()
return "\n".join(fail_messages)
def passes(self):
pass_counter: int = 0
fail_counter: int = 0
for result in self.test_results:
if result.startswith("PASS"):
pass_counter += 1
else:
fail_counter += 1
if (fail_counter == 0) and (pass_counter > 0):
return True
return False
# ~class # ~class
@@ -412,6 +443,7 @@ Example:
staConnect.run() staConnect.run()
run_results = staConnect.get_result_list() run_results = staConnect.get_result_list()
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -