Create core directory to contain most of code not in object classes used by tests

Change-Id: I9aec6c55ccd71894182057d36e0025b69925d314

selftest/_prep.py

@@ -7,11 +7,10 @@ src_dir = os.path.join(top_dir, 'src')
 # to find the osmo_gsm_tester py module
 sys.path.append(src_dir)
 
-from osmo_gsm_tester import log
+from osmo_gsm_tester.core import log
 
 log.TestsTarget()
 log.set_all_levels(log.L_DBG)
 
 if '-v' in sys.argv:
     log.style_change(trace=True)
-

selftest/config_test.py

@@ -8,7 +8,7 @@ import io
 import pprint
 import copy
 
-from osmo_gsm_tester import config, log, schema
+from osmo_gsm_tester.core import config, log, schema
 
 example_config_file = 'test.cfg'
 example_config = os.path.join(_prep.script_dir, 'config_test', example_config_file)

selftest/lock_test_help.py

@@ -4,7 +4,7 @@ import os
 
 import _prep
 
-from osmo_gsm_tester.util import FileLock, touch_file
+from osmo_gsm_tester.core.util import FileLock, touch_file
 
 testdir, name = sys.argv[1:]
 stop_signalling_file = os.path.join(testdir, name)

selftest/log_test.py

@@ -24,7 +24,7 @@ import _prep
 import sys
 import os
 
-from osmo_gsm_tester import log
+from osmo_gsm_tester.core import log
 
 #log.targets[0].get_time_str = lambda: '01:02:03'
 fake_time = '01:02:03'
@@ -45,7 +45,7 @@ class LogTest(log.Origin):
         super().__init__(log.C_TST, *name_items, **detail_items)
 
 t = LogTest('some', 'name', some="detail")
-	
+
 t.log("hello log")
 t.err("hello err")
 t.dbg("hello dbg not visible")

selftest/process_test.py

@@ -4,7 +4,7 @@ import _prep
 import time
 import os
 
-from osmo_gsm_tester import process, util, log
+from osmo_gsm_tester.core import process, util, log
 
 tmpdir = util.Dir(util.get_tempdir())
 

selftest/resource_test.py

@@ -6,7 +6,8 @@ import pprint
 import shutil
 import atexit
 import _prep
-from osmo_gsm_tester import config, log, resource, util
+from osmo_gsm_tester.core import config, log, util
+from osmo_gsm_tester import resource
 
 workdir = util.get_tempdir()
 

selftest/suite_test.py

@@ -2,7 +2,8 @@
 import os
 import _prep
 import shutil
-from osmo_gsm_tester import log, suite, config, report, util
+from osmo_gsm_tester.core import log, config, util
+from osmo_gsm_tester import suite, report
 
 config.ENV_CONF = './suite_test'
 

selftest/template_test.py

@@ -5,7 +5,7 @@ import _prep
 import sys
 import os
 
-from osmo_gsm_tester import template, log
+from osmo_gsm_tester.core import template, log
 
 log.set_level(log.C_CNF, log.L_DBG)
 

selftest/trial_test.py

@@ -3,7 +3,7 @@
 import time
 import _prep
 import os
-from osmo_gsm_tester import util
+from osmo_gsm_tester.core import util
 from osmo_gsm_tester.trial import Trial
 
 workdir = util.get_tempdir()

selftest/util_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import _prep
 
-from osmo_gsm_tester.util import hash_obj
+from osmo_gsm_tester.core.util import hash_obj
 
 print('- expect the same hashes on every test run')
 print(hash_obj('abc'))
@@ -9,4 +9,3 @@ print(hash_obj(1))
 print(hash_obj([1, 2, 3]))
 print(hash_obj({ 'k': [ {'a': 1, 'b': 2}, {'a': 3, 'b': 4}, ],
                  'i': [ {'c': 1, 'd': 2}, {'c': 3, 'd': 4}, ] }))
-

src/osmo-gsm-tester.py

@@ -70,7 +70,8 @@ import sys
 import argparse
 from signal import *
 from osmo_gsm_tester import __version__
-from osmo_gsm_tester import trial, suite, log, config
+from osmo_gsm_tester.core import log, config
+from osmo_gsm_tester import trial, suite
 
 def sig_handler_cleanup(signum, frame):
     print("killed by signal %d" % signum)

src/osmo_gsm_tester/bsc_osmo.py

@@ -21,7 +21,8 @@ import os
 import re
 import pprint
 
-from . import log, util, config, template, process, osmo_ctrl, pcap_recorder
+from .core import log, util, config, template, process
+from . import osmo_ctrl, pcap_recorder
 
 class OsmoBsc(log.Origin):
 

