diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-03-19 14:19:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-19 14:19:16 +0000 |
| commit | abf33b5d34225408fd882e455c86c36e0493c5e5 (patch) | |
| tree | e3fd0503190d6f76f0f7e9cb97bfa010e6a75e22 | |
| parent | 9c3b1a031a1467baf97c4b76c94be1f68444ec7a (diff) | |
| parent | 5f5736d76e79bd3dccc2db1285ca9a6e8d1021bd (diff) | |
Merge "Add support for Compass installer"
| -rw-r--r-- | sfc/tests/functest/config.yaml | 3 | ||||
| -rw-r--r-- | sfc/tests/functest/run_sfc_tests.py | 2 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc_chain_deletion.py | 2 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc_one_chain_two_service_functions.py | 2 | ||||
| -rw-r--r-- | sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/sfc/tests/functest/config.yaml b/sfc/tests/functest/config.yaml index 5bbba65f..3cd1883a 100644 --- a/sfc/tests/functest/config.yaml +++ b/sfc/tests/functest/config.yaml @@ -17,6 +17,9 @@ defaults: osa: user: root pkey_file: "/root/.ssh/id_rsa" + compass: + user: root + pkey_file: "/root/.ssh/id_rsa" image_format: qcow2 image_url: "http://artifacts.opnfv.org/sfc/images/sfc_nsh_fraser.qcow2" vnfd-dir: "vnfd-templates" diff --git a/sfc/tests/functest/run_sfc_tests.py b/sfc/tests/functest/run_sfc_tests.py index a9aba67f..6c4a86d3 100644 --- a/sfc/tests/functest/run_sfc_tests.py +++ b/sfc/tests/functest/run_sfc_tests.py @@ -104,7 +104,7 @@ class SfcFunctest(testcase.TestCase): 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" or "compass": pass else: raise Exception('Unsupported installer') diff --git a/sfc/tests/functest/sfc_chain_deletion.py b/sfc/tests/functest/sfc_chain_deletion.py index d4d7590a..cef56761 100644 --- a/sfc/tests/functest/sfc_chain_deletion.py +++ b/sfc/tests/functest/sfc_chain_deletion.py @@ -42,7 +42,7 @@ def main(): installer_type = os.environ.get("INSTALLER_TYPE") - supported_installers = ['fuel', 'apex', 'osa'] + supported_installers = ['fuel', 'apex', 'osa', 'compass'] if installer_type not in supported_installers: logger.error( 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 6e541b4b..58323bf3 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', 'compass'] 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 217c14e1..5c5abb33 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', 'compass'] if installer_type not in supported_installers: logger.error( |