openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Ignore '_comment' as a invalid field in instackenv.json"

This commit is contained in:
Jenkins 2017-05-03 15:09:03 +00:00 committed by Gerrit Code Review
parent 2a8f52fa09 207dd15d12
commit 3f2d517551
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleo_common/tests/utils/test_nodes.py
View File

@ -661,7 +661,8 @@ ABCDEF
VALID_NODE_JSON = [
{'pm_type': 'pxe_ipmitool',
{'_comment': 'This is a comment',
'pm_type': 'pxe_ipmitool',
'pm_addr': '192.168.0.1',
'pm_user': 'root',
'pm_password': 'p@$$w0rd'},
@ -697,6 +698,7 @@ VALID_NODE_JSON = [
'pm_addr': '1.2.3.4',
'pm_user': 'root',
'pm_password': EXAMPLE_SSH_PRIVATE_KEY,
'_comment': 'This is another comment',
'mac': ['11:11:11:11:11:11']},
{'pm_type': 'pxe_ssh',
'pm_addr': '1.2.3.4',

3
tripleo_common/utils/nodes.py
View File

@ -432,6 +432,9 @@ def validate_nodes(nodes_list):
names = set()
macs = set()
for index, node in enumerate(nodes_list):
# Remove any comment
node.pop("_comment", None)
handler = _find_node_handler(node)
try: