X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ftest%2Ftestapi%2Fopnfv_testapi%2Fcommon%2Fconfig.py;h=f888b07be386e82850236eee16a53bb7f181bb5b;hb=690b3d6ea4882a44c0a7fcbfc9076db0debebfdf;hp=4cd53c6190b50c753a0a4c8624c45d0cb3ac109e;hpb=5546db4ff1d6242250fa2b878e841c16c3be6637;p=releng.git

diff --git a/utils/test/testapi/opnfv_testapi/common/config.py b/utils/test/testapi/opnfv_testapi/common/config.py
index 4cd53c619..f888b07be 100644
--- a/utils/test/testapi/opnfv_testapi/common/config.py
+++ b/utils/test/testapi/opnfv_testapi/common/config.py
@@ -16,14 +16,10 @@ import sys
 class Config(object):
 
     def __init__(self):
-        self.config_file = None
+        self.config_file = '/etc/opnfv_testapi/config.ini'
         self._set_config_file()
         self._parse()
         self._parse_per_page()
-        self.static_path = os.path.join(
-            os.path.dirname(os.path.normpath(__file__)),
-            os.pardir,
-            'static')
 
     def _parse(self):
         if not os.path.exists(self.config_file):
@@ -48,7 +44,7 @@ class Config(object):
     def _parse_value(value):
         try:
             value = int(value)
-        except:
+        except Exception:
             if str(value).lower() == 'true':
                 value = True
             elif str(value).lower() == 'false':
@@ -56,23 +52,12 @@ class Config(object):
         return value
 
     def _set_config_file(self):
-        if not self._set_sys_config_file():
-            self._set_default_config_file()
-
-    def _set_sys_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)
-        try:
+        if hasattr(args, 'config_file') and args.config_file:
             self.config_file = args.config_file
-        finally:
-            return self.config_file is not None
-
-    def _set_default_config_file(self):
-        is_venv = os.getenv('VIRTUAL_ENV')
-        self.config_file = os.path.join('/' if not is_venv else is_venv,
-                                        'etc/opnfv_testapi/config.ini')
 
 
 CONF = Config()