Get properly env vars or their default values

It defines env.get() as an unique way to get Functest env vars or
their default values. It can be considered as a wrapper above os.environ.

It enforces backward compatibility via CONST which mustn't be used
for that purpose. It should be noted that it also stops using CONST
for getting OpenStack env vars.

Change-Id: I333dc1afbc0123166a7eaff8b551370098efa341
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/functest/cli/commands/cli_env.py b/functest/cli/commands/cli_env.py
index f93ef612c..18c8895ae 100644
--- a/functest/cli/commands/cli_env.py
+++ b/functest/cli/commands/cli_env.py
@@ -8,21 +8,21 @@
 
 # pylint: disable=missing-docstring
 
-import os
-
 import click
 import prettytable
 import six
 
+from functest.utils import env
+
 
 class Env(object):  # pylint: disable=too-few-public-methods
 
     @staticmethod
     def show():
-        install_type = os.environ.get('INSTALLER_TYPE', 'Unknown')
-        scenario = os.environ.get('DEPLOY_SCENARIO', 'Unknown')
-        node = os.environ.get('NODE_NAME', 'Unknown')
-        build_tag = os.environ.get('BUILD_TAG', None)
+        install_type = env.get('INSTALLER_TYPE')
+        scenario = env.get('DEPLOY_SCENARIO')
+        node = env.get('NODE_NAME')
+        build_tag = env.get('BUILD_TAG')
         if build_tag:
             build_tag = build_tag.lstrip(
                 "jenkins-").lstrip("functest").lstrip("-")