src/osmo_gsm_tester/bts.py

@@ -19,7 +19,7 @@
 
 import copy
 from abc import ABCMeta, abstractmethod
-from . import log, config, schema
+from .core import log, config, schema
 
 class Bts(log.Origin, metaclass=ABCMeta):
 

src/osmo_gsm_tester/bts_nanobts.py

@@ -20,9 +20,10 @@
 import os
 import re
 import json
-from . import log, config, util, process, pcap_recorder, bts, pcu
+from .core import log, config, util, process
+from .core.event_loop import MainLoop
+from . import pcap_recorder, bts, pcu
 from . import powersupply
-from .event_loop import MainLoop
 
 class NanoBts(bts.Bts):
 

src/osmo_gsm_tester/bts_oc2g.py

@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import log, config, util, template, process, remote, pcu_oc2g, bts_osmo
+from .core import log, config, util, template, process, remote
+from . import pcu_oc2g, bts_osmo
 
 class OsmoBtsOC2G(bts_osmo.OsmoBts):
 ##############

src/osmo_gsm_tester/bts_octphy.py

@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import log, config, util, template, process, bts_osmo
+from .core import log, config, util, template, process
+from . import bts_osmo
 
 class OsmoBtsOctphy(bts_osmo.OsmoBtsMainUnit):
 

src/osmo_gsm_tester/bts_osmo.py

@@ -20,7 +20,8 @@
 import os
 import tempfile
 from abc import ABCMeta, abstractmethod
-from . import log, bts, pcu_osmo
+from .core import log
+from . import bts, pcu_osmo
 
 class OsmoBts(bts.Bts, metaclass=ABCMeta):
 

src/osmo_gsm_tester/bts_osmotrx.py

@@ -20,9 +20,9 @@
 import os
 import pprint
 from abc import ABCMeta, abstractmethod
-from . import log, config, util, template, process, remote, bts_osmo
-from . import powersupply
-from .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):
 ##############

src/osmo_gsm_tester/bts_osmovirtual.py

@@ -20,7 +20,8 @@
 
 import os
 import pprint
-from . import config, util, template, process, bts_osmo
+from .core import config, util, template, process
+from . import bts_osmo
 
 class OsmoBtsVirtual(bts_osmo.OsmoBtsMainUnit):
 ##############
@@ -112,4 +113,3 @@ class OsmoBtsVirtual(bts_osmo.OsmoBtsMainUnit):
         self.suite_run.poll()
 
 # vim: expandtab tabstop=4 shiftwidth=4
-

src/osmo_gsm_tester/bts_sysmo.py

@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import log, config, util, template, process, remote, pcu_sysmo, bts_osmo
+from .core import log, config, util, template, process, remote
+from . import pcu_sysmo, bts_osmo
 
 class SysmoBts(bts_osmo.OsmoBts):
 ##############

src/osmo_gsm_tester/core/remote.py

@@ -22,7 +22,7 @@ import os
 import re
 import pprint
 
-from . import log, util, config, template, process, osmo_ctrl, pcap_recorder
+from . import log, util, config, template, process
 
 class RemoteHost(log.Origin):
 

src/osmo_gsm_tester/core/template.py

@@ -32,7 +32,7 @@ def set_templates_dir(*templates_dirs):
     global _logger
     if not templates_dirs:
         # default templates dir is relative to this source file
-        templates_dirs = [os.path.join(os.path.dirname(__file__), 'templates')]
+        templates_dirs = [os.path.join(os.path.dirname(os.path.dirname(__file__)), 'templates')]
     for d in templates_dirs:
         if not os.path.isdir(d):
             raise RuntimeError('templates dir is not a dir: %r'

src/osmo_gsm_tester/enb.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from . import log, config
+from .core import log, config
 
 
 class eNodeB(log.Origin, metaclass=ABCMeta):

src/osmo_gsm_tester/enb_amarisoft.py

@@ -20,7 +20,7 @@
 import os
 import pprint
 
-from . 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):

src/osmo_gsm_tester/enb_srs.py

@@ -20,7 +20,7 @@
 import os
 import pprint
 
-from . 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):

src/osmo_gsm_tester/epc.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from . import log, config
+from .core import log, config
 
 
 class EPC(log.Origin, metaclass=ABCMeta):

src/osmo_gsm_tester/epc_amarisoft.py

@@ -20,7 +20,7 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, remote
+from .core import log, util, config, template, process, remote
 from . import epc
 
 class AmarisoftEPC(epc.EPC):

src/osmo_gsm_tester/epc_srs.py

@@ -20,7 +20,7 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, remote
+from .core import log, util, config, template, process, remote
 from . import epc
 
 class srsEPC(epc.EPC):

