[MERGED] osmo-gsm-tester[master]: Rename module ofono_client as modem

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged.

Change subject: Rename module ofono_client as modem
......................................................................


Rename module ofono_client as modem

Change-Id: I43b51ae937d87d6d4e18caea59f9366e2e28c9f2
---
R src/osmo_gsm_tester/modem.py
M src/osmo_gsm_tester/resource.py
M src/osmo_gsm_tester/suite.py
3 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo_gsm_tester/ofono_client.py b/src/osmo_gsm_tester/modem.py
similarity index 100%
rename from src/osmo_gsm_tester/ofono_client.py
rename to src/osmo_gsm_tester/modem.py
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py
index 1bacd38..746aae0 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/resource.py
@@ -27,7 +27,7 @@
 from . import config
 from . import util
 from . import schema
-from . import ofono_client
+from . import modem
 from . import osmo_nitb
 from . import bts_sysmo, bts_osmotrx, bts_octphy
 
diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py
index eead5af..4b33abc 100644
--- a/src/osmo_gsm_tester/suite.py
+++ b/src/osmo_gsm_tester/suite.py
@@ -23,7 +23,7 @@
 import copy
 import traceback
 import pprint
-from . import config, log, template, util, resource, schema, ofono_client, event_loop, esme, sms
+from . import config, log, template, util, resource, schema, modem, event_loop, esme, sms
 from . import osmo_nitb
 from . import osmo_hlr, osmo_mgcpgw, osmo_msc, osmo_bsc, osmo_stp
 from . import test
@@ -352,9 +352,9 @@
     def modem(self, specifics=None):
         conf = self.reserved_resources.get(resource.R_MODEM, specifics=specifics)
         self.dbg('create Modem object', conf=conf)
-        modem = ofono_client.Modem(conf)
-        self.register_for_cleanup(modem)
-        return modem
+        ms = modem.Modem(conf)
+        self.register_for_cleanup(ms)
+        return ms
 
     def modems(self, count):
         l = []

-- 
To view, visit https://gerrit.osmocom.org/4709
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I43b51ae937d87d6d4e18caea59f9366e2e28c9f2
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>