<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17782">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 classes used by tests into obj/ subdir<br><br>Change-Id: I0b2963cf00acd1f9036dca2e87aa3b87a0f8066d<br>---<br>M selftest/sms_test.py<br>R src/osmo_gsm_tester/obj/bsc_osmo.py<br>R src/osmo_gsm_tester/obj/bts.py<br>R src/osmo_gsm_tester/obj/bts_nanobts.py<br>R src/osmo_gsm_tester/obj/bts_oc2g.py<br>R src/osmo_gsm_tester/obj/bts_octphy.py<br>R src/osmo_gsm_tester/obj/bts_osmo.py<br>R src/osmo_gsm_tester/obj/bts_osmotrx.py<br>R src/osmo_gsm_tester/obj/bts_osmovirtual.py<br>R src/osmo_gsm_tester/obj/bts_sysmo.py<br>R src/osmo_gsm_tester/obj/enb.py<br>R src/osmo_gsm_tester/obj/enb_amarisoft.py<br>R src/osmo_gsm_tester/obj/enb_srs.py<br>R src/osmo_gsm_tester/obj/epc.py<br>R src/osmo_gsm_tester/obj/epc_amarisoft.py<br>R src/osmo_gsm_tester/obj/epc_srs.py<br>R src/osmo_gsm_tester/obj/esme.py<br>R src/osmo_gsm_tester/obj/ggsn_osmo.py<br>R src/osmo_gsm_tester/obj/hlr_osmo.py<br>R src/osmo_gsm_tester/obj/iperf3.py<br>R src/osmo_gsm_tester/obj/mgcpgw_osmo.py<br>R src/osmo_gsm_tester/obj/mgw_osmo.py<br>R src/osmo_gsm_tester/obj/modem.py<br>R src/osmo_gsm_tester/obj/ms.py<br>R src/osmo_gsm_tester/obj/ms_amarisoft.py<br>R src/osmo_gsm_tester/obj/ms_driver.py<br>R src/osmo_gsm_tester/obj/ms_osmo_mobile.py<br>R src/osmo_gsm_tester/obj/ms_srs.py<br>R src/osmo_gsm_tester/obj/msc_osmo.py<br>R src/osmo_gsm_tester/obj/nitb_osmo.py<br>R src/osmo_gsm_tester/obj/osmo_ctrl.py<br>R src/osmo_gsm_tester/obj/osmocon.py<br>R src/osmo_gsm_tester/obj/pcap_recorder.py<br>R src/osmo_gsm_tester/obj/pcu.py<br>R src/osmo_gsm_tester/obj/pcu_oc2g.py<br>R src/osmo_gsm_tester/obj/pcu_osmo.py<br>R src/osmo_gsm_tester/obj/pcu_sysmo.py<br>R src/osmo_gsm_tester/obj/powersupply.py<br>R src/osmo_gsm_tester/obj/powersupply_intellinet.py<br>R src/osmo_gsm_tester/obj/powersupply_sispm.py<br>R src/osmo_gsm_tester/obj/run_node.py<br>R src/osmo_gsm_tester/obj/sgsn_osmo.py<br>R src/osmo_gsm_tester/obj/sms.py<br>R src/osmo_gsm_tester/obj/smsc.py<br>R src/osmo_gsm_tester/obj/stp_osmo.py<br>M src/osmo_gsm_tester/resource.py<br>M src/osmo_gsm_tester/suite.py<br>M src/osmo_gsm_tester/test.py<br>48 files changed, 60 insertions(+), 59 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/selftest/sms_test.py b/selftest/sms_test.py</span><br><span>index 01cecc2..c78e76c 100755</span><br><span>--- a/selftest/sms_test.py</span><br><span>+++ b/selftest/sms_test.py</span><br><span>@@ -1,7 +1,7 @@</span><br><span> #!/usr/bin/env python3</span><br><span> </span><br><span> import _prep</span><br><span style="color: hsl(0, 100%, 40%);">-from osmo_gsm_tester import sms</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester.obj import sms</span><br><span> </span><br><span> print(sms.Sms())</span><br><span> print(sms.Sms())</span><br><span>diff --git a/src/osmo_gsm_tester/bsc_osmo.py b/src/osmo_gsm_tester/obj/bsc_osmo.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/bsc_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/bsc_osmo.py</span><br><span>index e9d1631..25cc780 100644</span><br><span>--- a/src/osmo_gsm_tester/bsc_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bsc_osmo.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> import re</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process</span><br><span> from . import osmo_ctrl, pcap_recorder</span><br><span> </span><br><span> class OsmoBsc(log.Origin):</span><br><span>diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/obj/bts.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/bts.py</span><br><span>rename to src/osmo_gsm_tester/obj/bts.py</span><br><span>index a20bd53..515b42b 100644</span><br><span>--- a/src/osmo_gsm_tester/bts.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts.py</span><br><span>@@ -19,7 +19,7 @@</span><br><span> </span><br><span> import copy</span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config, schema</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config, schema</span><br><span> </span><br><span> class Bts(log.Origin, metaclass=ABCMeta):</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/obj/bts_nanobts.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/bts_nanobts.py</span><br><span>rename to src/osmo_gsm_tester/obj/bts_nanobts.py</span><br><span>index 539e5ed..3e9b035 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_nanobts.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_nanobts.py</span><br><span>@@ -20,8 +20,8 @@</span><br><span> import os</span><br><span> import re</span><br><span> import json</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config, util, process</span><br><span style="color: hsl(0, 100%, 40%);">-from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config, util, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core.event_loop import MainLoop</span><br><span> from . import pcap_recorder, bts, pcu</span><br><span> from . import powersupply</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/bts_oc2g.py b/src/osmo_gsm_tester/obj/bts_oc2g.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/bts_oc2g.py</span><br><span>rename to src/osmo_gsm_tester/obj/bts_oc2g.py</span><br><span>index 0cebc09..4a59eee 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_oc2g.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_oc2g.py</span><br><span>@@ -19,7 +19,7 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config, util, template, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config, util, template, process, remote</span><br><span> from . import pcu_oc2g, bts_osmo</span><br><span> </span><br><span> class OsmoBtsOC2G(bts_osmo.OsmoBts):</span><br><span>diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/obj/bts_octphy.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/bts_octphy.py</span><br><span>rename to src/osmo_gsm_tester/obj/bts_octphy.py</span><br><span>index e15cc15..11570e8 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_octphy.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_octphy.py</span><br><span>@@ -19,7 +19,7 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config, util, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config, util, template, process</span><br><span> from . import bts_osmo</span><br><span> </span><br><span> class OsmoBtsOctphy(bts_osmo.OsmoBtsMainUnit):</span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/obj/bts_osmo.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/bts_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/bts_osmo.py</span><br><span>index 39ca264..74f3ec7 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_osmo.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import tempfile</span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log</span><br><span> from . import bts, pcu_osmo</span><br><span> </span><br><span> class OsmoBts(bts.Bts, metaclass=ABCMeta):</span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/obj/bts_osmotrx.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>rename to src/osmo_gsm_tester/obj/bts_osmotrx.py</span><br><span>index 91a1dd8..5339946 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_osmotrx.py</span><br><span>@@ -20,8 +20,8 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config, util, template, process, remote</span><br><span style="color: hsl(0, 100%, 40%);">-from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config, util, template, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core.event_loop import MainLoop</span><br><span> from . import powersupply, bts_osmo</span><br><span> </span><br><span> class OsmoBtsTrx(bts_osmo.OsmoBtsMainUnit):</span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmovirtual.py b/src/osmo_gsm_tester/obj/bts_osmovirtual.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/bts_osmovirtual.py</span><br><span>rename to src/osmo_gsm_tester/obj/bts_osmovirtual.py</span><br><span>index 262c805..495b2a8 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmovirtual.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_osmovirtual.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import config, util, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import config, util, template, process</span><br><span> from . import bts_osmo</span><br><span> </span><br><span> class OsmoBtsVirtual(bts_osmo.OsmoBtsMainUnit):</span><br><span>diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/obj/bts_sysmo.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/bts_sysmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/bts_sysmo.py</span><br><span>index d28b034..aecf977 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_sysmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/bts_sysmo.py</span><br><span>@@ -19,7 +19,7 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config, util, template, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config, util, template, process, remote</span><br><span> from . import pcu_sysmo, bts_osmo</span><br><span> </span><br><span> class SysmoBts(bts_osmo.OsmoBts):</span><br><span>diff --git a/src/osmo_gsm_tester/enb.py b/src/osmo_gsm_tester/obj/enb.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/enb.py</span><br><span>rename to src/osmo_gsm_tester/obj/enb.py</span><br><span>index edaf462..bb5053f 100644</span><br><span>--- a/src/osmo_gsm_tester/enb.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb.py</span><br><span>@@ -18,7 +18,7 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config</span><br><span> </span><br><span> </span><br><span> class eNodeB(log.Origin, metaclass=ABCMeta):</span><br><span>diff --git a/src/osmo_gsm_tester/enb_amarisoft.py b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/enb_amarisoft.py</span><br><span>rename to src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>index a058653..70f8d47 100644</span><br><span>--- a/src/osmo_gsm_tester/enb_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process, remote</span><br><span> from . import enb</span><br><span> </span><br><span> def rf_type_valid(rf_type_str):</span><br><span>diff --git a/src/osmo_gsm_tester/enb_srs.py b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/enb_srs.py</span><br><span>rename to src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>index 079671a..0860d19 100644</span><br><span>--- a/src/osmo_gsm_tester/enb_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/enb_srs.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process, remote</span><br><span> from . import enb</span><br><span> </span><br><span> def rf_type_valid(rf_type_str):</span><br><span>diff --git a/src/osmo_gsm_tester/epc.py b/src/osmo_gsm_tester/obj/epc.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/epc.py</span><br><span>rename to src/osmo_gsm_tester/obj/epc.py</span><br><span>index 9141455..f6bddea 100644</span><br><span>--- a/src/osmo_gsm_tester/epc.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/epc.py</span><br><span>@@ -18,7 +18,7 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config</span><br><span> </span><br><span> </span><br><span> class EPC(log.Origin, metaclass=ABCMeta):</span><br><span>diff --git a/src/osmo_gsm_tester/epc_amarisoft.py b/src/osmo_gsm_tester/obj/epc_amarisoft.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/epc_amarisoft.py</span><br><span>rename to src/osmo_gsm_tester/obj/epc_amarisoft.py</span><br><span>index 33b8162..afd8aa4 100644</span><br><span>--- a/src/osmo_gsm_tester/epc_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/epc_amarisoft.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process, remote</span><br><span> from . import epc</span><br><span> </span><br><span> class AmarisoftEPC(epc.EPC):</span><br><span>diff --git a/src/osmo_gsm_tester/epc_srs.py b/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/epc_srs.py</span><br><span>rename to src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>index 4a45c7e..7288e69 100644</span><br><span>--- a/src/osmo_gsm_tester/epc_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/epc_srs.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process, remote</span><br><span> from . import epc</span><br><span> </span><br><span> class srsEPC(epc.EPC):</span><br><span>diff --git a/src/osmo_gsm_tester/esme.py b/src/osmo_gsm_tester/obj/esme.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/esme.py</span><br><span>rename to src/osmo_gsm_tester/obj/esme.py</span><br><span>index 048b69e..41ec87f 100644</span><br><span>--- a/src/osmo_gsm_tester/esme.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/esme.py</span><br><span>@@ -23,8 +23,8 @@</span><br><span> import smpplib.consts</span><br><span> import smpplib.exceptions</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log</span><br><span style="color: hsl(0, 100%, 40%);">-from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core.event_loop import MainLoop</span><br><span> </span><br><span> # if you want to know what's happening inside python-smpplib</span><br><span> #import logging</span><br><span>diff --git a/src/osmo_gsm_tester/ggsn_osmo.py b/src/osmo_gsm_tester/obj/ggsn_osmo.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/ggsn_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/ggsn_osmo.py</span><br><span>index e699203..11745f6 100644</span><br><span>--- a/src/osmo_gsm_tester/ggsn_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ggsn_osmo.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process</span><br><span> from . import pcap_recorder</span><br><span> </span><br><span> class OsmoGgsn(log.Origin):</span><br><span>diff --git a/src/osmo_gsm_tester/hlr_osmo.py b/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/hlr_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>index 245328b..93e5fff 100644</span><br><span>--- a/src/osmo_gsm_tester/hlr_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/hlr_osmo.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> import pprint</span><br><span> import sqlite3</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process</span><br><span> from . import pcap_recorder</span><br><span> </span><br><span> class OsmoHlr(log.Origin):</span><br><span>diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/iperf3.py</span><br><span>rename to src/osmo_gsm_tester/obj/iperf3.py</span><br><span>index 331a3ba..d2e9c36 100644</span><br><span>--- a/src/osmo_gsm_tester/iperf3.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/iperf3.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import json</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, process, remote</span><br><span> from . import pcap_recorder, run_node</span><br><span> </span><br><span> def iperf3_result_to_json(file):</span><br><span>diff --git a/src/osmo_gsm_tester/mgcpgw_osmo.py b/src/osmo_gsm_tester/obj/mgcpgw_osmo.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/mgcpgw_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/mgcpgw_osmo.py</span><br><span>index 0c9a13a..d31f439 100644</span><br><span>--- a/src/osmo_gsm_tester/mgcpgw_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/mgcpgw_osmo.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process</span><br><span> from . import pcap_recorder</span><br><span> </span><br><span> class OsmoMgcpgw(log.Origin):</span><br><span>diff --git a/src/osmo_gsm_tester/mgw_osmo.py b/src/osmo_gsm_tester/obj/mgw_osmo.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/mgw_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/mgw_osmo.py</span><br><span>index b7bd681..3798b2d 100644</span><br><span>--- a/src/osmo_gsm_tester/mgw_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/mgw_osmo.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process</span><br><span> from . import pcap_recorder</span><br><span> </span><br><span> class OsmoMgw(log.Origin):</span><br><span>diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/obj/modem.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/modem.py</span><br><span>rename to src/osmo_gsm_tester/obj/modem.py</span><br><span>index 6759e70..a79f8fb 100644</span><br><span>--- a/src/osmo_gsm_tester/modem.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/modem.py</span><br><span>@@ -17,8 +17,8 @@</span><br><span> # You should have received a copy of the GNU General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, process</span><br><span style="color: hsl(0, 100%, 40%);">-from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core.event_loop import MainLoop</span><br><span> from .ms import MS</span><br><span> from . import sms</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/ms.py b/src/osmo_gsm_tester/obj/ms.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/ms.py</span><br><span>rename to src/osmo_gsm_tester/obj/ms.py</span><br><span>index d310f5f..3dcea7b 100644</span><br><span>--- a/src/osmo_gsm_tester/ms.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms.py</span><br><span>@@ -18,7 +18,7 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log</span><br><span> </span><br><span> class MS(log.Origin, metaclass=ABCMeta):</span><br><span> """Base for everything about mobile/modem and SIMs."""</span><br><span>diff --git a/src/osmo_gsm_tester/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/ms_amarisoft.py</span><br><span>rename to src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>index 9527fa9..1b49b30 100644</span><br><span>--- a/src/osmo_gsm_tester/ms_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>@@ -20,8 +20,8 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process, remote</span><br><span style="color: hsl(0, 100%, 40%);">-from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core.event_loop import MainLoop</span><br><span> from .run_node import RunNode</span><br><span> from .ms import MS</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/obj/ms_driver.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/ms_driver.py</span><br><span>rename to src/osmo_gsm_tester/obj/ms_driver.py</span><br><span>index ef45b8b..2c7bb8b 100644</span><br><span>--- a/src/osmo_gsm_tester/ms_driver.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_driver.py</span><br><span>@@ -16,7 +16,7 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> from datetime import timedelta</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util</span><br><span> from osmo_ms_driver.cdf import cdfs</span><br><span> from osmo_ms_driver.event_server import EventServer</span><br><span> from osmo_ms_driver.simple_loop import SimpleLoop</span><br><span>diff --git a/src/osmo_gsm_tester/ms_osmo_mobile.py b/src/osmo_gsm_tester/obj/ms_osmo_mobile.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/ms_osmo_mobile.py</span><br><span>rename to src/osmo_gsm_tester/obj/ms_osmo_mobile.py</span><br><span>diff --git a/src/osmo_gsm_tester/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/ms_srs.py</span><br><span>rename to src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index d23cf40..c1803e3 100644</span><br><span>--- a/src/osmo_gsm_tester/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -20,9 +20,9 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process, remote</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process, remote</span><br><span> from .run_node import RunNode</span><br><span style="color: hsl(0, 100%, 40%);">-from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core.event_loop import MainLoop</span><br><span> from .ms import MS</span><br><span> </span><br><span> def rf_type_valid(rf_type_str):</span><br><span>diff --git a/src/osmo_gsm_tester/msc_osmo.py b/src/osmo_gsm_tester/obj/msc_osmo.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/msc_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/msc_osmo.py</span><br><span>index fd5d41f..cb8894f 100644</span><br><span>--- a/src/osmo_gsm_tester/msc_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/msc_osmo.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process</span><br><span> from . import osmo_ctrl, pcap_recorder, smsc</span><br><span> </span><br><span> class OsmoMsc(log.Origin):</span><br><span>diff --git a/src/osmo_gsm_tester/nitb_osmo.py b/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/nitb_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>index ec4912f..64db425 100644</span><br><span>--- a/src/osmo_gsm_tester/nitb_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/nitb_osmo.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> import re</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process</span><br><span> from . import osmo_ctrl, pcap_recorder, smsc</span><br><span> </span><br><span> class OsmoNitb(log.Origin):</span><br><span>diff --git a/src/osmo_gsm_tester/osmo_ctrl.py b/src/osmo_gsm_tester/obj/osmo_ctrl.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/osmo_ctrl.py</span><br><span>rename to src/osmo_gsm_tester/obj/osmo_ctrl.py</span><br><span>index 3bc21bd..312e1e9 100644</span><br><span>--- a/src/osmo_gsm_tester/osmo_ctrl.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/osmo_ctrl.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> import socket</span><br><span> import struct</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log</span><br><span> </span><br><span> class CtrlInterfaceExn(Exception):</span><br><span> pass</span><br><span>diff --git a/src/osmo_gsm_tester/osmocon.py b/src/osmo_gsm_tester/obj/osmocon.py</span><br><span>similarity index 97%</span><br><span>rename from src/osmo_gsm_tester/osmocon.py</span><br><span>rename to src/osmo_gsm_tester/obj/osmocon.py</span><br><span>index a6b3221..1fad239 100644</span><br><span>--- a/src/osmo_gsm_tester/osmocon.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/osmocon.py</span><br><span>@@ -20,8 +20,8 @@</span><br><span> import os</span><br><span> import tempfile</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, process</span><br><span style="color: hsl(0, 100%, 40%);">-from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core.event_loop import MainLoop</span><br><span> </span><br><span> class Osmocon(log.Origin):</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/pcap_recorder.py b/src/osmo_gsm_tester/obj/pcap_recorder.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/pcap_recorder.py</span><br><span>rename to src/osmo_gsm_tester/obj/pcap_recorder.py</span><br><span>index a9ba3a7..eb91420 100644</span><br><span>--- a/src/osmo_gsm_tester/pcap_recorder.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/pcap_recorder.py</span><br><span>@@ -19,7 +19,7 @@</span><br><span> </span><br><span> import os</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, process</span><br><span> </span><br><span> class PcapRecorder(log.Origin):</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/obj/pcu.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/pcu.py</span><br><span>rename to src/osmo_gsm_tester/obj/pcu.py</span><br><span>index 9dd6f59..6028f06 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/pcu.py</span><br><span>@@ -18,7 +18,7 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log</span><br><span> </span><br><span> class Pcu(log.Origin, metaclass=ABCMeta):</span><br><span> """PCU Abstract Base Class."""</span><br><span>diff --git a/src/osmo_gsm_tester/pcu_oc2g.py b/src/osmo_gsm_tester/obj/pcu_oc2g.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>rename to src/osmo_gsm_tester/obj/pcu_oc2g.py</span><br><span>index 714f6fd..4b67441 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu_oc2g.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/pcu_oc2g.py</span><br><span>@@ -19,7 +19,7 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config, util, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config, util, template, process</span><br><span> from . import pcu</span><br><span> </span><br><span> class OsmoPcuOC2G(pcu.Pcu):</span><br><span>diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/obj/pcu_osmo.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/pcu_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/pcu_osmo.py</span><br><span>index 11d3805..4c79f5a 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/pcu_osmo.py</span><br><span>@@ -19,7 +19,7 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import config, util, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import config, util, template, process</span><br><span> from . import pcu</span><br><span> </span><br><span> class OsmoPcu(pcu.Pcu):</span><br><span>diff --git a/src/osmo_gsm_tester/pcu_sysmo.py b/src/osmo_gsm_tester/obj/pcu_sysmo.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/pcu_sysmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/pcu_sysmo.py</span><br><span>index e907367..f7c480d 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu_sysmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/pcu_sysmo.py</span><br><span>@@ -19,7 +19,7 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config, util, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config, util, template, process</span><br><span> from . import pcu</span><br><span> </span><br><span> class OsmoPcuSysmo(pcu.Pcu):</span><br><span>diff --git a/src/osmo_gsm_tester/powersupply.py b/src/osmo_gsm_tester/obj/powersupply.py</span><br><span>similarity index 97%</span><br><span>rename from src/osmo_gsm_tester/powersupply.py</span><br><span>rename to src/osmo_gsm_tester/obj/powersupply.py</span><br><span>index 4a9205d..90e84ef 100644</span><br><span>--- a/src/osmo_gsm_tester/powersupply.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/powersupply.py</span><br><span>@@ -18,8 +18,8 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log</span><br><span style="color: hsl(0, 100%, 40%);">-from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core.event_loop import MainLoop</span><br><span> </span><br><span> class PowerSupply(log.Origin, metaclass=ABCMeta):</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/powersupply_intellinet.py b/src/osmo_gsm_tester/obj/powersupply_intellinet.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/powersupply_intellinet.py</span><br><span>rename to src/osmo_gsm_tester/obj/powersupply_intellinet.py</span><br><span>index 02dc803..5b00a1f 100644</span><br><span>--- a/src/osmo_gsm_tester/powersupply_intellinet.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/powersupply_intellinet.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import urllib.request</span><br><span> import xml.etree.ElementTree as ET</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log</span><br><span> from .powersupply import PowerSupply</span><br><span> </span><br><span> class PowerSupplyIntellinet(PowerSupply):</span><br><span>diff --git a/src/osmo_gsm_tester/powersupply_sispm.py b/src/osmo_gsm_tester/obj/powersupply_sispm.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/powersupply_sispm.py</span><br><span>rename to src/osmo_gsm_tester/obj/powersupply_sispm.py</span><br><span>index b392f73..d1b244f 100644</span><br><span>--- a/src/osmo_gsm_tester/powersupply_sispm.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/powersupply_sispm.py</span><br><span>@@ -20,8 +20,8 @@</span><br><span> import sispm</span><br><span> from usb.core import USBError</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log</span><br><span style="color: hsl(0, 100%, 40%);">-from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core.event_loop import MainLoop</span><br><span> from .powersupply import PowerSupply</span><br><span> </span><br><span> class PowerSupplySispm(PowerSupply):</span><br><span>diff --git a/src/osmo_gsm_tester/run_node.py b/src/osmo_gsm_tester/obj/run_node.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/run_node.py</span><br><span>rename to src/osmo_gsm_tester/obj/run_node.py</span><br><span>index e5f7d56..e9f43a1 100644</span><br><span>--- a/src/osmo_gsm_tester/run_node.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/run_node.py</span><br><span>@@ -17,7 +17,7 @@</span><br><span> # You should have received a copy of the GNU General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log</span><br><span> </span><br><span> class RunNode(log.Origin):</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/sgsn_osmo.py b/src/osmo_gsm_tester/obj/sgsn_osmo.py</span><br><span>similarity index 98%</span><br><span>rename from src/osmo_gsm_tester/sgsn_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/sgsn_osmo.py</span><br><span>index 647d848..6824d80 100644</span><br><span>--- a/src/osmo_gsm_tester/sgsn_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/sgsn_osmo.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process</span><br><span> from . import pcap_recorder</span><br><span> </span><br><span> class OsmoSgsn(log.Origin):</span><br><span>diff --git a/src/osmo_gsm_tester/sms.py b/src/osmo_gsm_tester/obj/sms.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/sms.py</span><br><span>rename to src/osmo_gsm_tester/obj/sms.py</span><br><span>diff --git a/src/osmo_gsm_tester/smsc.py b/src/osmo_gsm_tester/obj/smsc.py</span><br><span>similarity index 97%</span><br><span>rename from src/osmo_gsm_tester/smsc.py</span><br><span>rename to src/osmo_gsm_tester/obj/smsc.py</span><br><span>index 1083d22..ee89c69 100644</span><br><span>--- a/src/osmo_gsm_tester/smsc.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/smsc.py</span><br><span>@@ -17,7 +17,7 @@</span><br><span> # You should have received a copy of the GNU Affero General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, config</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, config</span><br><span> </span><br><span> class Smsc:</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/stp_osmo.py b/src/osmo_gsm_tester/obj/stp_osmo.py</span><br><span>similarity index 97%</span><br><span>rename from src/osmo_gsm_tester/stp_osmo.py</span><br><span>rename to src/osmo_gsm_tester/obj/stp_osmo.py</span><br><span>index 500c5da..afb8a04 100644</span><br><span>--- a/src/osmo_gsm_tester/stp_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/stp_osmo.py</span><br><span>@@ -20,7 +20,7 @@</span><br><span> import os</span><br><span> import pprint</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from .core import log, util, config, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from ..core import log, util, config, template, process</span><br><span> from . import pcap_recorder</span><br><span> </span><br><span> class OsmoStp(log.Origin):</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 5b86a08..2c1ec4b 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,10 @@</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 . import bts_sysmo, bts_osmotrx, bts_osmovirtual, bts_octphy, bts_nanobts, bts_oc2g</span><br><span style="color: hsl(0, 100%, 40%);">-from . import modem</span><br><span style="color: hsl(0, 100%, 40%);">-from . import ms_osmo_mobile</span><br><span style="color: hsl(0, 100%, 40%);">-from . import ms_srs, ms_amarisoft, enb_srs, enb_amarisoft, epc_srs, epc_amarisoft</span><br><span style="color: hsl(120, 100%, 40%);">+from .obj import bts_sysmo, bts_osmotrx, bts_osmovirtual, bts_octphy, bts_nanobts, bts_oc2g</span><br><span style="color: hsl(120, 100%, 40%);">+from .obj import modem</span><br><span style="color: hsl(120, 100%, 40%);">+from .obj import ms_osmo_mobile</span><br><span style="color: hsl(120, 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>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py</span><br><span>index 586c518..fecb7a6 100644</span><br><span>--- a/src/osmo_gsm_tester/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/suite.py</span><br><span>@@ -23,9 +23,9 @@</span><br><span> import pprint</span><br><span> from .core import config, log, util, process</span><br><span> from .core.event_loop import MainLoop</span><br><span style="color: hsl(120, 100%, 40%);">+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 style="color: hsl(120, 100%, 40%);">+from .obj import run_node</span><br><span> from . import resource, test</span><br><span style="color: hsl(0, 100%, 40%);">-from . 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 style="color: hsl(0, 100%, 40%);">-from . import run_node</span><br><span> </span><br><span> class Timeout(Exception):</span><br><span> pass</span><br><span>diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py</span><br><span>index f517b52..64b45c5 100644</span><br><span>--- a/src/osmo_gsm_tester/test.py</span><br><span>+++ b/src/osmo_gsm_tester/test.py</span><br><span>@@ -59,7 +59,8 @@</span><br><span> self.start_timestamp = time.time()</span><br><span> from .core import process</span><br><span> from .core.event_loop import MainLoop</span><br><span style="color: hsl(0, 100%, 40%);">- from . import suite, sms</span><br><span style="color: hsl(120, 100%, 40%);">+ from .obj import sms</span><br><span style="color: hsl(120, 100%, 40%);">+ from . import suite</span><br><span> testenv.setup(self.suite_run, self, suite, MainLoop, sms, process)</span><br><span> with self.redirect_stdout():</span><br><span> util.run_python_file('%s.%s' % (self.suite_run.definition.name(), self.basename),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17782">change 17782</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/+/17782"/><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: I0b2963cf00acd1f9036dca2e87aa3b87a0f8066d </div>
<div style="display:none"> Gerrit-Change-Number: 17782 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>