openstack
/
octavia
Code Issues Proposed changes

Taskflow update exposed inconsistencies in tasks 

The new taskflow exposed areas we forgot to update
the revert method with the correct object data.

Taskflow now validates the revert data which exposed
those inconsistencies in the project

Change-Id: I319d59b345aab07784ae4dba19e0ffb7fbba0b04
Closes-Bug: #1581615
This commit is contained in:
ptoohill1 2016-05-13 12:18:12 -05:00
parent 3d5c097aa9
commit 93983ad04c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
octavia/controller/worker/tasks/database_tasks.py
View File

@ -220,14 +220,14 @@ class DeleteListenerInDB(BaseDatabaseTask):
LOG.debug("Delete in DB for listener id: %s", listener.id)
self.listener_repo.delete(db_apis.get_session(), id=listener.id)
def revert(self, listener_id, *args, **kwargs):
def revert(self, listener, *args, **kwargs):
"""Mark the listener ERROR since the listener didn't delete
:returns: None
"""
LOG.warning(_LW("Reverting mark listener delete in DB "
"for listener id %s"), listener_id)
"for listener id %s"), listener.id)
class DeletePoolInDB(BaseDatabaseTask):
@ -246,14 +246,14 @@ class DeletePoolInDB(BaseDatabaseTask):
LOG.debug("Delete in DB for pool id: %s ", pool.id)
self.pool_repo.delete(db_apis.get_session(), id=pool.id)
def revert(self, pool_id, *args, **kwargs):
def revert(self, pool, *args, **kwargs):
"""Mark the pool ERROR since the delete couldn't happen
:returns: None
"""
LOG.warning(_LW("Reverting delete in DB "
"for pool id %s"), pool_id)
"for pool id %s"), pool.id)
# TODO(johnsom) Fix this
# self.pool_repo.update(db_apis.get_session(), pool.id,
# operating_status=constants.ERROR)
@ -275,14 +275,14 @@ class DeleteL7PolicyInDB(BaseDatabaseTask):
LOG.debug("Delete in DB for l7policy id: %s ", l7policy.id)
self.l7policy_repo.delete(db_apis.get_session(), id=l7policy.id)
def revert(self, l7policy_id, *args, **kwargs):
def revert(self, l7policy, *args, **kwargs):
"""Mark the l7policy ERROR since the delete couldn't happen
:returns: None
"""
LOG.warning(_LW("Reverting delete in DB "
"for l7policy id %s"), l7policy_id)
"for l7policy id %s"), l7policy.id)
# TODO(sbalukoff) Fix this
# self.listener_repo.update(db_apis.get_session(), l7policy.listener.id,
# operating_status=constants.ERROR)
@ -304,14 +304,14 @@ class DeleteL7RuleInDB(BaseDatabaseTask):
LOG.debug("Delete in DB for l7rule id: %s ", l7rule.id)
self.l7rule_repo.delete(db_apis.get_session(), id=l7rule.id)
def revert(self, l7rule_id, *args, **kwargs):
def revert(self, l7rule, *args, **kwargs):
"""Mark the l7rule ERROR since the delete couldn't happen
:returns: None
"""
LOG.warning(_LW("Reverting delete in DB "
"for l7rule id %s"), l7rule_id)
"for l7rule id %s"), l7rule.id)
# TODO(sbalukoff) Fix this
# self.listener_repo.update(db_apis.get_session(),
# l7rule.l7policy.listener.id,

6
octavia/tests/unit/controller/worker/tasks/test_database_tasks.py
View File

@ -320,7 +320,7 @@ class TestDatabaseTasks(base.TestCase):
# Test the revert
mock_pool_repo_delete.reset_mock()
delete_pool.revert(POOL_ID)
delete_pool.revert(_pool_mock)
# TODO(johnsom) Fix
# repo.PoolRepository.update.assert_called_once_with(
@ -349,7 +349,7 @@ class TestDatabaseTasks(base.TestCase):
# Test the revert
mock_l7policy_repo_delete.reset_mock()
delete_l7policy.revert(L7POLICY_ID)
delete_l7policy.revert(_l7policy_mock)
# TODO(sbalukoff) Fix
# repo.ListenerRepository.update.assert_called_once_with(
@ -378,7 +378,7 @@ class TestDatabaseTasks(base.TestCase):
# Test the revert
mock_l7rule_repo_delete.reset_mock()
delete_l7rule.revert(L7RULE_ID)
delete_l7rule.revert(_l7rule_mock)
# TODO(sbalukoff) Fix
# repo.ListenerRepository.update.assert_called_once_with(