openstack
/
os-cloud-config
Code Issues Proposed changes

Remove pxe_ prefix from deploy_ramdisk and deploy_kernel params 

Co-Authored-By: Steve Kowalik <steven@wedontsleep.org>
Co-Authored-By: Lucas Alvares Gomes <lucasagomes@gmail.com>

Change-Id: Ie38d3186b45fe00e0577f4b0f8b6a971edb9827d
Closes-Bug: 1453076
Related-To: I0727126770e6c79c898560a34e91a10686696d82
This commit is contained in:
Giulio Fidente 2015-05-08 12:28:51 +02:00
parent 439f10136d
commit d3168fe6fd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os_cloud_config/nodes.py
View File

@ -99,9 +99,9 @@ def _extract_driver_info(node):
raise ValueError("Unknown pm_type: %s" % node["pm_type"])
if "pxe" in node["pm_type"]:
if "kernel_id" in node:
driver_info["pxe_deploy_kernel"] = node["kernel_id"]
driver_info["deploy_kernel"] = node["kernel_id"]
if "ramdisk_id" in node:
driver_info["pxe_deploy_ramdisk"] = node["ramdisk_id"]
driver_info["deploy_ramdisk"] = node["ramdisk_id"]
return driver_info

8
os_cloud_config/tests/test_nodes.py
View File

@ -203,8 +203,8 @@ class NodesTest(base.TestCase):
expected = {"ipmi_address": "foo.bar",
"ipmi_username": "test",
"ipmi_password": "random",
"pxe_deploy_kernel": "kernel-abc",
"pxe_deploy_ramdisk": "ramdisk-foo"}
"deploy_kernel": "kernel-abc",
"deploy_ramdisk": "ramdisk-foo"}
self.assertEqual(expected, nodes._extract_driver_info(node))
def test_extract_driver_info_unknown_type(self):
@ -255,8 +255,8 @@ class NodesTest(base.TestCase):
"ssh_username": "test",
"ssh_key_contents": "random",
"ssh_virt_type": "virsh",
"pxe_deploy_kernel": "kernel-123",
"pxe_deploy_ramdisk": "ramdisk-999"}
"deploy_kernel": "kernel-123",
"deploy_ramdisk": "ramdisk-999"}
pxe_node = mock.call(driver="pxe_ssh",
driver_info=pxe_node_driver_info,
properties=node_properties)