[odl-sfc] Add timeout to get_vnf_id and create_vnf functions

[functest.git] / functest / utils / config.py

diff --git a/functest/utils/config.py b/functest/utils/config.py
index 4cee634..84166c1 100644 (file)
--- a/functest/utils/config.py
+++ b/functest/utils/config.py
@@ -11,20 +11,25 @@ class Config(object):
         try:
             with open(self.config_functest) as f:
                 self.functest_yaml = yaml.safe_load(f)
-                self.parse(None, self.functest_yaml)
+                self._parse(None, self.functest_yaml)
         except:
             raise Exception('Parse {} failed'.format(self.config_functest))
+        self._set_others()
 
-    def parse(self, attr_now, left_parametes):
+    def _parse(self, attr_now, left_parametes):
         for param_n, param_v in left_parametes.iteritems():
-            attr_further = self.get_attr_further(attr_now, param_n)
+            attr_further = self._get_attr_further(attr_now, param_n)
             if not isinstance(param_v, dict):
                 self.__setattr__(attr_further, param_v)
             else:
-                self.parse(attr_further, param_v)
+                self._parse(attr_further, param_v)
 
-    def get_attr_further(self, attr_now, next):
+    def _get_attr_further(self, attr_now, next):
         return attr_now if next == 'general' else (
             '{}_{}'.format(attr_now, next) if attr_now else next)
 
+    def _set_others(self):
+        self.env_active = os.path.join(self.dir_functest_conf, "env_active")
+
+
 CONF = Config()