From 9c3020625114d24ab9bbc8351317957e695b9fae Mon Sep 17 00:00:00 2001 From: Alexey Weyl Date: Tue, 18 Jul 2017 07:34:47 +0000 Subject: [PATCH] Remove sample_timestamp from update events made by vitrage Closes-Bug: #1701194 Change-Id: I4f130202589420d937be66ea7def1465bf2bf324 --- vitrage/entity_graph/processor/processor_utils.py | 4 ++-- vitrage/evaluator/actions/evaluator_event_transformer.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/vitrage/entity_graph/processor/processor_utils.py b/vitrage/entity_graph/processor/processor_utils.py index 9a9964f59..60d3cbcd7 100644 --- a/vitrage/entity_graph/processor/processor_utils.py +++ b/vitrage/entity_graph/processor/processor_utils.py @@ -33,9 +33,9 @@ def is_newer_vertex(prev_vertex, new_vertex): return True prev_time = parser.parse(prev_timestamp) - new_timestamp = new_vertex[VProps.VITRAGE_SAMPLE_TIMESTAMP] + new_timestamp = new_vertex.get(VProps.VITRAGE_SAMPLE_TIMESTAMP) if not new_timestamp: - return False + return True new_time = parser.parse(new_timestamp) return prev_time <= new_time diff --git a/vitrage/evaluator/actions/evaluator_event_transformer.py b/vitrage/evaluator/actions/evaluator_event_transformer.py index 64e366551..c0b215b4c 100644 --- a/vitrage/evaluator/actions/evaluator_event_transformer.py +++ b/vitrage/evaluator/actions/evaluator_event_transformer.py @@ -63,8 +63,6 @@ class EvaluatorEventTransformer(transformer_base.TransformerBase): if event_type == UPDATE_VERTEX: properties = { VProps.UPDATE_TIMESTAMP: update_timestamp, - VProps.VITRAGE_SAMPLE_TIMESTAMP: - event[VProps.VITRAGE_SAMPLE_TIMESTAMP], VProps.VITRAGE_IS_PLACEHOLDER: False, VProps.RESOURCE_ID: event.get(TFields.TARGET) }