X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Futils%2Fenv.py;h=110164bee94cca8ecb559fb88bd972dd3ed6b032;hb=14b025cc9ca739957553d3fede7803be78a1a2cf;hp=d7b396eaa11b4cd7b16800d1b023042e7c86bbb3;hpb=7c3035d0b2ac3e2fdec39c77028804247c1013d9;p=functest.git

diff --git a/functest/utils/env.py b/functest/utils/env.py
index d7b396eaa..110164bee 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -1,51 +1,46 @@
 #!/usr/bin/env python
 
-import pkg_resources
+# pylint: disable=missing-docstring
+
 import os
 import re
 
+import pkg_resources
 import six
 
 
-default_envs = {
-    'NODE_NAME': 'unknown_pod',
-    'CI_DEBUG': 'false',
-    'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha',
-    'DEPLOY_TYPE': 'virt',
-    'INSTALLER_TYPE': None,
-    'INSTALLER_IP': None,
-    'BUILD_TAG': None,
-    'OS_ENDPOINT_TYPE': None,
-    'OS_AUTH_URL': None,
-    'CONFIG_FUNCTEST_YAML': pkg_resources.resource_filename(
-        'functest', 'ci/config_functest.yaml'),
-    'OS_INSECURE': ''
-}
+class Environment(object):  # pylint: disable=too-few-public-methods
 
-
-class Environment(object):
+    default_envs = {
+        'NODE_NAME': 'unknown_pod',
+        'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha',
+        'DEPLOY_TYPE': 'virt',
+        'INSTALLER_TYPE': None,
+        'INSTALLER_IP': None,
+        'BUILD_TAG': None,
+        'OS_ENDPOINT_TYPE': None,
+        'OS_AUTH_URL': None,
+        'CONFIG_FUNCTEST_YAML': pkg_resources.resource_filename(
+            'functest', 'ci/config_functest.yaml'),
+        'OS_INSECURE': '',
+        'OS_REGION_NAME': 'RegionOne'
+    }
 
     def __init__(self):
-        for k, v in six.iteritems(os.environ):
-            self.__setattr__(k, v)
-        for k, v in six.iteritems(default_envs):
-            if k not in os.environ:
-                self.__setattr__(k, v)
-        self._set_ci_run()
+        for key, value in six.iteritems(os.environ):
+            setattr(self, key, value)
+        for key, value in six.iteritems(self.default_envs):
+            if key not in os.environ:
+                setattr(self, key, value)
         if 'CI_LOOP' not in os.environ:
             self._set_ci_loop()
 
-    def _set_ci_run(self):
-        if self.BUILD_TAG:
-            self.IS_CI_RUN = True
-        else:
-            self.IS_CI_RUN = False
-
     def _set_ci_loop(self):
-        if self.BUILD_TAG and re.search("daily", self.BUILD_TAG):
-            self.CI_LOOP = "daily"
+        if (getattr(self, "BUILD_TAG") and
+                re.search("daily", getattr(self, "BUILD_TAG"))):
+            setattr(self, "CI_LOOP", "daily")
         else:
-            self.CI_LOOP = "weekly"
+            setattr(self, "CI_LOOP", "weekly")
 
 
 ENV = Environment()