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

l3_cxprofile.py : handle case were beacon avg signal not present as a key

Browse Source 
port_probe.py if MHz not in probe set to 20Mhz,  this may need to change

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-12-08 11:03:18 -07:00
parent 2d52f7369c
commit 721ab3c510
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
py-json/l3_cxprofile.py
View File

@@ -289,7 +289,10 @@ class L3CXProfile(LFCliBase):
probe_results['Signal Avg per Chain'] = probe_port.getSignalAvgPerChain() probe_results['Signal Avg per Chain'] = probe_port.getSignalAvgPerChain()
probe_results['Signal Combined'] = probe_port.getSignalCombined() probe_results['Signal Combined'] = probe_port.getSignalCombined()
probe_results['Signal per Chain'] = probe_port.getSignalPerChain() probe_results['Signal per Chain'] = probe_port.getSignalPerChain()
probe_results['Beacon Avg Signal'] = probe_port.getBeaconSignalAvg() if 'Beacon Av Signal' in probe_results.keys():
probe_results['Beacon Avg Signal'] = probe_port.getBeaconSignalAvg()
else:
probe_results['Beacon Avg Signal'] = "0"
# probe_results['HE status'] = probe_port.he # probe_results['HE status'] = probe_port.he
probe_results['TX Bitrate'] = probe_port.tx_bitrate probe_results['TX Bitrate'] = probe_port.tx_bitrate
probe_results['TX Mbps'] = probe_port.tx_mbit probe_results['TX Mbps'] = probe_port.tx_mbit

38
py-json/port_probe.py
View File

@@ -66,7 +66,7 @@ class ProbePort(LFCliBase):
self.response = response self.response = response
if self.debug: if self.debug:
print("probepath (eid): {probepath}".format(probepath=self.probepath)) print("probepath (eid): {probepath}".format(probepath=self.probepath))
# pprint("Probe response: {response}".format(response=self.response)) pprint("Probe response: {response}".format(response=self.response))
text = self.response['probe-results'][0][self.eid_str]['probe results'].split('\n') text = self.response['probe-results'][0][self.eid_str]['probe results'].split('\n')
signals = [x.strip('\t').split('\t') for x in text if 'signal' in x] signals = [x.strip('\t').split('\t') for x in text if 'signal' in x]
keys = [x[0].strip(' ').strip(':') for x in signals] keys = [x[0].strip(' ').strip(':') for x in signals]
@@ -85,6 +85,10 @@ class ProbePort(LFCliBase):
self.tx_mhz = [x.strip('\t') for x in text if 'tx bitrate' in x][0].split('MHz')[0].rsplit(' ')[-1].strip( self.tx_mhz = [x.strip('\t') for x in text if 'tx bitrate' in x][0].split('MHz')[0].rsplit(' ')[-1].strip(
' ') ' ')
print("tx_mhz {tx_mhz}".format(tx_mhz=self.tx_mhz)) print("tx_mhz {tx_mhz}".format(tx_mhz=self.tx_mhz))
else:
self.tx_mhz = 20
print("HT: tx_mhz {tx_mhz}".format(tx_mhz=self.tx_mhz))
try: try:
tx_mcs = [x.strip('\t') for x in text if 'tx bitrate' in x][0].split(':')[1].strip('\t') tx_mcs = [x.strip('\t') for x in text if 'tx bitrate' in x][0].split(':')[1].strip('\t')
@@ -115,18 +119,20 @@ class ProbePort(LFCliBase):
self.rx_bitrate = rx_bitrate.split(':')[-1].strip(' ') self.rx_bitrate = rx_bitrate.split(':')[-1].strip(' ')
print("self.rx_bitrate {rx_bitrate}".format(rx_bitrate=self.rx_bitrate)) print("self.rx_bitrate {rx_bitrate}".format(rx_bitrate=self.rx_bitrate))
# rx will received : 6Mbps encoding is legacy frame # rx will received : 6Mbps encoding is legacy frame
try: # for 24g - MHz is 20
if 'MHz' in rx_bitrate: # try:
self.rx_mhz = [x.strip('\t') for x in text if 'rx bitrate' in x][0].split('MHz')[0].rsplit(' ')[ if 'MHz' in rx_bitrate:
-1].strip(' ') self.rx_mhz = [x.strip('\t') for x in text if 'rx bitrate' in x][0].split('MHz')[0].rsplit(' ')[
print("rx_mhz {rx_mhz}".format(rx_mhz=self.rx_mhz)) -1].strip(' ')
self.rx_mgt_6Mb_frame = False print("rx_mhz {rx_mhz}".format(rx_mhz=self.rx_mhz))
else: self.rx_mgt_6Mb_frame = False
self.rx_mgt_6Mb_frame = True else:
self.rx_mhz = 20
except BaseException:
self.rx_mgt_6Mb_frame = True self.rx_mgt_6Mb_frame = True
print("received rx_mgt_6Mb_frame")
# except BaseException:
# self.rx_mgt_6Mb_frame = True
# print("received rx_mgt_6Mb_frame")
try: try:
rx_mcs = [x.strip('\t') for x in text if 'rx bitrate' in x][0].split(':')[1].strip('\t') rx_mcs = [x.strip('\t') for x in text if 'rx bitrate' in x][0].split(':')[1].strip('\t')
@@ -184,10 +190,10 @@ class ProbePort(LFCliBase):
bw = 20 bw = 20
# Note the T_gi is not exactly know so need to calculate bothh with .4 and .8 # Note the T_gi is not exactly know so need to calculate bothh with .4 and .8
# the nubmer of Data Subcarriers is based on modulation and bandwith # the nubmer of Data Subcarriers is based on modulation and bandwith
try: # try:
bw = int(self.tx_mhz) bw = int(self.tx_mhz)
except BaseException: # except BaseException:
print("port_probe.py: WARNING unable to parse tx MHz (BW) , check probe output will use {bw}".format(bw=bw)) # print("port_probe.py: WARNING unable to parse tx MHz (BW) , check probe output will use {bw}".format(bw=bw))
print("Mhz {Mhz}".format(Mhz=self.tx_mhz)) print("Mhz {Mhz}".format(Mhz=self.tx_mhz))
if bw == 20: if bw == 20: