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

lf_cisco_dfs.py: use configured channel and not the initial channel read from controller

Browse Source 
Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-02-16 16:29:57 -07:00
parent 3a0e89c04d
commit 641b56d5e4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
py-scripts/lf_cisco_dfs.py
View File

@@ -1366,7 +1366,7 @@ class L3VariableTime(Realm):
return cc_ch return cc_ch
def read_auto_rf(self,initial_channel): def read_auto_rf(self):
logg.info("read_channel: cisco_wifi_ctl.py action auto-rf") logg.info("read_channel: cisco_wifi_ctl.py action auto-rf")
pss = "" pss = ""
@@ -1391,11 +1391,11 @@ class L3VariableTime(Realm):
exit(1) exit(1)
blacklist_time = "" blacklist_time = ""
for line in pss.splitlines(): for line in pss.splitlines():
pat = 'Channel\s+%s\S+\s+(\S+)\s+\S+\s+remaining'%(initial_channel) pat = 'Channel\s+%s\S+\s+(\S+)\s+\S+\s+remaining'%(self.chan_5ghz)
m = re.search(pat, line) m = re.search(pat, line)
if ( m != None ): if ( m != None ):
blacklist_time = m.group(1) blacklist_time = m.group(1)
logg.info("dfs_channel: {} blacklist_time: {}".format(initial_channel,blacklist_time)) logg.info("dfs_channel: {} blacklist_time: {}".format(self.chan_5ghz,blacklist_time))
return blacklist_time return blacklist_time
@@ -1730,7 +1730,7 @@ class L3VariableTime(Realm):
logg.info("FAIL: channel set on command line: {} not configured in controller: {} is there a DFS lockout condition".format(self.chan_5ghz,initial_channel)) logg.info("FAIL: channel set on command line: {} not configured in controller: {} is there a DFS lockout condition".format(self.chan_5ghz,initial_channel))
pass_fail = "fail" pass_fail = "fail"
blacklist_time = self.read_auto_rf(initial_channel) blacklist_time = self.read_auto_rf()
best_csv_rx_row_data.append(initial_channel) best_csv_rx_row_data.append(initial_channel)