From f03f3feb759dad7b7814704127acca6f4aa62f85 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Tue, 15 Nov 2016 13:58:04 +0200 Subject: [PATCH] Move `deploy_forces_oob_reboot` to deploy drivers Currently this driver option is exported by agent vendor interface which is about to be removed. Change-Id: I44e6ce39163d13d1e687bca3953a4bafe1e1be6d Partial-Bug: #1640533 --- ironic/drivers/modules/agent.py | 1 + ironic/drivers/modules/iscsi_deploy.py | 2 +- ironic/tests/unit/drivers/modules/test_iscsi_deploy.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ironic/drivers/modules/agent.py b/ironic/drivers/modules/agent.py index 8ef24050d5..1384828957 100644 --- a/ironic/drivers/modules/agent.py +++ b/ironic/drivers/modules/agent.py @@ -60,6 +60,7 @@ OPTIONAL_PROPERTIES = { COMMON_PROPERTIES = REQUIRED_PROPERTIES.copy() COMMON_PROPERTIES.update(OPTIONAL_PROPERTIES) +COMMON_PROPERTIES.update(agent_base_vendor.VENDOR_PROPERTIES) PARTITION_IMAGE_LABELS = ('kernel', 'ramdisk', 'root_gb', 'root_mb', 'swap_mb', 'ephemeral_mb', 'ephemeral_format', 'configdrive', diff --git a/ironic/drivers/modules/iscsi_deploy.py b/ironic/drivers/modules/iscsi_deploy.py index 09e0b280b7..0d2fdc7883 100644 --- a/ironic/drivers/modules/iscsi_deploy.py +++ b/ironic/drivers/modules/iscsi_deploy.py @@ -396,7 +396,7 @@ class ISCSIDeploy(AgentDeployMixin, base.DeployInterface): """iSCSI Deploy Interface for deploy-related actions.""" def get_properties(self): - return {} + return agent_base_vendor.VENDOR_PROPERTIES @METRICS.timer('ISCSIDeploy.validate') def validate(self, task): diff --git a/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py b/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py index 7ca3771fa4..a6fe30beb5 100644 --- a/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py +++ b/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py @@ -518,7 +518,8 @@ class ISCSIDeployTestCase(db_base.DbTestCase): def test_get_properties(self): with task_manager.acquire(self.context, self.node.uuid, shared=True) as task: - self.assertEqual({}, task.driver.deploy.get_properties()) + props = task.driver.deploy.get_properties() + self.assertEqual(['deploy_forces_oob_reboot'], list(props)) @mock.patch.object(iscsi_deploy, 'validate', autospec=True) @mock.patch.object(deploy_utils, 'validate_capabilities', autospec=True)