<p>srs_andre has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20611">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">srslte_common: fix indent in whole file<br><br>Change-Id: I8aee79e9d451761dde8f35f84d75483dc4e23040<br>---<br>M src/osmo_gsm_tester/obj/srslte_common.py<br>1 file changed, 65 insertions(+), 65 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/11/20611/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/srslte_common.py b/src/osmo_gsm_tester/obj/srslte_common.py</span><br><span>index c4d8e62..e221940 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/srslte_common.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/srslte_common.py</span><br><span>@@ -22,79 +22,79 @@</span><br><span> </span><br><span> class srslte_common(): # don't inherit from log.Origin here but instead use .name() from whoever inherits from us</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def __init__(self):</span><br><span style="color: hsl(0, 100%, 40%);">- self.log_file = None</span><br><span style="color: hsl(0, 100%, 40%);">- self.process = None</span><br><span style="color: hsl(0, 100%, 40%);">- self.metrics_file = None</span><br><span style="color: hsl(0, 100%, 40%);">- self.stop_sleep_time = 6 # We require at most 5s to stop</span><br><span style="color: hsl(0, 100%, 40%);">- self.kpis = None</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.process = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.metrics_file = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop_sleep_time = 6 # We require at most 5s to stop</span><br><span style="color: hsl(120, 100%, 40%);">+ self.kpis = None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def sleep_after_stop(self):</span><br><span style="color: hsl(0, 100%, 40%);">- # Only sleep once</span><br><span style="color: hsl(0, 100%, 40%);">- if self.stop_sleep_time > 0:</span><br><span style="color: hsl(0, 100%, 40%);">- MainLoop.sleep(self.stop_sleep_time)</span><br><span style="color: hsl(0, 100%, 40%);">- self.stop_sleep_time = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ def sleep_after_stop(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Only sleep once</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.stop_sleep_time > 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ MainLoop.sleep(self.stop_sleep_time)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop_sleep_time = 0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def stop(self):</span><br><span style="color: hsl(0, 100%, 40%);">- self.testenv.stop_process(self.process)</span><br><span style="color: hsl(0, 100%, 40%);">- self.sleep_after_stop()</span><br><span style="color: hsl(120, 100%, 40%);">+ def stop(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ self.testenv.stop_process(self.process)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.sleep_after_stop()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def get_kpis(self):</span><br><span style="color: hsl(0, 100%, 40%);">- ''' Return all KPI '''</span><br><span style="color: hsl(0, 100%, 40%);">- if self.kpis is None:</span><br><span style="color: hsl(0, 100%, 40%);">- self.extract_kpis()</span><br><span style="color: hsl(0, 100%, 40%);">- return self.kpis</span><br><span style="color: hsl(120, 100%, 40%);">+ def get_kpis(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ ''' Return all KPI '''</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.kpis is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.extract_kpis()</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.kpis</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def get_log_kpis(self):</span><br><span style="color: hsl(0, 100%, 40%);">- ''' Return KPIs extracted from log '''</span><br><span style="color: hsl(0, 100%, 40%);">- if self.kpis is None:</span><br><span style="color: hsl(0, 100%, 40%);">- self.extract_kpis()</span><br><span style="color: hsl(120, 100%, 40%);">+ def get_log_kpis(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ ''' Return KPIs extracted from log '''</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.kpis is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.extract_kpis()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Use log KPIs if they exist for this node</span><br><span style="color: hsl(0, 100%, 40%);">- if "log_" + self.name() in self.kpis:</span><br><span style="color: hsl(0, 100%, 40%);">- log_kpi = self.kpis["log_" + self.name()]</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- log_kpi = {}</span><br><span style="color: hsl(120, 100%, 40%);">+ # Use log KPIs if they exist for this node</span><br><span style="color: hsl(120, 100%, 40%);">+ if "log_" + self.name() in self.kpis:</span><br><span style="color: hsl(120, 100%, 40%);">+ log_kpi = self.kpis["log_" + self.name()]</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ log_kpi = {}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Make sure we have the errors and warnings counter in the dict</span><br><span style="color: hsl(0, 100%, 40%);">- if 'total_errors' not in log_kpi:</span><br><span style="color: hsl(0, 100%, 40%);">- log_kpi['total_errors'] = 0</span><br><span style="color: hsl(0, 100%, 40%);">- if 'total_warnings' not in log_kpi:</span><br><span style="color: hsl(0, 100%, 40%);">- log_kpi['total_warnings'] = 0</span><br><span style="color: hsl(0, 100%, 40%);">- return log_kpi</span><br><span style="color: hsl(120, 100%, 40%);">+ # Make sure we have the errors and warnings counter in the dict</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'total_errors' not in log_kpi:</span><br><span style="color: hsl(120, 100%, 40%);">+ log_kpi['total_errors'] = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'total_warnings' not in log_kpi:</span><br><span style="color: hsl(120, 100%, 40%);">+ log_kpi['total_warnings'] = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ return log_kpi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def extract_kpis(self):</span><br><span style="color: hsl(0, 100%, 40%);">- ''' Use the srsLTE KPI analyzer module (part of srsLTE.git) if available to collect KPIs '''</span><br><span style="color: hsl(120, 100%, 40%);">+ def extract_kpis(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ ''' Use the srsLTE KPI analyzer module (part of srsLTE.git) if available to collect KPIs '''</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Stop application, copy back logs and process them</span><br><span style="color: hsl(0, 100%, 40%);">- if self.running():</span><br><span style="color: hsl(0, 100%, 40%);">- self.stop()</span><br><span style="color: hsl(0, 100%, 40%);">- self.cleanup()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Stop application, copy back logs and process them</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.running():</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop()</span><br><span style="color: hsl(120, 100%, 40%);">+ self.cleanup()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.kpis = {}</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- # Please make sure the srsLTE scripts folder is included in your PYTHONPATH env variable</span><br><span style="color: hsl(0, 100%, 40%);">- from kpi_analyzer import kpi_analyzer</span><br><span style="color: hsl(0, 100%, 40%);">- analyzer = kpi_analyzer(self.name())</span><br><span style="color: hsl(0, 100%, 40%);">- if self.log_file is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- self.kpis["log_" + self.name()] = analyzer.get_kpi_from_logfile(self.log_file)</span><br><span style="color: hsl(0, 100%, 40%);">- if self.process.get_output_file('stdout') is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- self.kpis["stdout_" + self.name()] = analyzer.get_kpi_from_stdout(self.process.get_output_file('stdout'))</span><br><span style="color: hsl(0, 100%, 40%);">- if self.metrics_file is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- self.kpis["csv_" + self.name()] = analyzer.get_kpi_from_csv(self.metrics_file)</span><br><span style="color: hsl(0, 100%, 40%);">- except ImportError:</span><br><span style="color: hsl(0, 100%, 40%);">- self.log("Can't load KPI analyzer module.")</span><br><span style="color: hsl(0, 100%, 40%);">- self.kpis = {}</span><br><span style="color: hsl(120, 100%, 40%);">+ self.kpis = {}</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Please make sure the srsLTE scripts folder is included in your PYTHONPATH env variable</span><br><span style="color: hsl(120, 100%, 40%);">+ from kpi_analyzer import kpi_analyzer</span><br><span style="color: hsl(120, 100%, 40%);">+ analyzer = kpi_analyzer(self.name())</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.log_file is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.kpis["log_" + self.name()] = analyzer.get_kpi_from_logfile(self.log_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.process.get_output_file('stdout') is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.kpis["stdout_" + self.name()] = analyzer.get_kpi_from_stdout(self.process.get_output_file('stdout'))</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.metrics_file is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.kpis["csv_" + self.name()] = analyzer.get_kpi_from_csv(self.metrics_file)</span><br><span style="color: hsl(120, 100%, 40%);">+ except ImportError:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log("Can't load KPI analyzer module.")</span><br><span style="color: hsl(120, 100%, 40%);">+ self.kpis = {}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return self.kpis</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.kpis</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def get_num_phy_errors(self, kpi):</span><br><span style="color: hsl(0, 100%, 40%);">- """ Use KPI analyzer to calculate the number PHY errors for either UE or eNB components from parsed KPI vector """</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- # Same as above, make sure the srsLTE scripts folder is included in your PYTHONPATH env variable</span><br><span style="color: hsl(0, 100%, 40%);">- from kpi_analyzer import kpi_analyzer</span><br><span style="color: hsl(0, 100%, 40%);">- analyzer = kpi_analyzer(self.name())</span><br><span style="color: hsl(0, 100%, 40%);">- return analyzer.get_num_phy_errors(kpi)</span><br><span style="color: hsl(0, 100%, 40%);">- except ImportError:</span><br><span style="color: hsl(0, 100%, 40%);">- self.log("Can't load KPI analyzer module.")</span><br><span style="color: hsl(0, 100%, 40%);">- return 0</span><br><span>\ No newline at end of file</span><br><span style="color: hsl(120, 100%, 40%);">+ def get_num_phy_errors(self, kpi):</span><br><span style="color: hsl(120, 100%, 40%);">+ """ Use KPI analyzer to calculate the number PHY errors for either UE or eNB components from parsed KPI vector """</span><br><span style="color: hsl(120, 100%, 40%);">+ try:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Same as above, make sure the srsLTE scripts folder is included in your PYTHONPATH env variable</span><br><span style="color: hsl(120, 100%, 40%);">+ from kpi_analyzer import kpi_analyzer</span><br><span style="color: hsl(120, 100%, 40%);">+ analyzer = kpi_analyzer(self.name())</span><br><span style="color: hsl(120, 100%, 40%);">+ return analyzer.get_num_phy_errors(kpi)</span><br><span style="color: hsl(120, 100%, 40%);">+ except ImportError:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log("Can't load KPI analyzer module.")</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0</span><br><span>\ No newline at end of file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20611">change 20611</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/20611"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8aee79e9d451761dde8f35f84d75483dc4e23040 </div>
<div style="display:none"> Gerrit-Change-Number: 20611 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: srs_andre <andre@softwareradiosystems.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>