Cherry picks/stable/ussuri (#732)

* 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.

yaml/pyyaml#561

Closes-Bug: #1951650

* 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

Co-authored-by: Felipe Reyes <[email protected]>
Co-authored-by: Corey Bryant <[email protected]>

Author: 3 people

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,
         })

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}