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

Give --scheme a chance to work.

Browse Source 
telnet still needs testing against real controller, but at least
arguments are properly passed to helper script now.
This commit is contained in:
Ben Greear
2020-01-13 20:09:59 -08:00
parent 86d23cf352
commit 5fde49021a
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lf_cisco_power.py
View File

@@ -377,7 +377,7 @@ def main():
"--cmd", "set_cx_state all c-udp-power RUNNING"], capture_output=True); "--cmd", "set_cx_state all c-udp-power RUNNING"], capture_output=True);
myrd = "" myrd = ""
advanced = subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "summary"], capture_output=True) "--action", "summary"], capture_output=True)
pss = advanced.stdout.decode('utf-8', 'ignore'); pss = advanced.stdout.decode('utf-8', 'ignore');
print(pss) print(pss)
@@ -400,11 +400,11 @@ def main():
for n in nss: for n in nss:
for bw in bandwidths: for bw in bandwidths:
if (n != "NA"): if (n != "NA"):
ni = int(n);
if (parent == None): if (parent == None):
print("ERROR: Skipping setting the spatial streams because cannot find Parent radio for station.") print("ERROR: Skipping setting the spatial streams because cannot find Parent radio for station: %s."%(lfstation))
else: else:
# Set nss on LANforge Station, not sure it can be done on AP # Set nss on LANforge Station, not sure it can be done on AP
ni = int(n);
if (bw == "160"): if (bw == "160"):
# 9984 hardware needs 2 chains to do one NSS at 160Mhz # 9984 hardware needs 2 chains to do one NSS at 160Mhz
if (ni > 2): if (ni > 2):
@@ -434,36 +434,36 @@ def main():
"--set_ifstate", "down"]); "--set_ifstate", "down"]);
# Disable AP, apply settings, enable AP # Disable AP, apply settings, enable AP
subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "disable"]) "--action", "disable"])
subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "cmd", "--value", "config 802.11a disable network"]) "--action", "cmd", "--value", "config 802.11a disable network"])
subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "cmd", "--value", "config 802.11b disable network"]) "--action", "cmd", "--value", "config 802.11b disable network"])
if (tx != "NA"): if (tx != "NA"):
subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "txPower", "--value", tx]) "--action", "txPower", "--value", tx])
if (bw != "NA"): if (bw != "NA"):
subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "bandwidth", "--value", bw]) "--action", "bandwidth", "--value", bw])
# NSS is set on the station earlier... # NSS is set on the station earlier...
if (ch != "NA"): if (ch != "NA"):
subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "channel", "--value", ch]) "--action", "channel", "--value", ch])
subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "cmd", "--value", "config 802.11a enable network"]) "--action", "cmd", "--value", "config 802.11a enable network"])
subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "cmd", "--value", "config 802.11b enable network"]) "--action", "cmd", "--value", "config 802.11b enable network"])
subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "enable"]) "--action", "enable"])
# Wait a bit for AP to come back up # Wait a bit for AP to come back up
time.sleep(1); time.sleep(1);
advanced = subprocess.run(["./cisco_wifi_ctl.py", "-s", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band, "-s", "ssh", advanced = subprocess.run(["./cisco_wifi_ctl.py", "--scheme", scheme, "-d", args.dest, "-u", args.user, "-p", args.passwd, "-a", args.ap, "--band", band,
"--action", "advanced"], capture_output=True) "--action", "advanced"], capture_output=True)
pss = advanced.stdout.decode('utf-8', 'ignore'); pss = advanced.stdout.decode('utf-8', 'ignore');
print(pss) print(pss)
@@ -712,7 +712,7 @@ def main():
diff_a2 = calc_ant2 - allowed_per_path diff_a2 = calc_ant2 - allowed_per_path
diff_a3 = calc_ant3 - allowed_per_path diff_a3 = calc_ant3 - allowed_per_path
diff_a4 = calc_ant4 - allowed_per_path diff_a4 = calc_ant4 - allowed_per_path
# DUT transmits one chain at lower powe when using higher MCS, so allow # DUT transmits one chain at lower power when using higher MCS, so allow
# for that as passing result. # for that as passing result.
failed_low = 0 failed_low = 0
least = 0 least = 0