Skip to content

Commit

Permalink
Merge pull request #1335 from gizmoguy/sphinx-docs-port
Browse files Browse the repository at this point in the history
Convert our documentation to Sphinx.
  • Loading branch information
anarkiwi committed Dec 2, 2017
2 parents ca0766e + dffee11 commit c61cdb8
Show file tree
Hide file tree
Showing 58 changed files with 1,022 additions and 763 deletions.
9 changes: 1 addition & 8 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
============
Contributing
============
There is no formal process for contributions. Feel free to submit an issue or a
pull request if you so desire. These will be reviewed by Brad, Josh or Kit.
We'll either accept, close or offer feedback (or some combination).

Code should pass all tests.

For more detail see README.developerguide.rst in the docs directory
Please see the `developer guide <https://faucet.readthedocs.io/en/latest/developer_guide.html>`_.

=========
Licensing
=========
This got a bit messy, so in the interest of clarifying things and tidying this
Expand Down
54 changes: 17 additions & 37 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
Faucet
======

:version: 1.6.11

.. image:: https://travis-ci.org/faucetsdn/faucet.svg?branch=master
:target: https://travis-ci.org/faucetsdn/faucet

.. meta::
:keywords: OpenFlow, Ryu, Faucet, VLAN, SDN

======
Faucet
======

FAUCET is an OpenFlow controller for multi table OpenFlow 1.3 switches, that implements layer 2 switching, VLANs, ACLs, and layer 3 IPv4 and IPv6 routing, static and via BGP. It is based on Waikato University's `Valve <https://github.com/wandsdn/valve>`_ and the `Ryu OpenFlow Controller <http://osrg.github.io/ryu/>`_. FAUCET's design and background is described in `ACM Queue <https://queue.acm.org/detail.cfm?id=3015763>`_.

It supports:
Expand All @@ -24,12 +20,10 @@ It supports:
- Controller health and statistics via Prometheus
- Unit and systems tests run under Travis based on mininet and OVS


====================================
Hardware and software switch support
====================================
------------------------------------

Detailed guides for some switches are available in `docs/vendors <docs/vendors>`_.
Detailed guides for some switches are available on `readthedocs <https://faucet.readthedocs.io/en/latest/vendors/index.html>`_.

FAUCET has been tested against the following switches (see also SUPPORTED_HARDWARE in `faucet/valve.py <faucet/valve.py>`_):

Expand All @@ -45,52 +39,38 @@ Faucet's design principle is to be as hardware agnostic as possible and not requ

If you are a hardware vendor wanting to support FAUCET, you need to support all the matches in `faucet/valve.py <faucet/valve.py>`_ valve_in_match() and pass all tests.


============
Installation
============
------------

Please see `docs/README_install.rst <docs/README_install.rst>`_
Please see the `installation guide <https://faucet.readthedocs.io/en/latest/installation.html>`_.


=============
Configuration
=============

Please see `docs/README_config.rst <docs/README_config.rst>`_
-------------

Please see the `configuration guide <https://faucet.readthedocs.io/en/latest/configuration.html>`_
for documentation regarding the general configuration of faucet and the
`recipe book <https://faucet.readthedocs.io/en/latest/recipe_book/index.html>`_
for configuration snippets for common use cases.

=======================
Development and testing
=======================
-----------------------

Please see `docs/README.developerguide.rst <docs/README.developerguide.rst>`_
Please see the `developer guide <https://faucet.readthedocs.io/en/latest/developer_guide.html>`_.


=======
Support
=======
-------

We run a number of mailing lists for communication between users and developers of Faucet, as well as a low traffic mailing list for announcements of new versions:

- https://list.waikato.ac.nz/mailman/listinfo/faucet-announce
- https://list.waikato.ac.nz/mailman/listinfo/faucet-dev
- https://lists.geant.org/sympa/info/faucet-users

Additional documentation is available under the `docs <docs>`_ directory.

Faucet blog by Josh Bailey available at http://faucet-sdn.blogspot.co.nz.

To create a issue, use `GitHub Issues <https://github.com/faucetsdn/faucet/issues>`_.


==================================
Faucet deployment around the world
==================================
https://www.google.com/maps/d/u/0/viewer?mid=1MZ0M9ZtZOp2yHWS0S-BQH0d3e4s&hl=en

.. raw:: html
----------------------------------

<div class="figure">
<iframe src="https://www.google.com/maps/d/u/0/embed?mid=1MZ0M9ZtZOp2yHWS0S-BQH0d3e4s" width="640" height="480"></iframe>
</div>
`Faucet deployment map <https://www.google.com/maps/d/u/0/viewer?mid=1MZ0M9ZtZOp2yHWS0S-BQH0d3e4s&hl=en>`_
1 change: 1 addition & 0 deletions docs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_build
99 changes: 0 additions & 99 deletions docs/CouchDB_configuration.rst

This file was deleted.

25 changes: 25 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS =
APIDOC = sphinx-apidoc
APIDOCOUTPUT = source/apidoc
APIDOCMODPATH = ../faucet
APIDOCEXCLUDE =
SPHINXBUILD = sphinx-build
SPHINXPROJ = faucet
SOURCEDIR = .
BUILDDIR = _build

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(APIDOC) -o $(APIDOCOUTPUT) $(APIDOCMODPATH) $(APIDOCEXCLUDE)
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
16 changes: 16 additions & 0 deletions docs/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Faucet Documentation
====================


Viewing documentation
---------------------

Docs are viewable on `readthedocs <https://faucet.readthedocs.io>`_.

Building documentation
----------------------

.. code:: bash
sudo pip3 install -r requirements.txt
make html
104 changes: 0 additions & 104 deletions docs/README_config.rst

This file was deleted.

File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit c61cdb8

Please sign in to comment.