Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry picks/stable/train #731

Merged
merged 2 commits into from
Mar 25, 2022
Merged

Cherry picks/stable/train #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e88b4f2
Use yaml.safe_load()
freyes Nov 22, 2021
cf5899d
Use snapshot_support=True for manila share type
Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zaza/openstack/charm_tests/manila_ganesha/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
2 changes: 1 addition & 1 deletion zaza/openstack/charm_tests/neutron/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down