[MERGED] osmo-gsm-tester[master]: add cmdline arg to set conf dir

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: add cmdline arg to set conf dir
......................................................................


add cmdline arg to set conf dir

Add -c cmdline option to do the same as / in addition to the
OSMO_GSM_TESTER_CONF var, because setting the var is cumbersome in daily
development.

Change-Id: I4c3b482f31f638047ab3f3d785d294b28d244b80
---
M src/osmo-gsm-tester.py
M src/osmo_gsm_tester/config.py
2 files changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/src/osmo-gsm-tester.py b/src/osmo-gsm-tester.py
index 5854836..0402802 100755
--- a/src/osmo-gsm-tester.py
+++ b/src/osmo-gsm-tester.py
@@ -117,6 +117,9 @@
             help='Set logging level for all categories (on stdout)')
     parser.add_argument('-T', '--traceback', dest='trace', action='store_true',
             help='Enable logging of tracebacks')
+    parser.add_argument('-c', '--conf-dir', dest='conf_dir',
+            help='''Specify configuration dir (overrides
+OSMO_GSM_TESTER_CONF env and default locations)''')
     args = parser.parse_args()
 
     if args.version:
@@ -135,6 +138,8 @@
         log.set_all_levels(log.LEVEL_STRS.get(args.log_level))
     if args.trace:
         log.style_change(trace=True)
+    if args.conf_dir:
+        config.override_conf = args.conf_dir
 
     combination_strs = list(args.suite_scenario or [])
     # for series in args.series:
diff --git a/src/osmo_gsm_tester/config.py b/src/osmo_gsm_tester/config.py
index deb872f..38d8e2f 100644
--- a/src/osmo_gsm_tester/config.py
+++ b/src/osmo_gsm_tester/config.py
@@ -59,6 +59,8 @@
 ENV_PREFIX = 'OSMO_GSM_TESTER_'
 ENV_CONF = os.getenv(ENV_PREFIX + 'CONF')
 
+override_conf = None
+
 DEFAULT_CONFIG_LOCATIONS = [
     '.',
     os.path.join(os.getenv('HOME'), '.config', 'osmo-gsm-tester'),
@@ -82,7 +84,9 @@
 PATHS = None
 
 def _get_config_file(basename, fail_if_missing=True):
-    if ENV_CONF:
+    if override_conf:
+        locations = [ override_conf ]
+    elif ENV_CONF:
         locations = [ ENV_CONF ]
     else:
         locations = DEFAULT_CONFIG_LOCATIONS

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

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