openstack/vitrage
Code Issues Proposed changes

change tenant_id to project_id

Browse Source 
Change-Id: I423c378ce2623bf996a7bbfd3c37c4551280deef
This commit is contained in:
Alexey Weyl 2016-08-14 11:23:13 +03:00
parent afa55da69d
commit edfc7ddf0f
7 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vitrage/common/constants.py
View File

@ -24,7 +24,6 @@ class VertexProperties(object):
AGGREGATED_STATE = 'aggregated_state' AGGREGATED_STATE = 'aggregated_state'
OPERATIONAL_STATE = 'operational_state' OPERATIONAL_STATE = 'operational_state'
PROJECT_ID = 'project_id' PROJECT_ID = 'project_id'
TENANT_ID = 'tenant_id'
UPDATE_TIMESTAMP = 'update_timestamp' UPDATE_TIMESTAMP = 'update_timestamp'
SAMPLE_TIMESTAMP = 'sample_timestamp' SAMPLE_TIMESTAMP = 'sample_timestamp'
NAME = 'name' NAME = 'name'

2
vitrage/datasources/aodh/transformer.py
View File

@ -51,7 +51,7 @@ class AodhTransformer(AlarmTransformerBase):
VProps.SEVERITY: entity_event[AodhProps.SEVERITY], VProps.SEVERITY: entity_event[AodhProps.SEVERITY],
AodhProps.DESCRIPTION: entity_event[AodhProps.DESCRIPTION], AodhProps.DESCRIPTION: entity_event[AodhProps.DESCRIPTION],
AodhProps.ENABLED: entity_event[AodhProps.ENABLED], 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], AodhProps.REPEAT_ACTIONS: entity_event[AodhProps.REPEAT_ACTIONS],
'alarm_type': entity_event[AodhProps.TYPE] 'alarm_type': entity_event[AodhProps.TYPE]
} }

12
vitrage/datasources/cinder/volume/transformer.py
View File

@ -50,14 +50,14 @@ class CinderVolumeTransformer(ResourceTransformerBase):
volume_name = extract_field_value(entity_event, 'display_name') volume_name = extract_field_value(entity_event, 'display_name')
volume_id = extract_field_value(entity_event, 'id') volume_id = extract_field_value(entity_event, 'id')
volume_state = extract_field_value(entity_event, 'status') 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') timestamp = extract_field_value(entity_event, 'created_at')
return self._create_vertex(entity_event, return self._create_vertex(entity_event,
volume_name, volume_name,
volume_id, volume_id,
volume_state, volume_state,
tenant_id, project_id,
timestamp) timestamp)
def _create_update_entity_vertex(self, entity_event): 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_name = extract_field_value(entity_event, 'display_name')
volume_id = extract_field_value(entity_event, 'volume_id') volume_id = extract_field_value(entity_event, 'volume_id')
volume_state = extract_field_value(entity_event, 'status') 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) timestamp = entity_event.get('updated_at', None)
return self._create_vertex(entity_event, return self._create_vertex(entity_event,
volume_name, volume_name,
volume_id, volume_id,
volume_state, volume_state,
tenant_id, project_id,
timestamp) timestamp)
def _create_vertex(self, def _create_vertex(self,
@ -80,11 +80,11 @@ class CinderVolumeTransformer(ResourceTransformerBase):
volume_name, volume_name,
volume_id, volume_id,
volume_state, volume_state,
tenant_id, project_id,
update_timestamp): update_timestamp):
metadata = { metadata = {
VProps.NAME: volume_name, VProps.NAME: volume_name,
VProps.TENANT_ID: tenant_id, VProps.PROJECT_ID: project_id,
} }
entity_key = self._create_entity_key(entity_event) entity_key = self._create_entity_key(entity_event)

13
vitrage/datasources/neutron/network/transformer.py
View File

