diff options
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 4 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/refstack_client/refstack_client.py | 7 | ||||
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 17 | ||||
| -rw-r--r-- | functest/tests/unit/odl/test_odl.py | 29 | ||||
| -rw-r--r-- | functest/tests/unit/openstack/refstack_client/test_refstack_client.py | 51 |
6 files changed, 77 insertions, 35 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 603bc38b9..6e5161c34 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,9 +14,10 @@ LABEL version="0.1" description="OPNFV Functest Docker container" # Environment variables ARG BRANCH=master ARG RALLY_TAG=stable/0.9 -ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940 +ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2 ARG OPENSTACK_TAG=stable/ocata ARG VIMS_TAG=stable +ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 ARG REPOS_DIR=/home/opnfv/repos ARG FUNCTEST_BASE_DIR=/home/opnfv/functest ARG FUNCTEST_CONF_DIR=${FUNCTEST_BASE_DIR}/conf @@ -82,6 +83,7 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \ update-requirements -s --source /src/openstack-requirements /src/rally && \ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ + (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/refstack-client && \ pip install --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 3b1e8d2e7..abf1714b4 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -2,14 +2,16 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/ocata -ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940 +ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2 ARG FDS_TAG=master +ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2 COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev git && \ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ + (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \ pip install --no-cache-dir --src /src \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py index 10ffddf54..42befe221 100644 --- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py +++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py @@ -1,6 +1,7 @@ #!/usr/bin/env python + # Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. -# matthew.lijun@huawei.com wangwulin@huawei.com +# # 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 @@ -10,7 +11,6 @@ from __future__ import division - import argparse import logging import os @@ -29,6 +29,9 @@ from functest.opnfv_tests.openstack.tempest import conf_utils from functest.utils.constants import CONST import functest.utils.functest_utils as ft_utils +__author__ = ("Matthew Li <matthew.lijun@huawei.com>," + "Linda Wang <wangwulin@huawei.com>") + # logging configuration """ LOGGER = logging.getLogger(__name__) diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index ab70ba107..d09532cb0 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -157,7 +157,11 @@ class ODLTests(testcase.TestCase): 'NEUTRON:' + kwargs['neutronip'], 'OS_AUTH_URL:"' + osauthurl + '"', 'OSUSERNAME:"' + kwargs['osusername'] + '"', + ('OSUSERDOMAINNAME:"' + + kwargs['osuserdomainname'] + '"'), 'OSTENANTNAME:"' + kwargs['ostenantname'] + '"', + ('OSPROJECTDOMAINNAME:"' + + kwargs['osprojectdomainname'] + '"'), 'OSPASSWORD:"' + kwargs['ospassword'] + '"', 'ODL_SYSTEM_IP:' + kwargs['odlip'], 'PORT:' + kwargs['odlwebport'], @@ -221,7 +225,11 @@ class ODLTests(testcase.TestCase): if 'INSTALLER_TYPE' in os.environ: installer_type = os.environ['INSTALLER_TYPE'] kwargs['osusername'] = os.environ['OS_USERNAME'] + kwargs['osuserdomainname'] = os.environ.get( + 'OS_USER_DOMAIN_NAME', 'Default') kwargs['ostenantname'] = os.environ['OS_TENANT_NAME'] + kwargs['osprojectdomainname'] = os.environ.get( + 'OS_PROJECT_DOMAIN_NAME', 'Default') kwargs['osauthurl'] = os.environ['OS_AUTH_URL'] kwargs['ospassword'] = os.environ['OS_PASSWORD'] if installer_type == 'fuel': @@ -263,14 +271,21 @@ class ODLParser(object): # pylint: disable=too-few-public-methods default='127.0.0.1') self.parser.add_argument( '-k', '--osauthurl', help='OS_AUTH_URL as defined by OpenStack', - default='http://127.0.0.1:5000/v2.0') + default='http://127.0.0.1:5000/v3') self.parser.add_argument( '-a', '--osusername', help='Username for OpenStack', default='admin') self.parser.add_argument( + '-f', '--osuserdomainname', help='User domain name for OpenStack', + default='Default') + self.parser.add_argument( '-b', '--ostenantname', help='Tenantname for OpenStack', default='admin') self.parser.add_argument( + '-g', '--osprojectdomainname', + help='Project domain name for OpenStack', + default='Default') + self.parser.add_argument( '-c', '--ospassword', help='Password for OpenStack', default='admin') self.parser.add_argument( diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index 878d47dda..338a4e69d 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -69,7 +69,7 @@ class ODLTesting(unittest.TestCase): _keystone_ip = "127.0.0.1" _neutron_ip = "127.0.0.2" _sdn_controller_ip = "127.0.0.3" - _os_auth_url = "http://{}:5000/v2.0".format(_keystone_ip) + _os_auth_url = "http://{}:5000/v3".format(_keystone_ip) _os_tenantname = "admin" _os_username = "admin" _os_password = "admin" @@ -77,6 +77,8 @@ class ODLTesting(unittest.TestCase): _odl_restconfport = "8181" _odl_username = "admin" _odl_password = "admin" + _os_userdomainname = 'Default' + _os_projectdomainname = 'Default' def setUp(self): for var in ("INSTALLER_TYPE", "SDN_CONTROLLER", "SDN_CONTROLLER_IP"): @@ -84,15 +86,20 @@ class ODLTesting(unittest.TestCase): del os.environ[var] os.environ["OS_AUTH_URL"] = self._os_auth_url os.environ["OS_USERNAME"] = self._os_username + os.environ["OS_USER_DOMAIN_NAME"] = self._os_userdomainname os.environ["OS_PASSWORD"] = self._os_password os.environ["OS_TENANT_NAME"] = self._os_tenantname + os.environ["OS_PROJECT_DOMAIN_NAME"] = self._os_projectdomainname + os.environ["OS_PASSWORD"] = self._os_password self.test = odl.ODLTests(case_name='odl', project_name='functest') self.defaultargs = {'odlusername': self._odl_username, 'odlpassword': self._odl_password, 'neutronip': self._keystone_ip, 'osauthurl': self._os_auth_url, 'osusername': self._os_username, + 'osuserdomainname': self._os_userdomainname, 'ostenantname': self._os_tenantname, + 'osprojectdomainname': self._os_projectdomainname, 'ospassword': self._os_password, 'odlip': self._keystone_ip, 'odlwebport': self._odl_webport, @@ -211,7 +218,9 @@ class ODLMainTesting(ODLTesting): 'neutronip': self._neutron_ip, 'osauthurl': self._os_auth_url, 'osusername': self._os_username, + 'osuserdomainname': self._os_userdomainname, 'ostenantname': self._os_tenantname, + 'osprojectdomainname': self._os_projectdomainname, 'ospassword': self._os_password, 'odlip': self._sdn_controller_ip, 'odlwebport': self._odl_webport, @@ -231,7 +240,11 @@ class ODLMainTesting(ODLTesting): 'NEUTRON:{}'.format(self._neutron_ip), 'OS_AUTH_URL:"{}"'.format(self._os_auth_url), 'OSUSERNAME:"{}"'.format(self._os_username), + 'OSUSERDOMAINNAME:"{}"'.format( + self._os_userdomainname), 'OSTENANTNAME:"{}"'.format(self._os_tenantname), + 'OSPROJECTDOMAINNAME:"{}"'.format( + self._os_projectdomainname), 'OSPASSWORD:"{}"'.format(self._os_password), 'ODL_SYSTEM_IP:{}'.format(self._sdn_controller_ip), 'PORT:{}'.format(self._odl_webport), @@ -383,7 +396,9 @@ class ODLRunTesting(ODLTesting): odlusername=self._odl_username, odlwebport=odlwebport, osauthurl=self._os_auth_url, ospassword=self._os_password, ostenantname=self._os_tenantname, - osusername=self._os_username) + osusername=self._os_username, + osprojectdomainname=self._os_projectdomainname, + osuserdomainname=self._os_userdomainname) def _test_multiple_suites(self, suites, status=testcase.TestCase.EX_OK, **kwargs): @@ -404,7 +419,9 @@ class ODLRunTesting(ODLTesting): odlusername=self._odl_username, odlwebport=odlwebport, osauthurl=self._os_auth_url, ospassword=self._os_password, ostenantname=self._os_tenantname, - osusername=self._os_username) + osusername=self._os_username, + osprojectdomainname=self._os_projectdomainname, + osuserdomainname=self._os_userdomainname) def test_exc(self): with mock.patch('functest.utils.openstack_utils.get_endpoint', @@ -579,9 +596,15 @@ class ODLArgParserTesting(ODLTesting): def test_osusername(self): self._test_arg('osusername', 'foo') + def test_osuserdomainname(self): + self._test_arg('osuserdomainname', 'domain') + def test_ostenantname(self): self._test_arg('ostenantname', 'foo') + def test_osprojectdomainname(self): + self._test_arg('osprojectdomainname', 'domain') + def test_ospassword(self): self._test_arg('ospassword', 'foo') diff --git a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py index ca0974832..61e950a6b 100644 --- a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py +++ b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py @@ -1,11 +1,14 @@ #!/usr/bin/env python + # Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. -# matthew.lijun@huawei.com wangwulin@huawei.com +# # 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 +# pylint: disable=missing-docstring + import logging import mock import pkg_resources @@ -18,8 +21,13 @@ from functest.utils.constants import CONST from snaps.openstack.os_credentials import OSCreds +__author__ = ("Matthew Li <matthew.lijun@huawei.com>," + "Linda Wang <wangwulin@huawei.com>") + class OSRefstackClientTesting(unittest.TestCase): + """The class testing RefstackClient """ + # pylint: disable=missing-docstring, too-many-public-methods _config = pkg_resources.resource_filename( 'functest', @@ -32,13 +40,20 @@ class OSRefstackClientTesting(unittest.TestCase): 'testlist': self._testlist} CONST.__setattr__('OS_AUTH_URL', 'https://ip:5000/v3') CONST.__setattr__('OS_INSECURE', 'true') + self.case_name = 'refstack_defcore' + self.result = 0 self.os_creds = OSCreds( username='user', password='pass', auth_url='http://foo.com:5000/v3', project_name='bar') + self.details = {"tests": 3, + "failures": 1, + "success": ['tempest.api.compute [18.464988s]'], + "errors": ['tempest.api.volume [0.230334s]'], + "skipped": ['tempest.api.network [1.265828s]']} @mock.patch('functest.opnfv_tests.openstack.refstack_client.tempest_conf.' 'TempestConf', return_value=mock.Mock()) - def _create_client(self, mock_conf): + def _create_client(self, *args): with mock.patch('snaps.openstack.tests.openstack_tests.' 'get_credentials', return_value=self.os_creds): return RefstackClient() @@ -49,11 +64,11 @@ class OSRefstackClientTesting(unittest.TestCase): testlist = 'testlist' client = self._create_client() with mock.patch('functest.opnfv_tests.openstack.refstack_client.' - 'refstack_client.ft_utils.execute_command') as m: + 'refstack_client.ft_utils.execute_command') as m_cmd: cmd = ("refstack-client test {0} -c {1} -v --test-list {2}" .format(insecure, config, testlist)) client.run_defcore(config, testlist) - m.assert_any_call(cmd) + m_cmd.assert_any_call(cmd) def test_run_defcore(self): CONST.__setattr__('OS_AUTH_URL', 'http://ip:5000/v3') @@ -62,25 +77,22 @@ class OSRefstackClientTesting(unittest.TestCase): testlist = 'testlist' client = self._create_client() with mock.patch('functest.opnfv_tests.openstack.refstack_client.' - 'refstack_client.ft_utils.execute_command') as m: + 'refstack_client.ft_utils.execute_command') as m_cmd: cmd = ("refstack-client test {0} -c {1} -v --test-list {2}" .format(insecure, config, testlist)) client.run_defcore(config, testlist) - m.assert_any_call(cmd) + m_cmd.assert_any_call(cmd) @mock.patch('functest.opnfv_tests.openstack.refstack_client.' 'refstack_client.LOGGER.info') @mock.patch('__builtin__.open', side_effect=Exception) - def test_parse_refstack_result_missing_log_file(self, mock_open, - mock_logger_info): - self.case_name = 'refstack_defcore' - self.result = 0 + def test_parse_refstack_result_fail(self, *args): self._create_client().parse_refstack_result() - mock_logger_info.assert_called_once_with( + args[1].assert_called_once_with( "Testcase %s success_rate is %s%%", self.case_name, self.result) - def test_parse_refstack_result_default(self): + def test_parse_refstack_result_ok(self): log_file = (''' {0} tempest.api.compute [18.464988s] ... ok {0} tempest.api.volume [0.230334s] ... FAILED @@ -90,11 +102,6 @@ class OSRefstackClientTesting(unittest.TestCase): - Skipped: 1 - Failed: 1 ''') - self.details = {"tests": 3, - "failures": 1, - "success": ['tempest.api.compute [18.464988s]'], - "errors": ['tempest.api.volume [0.230334s]'], - "skipped": ['tempest.api.network [1.265828s]']} client = self._create_client() with mock.patch('__builtin__.open', mock.mock_open(read_data=log_file)): @@ -108,16 +115,6 @@ class OSRefstackClientTesting(unittest.TestCase): del kwargs[key] return kwargs - def _test_main(self, status, *args): - kwargs = self._get_main_kwargs() - client = self._create_client() - self.assertEqual(client.main(**kwargs), status) - if len(args) > 0: - args[0].assert_called_once_with( - RefstackClient.result_dir) - if len(args) > 1: - args - def _test_main_missing_keyword(self, key): kwargs = self._get_main_kwargs(key) client = self._create_client() |