openstack/taskflow
Code Issues Proposed changes

Rename attribute '_graph' to '_execution_graph'

Browse Source 
The naming of '_execution_graph' is more appropriate
so that people looking at this code are clear on exactly
what this graph is and what it is used for.

Change-Id: I8d80101a05b34886a87bdc75e38a0457c785fcf4
This commit is contained in:
Joshua Harlow
2015-03-13 18:51:34 -07:00
parent dbb71b8471
commit 87d6f5823d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
taskflow/engines/action_engine/analyzer.py
View File

@@ -33,7 +33,7 @@ class Analyzer(object):
def __init__(self, compilation, storage):
self._storage = storage
self._graph = compilation.execution_graph
self._execution_graph = compilation.execution_graph
def get_next_nodes(self, node=None):
if node is None:
@@ -65,9 +65,9 @@ class Analyzer(object):
otherwise it will examine the whole graph.
"""
if node:
nodes = self._graph.successors(node)
nodes = self._execution_graph.successors(node)
else:
nodes = self._graph.nodes_iter()
nodes = self._execution_graph.nodes_iter()
available_nodes = []
for node in nodes:
@@ -83,9 +83,9 @@ class Analyzer(object):
node, otherwise it will examine the whole graph.
"""
if node:
nodes = self._graph.predecessors(node)
nodes = self._execution_graph.predecessors(node)
else:
nodes = self._graph.nodes_iter()
nodes = self._execution_graph.nodes_iter()
available_nodes = []
for node in nodes:
@@ -102,7 +102,7 @@ class Analyzer(object):
return False
task_names = []
for prev_task in self._graph.predecessors(task):
for prev_task in self._execution_graph.predecessors(task):
task_names.append(prev_task.name)
task_states = self._storage.get_atoms_states(task_names)
@@ -118,7 +118,7 @@ class Analyzer(object):
return False
task_names = []
for prev_task in self._graph.successors(task):
for prev_task in self._execution_graph.successors(task):
task_names.append(prev_task.name)
task_states = self._storage.get_atoms_states(task_names)
@@ -127,7 +127,7 @@ class Analyzer(object):
def iterate_subgraph(self, retry):
"""Iterates a subgraph connected to given retry controller."""
for _src, dst in traversal.dfs_edges(self._graph, retry):
for _src, dst in traversal.dfs_edges(self._execution_graph, retry):
yield dst
def iterate_retries(self, state=None):
@@ -135,20 +135,20 @@ class Analyzer(object):
If no state is provided it will yield back all retry controllers.
"""
for node in self._graph.nodes_iter():
for node in self._execution_graph.nodes_iter():
if isinstance(node, retry_atom.Retry):
if not state or self.get_state(node) == state:
yield node
def iterate_all_nodes(self):
for node in self._graph.nodes_iter():
for node in self._execution_graph.nodes_iter():
yield node
def find_atom_retry(self, atom):
return self._graph.node[atom].get('retry')
return self._execution_graph.node[atom].get('retry')
def is_success(self):
for node in self._graph.nodes_iter():
for node in self._execution_graph.nodes_iter():
if self.get_state(node) != st.SUCCESS:
return False
return True