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.orgpespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17468 ) Change subject: Move RESOURCES_CONF from resource.py to config.py ...................................................................... Move RESOURCES_CONF from resource.py to config.py This way we have all known config file names in one place, in the module containing the implementation to retrieve them (config.read_config_file()). Change-Id: I8304dda70268b16dbc316af882fecdbf20ac25ec --- M src/osmo_gsm_tester/config.py M src/osmo_gsm_tester/resource.py 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_gsm_tester/config.py b/src/osmo_gsm_tester/config.py index 4480338..5016018 100644 --- a/src/osmo_gsm_tester/config.py +++ b/src/osmo_gsm_tester/config.py @@ -72,6 +72,8 @@ PATHS_CONF = 'paths.conf' DEFAULT_SUITES_CONF = 'default-suites.conf' DEFAULTS_CONF = 'defaults.conf' +RESOURCES_CONF = 'resources.conf' + PATH_STATE_DIR = 'state_dir' PATH_SUITES_DIR = 'suites_dir' PATH_SCENARIOS_DIR = 'scenarios_dir' diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 07d32e2..cdf0596 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -37,7 +37,6 @@ RESERVED_KEY = '_reserved_by' USED_KEY = '_used' -RESOURCES_CONF = 'resources.conf' RESERVED_RESOURCES_FILE = 'reserved_resources.state' R_IP_ADDRESS = 'ip_address' @@ -151,7 +150,7 @@ _registered_exit_handler = False def __init__(self): - self.config_path = config.get_config_file(RESOURCES_CONF) + self.config_path = config.get_config_file(config.RESOURCES_CONF) self.state_dir = config.get_state_dir() super().__init__(log.C_CNF, conf=self.config_path, state=self.state_dir.path) self.read_conf() -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17468 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: I8304dda70268b16dbc316af882fecdbf20ac25ec Gerrit-Change-Number: 17468 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/20200312/5b435dbd/attachment.htm>