<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18031">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move object subclass instance allocation logic out of suite.py/resource.py<br><br>This way we get rid of object related content in resource.py and we can<br>finally move it to core/ in next commit.<br><br>Change-Id: Ia5b861115ae3ae1b90149863c4265dcc730b8cd4<br>---<br>M src/osmo_gsm_tester/obj/bts.py<br>M src/osmo_gsm_tester/obj/enb.py<br>M src/osmo_gsm_tester/obj/epc.py<br>M src/osmo_gsm_tester/obj/ms.py<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/suite.py<br>6 files changed, 120 insertions(+), 90 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/bts.py b/src/osmo_gsm_tester/obj/bts.py</span><br><span>index 8b05ea0..e23b555 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/bts.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts.py</span><br><span>@@ -162,6 +162,34 @@</span><br><span> 'Nothing to do by default. Subclass can override if required.'</span><br><span> pass</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def get_instance_by_type(suite_run, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Allocate a BTS child class based on type. Opts are passed to the newly created object."""</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_type = conf.get('type')</span><br><span style="color: hsl(120, 100%, 40%);">+ if bts_type is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('BTS type is not defined!')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if bts_type == 'osmo-bts-sysmo':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .bts_sysmo import SysmoBts</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_class = SysmoBts</span><br><span style="color: hsl(120, 100%, 40%);">+ elif bts_type == 'osmo-bts-trx':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .bts_osmotrx import OsmoBtsTrx</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_class = OsmoBtsTrx</span><br><span style="color: hsl(120, 100%, 40%);">+ elif bts_type == 'osmo-bts-oc2g':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .bts_oc2g import OsmoBtsOC2G</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_class = OsmoBtsOC2G</span><br><span style="color: hsl(120, 100%, 40%);">+ elif bts_type == 'osmo-bts-octphy':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .bts_octphy import OsmoBtsOctphy</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_class = OsmoBtsOctphy</span><br><span style="color: hsl(120, 100%, 40%);">+ elif bts_type == 'osmo-bts-virtual':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .bts_osmovirtual import OsmoBtsVirtual</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_class = OsmoBtsVirtual</span><br><span style="color: hsl(120, 100%, 40%);">+ elif bts_type == 'nanobts':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .bts_nanobts import NanoBts</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_class = NanoBts</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('BTS type not supported:', bts_type)</span><br><span style="color: hsl(120, 100%, 40%);">+ return bts_class(suite_run, conf)</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>diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py</span><br><span>index c652761..7514604 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/enb.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb.py</span><br><span>@@ -192,6 +192,22 @@</span><br><span> </span><br><span> return rf_dev_args</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def get_instance_by_type(suite_run, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Allocate a ENB child class based on type. Opts are passed to the newly created object."""</span><br><span style="color: hsl(120, 100%, 40%);">+ enb_type = conf.get('type')</span><br><span style="color: hsl(120, 100%, 40%);">+ if enb_type is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('ENB type is not defined!')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if enb_type == 'amarisoftenb':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .enb_amarisoft import AmarisoftENB</span><br><span style="color: hsl(120, 100%, 40%);">+ enb_class = AmarisoftENB</span><br><span style="color: hsl(120, 100%, 40%);">+ elif enb_type == 'srsenb':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .enb_srs import srsENB</span><br><span style="color: hsl(120, 100%, 40%);">+ enb_class = srsENB</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('ENB type not supported:', enb_type)</span><br><span style="color: hsl(120, 100%, 40%);">+ return enb_class(suite_run, conf)</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>diff --git a/src/osmo_gsm_tester/obj/epc.py b/src/osmo_gsm_tester/obj/epc.py</span><br><span>index c725f76..cbca0fb 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/epc.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/epc.py</span><br><span>@@ -57,6 +57,25 @@</span><br><span> 'Nothing to do by default. Subclass can override if required.'</span><br><span> pass</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def get_instance_by_type(suite_run, run_node):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Allocate a EPC child class based on type. Opts are passed to the newly created object."""</span><br><span style="color: hsl(120, 100%, 40%);">+ values = dict(epc=config.get_defaults('epc'))</span><br><span style="color: hsl(120, 100%, 40%);">+ config.overlay(values, dict(epc=suite_run.config().get('epc', {})))</span><br><span style="color: hsl(120, 100%, 40%);">+ epc_type = values['epc'].get('type', None)</span><br><span style="color: hsl(120, 100%, 40%);">+ if epc_type is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('EPC type is not defined!')</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if epc_type == 'amarisoftepc':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .epc_amarisoft import AmarisoftEPC</span><br><span style="color: hsl(120, 100%, 40%);">+ epc_class = AmarisoftEPC</span><br><span style="color: hsl(120, 100%, 40%);">+ elif epc_type == 'srsepc':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .epc_srs import srsEPC</span><br><span style="color: hsl(120, 100%, 40%);">+ epc_class = srsEPC</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('EPC type not supported:', epc_type)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return epc_class(suite_run, run_node)</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>diff --git a/src/osmo_gsm_tester/obj/ms.py b/src/osmo_gsm_tester/obj/ms.py</span><br><span>index b72333a..a30a9c7 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms.py</span><br><span>@@ -38,11 +38,48 @@</span><br><span> class MS(log.Origin, metaclass=ABCMeta):</span><br><span> """Base for everything about mobile/modem and SIMs."""</span><br><span> </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> def __init__(self, name, conf):</span><br><span> super().__init__(log.C_TST, name)</span><br><span> self._conf = conf</span><br><span> self.msisdn = None</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+########################</span><br><span style="color: hsl(120, 100%, 40%);">+# PUBLIC - INTERNAL API</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 cleanup(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Cleans up resources allocated."""</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%);">+ def get_instance_by_type(suite_run, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Allocate a MS child class based on type. Opts are passed to the newly created object."""</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_type = conf.get('type')</span><br><span style="color: hsl(120, 100%, 40%);">+ if ms_type is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Map None to ofono for forward compability</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_type = 'ofono'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ms_type == 'ofono':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .ms_ofono import Modem</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_class = Modem</span><br><span style="color: hsl(120, 100%, 40%);">+ elif ms_type == 'osmo-mobile':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .ms_osmo_mobile import MSOsmoMobile</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_class = MSOsmoMobile</span><br><span style="color: hsl(120, 100%, 40%);">+ elif ms_type == 'srsue':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .ms_srs import srsUE</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_class = srsUE</span><br><span style="color: hsl(120, 100%, 40%);">+ elif ms_type == 'amarisoftue':</span><br><span style="color: hsl(120, 100%, 40%);">+ from .ms_amarisoft import AmarisoftUE</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_class = AmarisoftUE</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('MS type not supported:', ms_type)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ms_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> def imsi(self):</span><br><span> return self._conf.get('imsi')</span><br><span> </span><br><span>@@ -60,8 +97,3 @@</span><br><span> </span><br><span> def msisdn(self):</span><br><span> return self.msisdn</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- @abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">- def cleanup(self):</span><br><span style="color: hsl(0, 100%, 40%);">- """Cleans up resources allocated."""</span><br><span style="color: hsl(0, 100%, 40%);">- pass</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index b216c50..7674bff 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -26,10 +26,6 @@</span><br><span> from .core import config</span><br><span> from .core import util</span><br><span> from .core import schema</span><br><span style="color: hsl(0, 100%, 40%);">-from .obj import bts_sysmo, bts_osmotrx, bts_osmovirtual, bts_octphy, bts_nanobts, bts_oc2g</span><br><span style="color: hsl(0, 100%, 40%);">-from .obj import ms_ofono</span><br><span style="color: hsl(0, 100%, 40%);">-from .obj import ms_osmo_mobile</span><br><span style="color: hsl(0, 100%, 40%);">-from .obj import ms_srs, ms_amarisoft, enb_srs, enb_amarisoft, epc_srs, epc_amarisoft</span><br><span> </span><br><span> from .core.util import is_dict, is_list</span><br><span> </span><br><span>@@ -47,38 +43,6 @@</span><br><span> R_OSMOCON = 'osmocon_phone'</span><br><span> R_ENB = 'enb'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-KNOWN_BTS_TYPES = {</span><br><span style="color: hsl(0, 100%, 40%);">- 'osmo-bts-sysmo': bts_sysmo.SysmoBts,</span><br><span style="color: hsl(0, 100%, 40%);">- 'osmo-bts-trx': bts_osmotrx.OsmoBtsTrx,</span><br><span style="color: hsl(0, 100%, 40%);">- 'osmo-bts-oc2g': bts_oc2g.OsmoBtsOC2G,</span><br><span style="color: hsl(0, 100%, 40%);">- 'osmo-bts-octphy': bts_octphy.OsmoBtsOctphy,</span><br><span style="color: hsl(0, 100%, 40%);">- 'osmo-bts-virtual': bts_osmovirtual.OsmoBtsVirtual,</span><br><span style="color: hsl(0, 100%, 40%);">- 'nanobts': bts_nanobts.NanoBts,</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-KNOWN_ENB_TYPES = {</span><br><span style="color: hsl(0, 100%, 40%);">- 'srsenb': enb_srs.srsENB,</span><br><span style="color: hsl(0, 100%, 40%);">- 'amarisoftenb': enb_amarisoft.AmarisoftENB,</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-KNOWN_EPC_TYPES = {</span><br><span style="color: hsl(0, 100%, 40%);">- 'srsepc': epc_srs.srsEPC,</span><br><span style="color: hsl(0, 100%, 40%);">- 'amarisoftepc': epc_amarisoft.AmarisoftEPC,</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-KNOWN_MS_TYPES = {</span><br><span style="color: hsl(0, 100%, 40%);">- # Map None to ofono for forward compability</span><br><span style="color: hsl(0, 100%, 40%);">- None: ms_ofono.Modem,</span><br><span style="color: hsl(0, 100%, 40%);">- 'ofono': ms_ofono.Modem,</span><br><span style="color: hsl(0, 100%, 40%);">- 'osmo-mobile': ms_osmo_mobile.MSOsmoMobile,</span><br><span style="color: hsl(0, 100%, 40%);">- 'srsue': ms_srs.srsUE,</span><br><span style="color: hsl(0, 100%, 40%);">- 'amarisoftue': ms_amarisoft.AmarisoftUE,</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def register_bts_type(name, clazz):</span><br><span style="color: hsl(0, 100%, 40%);">- KNOWN_BTS_TYPES[name] = clazz</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> class ResourcesPool(log.Origin):</span><br><span> _remember_to_free = None</span><br><span> _registered_exit_handler = False</span><br><span>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py</span><br><span>index 6d2916c..db307ff 100644</span><br><span>--- a/src/osmo_gsm_tester/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/suite.py</span><br><span>@@ -25,6 +25,10 @@</span><br><span> from .core.event_loop import MainLoop</span><br><span> from .obj import nitb_osmo, hlr_osmo, mgcpgw_osmo, mgw_osmo, msc_osmo, bsc_osmo, stp_osmo, ggsn_osmo, sgsn_osmo, esme, osmocon, ms_driver, iperf3</span><br><span> from .obj import run_node</span><br><span style="color: hsl(120, 100%, 40%);">+from .obj import epc</span><br><span style="color: hsl(120, 100%, 40%);">+from .obj import enb</span><br><span style="color: hsl(120, 100%, 40%);">+from .obj import bts</span><br><span style="color: hsl(120, 100%, 40%);">+from .obj import ms</span><br><span> from . import resource, test</span><br><span> </span><br><span> class Timeout(Exception):</span><br><span>@@ -324,24 +328,19 @@</span><br><span> return ms</span><br><span> </span><br><span> def bts(self, specifics=None):</span><br><span style="color: hsl(0, 100%, 40%);">- bts = bts_obj(self, self.reserved_resources.get(resource.R_BTS, specifics=specifics))</span><br><span style="color: hsl(0, 100%, 40%);">- bts.set_lac(self.lac())</span><br><span style="color: hsl(0, 100%, 40%);">- bts.set_rac(self.rac())</span><br><span style="color: hsl(0, 100%, 40%);">- bts.set_cellid(self.cellid())</span><br><span style="color: hsl(0, 100%, 40%);">- bts.set_bvci(self.bvci())</span><br><span style="color: hsl(0, 100%, 40%);">- self.register_for_cleanup(bts)</span><br><span style="color: hsl(0, 100%, 40%);">- return bts</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_obj = bts.Bts.get_instance_by_type(self, self.reserved_resources.get(resource.R_BTS, specifics=specifics))</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_obj.set_lac(self.lac())</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_obj.set_rac(self.rac())</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_obj.set_cellid(self.cellid())</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_obj.set_bvci(self.bvci())</span><br><span style="color: hsl(120, 100%, 40%);">+ self.register_for_cleanup(bts_obj)</span><br><span style="color: hsl(120, 100%, 40%);">+ return bts_obj</span><br><span> </span><br><span> def modem(self, specifics=None):</span><br><span> conf = self.reserved_resources.get(resource.R_MODEM, specifics=specifics)</span><br><span style="color: hsl(0, 100%, 40%);">- ms_type = conf.get('type')</span><br><span style="color: hsl(0, 100%, 40%);">- ms_class = resource.KNOWN_MS_TYPES.get(ms_type)</span><br><span style="color: hsl(0, 100%, 40%);">- if ms_class is None:</span><br><span style="color: hsl(0, 100%, 40%);">- raise RuntimeError('No such Modem type is defined: %r' % ms_type)</span><br><span style="color: hsl(0, 100%, 40%);">- self.dbg('create Modem object', conf=conf)</span><br><span style="color: hsl(0, 100%, 40%);">- ms = ms_class(self, conf)</span><br><span style="color: hsl(0, 100%, 40%);">- self.register_for_cleanup(ms)</span><br><span style="color: hsl(0, 100%, 40%);">- return ms</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_obj = ms.MS.get_instance_by_type(self, conf)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.register_for_cleanup(ms_obj)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ms_obj</span><br><span> </span><br><span> def modems(self, count):</span><br><span> l = []</span><br><span>@@ -367,16 +366,16 @@</span><br><span> return run_node.RunNode.from_conf(self.reserved_resources.get(resource.R_RUN_NODE, specifics=specifics))</span><br><span> </span><br><span> def enb(self, specifics=None):</span><br><span style="color: hsl(0, 100%, 40%);">- enb = enb_obj(self, self.reserved_resources.get(resource.R_ENB, specifics=specifics))</span><br><span style="color: hsl(0, 100%, 40%);">- self.register_for_cleanup(enb)</span><br><span style="color: hsl(0, 100%, 40%);">- return enb</span><br><span style="color: hsl(120, 100%, 40%);">+ enb_obj = enb.eNodeB.get_instance_by_type(self, self.reserved_resources.get(resource.R_ENB, specifics=specifics))</span><br><span style="color: hsl(120, 100%, 40%);">+ self.register_for_cleanup(enb_obj)</span><br><span style="color: hsl(120, 100%, 40%);">+ return enb_obj</span><br><span> </span><br><span> def epc(self, run_node=None):</span><br><span> if run_node is None:</span><br><span> run_node = self.run_node()</span><br><span style="color: hsl(0, 100%, 40%);">- epc = epc_obj(self, run_node)</span><br><span style="color: hsl(0, 100%, 40%);">- self.register_for_cleanup(epc)</span><br><span style="color: hsl(0, 100%, 40%);">- return epc</span><br><span style="color: hsl(120, 100%, 40%);">+ epc_obj = epc.EPC.get_instance_by_type(self, run_node)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.register_for_cleanup(epc_obj)</span><br><span style="color: hsl(120, 100%, 40%);">+ return epc_obj</span><br><span> </span><br><span> def osmocon(self, specifics=None):</span><br><span> conf = self.reserved_resources.get(resource.R_OSMOCON, specifics=specifics)</span><br><span>@@ -489,32 +488,4 @@</span><br><span> scenarios = [config.get_scenario(scenario_name, schema.get_all_schema()) for scenario_name in scenario_names]</span><br><span> return (suite_scenario_str, suite, scenarios)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def bts_obj(suite_run, conf):</span><br><span style="color: hsl(0, 100%, 40%);">- bts_type = conf.get('type')</span><br><span style="color: hsl(0, 100%, 40%);">- log.dbg('create BTS object', type=bts_type)</span><br><span style="color: hsl(0, 100%, 40%);">- bts_class = resource.KNOWN_BTS_TYPES.get(bts_type)</span><br><span style="color: hsl(0, 100%, 40%);">- if bts_class is None:</span><br><span style="color: hsl(0, 100%, 40%);">- raise RuntimeError('No such BTS type is defined: %r' % bts_type)</span><br><span style="color: hsl(0, 100%, 40%);">- return bts_class(suite_run, conf)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def enb_obj(suite_run, conf):</span><br><span style="color: hsl(0, 100%, 40%);">- enb_type = conf.get('type')</span><br><span style="color: hsl(0, 100%, 40%);">- log.dbg('create ENB object', type=enb_type)</span><br><span style="color: hsl(0, 100%, 40%);">- enb_class = resource.KNOWN_ENB_TYPES.get(enb_type)</span><br><span style="color: hsl(0, 100%, 40%);">- if enb_class is None:</span><br><span style="color: hsl(0, 100%, 40%);">- raise RuntimeError('No such ENB type is defined: %r' % enb_type)</span><br><span style="color: hsl(0, 100%, 40%);">- return enb_class(suite_run, conf)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def epc_obj(suite_run, run_node):</span><br><span style="color: hsl(0, 100%, 40%);">- values = dict(epc=config.get_defaults('epc'))</span><br><span style="color: hsl(0, 100%, 40%);">- config.overlay(values, dict(epc=suite_run.config().get('epc', {})))</span><br><span style="color: hsl(0, 100%, 40%);">- epc_type = values['epc'].get('type', None)</span><br><span style="color: hsl(0, 100%, 40%);">- if epc_type is None:</span><br><span style="color: hsl(0, 100%, 40%);">- raise RuntimeError('EPC type is not defined!')</span><br><span style="color: hsl(0, 100%, 40%);">- log.dbg('create EPC object', type=epc_type)</span><br><span style="color: hsl(0, 100%, 40%);">- epc_class = resource.KNOWN_EPC_TYPES.get(epc_type)</span><br><span style="color: hsl(0, 100%, 40%);">- if epc_class is None:</span><br><span style="color: hsl(0, 100%, 40%);">- raise RuntimeError('No such EPC type is defined: %r' % epc_type)</span><br><span style="color: hsl(0, 100%, 40%);">- return epc_class(suite_run, run_node)</span><br><span style="color: hsl(0, 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/+/18031">change 18031</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/+/18031"/><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: Ia5b861115ae3ae1b90149863c4265dcc730b8cd4 </div>
<div style="display:none"> Gerrit-Change-Number: 18031 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>