Skip to content

Commit 75d672b

Browse files
committed
Remove set_state function and its references
Change all functions to use ``set_last_processed_timestamp`` instead of ``set_state``, update the tests and remove the ``set_state`` function. Change-Id: I3ff5a8932165a8a1780ca7e3084a9819bba281ec
1 parent d1c962a commit 75d672b

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

cloudkitty/orchestrator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ def execute_measurements_rating(self, end_time, start_time, usage_data):
446446
return frame
447447

448448
def update_scope_processing_state_db(self, timestamp):
449-
self._state.set_state(self._tenant_id, timestamp)
449+
self._state.set_last_processed_timestamp(self._tenant_id, timestamp)
450450

451451

452452
class ReprocessingWorker(Worker):

cloudkitty/storage_state/__init__.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,6 @@ def _get_db_item(self, session, identifier,
148148
session.commit()
149149
return r
150150

151-
def set_state(self, identifier, state,
152-
fetcher=None, collector=None, scope_key=None):
153-
"""Set the last processed timestamp of a scope.
154-
155-
This method is deprecated, consider using
156-
"set_last_processed_timestamp".
157-
"""
158-
LOG.warning("The method 'set_state' is deprecated. "
159-
"Consider using the new method "
160-
"'set_last_processed_timestamp'.")
161-
self.set_last_processed_timestamp(
162-
identifier, state, fetcher, collector, scope_key)
163-
164151
def set_last_processed_timestamp(
165152
self, identifier, last_processed_timestamp, fetcher=None,
166153
collector=None, scope_key=None):

cloudkitty/tests/gabbi/fixtures.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ def start_fixture(self):
403403
('hhhh', datetime.datetime(2019, 6, 6), 'fet2', 'col2', 'key2'),
404404
]
405405
for d in data:
406-
self.sm.set_state(
406+
self.sm.set_last_processed_timestamp(
407407
d[0], d[1], fetcher=d[2], collector=d[3], scope_key=d[4])
408408

409409
def stop_fixture(self):

cloudkitty/tests/test_orchestrator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,8 @@ def setUp(self):
237237
super(WorkerTest, self).setUp()
238238

239239
patcher_state_manager_set_state = mock.patch(
240-
"cloudkitty.storage_state.StateManager.set_state")
240+
"cloudkitty.storage_state."
241+
"StateManager.set_last_processed_timestamp")
241242
self.addCleanup(patcher_state_manager_set_state.stop)
242243
self.state_manager_set_state_mock = \
243244
patcher_state_manager_set_state.start()

cloudkitty/tests/test_storage_state.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ def test_get_last_processed_timestamp_does_update_columns(self):
8484
def test_set_state_does_update_columns(self):
8585
with mock.patch('cloudkitty.db.session_for_write'):
8686
self._test_x_state_does_update_columns(
87-
lambda x: self._state.set_state(x, datetime(2042, 1, 1)))
87+
lambda x: self._state.set_last_processed_timestamp(
88+
x, datetime(2042, 1, 1)
89+
)
90+
)
8891

8992
def _test_x_state_no_column_update(self, func):
9093
r_mock = self._get_r_mock(
@@ -106,7 +109,10 @@ def test_get_last_processed_timestamp_no_column_update(self):
106109
def test_set_state_no_column_update(self):
107110
with mock.patch('cloudkitty.db.session_for_write'):
108111
self._test_x_state_no_column_update(
109-
lambda x: self._state.set_state(x, datetime(2042, 1, 1)))
112+
lambda x: self._state.set_last_processed_timestamp(
113+
x, datetime(2042, 1, 1)
114+
)
115+
)
110116

111117
def test_set_state_does_not_duplicate_entries(self):
112118
state = datetime(2042, 1, 1)
@@ -118,7 +124,7 @@ def test_set_state_does_not_duplicate_entries(self):
118124
'cloudkitty.db.session_for_write') as sm:
119125
sm.return_value.__enter__.return_value = session_mock = \
120126
mock.MagicMock()
121-
self._state.set_state('fake_identifier', state)
127+
self._state.set_last_processed_timestamp('fake_identifier', state)
122128
session_mock.commit.assert_not_called()
123129
session_mock.add.assert_not_called()
124130

@@ -133,7 +139,9 @@ def test_set_state_does_update_state(self):
133139
sm.return_value.__enter__.return_value = session_mock = \
134140
mock.MagicMock()
135141
self.assertNotEqual(r_mock.state, new_state)
136-
self._state.set_state('fake_identifier', new_state)
142+
self._state.set_last_processed_timestamp(
143+
'fake_identifier', new_state
144+
)
137145
self.assertEqual(r_mock.last_processed_timestamp, new_state)
138146
session_mock.commit.assert_called_once()
139147
session_mock.add.assert_not_called()
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
upgrade:
3+
- |
4+
The ``storage_state.set_state`` method has been removed in favor of the
5+
``storage_state.set_last_processed_timestamp`` method.

0 commit comments

Comments
 (0)