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

port_probe.py : removed exception when looking for NSS on tx and rx ,check

Browse Source 
string first before parsing.

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-12-10 14:28:34 -07:00
parent 040ca87757
commit 32c2b76b25
1 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
py-json/port_probe.py
View File

@@ -88,29 +88,25 @@ class ProbePort(LFCliBase):
self.tx_mhz = 20 self.tx_mhz = 20
print("HT: tx_mhz {tx_mhz}".format(tx_mhz=self.tx_mhz)) print("HT: tx_mhz {tx_mhz}".format(tx_mhz=self.tx_mhz))
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') self.tx_mcs = int(tx_mcs.split('MCS')[1].strip(' ').split(' ')[0])
self.tx_mcs = int(tx_mcs.split('MCS')[1].strip(' ').split(' ')[0]) print("self.tx_mcs {tx_mcs}".format(tx_mcs=self.tx_mcs))
print("self.tx_mcs {tx_mcs}".format(tx_mcs=self.tx_mcs)) if 'NSS' in text:
try: self.tx_nss = [x.strip('\t') for x in text if 'tx bitrate' in x][0].split('NSS')[1].strip(' ')
self.tx_nss = [x.strip('\t') for x in text if 'tx bitrate' in x][0].split('NSS')[1].strip(' ') else:
except BaseException: # nss is not present need to derive from MCS for HT
# nss is not present need to derive from MCS for HT if 0 <= self.tx_mcs <= 7:
if 0 <= self.tx_mcs <= 7: self.tx_nss = 1
self.tx_nss = 1 elif 8 <= self.tx_mcs <= 15:
elif 8 <= self.tx_mcs <= 15: self.tx_nss = 2
self.tx_nss = 2 elif 16 <= self.tx_mcs <= 23:
elif 16 <= self.tx_mcs <= 23: self.tx_nss = 3
self.tx_nss = 3 elif 24 <= self.tx_mcs <= 31:
elif 24 <= self.tx_mcs <= 31: self.tx_nss = 4
self.tx_nss = 4 print("tx_nss {tx_nss}".format(tx_nss=self.tx_nss))
print("tx_nss {tx_nss}".format(tx_nss=self.tx_nss)) self.tx_mbit = float(self.tx_bitrate.split(' ')[0])
self.tx_mbit = float(self.tx_bitrate.split(' ')[0]) print("tx_mbit {tx_mbit}".format(tx_mbit=self.tx_mbit))
print("tx_mbit {tx_mbit}".format(tx_mbit=self.tx_mbit)) self.calculated_data_rate_tx_HT()
self.calculated_data_rate_tx_HT()
except IndexError as error:
print(error)
rx_bitrate = [x for x in text if 'rx bitrate' in x][0].replace('\t', ' ') rx_bitrate = [x for x in text if 'rx bitrate' in x][0].replace('\t', ' ')
print("rx_bitrate {rx_bitrate}".format(rx_bitrate=rx_bitrate)) print("rx_bitrate {rx_bitrate}".format(rx_bitrate=rx_bitrate))
@@ -126,22 +122,21 @@ class ProbePort(LFCliBase):
else: else:
self.rx_mhz = 20 self.rx_mhz = 20
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') self.rx_mcs = int(rx_mcs.split('MCS')[1].strip(' ').split(' ')[0])
self.rx_mcs = int(rx_mcs.split('MCS')[1].strip(' ').split(' ')[0]) print("self.rx_mcs {rx_mcs}".format(rx_mcs=self.rx_mcs))
print("self.rx_mcs {rx_mcs}".format(rx_mcs=self.rx_mcs)) if 'NSS' in text:
try: self.rx_nss = [x.strip('\t') for x in text if 'rx bitrate' in x][0].split('NSS')[1].strip(' ')
self.rx_nss = [x.strip('\t') for x in text if 'rx bitrate' in x][0].split('NSS')[1].strip(' ') else:
except BaseException: # nss is not present need to derive from MCS for HT
# nss is not present need to derive from MCS for HT if 0 <= self.rx_mcs <= 7:
if 0 <= self.rx_mcs <= 7: self.rx_nss = 1
self.rx_nss = 1 elif 8 <= self.rx_mcs <= 15:
elif 8 <= self.rx_mcs <= 15: self.rx_nss = 2
self.rx_nss = 2 elif 16 <= self.rx_mcs <= 23:
elif 16 <= self.rx_mcs <= 23: self.rx_nss = 3
self.rx_nss = 3 elif 24 <= self.rx_mcs <= 31:
elif 24 <= self.rx_mcs <= 31: self.rx_nss = 4
self.rx_nss = 4
self.rx_mbit = self.rx_bitrate.split(' ')[0] self.rx_mbit = self.rx_bitrate.split(' ')[0]
print("rx_nss {rx_nss}".format(rx_nss=self.rx_nss)) print("rx_nss {rx_nss}".format(rx_nss=self.rx_nss))