openstack/vitrage
Code Issues Proposed changes

Graph-type tree without a filter

Browse Source 
Closes-Bug: #1577112

Change-Id: I4e4be2c3f0a2d02bf2d2cf0839a55a66b56557ff
This commit is contained in:
Noam Bloom
2016-05-29 10:30:34 +03:00
parent 38a40b3e2e
commit 5360c43132
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vitrage/entity_graph/api_handler/entity_graph_api.py
View File

@@ -99,7 +99,11 @@ class EntityGraphApis(object):
ga = create_algorithm(self.entity_graph)
if graph_type == 'tree':
final_query = query if query else TREE_TOPOLOGY_QUERY
if query:
final_query = query
else:
LOG.error("Graph-type 'tree' requires a filter.")
return {}
else:
final_query = query if query else TOPOLOGY_AND_ALARMS_QUERY

16
vitrage_tempest_tests/tests/api/topology/test_topology.py
View File

@@ -18,6 +18,13 @@ from vitrage_tempest_tests.tests.api.topology.base import BaseTopologyTest
import vitrage_tempest_tests.tests.utils as utils
LOG = logging.getLogger(__name__)
NOVA_QUERY = '{"and": [{"==": {"category": "RESOURCE"}},' \
'{"==": {"is_deleted": false}},' \
'{"==": {"is_placeholder": false}},' \
'{"or": [{"==": {"type": "openstack.cluster"}},' \
'{"==": {"type": "nova.instance"}},' \
'{"==": {"type": "nova.host"}},' \
'{"==": {"type": "nova.zone"}}]}]}'
class TestTopology(BaseTopologyTest):
@@ -69,11 +76,12 @@ class TestTopology(BaseTopologyTest):
finally:
self._rollback_to_default()
def test_default_tree(self):
def test_nova_tree(self):
try:
# create entities
self._create_entities(num_instances=3, num_volumes=1)
api_graph = self.vitrage_client.topology.get(graph_type='tree')
api_graph = self.vitrage_client.topology.get(graph_type='tree',
query=NOVA_QUERY)
self.assertIsNotNone(api_graph)
graph = self._create_graph_from_tree_dictionary(api_graph)
entities = self._entities_validation_data(
@@ -106,7 +114,7 @@ class TestTopology(BaseTopologyTest):
# create entities
self._create_entities(num_instances=3)
api_graph = self.vitrage_client.topology.get(
limit=2, graph_type='tree')
limit=2, graph_type='tree', query=NOVA_QUERY)
self.assertIsNotNone(api_graph)
graph = self._create_graph_from_tree_dictionary(api_graph)
entities = self._entities_validation_data(
@@ -120,7 +128,7 @@ class TestTopology(BaseTopologyTest):
# create entities
self._create_entities(num_instances=3)
api_graph = self.vitrage_client.topology.get(
limit=3, graph_type='tree')
limit=3, graph_type='tree', query=NOVA_QUERY)
self.assertIsNotNone(api_graph)
graph = self._create_graph_from_tree_dictionary(api_graph)
entities = self._entities_validation_data(