openstack/vitrage
Code Issues Proposed changes

not condition

Browse Source 
add name property to the openstack cluster entity

Change-Id: Icbd146e8773cbfa26a37a69e59f8705d5d37a851
This commit is contained in:
Alexey Weyl 2017-02-02 08:01:27 +00:00
parent 5237b7193a
commit 10006a9cbe
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/gate_hook.sh
View File

@ -64,6 +64,9 @@ notification_driver = messagingv2
notification_topics = notifications,vitrage_notifications notification_topics = notifications,vitrage_notifications
notification_driver = messagingv2 notification_driver = messagingv2
[oslo_messaging_notifications]
transport_url = rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672/
[[post-config|\$HEAT_CONF]] [[post-config|\$HEAT_CONF]]
[DEFAULT] [DEFAULT]
notification_topics = notifications,vitrage_notifications notification_topics = notifications,vitrage_notifications

3
vitrage/datasources/nova/zone/transformer.py
View File

@ -85,7 +85,8 @@ class ZoneTransformer(ResourceTransformerBase):
neighbors = [] neighbors = []
metadata = { metadata = {
VProps.IS_PLACEHOLDER: False, VProps.IS_PLACEHOLDER: False,
VProps.STATE: 'available' VProps.STATE: 'available',
VProps.NAME: OPENSTACK_CLUSTER
} }
cluster_neighbor = self._create_neighbor(entity_event, cluster_neighbor = self._create_neighbor(entity_event,
CLUSTER_ID, CLUSTER_ID,

9
vitrage_tempest_tests/tests/api/base.py
View File

@ -341,8 +341,6 @@ class BaseApiTest(base.BaseTestCase):
entities): entities):
self.assertIsNotNone(graph) self.assertIsNotNone(graph)
self.assertIsNotNone(entities) self.assertIsNotNone(entities)
self.assertEqual(num_entities, graph.num_vertices())
self.assertEqual(num_edges, graph.num_edges())
for entity in entities: for entity in entities:
query = { query = {
@ -357,13 +355,16 @@ class BaseApiTest(base.BaseTestCase):
'%s%s' % ('Num vertices is incorrect for: ', '%s%s' % ('Num vertices is incorrect for: ',
entity[VProps.TYPE])) entity[VProps.TYPE]))
num_edges = sum([len(graph.get_edges(vertex.vertex_id)) entity_num_edges = sum([len(graph.get_edges(vertex.vertex_id))
for vertex in vertices]) for vertex in vertices])
self.assertEqual(entity[self.NUM_EDGES_PER_TYPE], self.assertEqual(entity[self.NUM_EDGES_PER_TYPE],
num_edges, entity_num_edges,
'%s%s' % ('Num edges is incorrect for: ', '%s%s' % ('Num edges is incorrect for: ',
entity[VProps.TYPE])) entity[VProps.TYPE]))
self.assertEqual(num_entities, graph.num_vertices())
self.assertEqual(num_edges, graph.num_edges())
@staticmethod @staticmethod
def _get_value(item, key): def _get_value(item, key):
return utils.uni2str(item[key]) return utils.uni2str(item[key])