openstack/vitrage
Code Issues Proposed changes

Merge "undo the removal of persistency tables"

Browse Source
This commit is contained in:
Zuul 2018-02-28 08:30:59 +00:00 committed by Gerrit Code Review
commit 5f5f11089d
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/gate_hook.sh
View File

@ -69,6 +69,9 @@ changes_interval = 5
[datasources] [datasources]
snapshots_interval = 120 snapshots_interval = 120
[persistency]
enable_persistency=true
EOF EOF
)" )"

9
vitrage/datasources/collector_notifier.py
View File

@ -27,11 +27,10 @@ class CollectorNotifier(object):
self.oslo_notifier = None self.oslo_notifier = None
try: try:
topics = [conf.datasources.notification_topic_collector] topics = [conf.datasources.notification_topic_collector]
# TODO(idan_hefetz): persistency is in development if conf.persistency.enable_persistency:
# if conf.persistency.enable_persistency: topics.append(conf.persistency.persistor_topic)
# topics.append(conf.persistency.persistor_topic) else:
# else: LOG.warning("Not persisting events")
# LOG.warning("Not persisting events")
self.oslo_notifier = oslo_messaging.Notifier( self.oslo_notifier = oslo_messaging.Notifier(
get_transport(conf), get_transport(conf),

7
vitrage/storage/impl_sqlalchemy.py
View File

@ -79,13 +79,12 @@ class Connection(base.Connection):
def upgrade(self, nocreate=False): def upgrade(self, nocreate=False):
engine = self._engine_facade.get_engine() engine = self._engine_facade.get_engine()
engine.connect() engine.connect()
models.Base.metadata.drop_all(
engine, tables=[models.Event.__table__,
models.GraphSnapshot.__table__])
models.Base.metadata.create_all( models.Base.metadata.create_all(
engine, tables=[models.ActiveAction.__table__, engine, tables=[models.ActiveAction.__table__,
models.Template.__table__, models.Template.__table__,
models.Webhooks.__table__]) models.Webhooks.__table__,
models.Event.__table__,
models.GraphSnapshot.__table__])
# TODO(idan_hefetz) upgrade logic is missing # TODO(idan_hefetz) upgrade logic is missing
def disconnect(self): def disconnect(self):

5
vitrage/tests/functional/entity_graph/graph_persistor/test_graph_persistor.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import time import time
import unittest
from oslo_config import cfg from oslo_config import cfg
from oslo_db.options import database_opts from oslo_db.options import database_opts
@ -43,7 +42,6 @@ class TestGraphPersistor(TestFunctionalBase):
cls.load_datasources(cls.conf) cls.load_datasources(cls.conf)
cls.graph_persistor = GraphPersistor(cls.conf) cls.graph_persistor = GraphPersistor(cls.conf)
@unittest.skip("persistency is disabled in queens")
def test_persist_graph(self): def test_persist_graph(self):
g = GraphGenerator().create_graph() g = GraphGenerator().create_graph()
current_time = utcnow() current_time = utcnow()
@ -53,7 +51,6 @@ class TestGraphPersistor(TestFunctionalBase):
self.assert_graph_equal(g, graph_snapshot) self.assert_graph_equal(g, graph_snapshot)
self.graph_persistor.delete_graph_snapshots(utcnow()) self.graph_persistor.delete_graph_snapshots(utcnow())
@unittest.skip("persistency is disabled in queens")
def test_persist_two_graphs(self): def test_persist_two_graphs(self):
g1 = GraphGenerator().create_graph() g1 = GraphGenerator().create_graph()
current_time1 = utcnow() current_time1 = utcnow()
@ -71,7 +68,6 @@ class TestGraphPersistor(TestFunctionalBase):
self.assert_graph_equal(g2, graph_snapshot2) self.assert_graph_equal(g2, graph_snapshot2)
self.graph_persistor.delete_graph_snapshots(utcnow()) self.graph_persistor.delete_graph_snapshots(utcnow())
@unittest.skip("persistency is disabled in queens")
def test_load_last_graph_snapshot_until_timestamp(self): def test_load_last_graph_snapshot_until_timestamp(self):
g1 = GraphGenerator().create_graph() g1 = GraphGenerator().create_graph()
self.graph_persistor.last_event_timestamp = utcnow() self.graph_persistor.last_event_timestamp = utcnow()
@ -89,7 +85,6 @@ class TestGraphPersistor(TestFunctionalBase):
self.assert_graph_equal(g1, graph_snapshot) self.assert_graph_equal(g1, graph_snapshot)
self.graph_persistor.delete_graph_snapshots(utcnow()) self.graph_persistor.delete_graph_snapshots(utcnow())
@unittest.skip("persistency is disabled in queens")
def test_delete_graph_snapshots(self): def test_delete_graph_snapshots(self):
g = GraphGenerator().create_graph() g = GraphGenerator().create_graph()
self.graph_persistor.last_event_timestamp = utcnow() self.graph_persistor.last_event_timestamp = utcnow()