X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ftest%2Ftestapi%2Fopnfv_testapi%2Fcommon%2Fconfig.py;h=140e49283390b614f6214b1f0da476c3b4f0b626;hb=ca6539a8f8c7f608623cdd578d2d606322f06370;hp=362fca6408956584cf7bf76929e49cde8a7e341f;hpb=eab89fda5f0fde5b8c608b7facb3f8d45970a8ec;p=releng.git

diff --git a/utils/test/testapi/opnfv_testapi/common/config.py b/utils/test/testapi/opnfv_testapi/common/config.py
index 362fca640..140e49283 100644
--- a/utils/test/testapi/opnfv_testapi/common/config.py
+++ b/utils/test/testapi/opnfv_testapi/common/config.py
@@ -8,86 +8,56 @@
 # feng.xiaowei@zte.com.cn remove prepare_put_request            5-30-2016
 ##############################################################################
 import ConfigParser
+import argparse
 import os
+import sys
 
 
-class ParseError(Exception):
-    """
-    Custom exception class for config file
-    """
-
-    def __init__(self, message):
-        self.msg = message
-
-    def __str__(self):
-        return 'error parsing config file : %s' % self.msg
-
-
-class APIConfig(object):
-    """
-    The purpose of this class is to load values correctly from the config file.
-    Each key is declared as an attribute in __init__() and linked in parse()
-    """
+class Config(object):
 
     def __init__(self):
-        self._set_default_config()
-        self.mongo_url = None
-        self.mongo_dbname = None
-        self.api_port = None
-        self.api_debug_on = None
-        self.api_authenticate_on = None
-        self._parser = None
-        self.swagger_base_url = None
+        self.config_file = '/etc/opnfv_testapi/config.ini'
+        self._set_config_file()
+        self._parse()
+        self._parse_per_page()
 
-    def _set_default_config(self):
-        venv = os.getenv('VIRTUAL_ENV')
-        self._default_config = os.path.join('/' if not venv else venv,
-                                            'etc/opnfv_testapi/config.ini')
+    def _parse(self):
+        if not os.path.exists(self.config_file):
+            raise Exception("%s not found" % self.config_file)
 
-    def _get_parameter(self, section, param):
-        try:
-            return self._parser.get(section, param)
-        except ConfigParser.NoOptionError:
-            raise ParseError("No parameter: [%s.%s]" % (section, param))
+        config = ConfigParser.RawConfigParser()
+        config.read(self.config_file)
+        self._parse_section(config)
 
-    def _get_int_parameter(self, section, param):
-        try:
-            return int(self._get_parameter(section, param))
-        except ValueError:
-            raise ParseError("Not int: [%s.%s]" % (section, param))
+    def _parse_section(self, config):
+        [self._parse_item(config, section) for section in (config.sections())]
 
-    def _get_bool_parameter(self, section, param):
-        result = self._get_parameter(section, param)
-        if str(result).lower() == 'true':
-            return True
-        if str(result).lower() == 'false':
-            return False
+    def _parse_item(self, config, section):
+        [setattr(self, '{}_{}'.format(section, k), self._parse_value(v))
+         for k, v in config.items(section)]
 
-        raise ParseError(
-            "Not boolean: [%s.%s : %s]" % (section, param, result))
+    def _parse_per_page(self):
+        if not hasattr(self, 'api_results_per_page'):
+            self.api_results_per_page = 20
 
     @staticmethod
-    def parse(config_location=None):
-        obj = APIConfig()
-
-        if config_location is None:
-            config_location = obj._default_config
-
-        if not os.path.exists(config_location):
-            raise ParseError("%s not found" % config_location)
-
-        obj._parser = ConfigParser.SafeConfigParser()
-        obj._parser.read(config_location)
-
-        # Linking attributes to keys from file with their sections
-        obj.mongo_url = obj._get_parameter("mongo", "url")
-        obj.mongo_dbname = obj._get_parameter("mongo", "dbname")
-
-        obj.api_port = obj._get_int_parameter("api", "port")
-        obj.api_debug_on = obj._get_bool_parameter("api", "debug")
-        obj.api_authenticate_on = obj._get_bool_parameter("api",
-                                                          "authenticate")
-
-        obj.swagger_base_url = obj._get_parameter("swagger", "base_url")
-
-        return obj
+    def _parse_value(value):
+        try:
+            value = int(value)
+        except:
+            if str(value).lower() == 'true':
+                value = True
+            elif str(value).lower() == 'false':
+                value = False
+        return value
+
+    def _set_config_file(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument("-c", "--config-file", dest='config_file',
+                            help="Config file location", metavar="FILE")
+        args, _ = parser.parse_known_args(sys.argv)
+        if hasattr(args, 'config_file') and args.config_file:
+            self.config_file = args.config_file
+
+
+CONF = Config()