diff --git a/cloudkitty/orchestrator.py b/cloudkitty/orchestrator.py index f8a858bb..684108e5 100644 --- a/cloudkitty/orchestrator.py +++ b/cloudkitty/orchestrator.py @@ -170,8 +170,6 @@ class ScopeEndpoint(object): try: self._storage.delete(begin=state_dt, end=None, filters={ scope['scope_key']: scope['scope_id'], - 'collector': scope['collector'], - 'fetcher': scope['fetcher'], }) self._state.set_state( scope['scope_id'], diff --git a/cloudkitty/tests/test_orchestrator.py b/cloudkitty/tests/test_orchestrator.py index 9dc7bfb0..9373065e 100644 --- a/cloudkitty/tests/test_orchestrator.py +++ b/cloudkitty/tests/test_orchestrator.py @@ -84,18 +84,15 @@ class ScopeEndpointTest(tests.TestCase): begin=tzutils.utc_to_local( datetime.datetime(2019, 7, 16, 8, 55, 1)), end=None, - filters={ - 'project_id': 'f266f30b11f246b589fd266f85eeec39', - 'collector': 'prometheus', - 'fetcher': 'prometheus'}), + filters={'project_id': 'f266f30b11f246b589fd266f85eeec39'} + ), mock.call( begin=tzutils.utc_to_local( datetime.datetime(2019, 7, 16, 8, 55, 1)), end=None, - filters={ - 'project_id': '4dfb25b0947c4f5481daf7b948c14187', - 'collector': 'gnocchi', - 'fetcher': 'gnocchi'})], any_order=True) + filters={'project_id': '4dfb25b0947c4f5481daf7b948c14187'}, + ) + ], any_order=True) ss.assert_has_calls([ mock.call( diff --git a/releasenotes/notes/fix-scope-state-reset-filters-0a1f5ea503bd32a1.yaml b/releasenotes/notes/fix-scope-state-reset-filters-0a1f5ea503bd32a1.yaml new file mode 100644 index 00000000..3d2b4459 --- /dev/null +++ b/releasenotes/notes/fix-scope-state-reset-filters-0a1f5ea503bd32a1.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + An issue causing data not to be deleted from the storage backend when + resetting a scope's state through the API has been fixed.