Rally scenarios don't require volume type to exist as a precondition.
Change-Id: Id735346e062af084635fd8f76f3686005b9b8add
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
BLACKLIST_FILE = os.path.join(RALLY_DIR, "blacklist.txt")
TEMP_DIR = os.path.join(RALLY_DIR, "var")
- CINDER_VOLUME_TYPE_NAME = "volume_test"
RALLY_PRIVATE_NET_NAME = CONST.__getattribute__('rally_network_name')
RALLY_PRIVATE_SUBNET_NAME = CONST.__getattribute__('rally_subnet_name')
RALLY_PRIVATE_SUBNET_CIDR = CONST.__getattribute__('rally_subnet_cidr')
self.scenario_dir = ''
self.nova_client = os_utils.get_nova_client()
self.neutron_client = os_utils.get_neutron_client()
- self.cinder_client = os_utils.get_cinder_client()
self.network_dict = {}
- self.volume_type = None
self.smoke = None
self.test_name = None
self.image_exists = None
if self.test_name not in self.TESTS:
raise Exception("Test name '%s' is invalid" % self.test_name)
- volume_types = os_utils.list_volume_types(self.cinder_client,
- private=False)
- if volume_types:
- LOGGER.debug("Using existing volume type(s)...")
- else:
- LOGGER.debug('Creating volume type...')
- self.volume_type = os_utils.create_volume_type(
- self.cinder_client, self.CINDER_VOLUME_TYPE_NAME)
- if self.volume_type is None:
- raise Exception("Failed to create volume type '%s'" %
- self.CINDER_VOLUME_TYPE_NAME)
- LOGGER.debug("Volume type '%s' is created succesfully.",
- self.CINDER_VOLUME_TYPE_NAME)
-
LOGGER.debug('Getting or creating image...')
self.image_exists, self.image_id = os_utils.get_or_create_image(
self.GLANCE_IMAGE_NAME,
self.case_name, success_rate)
def _clean_up(self):
- if self.volume_type:
- LOGGER.debug("Deleting volume type '%s'...", self.volume_type)
- os_utils.delete_volume_type(self.cinder_client, self.volume_type)
-
if not self.image_exists:
LOGGER.debug("Deleting image '%s' with ID '%s'...",
self.GLANCE_IMAGE_NAME, self.image_id)
CinderVolumes.create_snapshot_and_attach_volume:
-
args:
- volume_type: false
size:
min: 1
max: 5
{{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
sla:
{{ no_failures_sla() }}
- -
- args:
- volume_type: true
- size:
- min: 1
- max: 5
- context:
- {% call user_context(tenants_amount, users_amount, use_existing_users) %}
- quotas:
- {{ unlimited_volumes() }}
- servers:
- {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
- servers_per_tenant: 2
- auto_assign_nic: true
- network: {}
- {% endcall %}
- runner:
- {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
- sla:
- {{ no_failures_sla() }}
CinderVolumes.create_volume:
-
'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)
with self.assertRaises(Exception):
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())
self.rally_base._run_tests()
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)
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(),
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,
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):
return None
-def list_volume_types(cinder_client, public=True, private=True):
- try:
- volume_types = cinder_client.volume_types.list()
- if not public:
- volume_types = [vt for vt in volume_types if not vt.is_public]
- if not private:
- volume_types = [vt for vt in volume_types if vt.is_public]
- return volume_types
- except Exception as e:
- logger.error("Error [list_volume_types(cinder_client)]: %s" % e)
- return None
-
-
-def create_volume_type(cinder_client, name):
- try:
- volume_type = cinder_client.volume_types.create(name)
- return volume_type
- except Exception as e:
- logger.error("Error [create_volume_type(cinder_client, '%s')]: %s"
- % (name, e))
- return None
-
-
def update_cinder_quota(cinder_client, tenant_id, vols_quota,
snapshots_quota, gigabytes_quota):
quotas_values = {"volumes": vols_quota,
return False
-def delete_volume_type(cinder_client, volume_type):
- try:
- cinder_client.volume_types.delete(volume_type)
- return True
- except Exception as e:
- logger.error("Error [delete_volume_type(cinder_client, '%s')]: %s"
- % (volume_type, e))
- return False
-
-
# *********************************************
# KEYSTONE
# *********************************************
Code Review / functest.git / commitdiff