X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Ftest%2Ftestapi%2Fopnfv_testapi%2Fcommon%2Fconfig.py;h=45e134fc17a05c2f85ae738886982332e24496d2;hb=c9663a366bab59d56f938dbfb9d8eb0dffafebfc;hp=84a127391436a65fef7c6d403a4ff8eafd5171e1;hpb=914c2788ae0f240c1a7a4e060213c531a602d6c7;p=releng.git

diff --git a/utils/test/testapi/opnfv_testapi/common/config.py b/utils/test/testapi/opnfv_testapi/common/config.py
index 84a127391..45e134fc1 100644
--- a/utils/test/testapi/opnfv_testapi/common/config.py
+++ b/utils/test/testapi/opnfv_testapi/common/config.py
@@ -8,6 +8,7 @@
 # feng.xiaowei@zte.com.cn remove prepare_put_request            5-30-2016
 ##############################################################################
 import ConfigParser
+import os
 
 
 class ParseError(Exception):
@@ -42,13 +43,13 @@ class APIConfig:
         try:
             return self._parser.get(section, param)
         except ConfigParser.NoOptionError:
-            raise ParseError("[%s.%s] parameter not found" % (section, param))
+            raise ParseError("No parameter: [%s.%s]" % (section, param))
 
     def _get_int_parameter(self, section, param):
         try:
             return int(self._get_parameter(section, param))
         except ValueError:
-            raise ParseError("[%s.%s] not an int" % (section, param))
+            raise ParseError("Not int: [%s.%s]" % (section, param))
 
     def _get_bool_parameter(self, section, param):
         result = self._get_parameter(section, param)
@@ -58,7 +59,7 @@ class APIConfig:
             return False
 
         raise ParseError(
-            "[%s.%s : %s] not a boolean" % (section, param, result))
+            "Not boolean: [%s.%s : %s]" % (section, param, result))
 
     @staticmethod
     def parse(config_location=None):
@@ -67,10 +68,11 @@ class APIConfig:
         if config_location is None:
             config_location = obj._default_config_location
 
+        if not os.path.exists(config_location):
+            raise ParseError("%s not found" % config_location)
+
         obj._parser = ConfigParser.SafeConfigParser()
         obj._parser.read(config_location)
-        if not obj._parser:
-            raise ParseError("%s not found" % config_location)
 
         # Linking attributes to keys from file with their sections
         obj.mongo_url = obj._get_parameter("mongo", "url")
@@ -84,15 +86,3 @@ class APIConfig:
         obj.swagger_base_url = obj._get_parameter("swagger", "base_url")
 
         return obj
-
-    def __str__(self):
-        return "mongo_url = %s \n" \
-               "mongo_dbname = %s \n" \
-               "api_port = %s \n" \
-               "api_debug_on = %s \n" \
-               "swagger_base_url = %s \n" % (self.mongo_url,
-                                             self.mongo_dbname,
-                                             self.api_port,
-                                             self.api_debug_on,
-                                             self.api_authenticate_on,
-                                             self.swagger_base_url)