Add tests for cinder nimblestorage and solidfire

Turn netapp tests into parent class CinderBackendTest.
Solidfire, nimblestorage and netapp inheret tests from parent.
This commit is contained in:
Gustavo Sanchez
2022-02-02 16:43:34 -04:00
parent d3ab250984
commit 42cb820276
3 changed files with 134 additions and 53 deletions

View File

@@ -0,0 +1,15 @@
# Copyright 2022 Canonical Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
"""Collection of code for setting up and testing cinder backends."""

View File

@@ -0,0 +1,109 @@
#!/usr/bin/env python3
# Copyright 2021 Canonical Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
"""Encapsulate cinder backend tests."""
import uuid
import zaza.model
import zaza.openstack.charm_tests.test_utils as test_utils
import zaza.openstack.utilities.openstack as openstack_utils
class CinderBackendTest(test_utils.OpenStackBaseTest):
"""Encapsulate cinder backend tests."""
expected_config_content = {}
backend_name = ""
@classmethod
def setUpClass(cls):
"""Run class setup for running tests."""
super(CinderBackendTest, cls).setUpClass()
cls.keystone_session = openstack_utils.get_overcloud_keystone_session()
cls.model_name = zaza.model.get_juju_model()
cls.cinder_client = openstack_utils.get_cinder_session_client(
cls.keystone_session)
def test_cinder_config(self):
"""Test that configuration options match our expectations."""
zaza.model.run_on_leader(
'cinder',
'sudo cp /etc/cinder/cinder.conf /tmp/')
zaza.model.block_until_oslo_config_entries_match(
'cinder',
'/tmp/cinder.conf',
self.expected_config_content,
timeout=2)
def test_create_volume(self):
"""Test creating a volume with basic configuration."""
test_vol_name = "zaza{}".format(uuid.uuid1().fields[0])
vol_new = self.cinder_client.volumes.create(
name=test_vol_name,
size='1')
try:
openstack_utils.resource_reaches_status(
self.cinder_client.volumes,
vol_new.id,
wait_iteration_max_time=12000,
stop_after_attempt=5,
expected_status='available',
msg='Volume status wait')
test_vol = self.cinder_client.volumes.find(name=test_vol_name)
self.assertEqual(
getattr(test_vol, 'os-vol-host-attr:host').split('#')[0],
'cinder@{}'.format(self.backend_name))
finally:
self.cinder_client.volumes.delete(vol_new)
class CinderSolidfireTest(CinderBackendTest):
"""Encapsulate cinder-solidfire tests."""
backend_name = 'cinder-solidfire'
expected_config_content = {
'cinder-solidfire': {
'volume_driver':
['cinder.volume.drivers.solidfire.SolidFireDriver'],
'san_ip': ['10.11.12.13'],
'san_login': ['username'],
'san_password': ['password']
}}
def test_create_volume(self):
"""Disabled while there is no hardware Solidfire appliance."""
pass
class CinderNimblestorageTest(CinderBackendTest):
"""Encapsulate cinder-nimblestorage tests."""
backend_name = 'cinder-nimblestorage'
expected_config_content = {
'cinder-nimblestorage': {
'volume_driver':
['cinder.volume.drivers.nimble.NimbleISCSIDriver'],
'san_ip': ['10.11.12.13'],
'san_login': ['username'],
'san_password': ['password'],
}}
def test_create_volume(self):
"""Disabled while there is no hardware Nimblestorage appliance."""
pass

View File

@@ -16,62 +16,19 @@
"""Encapsulate cinder-netapp testing."""
import uuid
import zaza.model
import zaza.openstack.charm_tests.test_utils as test_utils
import zaza.openstack.utilities.openstack as openstack_utils
from zaza.openstack.charm_tests.cinder_backend.tests import CinderBackendTest
class CinderNetAppTest(test_utils.OpenStackBaseTest):
class CinderNetAppTest(CinderBackendTest):
"""Encapsulate netapp tests."""
@classmethod
def setUpClass(cls):
"""Run class setup for running tests."""
super(CinderNetAppTest, cls).setUpClass()
cls.keystone_session = openstack_utils.get_overcloud_keystone_session()
cls.model_name = zaza.model.get_juju_model()
cls.cinder_client = openstack_utils.get_cinder_session_client(
cls.keystone_session)
backend_name = 'cinder-netapp'
def test_cinder_config(self):
"""Test that configuration options match our expectations."""
expected_contents = {
'cinder-netapp': {
'netapp_storage_family': ['ontap_cluster'],
'netapp_storage_protocol': ['iscsi'],
'volume_backend_name': ['cinder_netapp'],
'volume_driver':
expected_config_content = {
'cinder-netapp': {
'netapp_storage_family': ['ontap_cluster'],
'netapp_storage_protocol': ['iscsi'],
'volume_backend_name': ['cinder_netapp'],
'volume_driver':
['cinder.volume.drivers.netapp.common.NetAppDriver'],
}}
zaza.model.run_on_leader(
'cinder',
'sudo cp /etc/cinder/cinder.conf /tmp/')
zaza.model.block_until_oslo_config_entries_match(
'cinder',
'/tmp/cinder.conf',
expected_contents,
timeout=2)
def test_create_volume(self):
"""Test creating a volume with basic configuration."""
test_vol_name = "zaza{}".format(uuid.uuid1().fields[0])
vol_new = self.cinder_client.volumes.create(
name=test_vol_name,
size='1')
try:
openstack_utils.resource_reaches_status(
self.cinder_client.volumes,
vol_new.id,
wait_iteration_max_time=12000,
stop_after_attempt=5,
expected_status='available',
msg='Volume status wait')
test_vol = self.cinder_client.volumes.find(name=test_vol_name)
self.assertEqual(
getattr(test_vol, 'os-vol-host-attr:host').split('#')[0],
'cinder@cinder-netapp')
finally:
self.cinder_client.volumes.delete(vol_new)
}}