<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15465">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Support SC5 power cycling through powersupply<br><br>* Add powersupply related code to bts_osmotrx.py to power cycle the<br>board.<br>* Each time the board is started, we need to unlock the RF (start TRX<br>implementation).<br><br>Change-Id: I8a1428c1ff90c9f5b42d7ffe86a6fc763819cba2<br>---<br>M example/resources.conf.prod<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>2 files changed, 104 insertions(+), 18 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/65/15465/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/example/resources.conf.prod b/example/resources.conf.prod</span><br><span>index ef6e37b..e8fe2b0 100644</span><br><span>--- a/example/resources.conf.prod</span><br><span>+++ b/example/resources.conf.prod</span><br><span>@@ -71,8 +71,14 @@</span><br><span> ciphers: [a5_0, a5_1]</span><br><span> trx_list:</span><br><span> - arfcn: 878</span><br><span style="color: hsl(120, 100%, 40%);">+ power_supply:</span><br><span style="color: hsl(120, 100%, 40%);">+ type: 'intellinet'</span><br><span style="color: hsl(120, 100%, 40%);">+ device: '10.42.42.250'</span><br><span style="color: hsl(120, 100%, 40%);">+ port: '5'</span><br><span> osmo_trx:</span><br><span style="color: hsl(0, 100%, 40%);">- launch_trx: false</span><br><span style="color: hsl(120, 100%, 40%);">+ type: sc5</span><br><span style="color: hsl(120, 100%, 40%);">+ launch_trx: true</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_user: root</span><br><span> clock_reference: external</span><br><span> trx_ip: 10.42.42.112</span><br><span> max_trxd_version: 0</span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>index b3738d2..bafa389 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>@@ -22,6 +22,7 @@</span><br><span> import pprint</span><br><span> from abc import ABCMeta, abstractmethod</span><br><span> from . import log, config, util, template, process, bts_osmo</span><br><span style="color: hsl(120, 100%, 40%);">+from . import powersupply</span><br><span> from .event_loop import MainLoop</span><br><span> </span><br><span> class OsmoBtsTrx(bts_osmo.OsmoBtsMainUnit):</span><br><span>@@ -39,6 +40,7 @@</span><br><span> self.run_dir = None</span><br><span> self.inst = None</span><br><span> self.trx = None</span><br><span style="color: hsl(120, 100%, 40%);">+ self.pwsup_list = []</span><br><span> self.env = {}</span><br><span> self.gen_conf = {}</span><br><span> </span><br><span>@@ -92,6 +94,20 @@</span><br><span> self.dbg(r)</span><br><span> f.write(r)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ self.pwsup_list = [None] * self.num_trx()</span><br><span style="color: hsl(120, 100%, 40%);">+ # Construct trx_list appending with empty dicts if needed:</span><br><span style="color: hsl(120, 100%, 40%);">+ conf_trx_list = self.conf.get('trx_list', [])</span><br><span style="color: hsl(120, 100%, 40%);">+ conf_trx_list = conf_trx_list + [{}] * (self.num_trx() - len(conf_trx_list))</span><br><span style="color: hsl(120, 100%, 40%);">+ for trx_i in range(self.num_trx()):</span><br><span style="color: hsl(120, 100%, 40%);">+ pwsup_opt = conf_trx_list[trx_i].get('power_supply', {})</span><br><span style="color: hsl(120, 100%, 40%);">+ if not pwsup_opt:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('no power_supply configured for TRX %d' % trx_i)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue</span><br><span style="color: hsl(120, 100%, 40%);">+ pwsup_type = pwsup_opt.get('type')</span><br><span style="color: hsl(120, 100%, 40%);">+ if not pwsup_type:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('No type attribute provided in power_supply conf for TRX %d!' % trx_i)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.pwsup_list[trx_i] = powersupply.get_instance_by_type(pwsup_type, pwsup_opt)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def launch_trx_enabled(self):</span><br><span> return util.str2bool(self.gen_conf['osmo_bts_trx'].get('osmo_trx', {}).get('launch_trx'))</span><br><span> </span><br><span>@@ -109,6 +125,15 @@</span><br><span> def conf_for_osmotrx(self):</span><br><span> return dict(osmo_trx=self.gen_conf['osmo_bts_trx'].get('osmo_trx', {}))</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def cleanup(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ i = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ for pwsup in self.pwsup_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ if pwsup:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('Powering off TRX %d' % i)</span><br><span style="color: hsl(120, 100%, 40%);">+ pwsup.power_set(False)</span><br><span style="color: hsl(120, 100%, 40%);">+ i = i + 1</span><br><span style="color: hsl(120, 100%, 40%);">+ self.pwsup_list = []</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ###################</span><br><span> # PUBLIC (test API included)</span><br><span> ###################</span><br><span>@@ -121,6 +146,14 @@</span><br><span> self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # Power cycle all TRX if needed (right now only TRX0 for SC5):</span><br><span style="color: hsl(120, 100%, 40%);">+ i = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ for pwsup in self.pwsup_list:</span><br><span style="color: hsl(120, 100%, 40%);">+ if pwsup:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('Powering cycling TRX %d' % i)</span><br><span style="color: hsl(120, 100%, 40%);">+ pwsup.power_cycle(1.0)</span><br><span style="color: hsl(120, 100%, 40%);">+ i = i + 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if self.launch_trx_enabled():</span><br><span> self.trx = OsmoTrx.get_instance_by_type(self.get_osmo_trx_type(), self.suite_run, self.conf_for_osmotrx())</span><br><span> self.trx.start(keepalive)</span><br><span>@@ -138,7 +171,45 @@</span><br><span> '-i', self.bsc.addr())</span><br><span> self.suite_run.poll()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class OsmoTrx(log.Origin, metaclass=ABCMeta):</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+################################################################################</span><br><span style="color: hsl(120, 100%, 40%);">+# TRX</span><br><span style="color: hsl(120, 100%, 40%);">+################################################################################</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class Trx(log.Origin, metaclass=ABCMeta):</span><br><span style="color: hsl(120, 100%, 40%);">+##############</span><br><span style="color: hsl(120, 100%, 40%);">+# PROTECTED</span><br><span style="color: hsl(120, 100%, 40%);">+##############</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, suite_run, conf, name):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(log.C_RUN, name)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.suite_run = suite_run</span><br><span style="color: hsl(120, 100%, 40%);">+ self.conf = conf</span><br><span style="color: hsl(120, 100%, 40%);">+ self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.listen_ip = conf.get('osmo_trx', {}).get('trx_ip')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.remote_user = conf.get('osmo_trx', {}).get('remote_user', None)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ @classmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def get_instance_by_type(cls, type, suite_run, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ KNOWN_OSMOTRX_TYPES = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 'uhd': OsmoTrxUHD,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'lms': OsmoTrxLMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'sc5': TrxSC5</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_trx_class = KNOWN_OSMOTRX_TYPES.get(type)</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_trx_class(suite_run, conf)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+##############</span><br><span style="color: hsl(120, 100%, 40%);">+# PUBLIC (test API included)</span><br><span style="color: hsl(120, 100%, 40%);">+##############</span><br><span style="color: hsl(120, 100%, 40%);">+ @abstractmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def start(self, keepalive=False):</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ @abstractmethod</span><br><span style="color: hsl(120, 100%, 40%);">+ def trx_ready(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ pass</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class OsmoTrx(Trx, metaclass=ABCMeta):</span><br><span> </span><br><span> CONF_OSMO_TRX = 'osmo-trx.cfg'</span><br><span> REMOTE_DIR = '/osmo-gsm-tester-trx/last_run'</span><br><span>@@ -148,27 +219,13 @@</span><br><span> # PROTECTED</span><br><span> ##############</span><br><span> def __init__(self, suite_run, conf):</span><br><span style="color: hsl(0, 100%, 40%);">- super().__init__(log.C_RUN, self.binary_name())</span><br><span style="color: hsl(0, 100%, 40%);">- self.suite_run = suite_run</span><br><span style="color: hsl(0, 100%, 40%);">- self.conf = conf</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(suite_run, conf, self.binary_name())</span><br><span> self.env = {}</span><br><span> self.log("OSMOTRX CONF: %r" % conf)</span><br><span style="color: hsl(0, 100%, 40%);">- self.listen_ip = conf.get('osmo_trx', {}).get('trx_ip')</span><br><span> self.bts_ip = conf.get('osmo_trx', {}).get('bts_ip')</span><br><span style="color: hsl(0, 100%, 40%);">- self.remote_user = conf.get('osmo_trx', {}).get('remote_user', None)</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = None</span><br><span> self.inst = None</span><br><span> self.proc_trx = None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- @classmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def get_instance_by_type(cls, type, suite_run, conf):</span><br><span style="color: hsl(0, 100%, 40%);">- KNOWN_OSMOTRX_TYPES = {</span><br><span style="color: hsl(0, 100%, 40%);">- 'uhd': OsmoTrxUHD,</span><br><span style="color: hsl(0, 100%, 40%);">- 'lms': OsmoTrxLMS,</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_trx_class = KNOWN_OSMOTRX_TYPES.get(type)</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_trx_class(suite_run, conf)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> @abstractmethod</span><br><span> def binary_name(self):</span><br><span> 'Used by base class. Subclass can create different OsmoTRX implementations.'</span><br><span>@@ -242,7 +299,6 @@</span><br><span> # PUBLIC (test API included)</span><br><span> ##############</span><br><span> def start(self, keepalive=False):</span><br><span style="color: hsl(0, 100%, 40%);">- self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))</span><br><span> self.configure()</span><br><span> self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx')))</span><br><span> if not self.remote_user:</span><br><span>@@ -293,4 +349,28 @@</span><br><span> def binary_name(self):</span><br><span> return OsmoTrxLMS.BIN_TRX</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+class TrxSC5(Trx):</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, suite_run, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(suite_run, conf, "sc5-trx")</span><br><span style="color: hsl(120, 100%, 40%);">+ self.ready = False</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def start(self, keepalive=False):</span><br><span style="color: hsl(120, 100%, 40%);">+ name = "ssh_sc5_ccli"</span><br><span style="color: hsl(120, 100%, 40%);">+ run_dir = self.run_dir.new_dir(name)</span><br><span style="color: hsl(120, 100%, 40%);">+ popen_args = ('/cx/bin/ccli', '-c', 'gsm.unlock')</span><br><span style="color: hsl(120, 100%, 40%);">+ proc = process.RemoteProcess(name, run_dir, self.remote_user, self.listen_ip, None,</span><br><span style="color: hsl(120, 100%, 40%);">+ popen_args)</span><br><span style="color: hsl(120, 100%, 40%);">+ keep_trying = 10</span><br><span style="color: hsl(120, 100%, 40%);">+ while proc.respawn_sync(raise_nonsuccess=False) != 0 and keep_trying > 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ keep_trying = keep_trying - 1</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log('Configuring SC5 TRX failed, retrying %d more times' % keep_trying)</span><br><span style="color: hsl(120, 100%, 40%);">+ MainLoop.sleep(self, 5)</span><br><span style="color: hsl(120, 100%, 40%);">+ if keep_trying == 0 or 'OK' not in (proc.get_stdout() or ''):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('Failed configuring SC5!')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.ready = True</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def trx_ready(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.ready</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/15465">change 15465</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/+/15465"/><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: I8a1428c1ff90c9f5b42d7ffe86a6fc763819cba2 </div>
<div style="display:none"> Gerrit-Change-Number: 15465 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>