logLevel value should be parsed from config file as int

Author: Helene

source/confParser.py

@@ -121,6 +121,8 @@ def readConfigFile(self, fileName):
                 for sect in config.sections():
                     options[sect] = {}
                     for name, value in config.items(sect):
+                        if value.isdigit():
+                            value = int(value)
                         options[sect][name] = value
             except Exception as e:
                 print(f"cannot read config file {fileName} Exception {e}")
@@ -151,8 +153,8 @@ def parse_cmd_args(argv):
                         In this case make sure the \'query2port = \"9094\"\' is enabled in the ZIMon queryinterface settings (\'ZIMonCollector.cfg\')')
     parser.add_argument('-l', '--logPath', action="store", default="/var/log/ibm_bridge_for_grafana", help='location path of the log file (Default: /var/log/ibm_bridge_for_grafana')
     parser.add_argument('-f', '--logFile', action="store", default="zserver.log", help='Name of the log file (Default: zserver.log')
-    parser.add_argument('-c', '--logLevel', action="store", type=int, default=15,
-                        help='log level. Available levels: 10 (DEBUG), 15 (MOREINFO), 20 (INFO), 30 (WARN), 40 (ERROR) (Default: 15)')
+    parser.add_argument('-c', '--logLevel', action="store", type=int, default=None,
+                        help='log level. Available levels: 10 (DEBUG), 15 (MOREINFO), 20 (INFO), 30 (WARN), 40 (ERROR) (Default from config.ini: 15)')
     parser.add_argument('-p', '--port', action="store", type=int, choices=[4242, 8443], default=4242, help='port number listening on for HTTP(S) connections (Default: 4242)')
     parser.add_argument('-t', '--tlsKeyPath', action="store", default=None, help='Directory path of tls privkey.pem and cert.pem file location (Required only for HTTPS port 8443)')
     parser.add_argument('-k', '--tlsKeyFile', action="store", default=None, help='Name of TLS key file, f.e.: privkey.pem (Required only for HTTPS port 8443)')

source/config.ini

@@ -30,8 +30,8 @@ serverPort = 9084
 # Directory where the bridge can store logs
 logPath = /var/log/ibm_bridge_for_grafana
 
-# log level 10 (DEBUG), 20 (INFO), 30 (WARN), 40 (ERROR) (Default: 20)
-logLevel = 20
+# log level 10 (DEBUG), 15 (MOREINFO), 20 (INFO), 30 (WARN), 40 (ERROR) (Default: 15)
+logLevel = 15
 
 # Log file name (Default: zserver.log)
 logFile = zserver.log

tests/test_params.py

@@ -19,6 +19,15 @@ def test_case01():
 
 @with_setup(my_setup)
 def test_case02():
+    result = merge_defaults_and_args(a, b)
+    assert len(result.keys()) > 0
+    assert 'logLevel' in result.keys()
+    assert isinstance(result.get('logLevel'), int)
+    assert result.get('logLevel') == 15
+
+
+@with_setup(my_setup)
+def test_case03():
     result = merge_defaults_and_args(a, d)
     assert len(result.keys()) > 0
     assert 'port' in result.keys()