openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Handle a deployment that was manually cancelled." into stable/queens

This commit is contained in:
Zuul 2019-10-12 04:41:12 +00:00 committed by Gerrit Code Review
parent 17064e4f37 fa98192ac4
commit 5a730d0f23
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tripleoclient/tests/workflows/test_plan_management.py
View File

@ -356,6 +356,29 @@ class TestPlanUpdateWorkflows(base.TestCommand):
'generate_passwords': True, 'source_url': None,
'validate_stack': False})
@mock.patch('tripleoclient.workflows.plan_management._update_passwords',
autospec=True)
@mock.patch('yaml.safe_load',
autospec=True)
@mock.patch('tripleoclient.workflows.plan_management.tarball',
autospec=True)
@mock.patch('tripleo_common.utils.swift.empty_container',
autospec=True)
def test_update_plan_from_templates_recreate_env_missing_passwords(
self, mock_empty_container, mock_tarball, mock_yaml_safe_load,
mock_update_passwords):
plan_management.update_plan_from_templates(
self.app.client_manager,
'test-overcloud',
'/tht-root/',
validate_stack=False)
# A dictionary without the "passwords" key is provided in
# the _load_passwords method.
mock_yaml_safe_load.return_value = {}
# Ensure that the passwords variable is passed with a value of None.
mock_update_passwords.assert_called_with(
mock.ANY, 'test-overcloud', None)
class TestUpdatePasswords(base.TestCase):

7
tripleoclient/workflows/plan_management.py
View File

@ -259,7 +259,12 @@ def _upload_file_content(swift_client, container, filename, content):
def _load_passwords(swift_client, name):
plan_env = yaml.safe_load(swift_client.get_object(
name, constants.PLAN_ENVIRONMENT)[1])
return plan_env['passwords']
if "passwords" in plan_env:
return plan_env['passwords']
else:
LOG.warn("No passwords found in existing plan {}. "
"Updating plan with passwords.".format(name))
def _update_passwords(swift_client, name, passwords):