From e88b4f2d96ccdf27b9a794cfee9464f74019079d Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Mon, 22 Nov 2021 10:37:06 -0300 Subject: [PATCH 1/2] Use yaml.safe_load() Pyyaml>=6.0 requires to pass the Loader arg to yaml.load(), switching to yaml.safe_load() recovers the old and expected behavior. https://github.com/yaml/pyyaml/pull/561 Closes-Bug: #1951650 --- zaza/openstack/charm_tests/neutron/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zaza/openstack/charm_tests/neutron/tests.py b/zaza/openstack/charm_tests/neutron/tests.py index 96b45deaf..b3c890641 100644 --- a/zaza/openstack/charm_tests/neutron/tests.py +++ b/zaza/openstack/charm_tests/neutron/tests.py @@ -285,7 +285,7 @@ def _assert_result_match(self, action_result, resource_list, # extract data from juju action action_data = action_result.data.get('results', {}).get(resource_name) - resources_from_action = yaml.load(action_data) + resources_from_action = yaml.safe_load(action_data) # pull resource IDs from expected resource list and juju action data expected_resource_ids = {resource['id'] for resource in resource_list} From cf5899d6c1a430618d7154ca1b2ef2e9f920ed3d Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Thu, 24 Feb 2022 12:25:20 -0500 Subject: [PATCH 2/2] Use snapshot_support=True for manila share type The extra specs of a manila share type need to match the share service's capabilities. [1] [1] https://docs.openstack.org/manila/pike/admin/shared-file-systems-troubleshoot.html#id2 Closes-Bug: #1962204 --- zaza/openstack/charm_tests/manila_ganesha/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zaza/openstack/charm_tests/manila_ganesha/setup.py b/zaza/openstack/charm_tests/manila_ganesha/setup.py index a80495813..c4edd97f5 100644 --- a/zaza/openstack/charm_tests/manila_ganesha/setup.py +++ b/zaza/openstack/charm_tests/manila_ganesha/setup.py @@ -42,5 +42,5 @@ def setup_ganesha_share_type(manila_client=None): extra_specs={ 'vendor_name': 'Ceph', 'storage_protocol': 'NFS', - 'snapshot_support': False, + 'snapshot_support': True, })