l3_cxprofile.py : column title updated for Guard Index GI

port_probe.py : update for various porbe syntax for the rx and tx bitrate
in getting MHz values for bandwidth

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-10-27 10:21:48 -06:00
parent 422b2ab577
commit 1787929e37
2 changed files with 15 additions and 7 deletions

View File

@@ -283,8 +283,8 @@ class L3CXProfile(LFCliBase):
probe_results['TX NSS'] = probe_port.tx_nss
probe_results['TX MHz'] = probe_port.tx_mhz
#probe_results['TX guard interval'] = probe_port.tx_ns
probe_results['TX Mbps gi short'] = probe_port.tx_data_rate_gi_short_Mbps
probe_results['TX Mbps gi long'] = probe_port.tx_data_rate_gi_long_Mbps
probe_results['TX Mbps short GI'] = probe_port.tx_data_rate_gi_short_Mbps
probe_results['TX Mbps long GI'] = probe_port.tx_data_rate_gi_long_Mbps
probe_results['RX Bitrate'] = probe_port.rx_bitrate

View File

@@ -72,8 +72,9 @@ class ProbePort(LFCliBase):
tx_bitrate = [x for x in text if 'tx bitrate' in x][0].replace('\t', ' ')
print("tx_bitrate {tx_bitrate}".format(tx_bitrate=tx_bitrate))
self.tx_bitrate = tx_bitrate.split(':')[-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))
if 'MHz' in tx_bitrate:
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))
try:
tx_mcs = [x.strip('\t') for x in text if 'tx bitrate' in x][0].split(':')[1].strip('\t')
@@ -102,11 +103,18 @@ class ProbePort(LFCliBase):
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))
self.rx_bitrate = rx_bitrate.split(':')[-1].strip(' ')
print("self.rx_bitrate {rx_bitrate}".format(rx_bitrate=self.rx_bitrate))
# rx will received : 6Mbps encoding is legacy frame
try:
self.rx_mhz = [x.strip('\t') for x in text if 'rx bitrate' in x][0].split('MHz')[0].rsplit(' ')[-1].strip(' ')
print("rx_mhz {rx_mhz}".format(rx_mhz=self.rx_mhz))
self.rx_mgt_6Mb_frame = False
if 'MHz' in rx_bitrate:
self.rx_mhz = [x.strip('\t') for x in text if 'rx bitrate' in x][0].split('MHz')[0].rsplit(' ')[-1].strip(' ')
print("rx_mhz {rx_mhz}".format(rx_mhz=self.rx_mhz))
self.rx_mgt_6Mb_frame = False
else:
self.rx_mgt_6Mb_frame = True
self.rx_nss = 0
self.rx_mhz = 0
except:
self.rx_mgt_6Mb_frame = True
self.rx_nss = 0