openstack
/
tripleo-common
Code Issues Proposed changes

Fix placement endpoint check when endpoints are not set 

When endpoint are not set in the heat resource, None is returned, not an empty
dict. The check then raises a 'NoneType' is not iterable exception.

Fix the logic to handle None and update the unit test.

Closes-bug: #1913416
Change-Id: Iba06dc0f8afe9bc6a8820742c656dca5bf75df15
(cherry picked from commit 86d0e65a29)
This commit is contained in:
Oliver Walsh 2021-01-27 10:34:42 +00:00 committed by Jose Luis Franco
parent b5f0eaa76d
commit 3b3c9fc0fb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/tests/utils/test_plan.py
View File

@ -741,7 +741,7 @@ class PlanTest(base.TestCase):
}
mock_resource = mock.MagicMock()
mock_resource.attributes = {
'endpoint_map': {},
'endpoint_map': None,
'value': None
}
mock_orchestration.resources.get.return_value = mock_resource

7
tripleo_common/utils/plan.py
View File

@ -418,16 +418,17 @@ def generate_passwords(swift, heat, mistral=None,
except heat_exc.HTTPNotFound:
stack_env = None
placement_extracted = False
try:
# We can't rely on the existence of PlacementPassword to
# determine if placement extraction has occured as it was added
# in stein while the service extraction was delayed to train.
# Inspect the endpoint map instead.
endpoint_res = heat.resources.get(container, 'EndpointMap')
endpoints = endpoint_res.attributes.get('endpoint_map', {})
placement_extracted = 'PlacementPublic' in endpoints
endpoints = endpoint_res.attributes.get('endpoint_map', None)
placement_extracted = endpoints and 'PlacementPublic' in endpoints
except heat_exc.HTTPNotFound:
placement_extracted = False
pass
passwords = password_utils.generate_passwords(
stack_env=stack_env,