create config file with default config settings

Author: Helene

source/__init__.py

@@ -0,0 +1,24 @@
+'''
+##############################################################################
+# Copyright 2019 IBM Corp.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##############################################################################
+
+Created on Apr 4, 2017
+
+@author: HWASSMAN
+'''
+import os
+import sys
+sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))

source/confParser.py

@@ -24,6 +24,7 @@
 import os
 import logging.handlers
 from messages import MSG
+import configparser
 
 
 def findKeyFile(path):
@@ -42,6 +43,19 @@ def findCertFile(path):
     return None
 
 
+def parse_defaults_from_config_file(fileName='config.ini'):
+    defaults = {}
+    dirname, filename = os.path.split(os.path.abspath(__file__))
+    conf_file = os.path.join(dirname, fileName)
+    if os.path.isfile(conf_file):
+        config = configparser.ConfigParser()
+        config.read(conf_file)
+        for sect in config.sections():
+            for name, value in config.items(sect):
+                defaults[name] = value
+    return defaults
+
+
 def parse_cmd_args(argv):
     '''parse input parameters'''
 

source/config.ini

@@ -0,0 +1,37 @@
+##################### Grafana Connection Defaults ############################
+[connection]
+# port number the bridge listening on for Grafana data requests
+# 4242 - for HTTP connections 
+# 8443 - for HTTPS connections 
+# (Default: 4242)
+port = 4242
+
+#################################### Grafana Generic OAuth ####################
+[tls]
+# Directory path of tls key and cert file location
+#tlsKeyPath = /etc/bridge_cert/
+
+#
+#tlsKeyFile = privkey.pem
+
+#
+#tlsCertFile = cert.pem
+
+#################################### GPFS Server ##############################
+[server]
+# The ip address to bind to, empty will bind to all interfaces
+server = localhost
+
+# The http port to use
+serverPort = 9084
+
+#################################### Logging ##################################
+[logging]
+# 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 file name (Default: zserver.log)
+logFile = zserver.log

tests/test_params.py

@@ -1,31 +1,25 @@
-import os
+from source.confParser import parse_defaults_from_config_file
 
 
 def test_case01():
-    result = os.system("python ./source/zimonGrafanaIntf.py")
-    assert result == 0
-
+    result = parse_defaults_from_config_file()
+    assert isinstance(result, dict)
 
 def test_case02():
-    result = os.system("python ./source/zimonGrafanaIntf.py --port 4242")
-    assert result == 0
-
+    result = parse_defaults_from_config_file()
+    assert len(result.keys()) > 0
 
 def test_case03():
-    result = os.system("python ./source/zimonGrafanaIntf.py -c 10")
-    assert result == 0
-
+    result = parse_defaults_from_config_file()
+    elements = list(result.keys())
+    mandatoryItems = ['port','serverport']
+    assert all(item in elements for item in mandatoryItems)
 
 def test_case04():
-    result = os.system("python ./source/zimonGrafanaIntf.py --port 8443")
-    assert result > 0
-
+    result = parse_defaults_from_config_file()
+    value = int(result['port'])
+    assert value == 4242
 
 def test_case05():
-    result = os.system('python ./source/zimonGrafanaIntf.py --port 8443 --tlsKeyPath "/tmp"')
-    assert result > 0
-
-
-def test_case06():
-    result = os.system('python ./source/zimonGrafanaIntf.py -a 2')
-    assert result > 0
+    result = parse_defaults_from_config_file()
+    assert int(result['port']) == 4242 and int(result['serverport']) == 9084