From d3168fe6fdb4be891f44636c66225ce73ecd39a2 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 8 May 2015 12:28:51 +0200 Subject: [PATCH] Remove pxe_ prefix from deploy_ramdisk and deploy_kernel params Co-Authored-By: Steve Kowalik Co-Authored-By: Lucas Alvares Gomes Change-Id: Ie38d3186b45fe00e0577f4b0f8b6a971edb9827d Closes-Bug: 1453076 Related-To: I0727126770e6c79c898560a34e91a10686696d82 --- os_cloud_config/nodes.py | 4 ++-- os_cloud_config/tests/test_nodes.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/os_cloud_config/nodes.py b/os_cloud_config/nodes.py index 0a46607..64e5801 100644 --- a/os_cloud_config/nodes.py +++ b/os_cloud_config/nodes.py @@ -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 diff --git a/os_cloud_config/tests/test_nodes.py b/os_cloud_config/tests/test_nodes.py index 899c09f..8292b1a 100644 --- a/os_cloud_config/tests/test_nodes.py +++ b/os_cloud_config/tests/test_nodes.py @@ -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)