@ -52,12 +52,14 @@ class NetworkTransformer(ResourceTransformerBase):
entity_id = entity_event['id'] entity_id = entity_event['id']
state = entity_event['status'] state = entity_event['status']
update_timestamp = entity_event['updated_at'] update_timestamp = entity_event['updated_at']
project_id = entity_event.get('tenant_id', None)
return self._create_vertex(entity_event, return self._create_vertex(entity_event,
name, name,
entity_id, entity_id,
state, state,
update_timestamp) update_timestamp,
project_id)
def _create_update_entity_vertex(self, entity_event): def _create_update_entity_vertex(self, entity_event):
@ -68,23 +70,26 @@ class NetworkTransformer(ResourceTransformerBase):
extract_field_value(entity_event, 'network', 'updated_at') extract_field_value(entity_event, 'network', 'updated_at')
entity_id = extract_field_value(entity_event, entity_id = extract_field_value(entity_event,
*self.UPDATE_ID_PROPERTY[event_type]) *self.UPDATE_ID_PROPERTY[event_type])
project_id = extract_field_value(entity_event, 'network', 'tenant_id')
return self._create_vertex(entity_event, return self._create_vertex(entity_event,
name, name,
entity_id, entity_id,
state, state,
update_timestamp) update_timestamp,
project_id)
def _create_vertex(self, def _create_vertex(self,
entity_event, entity_event,
name, name,
entity_id, entity_id,
state, state,
update_timestamp): update_timestamp,
project_id):
metadata = { metadata = {
VProps.NAME: name, 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] sample_timestamp = entity_event[DSProps.SAMPLE_DATE]

13
vitrage/datasources/neutron/port/transformer.py
View File

@ -63,12 +63,14 @@ class PortTransformer(ResourceTransformerBase):
entity_id = entity_event['id'] entity_id = entity_event['id']
state = entity_event['status'] state = entity_event['status']
update_timestamp = entity_event['updated_at'] update_timestamp = entity_event['updated_at']
project_id = entity_event.get('tenant_id', None)
return self._create_vertex(entity_event, return self._create_vertex(entity_event,
name, name,
entity_id, entity_id,
state, state,
update_timestamp) update_timestamp,
project_id)
def _create_update_entity_vertex(self, entity_event): def _create_update_entity_vertex(self, entity_event):
@ -79,19 +81,22 @@ class PortTransformer(ResourceTransformerBase):
extract_field_value(entity_event, 'port', 'updated_at') extract_field_value(entity_event, 'port', 'updated_at')
entity_id = extract_field_value(entity_event, entity_id = extract_field_value(entity_event,
*self.UPDATE_ID_PROPERTY[event_type]) *self.UPDATE_ID_PROPERTY[event_type])
project_id = extract_field_value(entity_event, 'port', 'tenant_id')
return self._create_vertex(entity_event, return self._create_vertex(entity_event,
name, name,
entity_id, entity_id,
state, state,
update_timestamp) update_timestamp,
project_id)
def _create_vertex(self, def _create_vertex(self,
entity_event, entity_event,
name, name,
entity_id, entity_id,
state, state,
update_timestamp): update_timestamp,
project_id):
event_type = entity_event.get(DSProps.EVENT_TYPE, None) event_type = entity_event.get(DSProps.EVENT_TYPE, None)
ip_addresses = [] ip_addresses = []
if not event_type: if not event_type:
@ -100,7 +105,7 @@ class PortTransformer(ResourceTransformerBase):
ip_addresses = [ip['ip_address'] for ip in fixed_ips] ip_addresses = [ip['ip_address'] for ip in fixed_ips]
metadata = { metadata = {
VProps.NAME: name, VProps.NAME: name,
VProps.TENANT_ID: entity_event.get(VProps.TENANT_ID, None), VProps.PROJECT_ID: project_id,
'ip_addresses': tuple(ip_addresses), 'ip_addresses': tuple(ip_addresses),
} }

2
vitrage/datasources/nova/instance/transformer.py
View File

@ -62,7 +62,7 @@ class InstanceTransformer(ResourceTransformerBase):
metadata = { metadata = {
VProps.NAME: name, 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] sample_timestamp = entity_event[DSProps.SAMPLE_DATE]

2
vitrage/tests/unit/datasources/nova/test_nova_instance_transformers.py
View File

@ -176,7 +176,7 @@ class NovaInstanceTransformerTest(base.BaseTest):
vertex[VertexProperties.TYPE]) vertex[VertexProperties.TYPE])
expected_project = extract_value(event, 'tenant_id') 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) self.assertEqual(expected_project, observed_project)
state = 'state' if is_update_event else 'status' state = 'state' if is_update_event else 'status'