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 1488c72fe4..6cfae78ed1 100644 --- a/ironic/drivers/modules/iscsi_deploy.py +++ b/ironic/drivers/modules/iscsi_deploy.py @@ -409,7 +409,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 1c307cfa1a..5b50536f7a 100644 --- a/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py +++ b/ironic/tests/unit/drivers/modules/test_iscsi_deploy.py @@ -551,7 +551,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)