openstack/vitrage
Code Issues Proposed changes

Merge "tree topology API should return the specified root"

Browse Source
This commit is contained in:
Jenkins 2016-05-15 13:00:06 +00:00 committed by Gerrit Code Review
commit d28be58b3d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vitrage/api/controllers/v1/topology.py
View File

@ -21,6 +21,8 @@ from pecan.core import abort
from vitrage.api.controllers.rest import RootRestController
from vitrage.api.policy import enforce
from vitrage.common.constants import VertexProperties as VProps
from vitrage.datasources import OPENSTACK_CLUSTER
# noinspection PyProtectedMember
from vitrage.i18n import _LI
@ -64,7 +66,13 @@ class TopologyController(RootRestController):
if graph_type == 'graph':
return graph
if graph_type == 'tree':
return RootRestController.as_tree(graph)
node_id = OPENSTACK_CLUSTER
if root:
for node in graph['nodes']:
if node[VProps.VITRAGE_ID] == root:
node_id = node[VProps.ID]
break
return RootRestController.as_tree(graph, node_id)
except Exception as e:
LOG.exception('failed to get topology %s ', e)