Rename object classes to be {obj_class}_{implementation}
Change-Id: Ieafd96d7ee5b4baef08ca767629b93834f6a8c7c
This commit is contained in:
parent
f9d92f78e6
commit
9b486eedb6
|
@ -49,7 +49,7 @@ class AmarisoftENB(enb.eNodeB):
|
|||
|
||||
REMOTE_DIR = '/osmo-gsm-tester-amarisoftenb'
|
||||
BINFILE = 'lteenb'
|
||||
CFGFILE = 'amarisoft_enb.cfg'
|
||||
CFGFILE = 'enb_amarisoft.cfg'
|
||||
CFGFILE_SIB1 = 'amarisoft_sib1.asn'
|
||||
CFGFILE_SIB23 = 'amarisoft_sib23.asn'
|
||||
CFGFILE_RF = 'amarisoft_rf_driver.cfg'
|
|
@ -29,7 +29,7 @@ from . 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 srs_ue, amarisoft_ue, srs_enb, amarisoft_enb, srs_epc, amarisoft_epc
|
||||
from . import ms_srs, ms_amarisoft, enb_srs, enb_amarisoft, epc_srs, epc_amarisoft
|
||||
|
||||
from .util import is_dict, is_list
|
||||
|
||||
|
@ -157,13 +157,13 @@ KNOWN_BTS_TYPES = {
|
|||
}
|
||||
|
||||
KNOWN_ENB_TYPES = {
|
||||
'srsenb': srs_enb.srsENB,
|
||||
'amarisoftenb': amarisoft_enb.AmarisoftENB,
|
||||
'srsenb': enb_srs.srsENB,
|
||||
'amarisoftenb': enb_amarisoft.AmarisoftENB,
|
||||
}
|
||||
|
||||
KNOWN_EPC_TYPES = {
|
||||
'srsepc': srs_epc.srsEPC,
|
||||
'amarisoftepc': amarisoft_epc.AmarisoftEPC,
|
||||
'srsepc': epc_srs.srsEPC,
|
||||
'amarisoftepc': epc_amarisoft.AmarisoftEPC,
|
||||
}
|
||||
|
||||
KNOWN_MS_TYPES = {
|
||||
|
@ -171,8 +171,8 @@ KNOWN_MS_TYPES = {
|
|||
None: modem.Modem,
|
||||
'ofono': modem.Modem,
|
||||
'osmo-mobile': ms_osmo_mobile.MSOsmoMobile,
|
||||
'srsue': srs_ue.srsUE,
|
||||
'amarisoftue': amarisoft_ue.AmarisoftUE,
|
||||
'srsue': ms_srs.srsUE,
|
||||
'amarisoftue': ms_amarisoft.AmarisoftUE,
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ import time
|
|||
import pprint
|
||||
from . import config, log, util, resource, test
|
||||
from .event_loop import MainLoop
|
||||
from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, esme, osmocon, ms_driver, iperf3, process
|
||||
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 . import run_node
|
||||
|
||||
class Timeout(Exception):
|
||||
|
@ -275,47 +275,47 @@ class SuiteRun(log.Origin):
|
|||
def nitb(self, ip_address=None):
|
||||
if ip_address is None:
|
||||
ip_address = self.ip_address()
|
||||
return osmo_nitb.OsmoNitb(self, ip_address)
|
||||
return nitb_osmo.OsmoNitb(self, ip_address)
|
||||
|
||||
def hlr(self, ip_address=None):
|
||||
if ip_address is None:
|
||||
ip_address = self.ip_address()
|
||||
return osmo_hlr.OsmoHlr(self, ip_address)
|
||||
return hlr_osmo.OsmoHlr(self, ip_address)
|
||||
|
||||
def ggsn(self, ip_address=None):
|
||||
if ip_address is None:
|
||||
ip_address = self.ip_address()
|
||||
return osmo_ggsn.OsmoGgsn(self, ip_address)
|
||||
return ggsn_osmo.OsmoGgsn(self, ip_address)
|
||||
|
||||
def sgsn(self, hlr, ggsn, ip_address=None):
|
||||
if ip_address is None:
|
||||
ip_address = self.ip_address()
|
||||
return osmo_sgsn.OsmoSgsn(self, hlr, ggsn, ip_address)
|
||||
return sgsn_osmo.OsmoSgsn(self, hlr, ggsn, ip_address)
|
||||
|
||||
def mgcpgw(self, ip_address=None, bts_ip=None):
|
||||
if ip_address is None:
|
||||
ip_address = self.ip_address()
|
||||
return osmo_mgcpgw.OsmoMgcpgw(self, ip_address, bts_ip)
|
||||
return mgcpgw_osmo.OsmoMgcpgw(self, ip_address, bts_ip)
|
||||
|
||||
def mgw(self, ip_address=None):
|
||||
if ip_address is None:
|
||||
ip_address = self.ip_address()
|
||||
return osmo_mgw.OsmoMgw(self, ip_address)
|
||||
return mgw_osmo.OsmoMgw(self, ip_address)
|
||||
|
||||
def msc(self, hlr, mgcpgw, stp, ip_address=None):
|
||||
if ip_address is None:
|
||||
ip_address = self.ip_address()
|
||||
return osmo_msc.OsmoMsc(self, hlr, mgcpgw, stp, ip_address)
|
||||
return msc_osmo.OsmoMsc(self, hlr, mgcpgw, stp, ip_address)
|
||||
|
||||
def bsc(self, msc, mgw, stp, ip_address=None):
|
||||
if ip_address is None:
|
||||
ip_address = self.ip_address()
|
||||
return osmo_bsc.OsmoBsc(self, msc, mgw, stp, ip_address)
|
||||
return bsc_osmo.OsmoBsc(self, msc, mgw, stp, ip_address)
|
||||
|
||||
def stp(self, ip_address=None):
|
||||
if ip_address is None:
|
||||
ip_address = self.ip_address()
|
||||
return osmo_stp.OsmoStp(self, ip_address)
|
||||
return stp_osmo.OsmoStp(self, ip_address)
|
||||
|
||||
def ms_driver(self):
|
||||
ms = ms_driver.MsDriver(self)
|
||||
|
|
Loading…
Reference in New Issue