openstack
/
magnum
Code Issues Proposed changes

Fix wrong parameter while creating bay 

delete_trustee_and_trust() takes 3 arguments.

Closes-Bug: #1567195
Change-Id: I1bb9fd8b97fedc1e23159248d5efa5c2d4b896bd
This commit is contained in:
Eli Qiao 2016-04-07 11:12:08 +08:00
parent 98139f0ef3
commit 72549153e2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/conductor/handlers/bay_conductor.py
View File

@ -134,7 +134,7 @@ class Handler(object):
bay_create_timeout)
except Exception as e:
cert_manager.delete_certificates_from_bay(bay)
trust_manager.delete_trustee_and_trust(osc, bay)
trust_manager.delete_trustee_and_trust(osc, context, bay)
if isinstance(e, exc.HTTPBadRequest):
e = exception.InvalidParameterValue(message=six.text_type(e))

2
magnum/tests/unit/conductor/handlers/test_bay_conductor.py
View File

@ -222,7 +222,7 @@ class TestHandler(db_base.DbTestCase):
mock_cert_manager.delete_certificates_from_bay(self.bay)
mock_trust_manager.delete_trustee_and_trust.assert_called_once_with(
osc, self.bay)
osc, self.context, self.bay)
@patch('magnum.conductor.handlers.bay_conductor.trust_manager')
@patch('magnum.conductor.handlers.bay_conductor.cert_manager')