src/osmo_gsm_tester/esme.py

@@ -23,8 +23,8 @@ import smpplib.command
 import smpplib.consts
 import smpplib.exceptions
 
-from . import log
-from .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

src/osmo_gsm_tester/ggsn_osmo.py

@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoGgsn(log.Origin):
 

src/osmo_gsm_tester/hlr_osmo.py

@@ -21,7 +21,8 @@ import os
 import pprint
 import sqlite3
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoHlr(log.Origin):
     run_dir = None

src/osmo_gsm_tester/iperf3.py

@@ -20,7 +20,8 @@
 import os
 import json
 
-from . import log, util, config, process, pcap_recorder, run_node, remote
+from .core import log, util, config, process, remote
+from . import pcap_recorder, run_node
 
 def iperf3_result_to_json(file):
     with open(file) as f:

src/osmo_gsm_tester/mgcpgw_osmo.py

@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoMgcpgw(log.Origin):
 

src/osmo_gsm_tester/mgw_osmo.py

@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoMgw(log.Origin):
 

src/osmo_gsm_tester/modem.py

@@ -17,9 +17,10 @@
 # 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 . import log, util, sms, process
-from .event_loop import MainLoop
+from .core import log, util, process
+from .core.event_loop import MainLoop
 from .ms import MS
+from . import sms
 
 from pydbus import SystemBus, Variant
 import os

src/osmo_gsm_tester/ms.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from . import log
+from .core import log
 
 class MS(log.Origin, metaclass=ABCMeta):
     """Base for everything about mobile/modem and SIMs."""

src/osmo_gsm_tester/ms_amarisoft.py

@@ -20,9 +20,9 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, remote
+from .core import log, util, config, template, process, remote
+from .core.event_loop import MainLoop
 from .run_node import RunNode
-from .event_loop import MainLoop
 from .ms import MS
 
 def rf_type_valid(rf_type_str):

src/osmo_gsm_tester/ms_driver.py

@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from datetime import timedelta
-from . 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

src/osmo_gsm_tester/ms_srs.py

@@ -20,9 +20,9 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, remote
+from .core import log, util, config, template, process, remote
 from .run_node import RunNode
-from .event_loop import MainLoop
+from .core.event_loop import MainLoop
 from .ms import MS
 
 def rf_type_valid(rf_type_str):

src/osmo_gsm_tester/msc_osmo.py

@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, osmo_ctrl, pcap_recorder, smsc
+from .core import log, util, config, template, process
+from . import osmo_ctrl, pcap_recorder, smsc
 
 class OsmoMsc(log.Origin):
 

src/osmo_gsm_tester/nitb_osmo.py

@@ -21,7 +21,8 @@ import os
 import re
 import pprint
 
-from . import log, util, config, template, process, osmo_ctrl, pcap_recorder, smsc
+from .core import log, util, config, template, process
+from . import osmo_ctrl, pcap_recorder, smsc
 
 class OsmoNitb(log.Origin):
 

src/osmo_gsm_tester/osmo_ctrl.py

@@ -21,7 +21,7 @@
 import socket
 import struct
 
-from . import log
+from .core import log
 
 class CtrlInterfaceExn(Exception):
     pass

src/osmo_gsm_tester/osmocon.py

@@ -20,8 +20,8 @@
 import os
 import tempfile
 
-from . import log, util, process
-from .event_loop import MainLoop
+from .core import log, util, process
+from .core.event_loop import MainLoop
 
 class Osmocon(log.Origin):
 

src/osmo_gsm_tester/pcap_recorder.py

@@ -19,7 +19,7 @@
 
 import os
 
-from . import log, process
+from .core import log, process
 
 class PcapRecorder(log.Origin):
 

src/osmo_gsm_tester/pcu.py

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from . import log
+from .core import log
 
 class Pcu(log.Origin, metaclass=ABCMeta):
     """PCU Abstract Base Class."""

src/osmo_gsm_tester/pcu_oc2g.py

@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import log, config, util, template, process, pcu
+from .core import log, config, util, template, process
+from . import pcu
 
 class OsmoPcuOC2G(pcu.Pcu):
 

src/osmo_gsm_tester/pcu_osmo.py

@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import config, util, template, process, pcu
+from .core import config, util, template, process
+from . import pcu
 
 class OsmoPcu(pcu.Pcu):
 

src/osmo_gsm_tester/pcu_sysmo.py

@@ -19,7 +19,8 @@
 
 import os
 import pprint
-from . import log, config, util, template, process, pcu
+from .core import log, config, util, template, process
+from . import pcu
 
 class OsmoPcuSysmo(pcu.Pcu):
 

