Change in osmo-gsm-tester[master]: Move object classes used by tests into obj/ subdir

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

pespin gerrit-no-reply at lists.osmocom.org
Sat Apr 11 18:08:56 UTC 2020 

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17782 )

Change subject: Move object classes used by tests into obj/ subdir
......................................................................

Move object classes used by tests into obj/ subdir

Change-Id: I0b2963cf00acd1f9036dca2e87aa3b87a0f8066d
---
M selftest/sms_test.py
R src/osmo_gsm_tester/obj/bsc_osmo.py
R src/osmo_gsm_tester/obj/bts.py
R src/osmo_gsm_tester/obj/bts_nanobts.py
R src/osmo_gsm_tester/obj/bts_oc2g.py
R src/osmo_gsm_tester/obj/bts_octphy.py
R src/osmo_gsm_tester/obj/bts_osmo.py
R src/osmo_gsm_tester/obj/bts_osmotrx.py
R src/osmo_gsm_tester/obj/bts_osmovirtual.py
R src/osmo_gsm_tester/obj/bts_sysmo.py
R src/osmo_gsm_tester/obj/enb.py
R src/osmo_gsm_tester/obj/enb_amarisoft.py
R src/osmo_gsm_tester/obj/enb_srs.py
R src/osmo_gsm_tester/obj/epc.py
R src/osmo_gsm_tester/obj/epc_amarisoft.py
R src/osmo_gsm_tester/obj/epc_srs.py
R src/osmo_gsm_tester/obj/esme.py
R src/osmo_gsm_tester/obj/ggsn_osmo.py
R src/osmo_gsm_tester/obj/hlr_osmo.py
R src/osmo_gsm_tester/obj/iperf3.py
R src/osmo_gsm_tester/obj/mgcpgw_osmo.py
R src/osmo_gsm_tester/obj/mgw_osmo.py
R src/osmo_gsm_tester/obj/modem.py
R src/osmo_gsm_tester/obj/ms.py
R src/osmo_gsm_tester/obj/ms_amarisoft.py
R src/osmo_gsm_tester/obj/ms_driver.py
R src/osmo_gsm_tester/obj/ms_osmo_mobile.py
R src/osmo_gsm_tester/obj/ms_srs.py
R src/osmo_gsm_tester/obj/msc_osmo.py
R src/osmo_gsm_tester/obj/nitb_osmo.py
R src/osmo_gsm_tester/obj/osmo_ctrl.py
R src/osmo_gsm_tester/obj/osmocon.py
R src/osmo_gsm_tester/obj/pcap_recorder.py
R src/osmo_gsm_tester/obj/pcu.py
R src/osmo_gsm_tester/obj/pcu_oc2g.py
R src/osmo_gsm_tester/obj/pcu_osmo.py
R src/osmo_gsm_tester/obj/pcu_sysmo.py
R src/osmo_gsm_tester/obj/powersupply.py
R src/osmo_gsm_tester/obj/powersupply_intellinet.py
R src/osmo_gsm_tester/obj/powersupply_sispm.py
R src/osmo_gsm_tester/obj/run_node.py
R src/osmo_gsm_tester/obj/sgsn_osmo.py
R src/osmo_gsm_tester/obj/sms.py
R src/osmo_gsm_tester/obj/smsc.py
R src/osmo_gsm_tester/obj/stp_osmo.py
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/suite.py
M src/osmo_gsm_tester/test.py
48 files changed, 60 insertions(+), 59 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved



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

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17782
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I0b2963cf00acd1f9036dca2e87aa3b87a0f8066d
Gerrit-Change-Number: 17782
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200411/350ed387/attachment.htm>

More information about the gerrit-log mailing list