diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-28 10:24:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-28 10:24:29 +0000 |
| commit | d52591371ed376f54e5577c216936a66ea02f3e6 (patch) | |
| tree | 83bcc0df86794918bd4908eaa0d08847b1647db1 | |
| parent | 2207dcca9014092a15f8e0377ea07c1df910097a (diff) | |
| parent | 3477ad215ea40618413bf8964af995014d5022da (diff) | |
| download | ironic-d52591371ed376f54e5577c216936a66ea02f3e6.tar.gz | |
Merge "Fix seamicro validate() method definition"
| -rw-r--r-- | ironic/drivers/modules/seamicro.py | 2 | ||||
| -rw-r--r-- | ironic/tests/drivers/test_seamicro.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ironic/drivers/modules/seamicro.py b/ironic/drivers/modules/seamicro.py index ce2133569..4d6912cc5 100644 --- a/ironic/drivers/modules/seamicro.py +++ b/ironic/drivers/modules/seamicro.py @@ -386,7 +386,7 @@ class Power(base.PowerInterface): class VendorPassthru(base.VendorInterface): """SeaMicro vendor-specific methods.""" - def validate(self, node, **kwargs): + def validate(self, task, node, **kwargs): method = kwargs['method'] if method in VENDOR_PASSTHRU_METHODS: return True diff --git a/ironic/tests/drivers/test_seamicro.py b/ironic/tests/drivers/test_seamicro.py index 1af9f8059..8ea270995 100644 --- a/ironic/tests/drivers/test_seamicro.py +++ b/ironic/tests/drivers/test_seamicro.py @@ -362,8 +362,8 @@ class SeaMicroPowerDriverTestCase(db_base.DbTestCase): with task_manager.acquire(self.context, [self.node['uuid']], shared=True) as task: for method in seamicro.VENDOR_PASSTHRU_METHODS: - task.resources[0].driver.vendor.validate(self.node, - **{'method': method}) + task.resources[0].driver.vendor.validate( + task, self.node, **{'method': method}) def test_vendor_passthru_validate_fail(self): with task_manager.acquire(self.context, [self.node['uuid']], |