openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Allow setting pm_port when importing nodes from a .csv file"

This commit is contained in:
Jenkins 2017-05-04 17:31:05 +00:00 committed by Gerrit Code Review
parent 88f49641f0 e503fb47c2
commit dd19054206
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tripleoclient/tests/v1/baremetal/test_baremetal.py
View File

@ -293,7 +293,7 @@ class TestImportBaremetal(fakes.TestBaremetal):
self.csv_file.write("""\
pxe_ssh,192.168.122.1,stack,"KEY1",00:0b:d0:69:7e:59
pxe_ssh,192.168.122.2,stack,"KEY2",00:0b:d0:69:7e:58""")
pxe_ssh,192.168.122.2,stack,"KEY2",00:0b:d0:69:7e:58,6230""")
self.nodes_list = [{
"pm_user": "stack",
@ -308,6 +308,7 @@ pxe_ssh,192.168.122.2,stack,"KEY2",00:0b:d0:69:7e:58""")
"pm_addr": "192.168.122.2",
"pm_password": "KEY2",
"pm_type": "pxe_ssh",
"pm_port": "6230",
"mac": [
"00:0b:d0:69:7e:58"
]

6
tripleoclient/utils.py
View File

@ -671,6 +671,12 @@ def _csv_to_nodes_dict(nodes_csv):
row[4]
]
}
try:
node['pm_port'] = row[5]
except IndexError:
pass
data.append(node)
return data