diff options
| -rwxr-xr-x | functest/ci/config_functest.yaml | 5 | ||||
| -rwxr-xr-x | functest/ci/testcases.yaml | 56 | ||||
| -rw-r--r-- | functest/core/pytest_suite_runner.py | 56 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/__init__.py | 0 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/api_check.py | 31 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/connection_check.py | 31 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/smoke.py | 40 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/snaps_utils.py | 22 | ||||
| -rw-r--r-- | functest/utils/functest_utils.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 |
10 files changed, 243 insertions, 2 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index c75afdaf..0da2bb8f 100755 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -26,6 +26,7 @@ general: dir_repo_ovno: /home/opnfv/repos/ovno
dir_repo_parser: /home/opnfv/repos/parser
dir_repo_domino: /home/opnfv/repos/domino
+ dir_repo_snaps: /home/opnfv/repos/snaps
dir_functest: /home/opnfv/functest
dir_functest_test: /home/opnfv/repos/functest/functest/opnfv_tests
dir_results: /home/opnfv/functest/results
@@ -64,6 +65,10 @@ healthcheck: disk_format: qcow2
wait_time: 60
+snaps:
+ use_keystone: True
+ use_floating_ips: False
+
vping:
ping_timeout: 200
vm_flavor: m1.tiny # adapt to your environment
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index d483e589..56ca4017 100755 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -19,6 +19,42 @@ tiers: installer: '' scenario: '^((?!lxd).)*$' + - + name: connection_check + criteria: 'status == "PASS"' + blocking: true + description: >- + This test case verifies the retrieval of OpenStack clients: + Keystone, Glance, Neutron and Nova and may perform some + simple queries. When the config value of + snaps.use_keystone is True, functest must have access to + the cloud's private network. + + dependencies: + installer: '' + scenario: '' + run: + module: 'functest.opnfv_tests.openstack.snaps.connection_check' + class: 'ConnectionCheck' + + - + name: api_check + criteria: 'status == "PASS"' + blocking: true + description: >- + This test case verifies the retrieval of OpenStack clients: + Keystone, Glance, Neutron and Nova and may perform some + simple queries. When the config value of + snaps.use_keystone is True, functest must have access to + the cloud's private network. + + dependencies: + installer: '' + scenario: '' + run: + module: 'functest.opnfv_tests.openstack.snaps.api_check' + class: 'ApiCheck' + - name: smoke order: 1 @@ -106,6 +142,26 @@ tiers: installer: '' scenario: 'onos' + - + name: snaps_smoke + criteria: 'status == "PASS"' + blocking: true + description: >- + This test case contains tests that setup and destroy + environments with VMs with and without Floating IPs + with a newly created user and project. Set the config + value snaps.use_floating_ips (True|False) to toggle + this functionality. When the config value of + snaps.use_keystone is True, functest must have access to + the cloud's private network. + + dependencies: + installer: '' + scenario: '' + run: + module: 'functest.opnfv_tests.openstack.snaps.smoke' + class: 'SnapsSmoke' + - name: features order: 2 diff --git a/functest/core/pytest_suite_runner.py b/functest/core/pytest_suite_runner.py new file mode 100644 index 00000000..ba372c3b --- /dev/null +++ b/functest/core/pytest_suite_runner.py @@ -0,0 +1,56 @@ +#!/usr/bin/python +# +# Copyright (c) 2015 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 + +from functest.core import TestCasesBase +import unittest +import time + + +class PyTestSuiteRunner(TestCasesBase.TestCasesBase): + """ + This superclass is designed to execute pre-configured unittest.TestSuite() + objects + """ + def __init__(self): + super(PyTestSuiteRunner, self).__init__() + self.suite = None + + def run(self, **kwargs): + """ + Starts test execution from the functest framework + """ + start_time = time.time() + result = unittest.TextTestRunner(verbosity=2).run(self.suite) + end_time = time.time() + + if result.errors: + self.logger.error('Number of errors in test suite - ' + + str(len(result.errors))) + for test, message in result.errors: + self.logger.error(str(test) + " ERROR with " + message) + + if result.failures: + self.logger.error('Number of failures in test suite - ' + + str(len(result.failures))) + for test, message in result.failures: + self.logger.error(str(test) + " FAILED with " + message) + + if (result.errors and len(result.errors) > 0) \ + or (result.failures and len(result.failures) > 0): + self.logger.info("%s FAILED" % self.case_name) + self.criteria = 'FAIL' + exit_code = TestCasesBase.TestCasesBase.EX_RUN_ERROR + else: + self.logger.info("%s OK" % self.case_name) + exit_code = TestCasesBase.TestCasesBase.EX_OK + + self.details = {'timestart': start_time, + 'duration': round(end_time - start_time, 1), + 'status': self.criteria} + return exit_code diff --git a/functest/opnfv_tests/openstack/snaps/__init__.py b/functest/opnfv_tests/openstack/snaps/__init__.py new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/functest/opnfv_tests/openstack/snaps/__init__.py diff --git a/functest/opnfv_tests/openstack/snaps/api_check.py b/functest/opnfv_tests/openstack/snaps/api_check.py new file mode 100644 index 00000000..e6ee81e9 --- /dev/null +++ b/functest/opnfv_tests/openstack/snaps/api_check.py @@ -0,0 +1,31 @@ +# Copyright (c) 2015 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 + +import functest.utils.functest_utils as ft_utils +from functest.core.pytest_suite_runner import PyTestSuiteRunner +from functest.opnfv_tests.openstack.snaps import snaps_utils +from snaps import test_suite_builder +import unittest + + +class ApiCheck(PyTestSuiteRunner): + """ + This test executes the Python Tests included with the SNAPS libraries + that exercise many of the OpenStack APIs within Keystone, Glance, Neutron, + and Nova + """ + def __init__(self): + super(ApiCheck, self).__init__() + + self.suite = unittest.TestSuite() + creds_file = ft_utils.get_functest_config('general.openstack.creds') + use_key = ft_utils.get_functest_config('snaps.use_keystone') + ext_net_name = snaps_utils.get_ext_net_name() + + test_suite_builder.add_openstack_api_tests(self.suite, creds_file, + ext_net_name, + use_keystone=use_key) diff --git a/functest/opnfv_tests/openstack/snaps/connection_check.py b/functest/opnfv_tests/openstack/snaps/connection_check.py new file mode 100644 index 00000000..42e38d67 --- /dev/null +++ b/functest/opnfv_tests/openstack/snaps/connection_check.py @@ -0,0 +1,31 @@ +# Copyright (c) 2015 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 + +import functest.utils.functest_utils as ft_utils +from functest.core.pytest_suite_runner import PyTestSuiteRunner +from functest.opnfv_tests.openstack.snaps import snaps_utils +from snaps import test_suite_builder +import unittest + + +class ConnectionCheck(PyTestSuiteRunner): + """ + This test executes the Python Tests included with the SNAPS libraries + that simply obtain the different OpenStack clients and may perform + simple queries + """ + def __init__(self): + super(ConnectionCheck, self).__init__() + + self.suite = unittest.TestSuite() + creds_file = ft_utils.get_functest_config('general.openstack.creds') + use_key = ft_utils.get_functest_config('snaps.use_keystone') + ext_net_name = snaps_utils.get_ext_net_name() + + test_suite_builder.add_openstack_client_tests(self.suite, creds_file, + ext_net_name, + use_keystone=use_key) diff --git a/functest/opnfv_tests/openstack/snaps/smoke.py b/functest/opnfv_tests/openstack/snaps/smoke.py new file mode 100644 index 00000000..25433a32 --- /dev/null +++ b/functest/opnfv_tests/openstack/snaps/smoke.py @@ -0,0 +1,40 @@ +# Copyright (c) 2015 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 + +import functest.utils.functest_utils as ft_utils +from functest.core.pytest_suite_runner import PyTestSuiteRunner +from functest.opnfv_tests.openstack.snaps import snaps_utils +from snaps import test_suite_builder +import unittest +import os + + +class SnapsSmoke(PyTestSuiteRunner): + """ + This test executes the Python Tests included with the SNAPS libraries + that exercise many of the OpenStack APIs within Keystone, Glance, Neutron, + and Nova + """ + def __init__(self): + super(SnapsSmoke, self).__init__() + + self.suite = unittest.TestSuite() + creds_file = ft_utils.get_functest_config('general.openstack.creds') + use_key = ft_utils.get_functest_config('snaps.use_keystone') + use_fip = ft_utils.get_functest_config('snaps.use_floating_ips') + ext_net_name = snaps_utils.get_ext_net_name() + + # Tests requiring floating IPs leverage files contained within the + # SNAPS repository and are found relative to that path + if use_fip: + snaps_dir = ft_utils.get_functest_config( + 'general.directories.dir_repo_snaps') + '/snaps' + os.chdir(snaps_dir) + + test_suite_builder.add_openstack_integration_tests( + self.suite, creds_file, ext_net_name, use_keystone=use_key, + use_floating_ips=use_fip) diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py new file mode 100644 index 00000000..a25ad3e0 --- /dev/null +++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py @@ -0,0 +1,22 @@ +# Copyright (c) 2015 All rights reserved +# This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# +# http://www.apache.org/licenses/LICENSE-2.0 + +import functest.utils.functest_utils as ft_utils +from snaps.openstack.tests import openstack_tests +from snaps.openstack.utils import neutron_utils + + +def get_ext_net_name(): + """ + Returns the first external network name + :return: + """ + os_env_file = ft_utils.get_functest_config('general.openstack.creds') + os_creds = openstack_tests.get_credentials(os_env_file=os_env_file) + neutron = neutron_utils.neutron_client(os_creds) + ext_nets = neutron_utils.get_external_networks(neutron) + return ext_nets[0]['network']['name'] diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index a25967b6..5e204687 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -436,7 +436,7 @@ def check_test_result(test_name, ret, start_time, stop_time): def get_testcases_file_dir(): - return "/home/opnfv/repos/functest/functest/ci/testcases.yaml" + return get_functest_config('general.functest.testcases_yaml') def get_functest_yaml(): diff --git a/requirements.txt b/requirements.txt index e4d2877c..88d0d7de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ python-neutronclient==6.0.0 python-congressclient==1.5.0 virtualenv==1.11.4 pexpect==4.0 -requests==2.8.0 +requests>=2.8.0 robotframework==2.9.1 robotframework-requests==0.3.8 robotframework-sshlibrary==2.1.1 |