<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17468">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move RESOURCES_CONF from resource.py to config.py<br><br>This way we have all known config file names in one place, in the module<br>containing the implementation to retrieve them<br>(config.read_config_file()).<br><br>Change-Id: I8304dda70268b16dbc316af882fecdbf20ac25ec<br>---<br>M src/osmo_gsm_tester/config.py<br>M src/osmo_gsm_tester/resource.py<br>2 files changed, 3 insertions(+), 2 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/68/17468/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/config.py b/src/osmo_gsm_tester/config.py</span><br><span>index 55bcb1e..8ab81ec 100644</span><br><span>--- a/src/osmo_gsm_tester/config.py</span><br><span>+++ b/src/osmo_gsm_tester/config.py</span><br><span>@@ -72,6 +72,8 @@</span><br><span> PATHS_CONF = 'paths.conf'</span><br><span> DEFAULT_SUITES_CONF = 'default-suites.conf'</span><br><span> DEFAULTS_CONF = 'defaults.conf'</span><br><span style="color: hsl(120, 100%, 40%);">+RESOURCES_CONF = 'resources.conf'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> PATH_STATE_DIR = 'state_dir'</span><br><span> PATH_SUITES_DIR = 'suites_dir'</span><br><span> PATH_SCENARIOS_DIR = 'scenarios_dir'</span><br><span>diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py</span><br><span>index 07d32e2..cdf0596 100644</span><br><span>--- a/src/osmo_gsm_tester/resource.py</span><br><span>+++ b/src/osmo_gsm_tester/resource.py</span><br><span>@@ -37,7 +37,6 @@</span><br><span> RESERVED_KEY = '_reserved_by'</span><br><span> USED_KEY = '_used'</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-RESOURCES_CONF = 'resources.conf'</span><br><span> RESERVED_RESOURCES_FILE = 'reserved_resources.state'</span><br><span> </span><br><span> R_IP_ADDRESS = 'ip_address'</span><br><span>@@ -151,7 +150,7 @@</span><br><span>     _registered_exit_handler = False</span><br><span> </span><br><span>     def __init__(self):</span><br><span style="color: hsl(0, 100%, 40%);">-        self.config_path = config.get_config_file(RESOURCES_CONF)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.config_path = config.get_config_file(config.RESOURCES_CONF)</span><br><span>         self.state_dir = config.get_state_dir()</span><br><span>         super().__init__(log.C_CNF, conf=self.config_path, state=self.state_dir.path)</span><br><span>         self.read_conf()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17468">change 17468</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/+/17468"/><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: I8304dda70268b16dbc316af882fecdbf20ac25ec </div>
<div style="display:none"> Gerrit-Change-Number: 17468 </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>