aboutsummaryrefslogtreecommitdiffstats
path: root/functest
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-02-13 20:36:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-13 20:36:01 +0000
commite3299f119c93a57e00d1aaeeb1f7073a1adf7b87 (patch)
treed2d5fe3e3afcb3f86343947957db0b18786f7452 /functest
parent7ccd4189200f3fc1bf1429ea4fb7e6001bce7803 (diff)
parent0424a6d98739ac7499c28799570ea8a625c0779c (diff)
Merge "Remove INSTALLER_IP from Functest"
Diffstat (limited to 'functest')
-rw-r--r--functest/cli/commands/cli_env.py4
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py1
-rw-r--r--functest/tests/unit/cli/commands/test_cli_env.py6
-rw-r--r--functest/tests/unit/cli/commands/test_cli_os.py1
-rw-r--r--functest/utils/env.py1
5 files changed, 1 insertions, 12 deletions
diff --git a/functest/cli/commands/cli_env.py b/functest/cli/commands/cli_env.py
index a5c0e399..f93ef612 100644
--- a/functest/cli/commands/cli_env.py
+++ b/functest/cli/commands/cli_env.py
@@ -20,8 +20,6 @@ class Env(object): # pylint: disable=too-few-public-methods
@staticmethod
def show():
install_type = os.environ.get('INSTALLER_TYPE', 'Unknown')
- installer_ip = os.environ.get('INSTALLER_IP', 'Unknown')
- installer_info = ("%s, %s" % (install_type, installer_ip))
scenario = os.environ.get('DEPLOY_SCENARIO', 'Unknown')
node = os.environ.get('NODE_NAME', 'Unknown')
build_tag = os.environ.get('BUILD_TAG', None)
@@ -29,7 +27,7 @@ class Env(object): # pylint: disable=too-few-public-methods
build_tag = build_tag.lstrip(
"jenkins-").lstrip("functest").lstrip("-")
- env_info = {'INSTALLER': installer_info,
+ env_info = {'INSTALLER': install_type,
'SCENARIO': scenario,
'POD': node,
'BUILD_TAG': build_tag}
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index efcbe7fd..f128784c 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -52,7 +52,6 @@ TEST_ACCOUNTS_FILE = pkg_resources.resource_filename(
'opnfv_tests/openstack/tempest/custom_tests/test_accounts.yaml')
CI_INSTALLER_TYPE = CONST.__getattribute__('INSTALLER_TYPE')
-CI_INSTALLER_IP = CONST.__getattribute__('INSTALLER_IP')
""" logging configuration """
LOGGER = logging.getLogger(__name__)
diff --git a/functest/tests/unit/cli/commands/test_cli_env.py b/functest/tests/unit/cli/commands/test_cli_env.py
index d17da166..7d6f7787 100644
--- a/functest/tests/unit/cli/commands/test_cli_env.py
+++ b/functest/tests/unit/cli/commands/test_cli_env.py
@@ -36,9 +36,6 @@ class CliEnvTesting(unittest.TestCase):
if var == 'INSTALLER_TYPE':
os.environ['INSTALLER_TYPE'] = ''
reg_string = r"| INSTALLER: Unknown, \S+\s*|"
- elif var == 'INSTALLER_IP':
- os.environ['INSTALLER_IP'] = ''
- reg_string = r"| INSTALLER: \S+, Unknown\s*|"
elif var == 'SCENARIO':
os.environ['DEPLOY_SCENARIO'] = ''
reg_string = r"| SCENARIO: Unknown\s*|"
@@ -57,9 +54,6 @@ class CliEnvTesting(unittest.TestCase):
def test_show_ci_installer_type_ko(self, *args):
self._test_show_missing_env_var('INSTALLER_TYPE', *args)
- def test_show_ci_installer_ip_ko(self, *args):
- self._test_show_missing_env_var('INSTALLER_IP', *args)
-
def test_show_missing_ci_scenario(self, *args):
self._test_show_missing_env_var('SCENARIO', *args)
diff --git a/functest/tests/unit/cli/commands/test_cli_os.py b/functest/tests/unit/cli/commands/test_cli_os.py
index 02392d2d..a5e562a2 100644
--- a/functest/tests/unit/cli/commands/test_cli_os.py
+++ b/functest/tests/unit/cli/commands/test_cli_os.py
@@ -23,7 +23,6 @@ class CliOpenStackTesting(unittest.TestCase):
self.endpoint_ip = 'test_ip'
self.os_auth_url = 'http://test_ip:test_port/v2.0'
self.installer_type = 'test_installer_type'
- self.installer_ip = 'test_installer_ip'
self.openstack_creds = 'test_env_file'
self.snapshot_file = 'test_snapshot_file'
os.environ["OS_AUTH_URL"] = ''
diff --git a/functest/utils/env.py b/functest/utils/env.py
index 110164be..b626473a 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -16,7 +16,6 @@ class Environment(object): # pylint: disable=too-few-public-methods
'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,