From 191b33f219150f30f67ee91ef568ac390c7b1a58 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Wed, 4 Oct 2017 18:07:06 +0200 Subject: Do not use capital letters As agreed with the releng-xci guys, we should not use capital letters to refer to openstack-ansible (osa) Change-Id: I634747b07e72513f751cde3eb33f3b4bad5c176d Signed-off-by: Manuel Buil --- sfc/tests/functest/config.yaml | 2 +- sfc/tests/functest/run_sfc_tests.py | 2 +- sfc/tests/functest/sfc_one_chain_two_service_functions.py | 2 +- sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sfc/tests/functest/config.yaml b/sfc/tests/functest/config.yaml index 2957c596..8c4f9775 100644 --- a/sfc/tests/functest/config.yaml +++ b/sfc/tests/functest/config.yaml @@ -15,7 +15,7 @@ defaults: apex: user: stack pkey_file: "/root/.ssh/id_rsa" - OSA: + osa: user: root pkey_file: "/root/.ssh/id_rsa" image_format: qcow2 diff --git a/sfc/tests/functest/run_sfc_tests.py b/sfc/tests/functest/run_sfc_tests.py index fc866b79..20d9193c 100644 --- a/sfc/tests/functest/run_sfc_tests.py +++ b/sfc/tests/functest/run_sfc_tests.py @@ -105,7 +105,7 @@ class SfcFunctest(testcase.OSGCTestCase): self.__disable_heat_resource_finder_cache_apex(controllers) elif installer_type == "fuel": self.__disable_heat_resource_finder_cache_fuel(controllers) - elif installer_type == "OSA": + elif installer_type == "osa": pass else: raise Exception('Unsupported installer') diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions.py b/sfc/tests/functest/sfc_one_chain_two_service_functions.py index 60190a6d..e9569a66 100644 --- a/sfc/tests/functest/sfc_one_chain_two_service_functions.py +++ b/sfc/tests/functest/sfc_one_chain_two_service_functions.py @@ -43,7 +43,7 @@ def main(): installer_type = os.environ.get("INSTALLER_TYPE") - supported_installers = ['fuel', 'apex', 'OSA'] + supported_installers = ['fuel', 'apex', 'osa'] if installer_type not in supported_installers: logger.error( diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py index dc41ac2e..a06916d2 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -42,7 +42,7 @@ def main(): installer_type = os.environ.get("INSTALLER_TYPE") - supported_installers = ['fuel', 'apex', 'OSA'] + supported_installers = ['fuel', 'apex', 'osa'] if installer_type not in supported_installers: logger.error( -- cgit 1.2.3-korg