<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17780">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Rename object classes to be {obj_class}_{implementation}<br><br>Change-Id: Ieafd96d7ee5b4baef08ca767629b93834f6a8c7c<br>---<br>R src/osmo_gsm_tester/bsc_osmo.py<br>R src/osmo_gsm_tester/enb_amarisoft.py<br>R src/osmo_gsm_tester/enb_srs.py<br>R src/osmo_gsm_tester/epc_amarisoft.py<br>R src/osmo_gsm_tester/epc_srs.py<br>R src/osmo_gsm_tester/ggsn_osmo.py<br>R src/osmo_gsm_tester/hlr_osmo.py<br>R src/osmo_gsm_tester/mgcpgw_osmo.py<br>R src/osmo_gsm_tester/mgw_osmo.py<br>R src/osmo_gsm_tester/ms_amarisoft.py<br>R src/osmo_gsm_tester/ms_srs.py<br>R src/osmo_gsm_tester/msc_osmo.py<br>R src/osmo_gsm_tester/nitb_osmo.py<br>M src/osmo_gsm_tester/resource.py<br>R src/osmo_gsm_tester/sgsn_osmo.py<br>R src/osmo_gsm_tester/stp_osmo.py<br>M src/osmo_gsm_tester/suite.py<br>17 files changed, 18 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/80/17780/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/osmo_bsc.py b/src/osmo_gsm_tester/bsc_osmo.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/osmo_bsc.py</span><br><span>rename to src/osmo_gsm_tester/bsc_osmo.py</span><br><span>diff --git a/src/osmo_gsm_tester/amarisoft_enb.py b/src/osmo_gsm_tester/enb_amarisoft.py</span><br><span>similarity index 99%</span><br><span>rename from src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>rename to src/osmo_gsm_tester/enb_amarisoft.py</span><br><span>index c92bf50..1487bdd 100644</span><br><span>--- a/src/osmo_gsm_tester/amarisoft_enb.py</span><br><span>+++ b/src/osmo_gsm_tester/enb_amarisoft.py</span><br><span>@@ -49,7 +49,7 @@</span><br><span> </span><br><span> REMOTE_DIR = '/osmo-gsm-tester-amarisoftenb'</span><br><span> BINFILE = 'lteenb'</span><br><span style="color: hsl(0, 100%, 40%);">- CFGFILE = 'amarisoft_enb.cfg'</span><br><span style="color: hsl(120, 100%, 40%);">+ CFGFILE = 'enb_amarisoft.cfg'</span><br><span> CFGFILE_SIB1 = 'amarisoft_sib1.asn'</span><br><span> CFGFILE_SIB23 = 'amarisoft_sib23.asn'</span><br><span> CFGFILE_RF = 'amarisoft_rf_driver.cfg'</span><br><span>diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/enb_srs.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/srs_enb.py</span><br><span>rename to src/osmo_gsm_tester/enb_srs.py</span><br><span>diff --git a/src/osmo_gsm_tester/amarisoft_epc.py b/src/osmo_gsm_tester/epc_amarisoft.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/amarisoft_epc.py</span><br><span>rename to src/osmo_gsm_tester/epc_amarisoft.py</span><br><span>diff --git a/src/osmo_gsm_tester/srs_epc.py b/src/osmo_gsm_tester/epc_srs.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/srs_epc.py</span><br><span>rename to src/osmo_gsm_tester/epc_srs.py</span><br><span>diff --git a/src/osmo_gsm_tester/osmo_ggsn.py b/src/osmo_gsm_tester/ggsn_osmo.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/osmo_ggsn.py</span><br><span>rename to src/osmo_gsm_tester/ggsn_osmo.py</span><br><span>diff --git a/src/osmo_gsm_tester/osmo_hlr.py b/src/osmo_gsm_tester/hlr_osmo.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/osmo_hlr.py</span><br><span>rename to src/osmo_gsm_tester/hlr_osmo.py</span><br><span>diff --git a/src/osmo_gsm_tester/osmo_mgcpgw.py b/src/osmo_gsm_tester/mgcpgw_osmo.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/osmo_mgcpgw.py</span><br><span>rename to src/osmo_gsm_tester/mgcpgw_osmo.py</span><br><span>diff --git a/src/osmo_gsm_tester/osmo_mgw.py b/src/osmo_gsm_tester/mgw_osmo.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/osmo_mgw.py</span><br><span>rename to src/osmo_gsm_tester/mgw_osmo.py</span><br><span>diff --git a/src/osmo_gsm_tester/amarisoft_ue.py b/src/osmo_gsm_tester/ms_amarisoft.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/amarisoft_ue.py</span><br><span>rename to src/osmo_gsm_tester/ms_amarisoft.py</span><br><span>diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/ms_srs.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/srs_ue.py</span><br><span>rename to src/osmo_gsm_tester/ms_srs.py</span><br><span>diff --git a/src/osmo_gsm_tester/osmo_msc.py b/src/osmo_gsm_tester/msc_osmo.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/osmo_msc.py</span><br><span>rename to src/osmo_gsm_tester/msc_osmo.py</span><br><span>diff --git a/src/osmo_gsm_tester/osmo_nitb.py b/src/osmo_gsm_tester/nitb_osmo.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/osmo_nitb.py</span><br><span>rename to src/osmo_gsm_tester/nitb_osmo.py</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index c58bdc7..fa17bcd 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -29,7 +29,7 @@</span><br><span> from . import bts_sysmo, bts_osmotrx, bts_osmovirtual, bts_octphy, bts_nanobts, bts_oc2g</span><br><span> from . import modem</span><br><span> from . import ms_osmo_mobile</span><br><span style="color: hsl(0, 100%, 40%);">-from . import srs_ue, amarisoft_ue, srs_enb, amarisoft_enb, srs_epc, amarisoft_epc</span><br><span style="color: hsl(120, 100%, 40%);">+from . import ms_srs, ms_amarisoft, enb_srs, enb_amarisoft, epc_srs, epc_amarisoft</span><br><span> </span><br><span> from .util import is_dict, is_list</span><br><span> </span><br><span>@@ -157,13 +157,13 @@</span><br><span> }</span><br><span> </span><br><span> KNOWN_ENB_TYPES = {</span><br><span style="color: hsl(0, 100%, 40%);">- 'srsenb': srs_enb.srsENB,</span><br><span style="color: hsl(0, 100%, 40%);">- 'amarisoftenb': amarisoft_enb.AmarisoftENB,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'srsenb': enb_srs.srsENB,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'amarisoftenb': enb_amarisoft.AmarisoftENB,</span><br><span> }</span><br><span> </span><br><span> KNOWN_EPC_TYPES = {</span><br><span style="color: hsl(0, 100%, 40%);">- 'srsepc': srs_epc.srsEPC,</span><br><span style="color: hsl(0, 100%, 40%);">- 'amarisoftepc': amarisoft_epc.AmarisoftEPC,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'srsepc': epc_srs.srsEPC,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'amarisoftepc': epc_amarisoft.AmarisoftEPC,</span><br><span> }</span><br><span> </span><br><span> KNOWN_MS_TYPES = {</span><br><span>@@ -171,8 +171,8 @@</span><br><span> None: modem.Modem,</span><br><span> 'ofono': modem.Modem,</span><br><span> 'osmo-mobile': ms_osmo_mobile.MSOsmoMobile,</span><br><span style="color: hsl(0, 100%, 40%);">- 'srsue': srs_ue.srsUE,</span><br><span style="color: hsl(0, 100%, 40%);">- 'amarisoftue': amarisoft_ue.AmarisoftUE,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'srsue': ms_srs.srsUE,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'amarisoftue': ms_amarisoft.AmarisoftUE,</span><br><span> }</span><br><span> </span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/osmo_sgsn.py b/src/osmo_gsm_tester/sgsn_osmo.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/osmo_sgsn.py</span><br><span>rename to src/osmo_gsm_tester/sgsn_osmo.py</span><br><span>diff --git a/src/osmo_gsm_tester/osmo_stp.py b/src/osmo_gsm_tester/stp_osmo.py</span><br><span>similarity index 100%</span><br><span>rename from src/osmo_gsm_tester/osmo_stp.py</span><br><span>rename to src/osmo_gsm_tester/stp_osmo.py</span><br><span>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py</span><br><span>index 5076671..0ddd95f 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,7 +23,7 @@</span><br><span> import pprint</span><br><span> from . import config, log, util, resource, test</span><br><span> from .event_loop import MainLoop</span><br><span style="color: hsl(0, 100%, 40%);">-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</span><br><span style="color: hsl(120, 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, process</span><br><span> from . import run_node</span><br><span> </span><br><span> class Timeout(Exception):</span><br><span>@@ -275,47 +275,47 @@</span><br><span> def nitb(self, ip_address=None):</span><br><span> if ip_address is None:</span><br><span> ip_address = self.ip_address()</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_nitb.OsmoNitb(self, ip_address)</span><br><span style="color: hsl(120, 100%, 40%);">+ return nitb_osmo.OsmoNitb(self, ip_address)</span><br><span> </span><br><span> def hlr(self, ip_address=None):</span><br><span> if ip_address is None:</span><br><span> ip_address = self.ip_address()</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_hlr.OsmoHlr(self, ip_address)</span><br><span style="color: hsl(120, 100%, 40%);">+ return hlr_osmo.OsmoHlr(self, ip_address)</span><br><span> </span><br><span> def ggsn(self, ip_address=None):</span><br><span> if ip_address is None:</span><br><span> ip_address = self.ip_address()</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_ggsn.OsmoGgsn(self, ip_address)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ggsn_osmo.OsmoGgsn(self, ip_address)</span><br><span> </span><br><span> def sgsn(self, hlr, ggsn, ip_address=None):</span><br><span> if ip_address is None:</span><br><span> ip_address = self.ip_address()</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_sgsn.OsmoSgsn(self, hlr, ggsn, ip_address)</span><br><span style="color: hsl(120, 100%, 40%);">+ return sgsn_osmo.OsmoSgsn(self, hlr, ggsn, ip_address)</span><br><span> </span><br><span> def mgcpgw(self, ip_address=None, bts_ip=None):</span><br><span> if ip_address is None:</span><br><span> ip_address = self.ip_address()</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_mgcpgw.OsmoMgcpgw(self, ip_address, bts_ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ return mgcpgw_osmo.OsmoMgcpgw(self, ip_address, bts_ip)</span><br><span> </span><br><span> def mgw(self, ip_address=None):</span><br><span> if ip_address is None:</span><br><span> ip_address = self.ip_address()</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_mgw.OsmoMgw(self, ip_address)</span><br><span style="color: hsl(120, 100%, 40%);">+ return mgw_osmo.OsmoMgw(self, ip_address)</span><br><span> </span><br><span> def msc(self, hlr, mgcpgw, stp, ip_address=None):</span><br><span> if ip_address is None:</span><br><span> ip_address = self.ip_address()</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_msc.OsmoMsc(self, hlr, mgcpgw, stp, ip_address)</span><br><span style="color: hsl(120, 100%, 40%);">+ return msc_osmo.OsmoMsc(self, hlr, mgcpgw, stp, ip_address)</span><br><span> </span><br><span> def bsc(self, msc, mgw, stp, ip_address=None):</span><br><span> if ip_address is None:</span><br><span> ip_address = self.ip_address()</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_bsc.OsmoBsc(self, msc, mgw, stp, ip_address)</span><br><span style="color: hsl(120, 100%, 40%);">+ return bsc_osmo.OsmoBsc(self, msc, mgw, stp, ip_address)</span><br><span> </span><br><span> def stp(self, ip_address=None):</span><br><span> if ip_address is None:</span><br><span> ip_address = self.ip_address()</span><br><span style="color: hsl(0, 100%, 40%);">- return osmo_stp.OsmoStp(self, ip_address)</span><br><span style="color: hsl(120, 100%, 40%);">+ return stp_osmo.OsmoStp(self, ip_address)</span><br><span> </span><br><span> def ms_driver(self):</span><br><span> ms = ms_driver.MsDriver(self)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17780">change 17780</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/+/17780"/><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: Ieafd96d7ee5b4baef08ca767629b93834f6a8c7c </div>
<div style="display:none"> Gerrit-Change-Number: 17780 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>