diff options
Diffstat (limited to 'functest/tests')
5 files changed, 54 insertions, 142 deletions
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index 878d47dd..338a4e69 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/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py index 05311c3f..95222ca8 100644 --- a/functest/tests/unit/openstack/rally/test_rally.py +++ b/functest/tests/unit/openstack/rally/test_rally.py @@ -22,15 +22,12 @@ class OSRallyTesting(unittest.TestCase): 'get_nova_client', return_value=mock.Mock()) @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' 'get_neutron_client', return_value=mock.Mock()) - @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' - 'get_cinder_client', return_value=mock.Mock()) - def setUp(self, mock_func1, mock_func2, mock_func3): + def setUp(self, mock_func1, mock_func2): self.rally_base = rally.RallyBase() self.rally_base.network_dict['net_id'] = 'test_net_id' self.polling_iter = 2 mock_func1.assert_called() mock_func2.assert_called() - mock_func3.assert_called() @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' 'get_external_net', return_value=None) @@ -288,51 +285,26 @@ class OSRallyTesting(unittest.TestCase): self.rally_base._prepare_env() @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' - 'list_volume_types', return_value=None) - @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' - 'create_volume_type', return_value=None) - def test_prepare_env_volume_creation_failed(self, mock_list, mock_create): - self.rally_base.TESTS = ['test1', 'test2'] - self.rally_base.test_name = 'test1' - with self.assertRaises(Exception): - self.rally_base._prepare_env() - mock_list.assert_called() - mock_create.assert_called() - - @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' - 'list_volume_types', return_value=None) - @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' - 'create_volume_type', return_value=mock.Mock()) - @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' 'get_or_create_image', return_value=(True, None)) - def test_prepare_env_image_missing(self, mock_get_img, mock_create_vt, - mock_list_vt): + def test_prepare_env_image_missing(self, mock_get_img): self.rally_base.TESTS = ['test1', 'test2'] self.rally_base.test_name = 'test1' with self.assertRaises(Exception): self.rally_base._prepare_env() mock_get_img.assert_called() - mock_create_vt.assert_called() - mock_list_vt.assert_called() @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' - 'list_volume_types', return_value=None) - @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' - 'create_volume_type', return_value=mock.Mock()) - @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' 'get_or_create_image', return_value=(True, 'image_id')) @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' 'create_shared_network_full', return_value=None) def test_prepare_env_image_shared_network_creation_failed( - self, mock_create_net, mock_get_img, mock_create_vt, mock_list_vt): + self, mock_create_net, mock_get_img): self.rally_base.TESTS = ['test1', 'test2'] self.rally_base.test_name = 'test1' with self.assertRaises(Exception): self.rally_base._prepare_env() mock_create_net.assert_called() mock_get_img.assert_called() - mock_create_vt.assert_called() - mock_list_vt.assert_called() @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.' '_run_task', return_value=mock.Mock()) @@ -352,18 +324,13 @@ class OSRallyTesting(unittest.TestCase): mock_run_task.assert_any_call('test1') @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' - 'delete_volume_type') - @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.' 'delete_glance_image') - def test_clean_up_default(self, mock_glance_method, mock_vol_method): - self.rally_base.volume_type = mock.Mock() + def test_clean_up_default(self, mock_glance_method): self.rally_base.cinder_client = mock.Mock() self.rally_base.image_exists = False self.rally_base.image_id = 1 self.rally_base.nova_client = mock.Mock() self.rally_base._clean_up() - mock_vol_method.assert_any_call(self.rally_base.cinder_client, - self.rally_base.volume_type) mock_glance_method.assert_any_call(self.rally_base.nova_client, 1) 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 ca097483..61e950a6 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() diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py index 22017a7a..50b0edc6 100644 --- a/functest/tests/unit/openstack/tempest/test_conf_utils.py +++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py @@ -157,17 +157,6 @@ class OSTempestConfUtilsTesting(unittest.TestCase): self.assertTrue(m1.called) self.assertTrue(m2.called) - def test_get_repo_tag_default(self): - mock_popen = mock.Mock() - attrs = {'stdout.readline.return_value': 'test_tag'} - mock_popen.configure_mock(**attrs) - - with mock.patch('functest.opnfv_tests.openstack.tempest.' - 'conf_utils.subprocess.Popen', - return_value=mock_popen): - self.assertEqual(conf_utils.get_repo_tag('test_repo'), - 'test_tag') - def test_backup_tempest_config_default(self): with mock.patch('functest.opnfv_tests.openstack.tempest.' 'conf_utils.os.path.exists', diff --git a/functest/tests/unit/utils/test_openstack_utils.py b/functest/tests/unit/utils/test_openstack_utils.py index 3bd7e3dd..307cbe37 100644 --- a/functest/tests/unit/utils/test_openstack_utils.py +++ b/functest/tests/unit/utils/test_openstack_utils.py @@ -135,25 +135,8 @@ class OSUtilsTesting(unittest.TestCase): mock_obj.configure_mock(**attrs) self.volume = mock_obj - mock_obj = mock.Mock() - attrs = {'id': 'volume_type_id', - 'name': 'test_volume_type', - 'is_public': True} - mock_obj.configure_mock(**attrs) - self.volume_types = [mock_obj] - - mock_obj = mock.Mock() - attrs = {'id': 'volume_type_id', - 'name': 'test_volume_type', - 'is_public': False} - mock_obj.configure_mock(**attrs) - self.volume_types.append(mock_obj) - self.cinder_client = mock.Mock() attrs = {'volumes.list.return_value': [self.volume], - 'volume_types.list.return_value': self.volume_types, - 'volume_types.create.return_value': self.volume_types[0], - 'volume_types.delete.return_value': mock.Mock(), 'quotas.update.return_value': mock.Mock(), 'volumes.detach.return_value': mock.Mock(), 'volumes.force_delete.return_value': mock.Mock(), @@ -1525,41 +1508,6 @@ class OSUtilsTesting(unittest.TestCase): None) self.assertTrue(mock_logger_error.called) - def test_list_volume_types_default_private(self): - self.assertEqual(openstack_utils. - list_volume_types(self.cinder_client, - public=False, - private=True), - [self.volume_types[1]]) - - def test_list_volume_types_default_public(self): - self.assertEqual(openstack_utils. - list_volume_types(self.cinder_client, - public=True, - private=False), - [self.volume_types[0]]) - - @mock.patch('functest.utils.openstack_utils.logger.error') - def test_list_volume_types_exception(self, mock_logger_error): - self.assertEqual(openstack_utils. - list_volume_types(Exception), - None) - self.assertTrue(mock_logger_error.called) - - def test_create_volume_type_default(self): - self.assertEqual(openstack_utils. - create_volume_type(self.cinder_client, - 'test_volume_type'), - self.volume_types[0]) - - @mock.patch('functest.utils.openstack_utils.logger.error') - def test_create_volume_type_exception(self, mock_logger_error): - self.assertEqual(openstack_utils. - create_volume_type(Exception, - 'test_volume_type'), - None) - self.assertTrue(mock_logger_error.called) - def test_update_cinder_quota_default(self): self.assertTrue(openstack_utils. update_cinder_quota(self.cinder_client, @@ -1597,18 +1545,6 @@ class OSUtilsTesting(unittest.TestCase): forced=True)) self.assertTrue(mock_logger_error.called) - def test_delete_volume_type_default(self): - self.assertTrue(openstack_utils. - delete_volume_type(self.cinder_client, - self.volume_types[0])) - - @mock.patch('functest.utils.openstack_utils.logger.error') - def test_delete_volume_type_exception(self, mock_logger_error): - self.assertFalse(openstack_utils. - delete_volume_type(Exception, - self.volume_types[0])) - self.assertTrue(mock_logger_error.called) - def test_get_tenants_default(self): with mock.patch('functest.utils.openstack_utils.' 'is_keystone_v3', return_value=True): |