diff --git a/vitrage/common/constants.py b/vitrage/common/constants.py index 0086aa986..d95caab60 100644 --- a/vitrage/common/constants.py +++ b/vitrage/common/constants.py @@ -24,7 +24,6 @@ class VertexProperties(object): AGGREGATED_STATE = 'aggregated_state' OPERATIONAL_STATE = 'operational_state' PROJECT_ID = 'project_id' - TENANT_ID = 'tenant_id' UPDATE_TIMESTAMP = 'update_timestamp' SAMPLE_TIMESTAMP = 'sample_timestamp' NAME = 'name' diff --git a/vitrage/datasources/aodh/transformer.py b/vitrage/datasources/aodh/transformer.py index 349691284..ce61c3050 100644 --- a/vitrage/datasources/aodh/transformer.py +++ b/vitrage/datasources/aodh/transformer.py @@ -51,7 +51,7 @@ class AodhTransformer(AlarmTransformerBase): VProps.SEVERITY: entity_event[AodhProps.SEVERITY], AodhProps.DESCRIPTION: entity_event[AodhProps.DESCRIPTION], AodhProps.ENABLED: entity_event[AodhProps.ENABLED], - VProps.TENANT_ID: entity_event.get(AodhProps.PROJECT_ID, None), + VProps.PROJECT_ID: entity_event.get(AodhProps.PROJECT_ID, None), AodhProps.REPEAT_ACTIONS: entity_event[AodhProps.REPEAT_ACTIONS], 'alarm_type': entity_event[AodhProps.TYPE] } diff --git a/vitrage/datasources/cinder/volume/transformer.py b/vitrage/datasources/cinder/volume/transformer.py index f26bf8af8..ef29535d0 100644 --- a/vitrage/datasources/cinder/volume/transformer.py +++ b/vitrage/datasources/cinder/volume/transformer.py @@ -50,14 +50,14 @@ class CinderVolumeTransformer(ResourceTransformerBase): volume_name = extract_field_value(entity_event, 'display_name') volume_id = extract_field_value(entity_event, 'id') volume_state = extract_field_value(entity_event, 'status') - tenant_id = entity_event.get('os-vol-tenant-attr:tenant_id', None) + project_id = entity_event.get('os-vol-tenant-attr:tenant_id', None) timestamp = extract_field_value(entity_event, 'created_at') return self._create_vertex(entity_event, volume_name, volume_id, volume_state, - tenant_id, + project_id, timestamp) def _create_update_entity_vertex(self, entity_event): @@ -65,14 +65,14 @@ class CinderVolumeTransformer(ResourceTransformerBase): volume_name = extract_field_value(entity_event, 'display_name') volume_id = extract_field_value(entity_event, 'volume_id') volume_state = extract_field_value(entity_event, 'status') - tenant_id = entity_event.get(VProps.TENANT_ID, None) + project_id = entity_event.get('tenant_id', None) timestamp = entity_event.get('updated_at', None) return self._create_vertex(entity_event, volume_name, volume_id, volume_state, - tenant_id, + project_id, timestamp) def _create_vertex(self, @@ -80,11 +80,11 @@ class CinderVolumeTransformer(ResourceTransformerBase): volume_name, volume_id, volume_state, - tenant_id, + project_id, update_timestamp): metadata = { VProps.NAME: volume_name, - VProps.TENANT_ID: tenant_id, + VProps.PROJECT_ID: project_id, } entity_key = self._create_entity_key(entity_event) diff --git a/vitrage/datasources/neutron/network/transformer.py b/vitrage/datasources/neutron/network/transformer.py index 0e6cea6f8..b536de412 100644 --- a/vitrage/datasources/neutron/network/transformer.py +++ b/vitrage/datasources/neutron/network/transformer.py @@ -52,12 +52,14 @@ class NetworkTransformer(ResourceTransformerBase): entity_id = entity_event['id'] state = entity_event['status'] update_timestamp = entity_event['updated_at'] + project_id = entity_event.get('tenant_id', None) return self._create_vertex(entity_event, name, entity_id, state, - update_timestamp) + update_timestamp, + project_id) def _create_update_entity_vertex(self, entity_event): @@ -68,23 +70,26 @@ class NetworkTransformer(ResourceTransformerBase): extract_field_value(entity_event, 'network', 'updated_at') entity_id = extract_field_value(entity_event, *self.UPDATE_ID_PROPERTY[event_type]) + project_id = extract_field_value(entity_event, 'network', 'tenant_id') return self._create_vertex(entity_event, name, entity_id, state, - update_timestamp) + update_timestamp, + project_id) def _create_vertex(self, entity_event, name, entity_id, state, - update_timestamp): + update_timestamp, + project_id): metadata = { VProps.NAME: name, - VProps.TENANT_ID: entity_event.get(VProps.TENANT_ID, None), + VProps.PROJECT_ID: project_id, } sample_timestamp = entity_event[DSProps.SAMPLE_DATE] diff --git a/vitrage/datasources/neutron/port/transformer.py b/vitrage/datasources/neutron/port/transformer.py index 5e88e6a55..680dafdd5 100644 --- a/vitrage/datasources/neutron/port/transformer.py +++ b/vitrage/datasources/neutron/port/transformer.py @@ -63,12 +63,14 @@ class PortTransformer(ResourceTransformerBase): entity_id = entity_event['id'] state = entity_event['status'] update_timestamp = entity_event['updated_at'] + project_id = entity_event.get('tenant_id', None) return self._create_vertex(entity_event, name, entity_id, state, - update_timestamp) + update_timestamp, + project_id) def _create_update_entity_vertex(self, entity_event): @@ -79,19 +81,22 @@ class PortTransformer(ResourceTransformerBase): extract_field_value(entity_event, 'port', 'updated_at') entity_id = extract_field_value(entity_event, *self.UPDATE_ID_PROPERTY[event_type]) + project_id = extract_field_value(entity_event, 'port', 'tenant_id') return self._create_vertex(entity_event, name, entity_id, state, - update_timestamp) + update_timestamp, + project_id) def _create_vertex(self, entity_event, name, entity_id, state, - update_timestamp): + update_timestamp, + project_id): event_type = entity_event.get(DSProps.EVENT_TYPE, None) ip_addresses = [] if not event_type: @@ -100,7 +105,7 @@ class PortTransformer(ResourceTransformerBase): ip_addresses = [ip['ip_address'] for ip in fixed_ips] metadata = { VProps.NAME: name, - VProps.TENANT_ID: entity_event.get(VProps.TENANT_ID, None), + VProps.PROJECT_ID: project_id, 'ip_addresses': tuple(ip_addresses), } diff --git a/vitrage/datasources/nova/instance/transformer.py b/vitrage/datasources/nova/instance/transformer.py index b32c6bf14..49b8c32fa 100644 --- a/vitrage/datasources/nova/instance/transformer.py +++ b/vitrage/datasources/nova/instance/transformer.py @@ -62,7 +62,7 @@ class InstanceTransformer(ResourceTransformerBase): metadata = { VProps.NAME: name, - VProps.TENANT_ID: entity_event.get(VProps.TENANT_ID, None), + VProps.PROJECT_ID: entity_event.get('tenant_id', None), } sample_timestamp = entity_event[DSProps.SAMPLE_DATE] diff --git a/vitrage/tests/unit/datasources/nova/test_nova_instance_transformers.py b/vitrage/tests/unit/datasources/nova/test_nova_instance_transformers.py index 9f02d2737..e672765c3 100644 --- a/vitrage/tests/unit/datasources/nova/test_nova_instance_transformers.py +++ b/vitrage/tests/unit/datasources/nova/test_nova_instance_transformers.py @@ -176,7 +176,7 @@ class NovaInstanceTransformerTest(base.BaseTest): vertex[VertexProperties.TYPE]) expected_project = extract_value(event, 'tenant_id') - observed_project = vertex[VertexProperties.TENANT_ID] + observed_project = vertex[VertexProperties.PROJECT_ID] self.assertEqual(expected_project, observed_project) state = 'state' if is_update_event else 'status'