openstack/vitrage
Code Issues Proposed changes

Merge "fix get topology parameters"

Browse Source
This commit is contained in:
Jenkins 2016-02-15 12:28:52 +00:00 committed by Gerrit Code Review
commit aafc1c17f6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,10 +67,10 @@ class VitrageApiHandlerService(os_service.Service):
LOG.info("Finish start VitrageApiHandlerService") LOG.info("Finish start VitrageApiHandlerService")
def stop(self): def stop(self, graceful=False):
LOG.info("Stop VitrageApiHandlerService") LOG.info("Stop VitrageApiHandlerService")
super(VitrageApiHandlerService, self).stop() super(VitrageApiHandlerService, self).stop(graceful)
LOG.info("Finish stop VitrageApiHandlerService") LOG.info("Finish stop VitrageApiHandlerService")
@ -102,7 +102,7 @@ class EntityGraphApis(object):
LOG.info("EntityGraphApis get_alarms result:%s", str(items_list)) LOG.info("EntityGraphApis get_alarms result:%s", str(items_list))
return json.dumps({'alarms': [v.properties for v in items_list]}) return json.dumps({'alarms': [v.properties for v in items_list]})
def get_topology(self, ctx, arg): def get_topology(self, ctx, graph_type, depth, query, root):
ga = create_algorithm(self.entity_graph) ga = create_algorithm(self.entity_graph)
found_graph = ga.graph_query_vertices( found_graph = ga.graph_query_vertices(
{'!=': {VProps.CATEGORY: EntityCategory.ALARM}}) {'!=': {VProps.CATEGORY: EntityCategory.ALARM}})