openstack
/
heat
Code Issues Proposed changes

Make the API for getting dependency graph edges public 

This will allow us to build new dependency graphs from combinations of
existing graphs.

Change-Id: I6da62607fa1e361d4d2e1581fd286c62f0d9470a
This commit is contained in:
Zane Bitter 2013-08-22 13:01:21 +02:00
parent f2e9b31a96
commit 23aa437766
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
heat/engine/dependencies.py
View File

@ -112,6 +112,17 @@ class Graph(collections.defaultdict):
'''Return a copy of the graph with the edges reversed.'''
return Graph(self.map(lambda n: n.reverse_copy()))
def edges(self):
'''Return an iterator over all of the edges in the graph.'''
def outgoing_edges(rqr, node):
if node.disjoint():
yield (rqr, None)
else:
for rqd in node:
yield (rqr, rqd)
return itertools.chain.from_iterable(outgoing_edges(*i)
for i in self.iteritems())
def __delitem__(self, key):
'''Delete the node given by the specified key from the graph.'''
node = self[key]
@ -213,20 +224,10 @@ class Dependencies(object):
'''
return str(self._graph)
def _edges(self):
'''Return an iterator over all of the edges in the graph.'''
def outgoing_edges(rqr, node):
if node.disjoint():
yield (rqr, None)
else:
for rqd in node:
yield (rqr, rqd)
return itertools.chain.from_iterable(outgoing_edges(*i)
for i in self._graph.iteritems())
def __repr__(self):
'''Return a string representation of the object.'''
return 'Dependencies([%s])' % ', '.join(repr(e) for e in self._edges())
edge_reprs = (repr(e) for e in self._graph.edges())
return 'Dependencies([%s])' % ', '.join(edge_reprs)
def graph(self, reverse=False):
'''Return a copy of the underlying dependency graph.'''

5
heat/tests/test_dependencies.py
View File

@ -48,6 +48,11 @@ class dependenciesTest(testtools.TestCase):
'"%s" is not greater than "%s"' % (str(a), str(b)))
self._dep_test(reversed, assertGreater, deps)
def test_edges(self):
input_edges = [('1', None), ('2', '3'), ('2', '4')]
dp = Dependencies(input_edges)
self.assertEqual(set(dp.graph().edges()), set(input_edges))
def test_repr(self):
dp = Dependencies([('1', None), ('2', '3'), ('2', '4')])
s = "Dependencies([('1', None), ('2', '3'), ('2', '4')])"