src/osmo_gsm_tester/powersupply.py

@@ -18,8 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from . import log
-from .event_loop import MainLoop
+from .core import log
+from .core.event_loop import MainLoop
 
 class PowerSupply(log.Origin, metaclass=ABCMeta):
 

src/osmo_gsm_tester/powersupply_intellinet.py

@@ -20,7 +20,7 @@
 import urllib.request
 import xml.etree.ElementTree as ET
 
-from . import log
+from .core import log
 from .powersupply import PowerSupply
 
 class PowerSupplyIntellinet(PowerSupply):

src/osmo_gsm_tester/powersupply_sispm.py

@@ -20,8 +20,8 @@
 import sispm
 from usb.core import USBError
 
-from . import log
-from .event_loop import MainLoop
+from .core import log
+from .core.event_loop import MainLoop
 from .powersupply import PowerSupply
 
 class PowerSupplySispm(PowerSupply):

src/osmo_gsm_tester/resource.py

@@ -22,16 +22,16 @@ import copy
 import atexit
 import pprint
 
-from . import log
-from . import config
-from . import util
-from . import schema
+from .core import log
+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 .  import modem
+from .  import ms_osmo_mobile
+from .  import ms_srs, ms_amarisoft, enb_srs, enb_amarisoft, epc_srs, epc_amarisoft
 
-from .util import is_dict, is_list
+from .core.util import is_dict, is_list
 
 HASH_KEY = '_hash'
 RESERVED_KEY = '_reserved_by'

src/osmo_gsm_tester/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 . import log
+from .core import log
 
 class RunNode(log.Origin):
 

src/osmo_gsm_tester/sgsn_osmo.py

@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoSgsn(log.Origin):
 

src/osmo_gsm_tester/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 . import log, config
+from .core import log, config
 
 class Smsc:
 

src/osmo_gsm_tester/stp_osmo.py

@@ -20,7 +20,8 @@
 import os
 import pprint
 
-from . import log, util, config, template, process, pcap_recorder
+from .core import log, util, config, template, process
+from . import pcap_recorder
 
 class OsmoStp(log.Origin):
 

src/osmo_gsm_tester/suite.py

@@ -21,9 +21,10 @@ import os
 import sys
 import time
 import pprint
-from . import config, log, util, resource, test
-from .event_loop import MainLoop
-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, process
+from .core import config, log, util, process
+from .core.event_loop import MainLoop
+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):

src/osmo_gsm_tester/test.py

@@ -23,7 +23,8 @@ import time
 import traceback
 from . import testenv
 
-from . import log, util, resource
+from .core import log, util
+from . import resource
 
 class Test(log.Origin):
     UNKNOWN = 'UNKNOWN' # matches junit 'error'
@@ -56,8 +57,9 @@ class Test(log.Origin):
             log.large_separator(self.suite_run.trial.name(), self.suite_run.name(), self.name(), sublevel=3)
             self.status = Test.UNKNOWN
             self.start_timestamp = time.time()
-            from . import suite, sms, process
-            from .event_loop import MainLoop
+            from .core import process
+            from .core.event_loop import MainLoop
+            from . import suite, sms
             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),

src/osmo_gsm_tester/trial.py

@@ -22,7 +22,8 @@ import time
 import shutil
 import tarfile
 
-from . import log, util, suite, report
+from .core import log, util
+from . import suite, report
 
 FILE_MARK_TAKEN = 'taken'
 FILE_CHECKSUMS = 'checksums.md5'

src/osmo_ms_driver/__main__.py

@@ -22,7 +22,7 @@ from .location_update_test import MassUpdateLocationTest
 from .cdf import cdfs
 from .starter import BinaryOptions, MobileTestStarter
 from .test_support import imsi_ki_gen
-from osmo_gsm_tester import log, util
+from osmo_gsm_tester.core import log, util
 from osmo_gsm_tester import ms_osmo_mobile
 
 # System modules

src/osmo_ms_driver/event_server.py

@@ -1,5 +1,5 @@
 
-from osmo_gsm_tester import log
+from osmo_gsm_tester.core import log
 
 import time
 

src/osmo_ms_driver/simple_loop.py

@@ -15,7 +15,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 osmo_gsm_tester import log
+from osmo_gsm_tester.core import log
 
 import os
 import selectors

src/osmo_ms_driver/starter.py

@@ -16,7 +16,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 osmo_gsm_tester import log, util, process, template
+from osmo_gsm_tester.core import log, util, process, template
 
 from .test_support import ResultStore
 

src/osmo_ms_driver/test_support.py

@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta
-from osmo_gsm_tester import log
+from osmo_gsm_tester.core import log
 
 import time