openstack/octavia
Code Issues Proposed changes

Re-enable flow diagrams

Browse Source 
OpenStack requirements has added pydot to global requirements.
Even though this isn't the proper fix (still pending networkx 2.2 release)
this will resolve the dependency issue for us, so re-enabling our
flow diagrams.

Change-Id: I49856c8fbd7cb6302be4ec97a14b2c10682cf504
This commit is contained in:
Michael Johnson 2018-08-30 10:00:54 -07:00
parent 2a2b308a39
commit 96b9450e60
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/requirements.txt
View File

@ -16,6 +16,7 @@ sadisplay>=0.4.8 # BSD
reno>=2.5.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0
# This needs to be installed after above modules # This needs to be installed after above modules
pydot>=1.2.4 # MIT License
pydotplus>=2.0.2 # MIT License pydotplus>=2.0.2 # MIT License
pyparsing>=2.1.0 # MIT pyparsing>=2.1.0 # MIT
networkx>=1.10 # BSD networkx>=1.10 # BSD

6
doc/source/conf.py
View File

@ -27,10 +27,8 @@ sys.path.insert(0, os.path.abspath('.'))
from tools import create_flow_docs from tools import create_flow_docs
# Generate our flow diagrams # Generate our flow diagrams
# TODO(johnsom) Re-enable flow diagrams when networkx supports individual create_flow_docs.generate(
# extras. See https://github.com/networkx/networkx/pull/3080 'tools/flow-list.txt', 'doc/source/contributor/devref/flow_diagrams')
# create_flow_docs.generate(
# 'tools/flow-list.txt', 'doc/source/contributor/devref/flow_diagrams')
# Generate entity relationship diagram # Generate entity relationship diagram
desc = sadisplay.describe( desc = sadisplay.describe(

20
doc/source/contributor/devref/flows.rst
View File

@ -8,18 +8,14 @@ controller needs to take while managing load balancers.
This document is meant as a reference for the key flows used in the This document is meant as a reference for the key flows used in the
Octavia controller. Octavia controller.
.. note:: Flow diagrams are temporarly disabled due to a dependency issue.
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
.. TODO(johnsom) Re-enable flow diagrams when networkx supports individual flow_diagrams/AmphoraFlows.rst
.. extras. See https://github.com/networkx/networkx/pull/3080 flow_diagrams/HealthMonitorFlows.rst
.. flow_diagrams/AmphoraFlows.rst flow_diagrams/L7PolicyFlows.rst
.. flow_diagrams/HealthMonitorFlows.rst flow_diagrams/L7RuleFlows.rst
.. flow_diagrams/L7PolicyFlows.rst flow_diagrams/ListenerFlows.rst
.. flow_diagrams/L7RuleFlows.rst flow_diagrams/LoadBalancerFlows.rst
.. flow_diagrams/ListenerFlows.rst flow_diagrams/MemberFlows.rst
.. flow_diagrams/LoadBalancerFlows.rst flow_diagrams/PoolFlows.rst
.. flow_diagrams/MemberFlows.rst
.. flow_diagrams/PoolFlows.rst

1
lower-constraints.txt
View File

@ -107,6 +107,7 @@ pyasn1-modules==0.0.6
pycadf==2.7.0 pycadf==2.7.0
pycodestyle==2.3.1 pycodestyle==2.3.1
pycparser==2.18 pycparser==2.18
pydot==1.2.4
pyflakes==1.0.0 pyflakes==1.0.0
Pygments==2.2.0 Pygments==2.2.0
pyinotify==0.9.6 pyinotify==0.9.6