From a22833206a6cdbe8bb1283cc97df44ee714998ba Mon Sep 17 00:00:00 2001 From: Idan Hefetz Date: Sun, 11 Feb 2018 14:45:19 +0000 Subject: [PATCH] undo the removal of persistency tables Change-Id: I9fa1fd7a2edc4a475ec63f7cecc9d8bc980b2f32 --- devstack/gate_hook.sh | 3 +++ vitrage/datasources/collector_notifier.py | 9 ++++----- vitrage/storage/impl_sqlalchemy.py | 7 +++---- .../entity_graph/graph_persistor/test_graph_persistor.py | 5 ----- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh index 6c0cc4fdc..c8f28110e 100644 --- a/devstack/gate_hook.sh +++ b/devstack/gate_hook.sh @@ -73,6 +73,9 @@ changes_interval = 5 [datasources] snapshots_interval = 120 + +[persistency] +enable_persistency=true EOF )" diff --git a/vitrage/datasources/collector_notifier.py b/vitrage/datasources/collector_notifier.py index a0ef0b23d..54da41429 100644 --- a/vitrage/datasources/collector_notifier.py +++ b/vitrage/datasources/collector_notifier.py @@ -27,11 +27,10 @@ class CollectorNotifier(object): self.oslo_notifier = None try: topics = [conf.datasources.notification_topic_collector] - # TODO(idan_hefetz): persistency is in development - # if conf.persistency.enable_persistency: - # topics.append(conf.persistency.persistor_topic) - # else: - # LOG.warning("Not persisting events") + if conf.persistency.enable_persistency: + topics.append(conf.persistency.persistor_topic) + else: + LOG.warning("Not persisting events") self.oslo_notifier = oslo_messaging.Notifier( get_transport(conf), diff --git a/vitrage/storage/impl_sqlalchemy.py b/vitrage/storage/impl_sqlalchemy.py index b6a439e7a..d7a5a464f 100644 --- a/vitrage/storage/impl_sqlalchemy.py +++ b/vitrage/storage/impl_sqlalchemy.py @@ -79,13 +79,12 @@ class Connection(base.Connection): def upgrade(self, nocreate=False): engine = self._engine_facade.get_engine() engine.connect() - models.Base.metadata.drop_all( - engine, tables=[models.Event.__table__, - models.GraphSnapshot.__table__]) models.Base.metadata.create_all( engine, tables=[models.ActiveAction.__table__, models.Template.__table__, - models.Webhooks.__table__]) + models.Webhooks.__table__, + models.Event.__table__, + models.GraphSnapshot.__table__]) # TODO(idan_hefetz) upgrade logic is missing def disconnect(self): diff --git a/vitrage/tests/functional/entity_graph/graph_persistor/test_graph_persistor.py b/vitrage/tests/functional/entity_graph/graph_persistor/test_graph_persistor.py index 59e9516bd..e54348c63 100644 --- a/vitrage/tests/functional/entity_graph/graph_persistor/test_graph_persistor.py +++ b/vitrage/tests/functional/entity_graph/graph_persistor/test_graph_persistor.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. import time -import unittest from oslo_config import cfg from oslo_db.options import database_opts @@ -43,7 +42,6 @@ class TestGraphPersistor(TestFunctionalBase): cls.load_datasources(cls.conf) cls.graph_persistor = GraphPersistor(cls.conf) - @unittest.skip("persistency is disabled in queens") def test_persist_graph(self): g = GraphGenerator().create_graph() current_time = utcnow() @@ -53,7 +51,6 @@ class TestGraphPersistor(TestFunctionalBase): self.assert_graph_equal(g, graph_snapshot) self.graph_persistor.delete_graph_snapshots(utcnow()) - @unittest.skip("persistency is disabled in queens") def test_persist_two_graphs(self): g1 = GraphGenerator().create_graph() current_time1 = utcnow() @@ -71,7 +68,6 @@ class TestGraphPersistor(TestFunctionalBase): self.assert_graph_equal(g2, graph_snapshot2) self.graph_persistor.delete_graph_snapshots(utcnow()) - @unittest.skip("persistency is disabled in queens") def test_load_last_graph_snapshot_until_timestamp(self): g1 = GraphGenerator().create_graph() self.graph_persistor.last_event_timestamp = utcnow() @@ -89,7 +85,6 @@ class TestGraphPersistor(TestFunctionalBase): self.assert_graph_equal(g1, graph_snapshot) self.graph_persistor.delete_graph_snapshots(utcnow()) - @unittest.skip("persistency is disabled in queens") def test_delete_graph_snapshots(self): g = GraphGenerator().create_graph() self.graph_persistor.last_event_timestamp = utcnow()