From 2bd124731a943756174c04420a658a9f195a395c Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Wed, 28 Jun 2017 20:16:04 -0700
Subject: [PATCH] Add python-octaviaclient plugin

This patch adds the "loadbalancer" commands to the docs and sets
up the document generation for the python-octaviaclient plugin.

Depends-On: Ib123383c5f6904b4b00831e8cc7aaa180bd4a506
Change-Id: I48939cc3653cd379a328e0a0973d075019d22b00
---
 doc/source/cli/commands.rst        | 7 +++++++
 doc/source/cli/plugin-commands.rst | 6 ++++++
 doc/source/contributor/plugins.rst | 1 +
 test-requirements.txt              | 1 +
 4 files changed, 15 insertions(+)

diff --git a/doc/source/cli/commands.rst b/doc/source/cli/commands.rst
index 5c50a1bf64..2a05d5c91b 100644
--- a/doc/source/cli/commands.rst
+++ b/doc/source/cli/commands.rst
@@ -195,6 +195,13 @@ conflicts when creating new plugins. For a complete list check out
 * ``dataprocessing image tags``: (**Data Processing (Sahara)**)
 * ``dataprocessing plugin``: (**Data Processing (Sahara)**)
 * ``data protection plan``: (**Data Protection (Karbor)**)
+* ``loadbalancer``: (**Load Balancer (Octavia)**)
+* ``loadbalancer healthmonitor``: (**Load Balancer (Octavia)**)
+* ``loadbalancer l7policy``: (**Load Balancer (Octavia)**)
+* ``loadbalancer l7rule``: (**Load Balancer (Octavia)**)
+* ``loadbalancer listener``: (**Load Balancer (Octavia)**)
+* ``loadbalancer member``: (**Load Balancer (Octavia)**)
+* ``loadbalancer pool``: (**Load Balancer (Octavia)**)
 * ``message-broker cluster``: (**Message Broker (Cue)**)
 * ``messaging``: (**Messaging (Zaqar)**)
 * ``messaging flavor``: (**Messaging (Zaqar)**)
diff --git a/doc/source/cli/plugin-commands.rst b/doc/source/cli/plugin-commands.rst
index 55984ffb7f..34efdc3d84 100644
--- a/doc/source/cli/plugin-commands.rst
+++ b/doc/source/cli/plugin-commands.rst
@@ -81,6 +81,12 @@ neutron
 .. list-plugins:: openstack.neutronclient.v2
    :detailed:
 
+octavia
+-------
+
+.. list-plugins:: openstack.load_balancer.v2
+   :detailed:
+
 sahara
 ------
 
diff --git a/doc/source/contributor/plugins.rst b/doc/source/contributor/plugins.rst
index 13f5d49512..fb21a0795a 100644
--- a/doc/source/contributor/plugins.rst
+++ b/doc/source/contributor/plugins.rst
@@ -35,6 +35,7 @@ The following is a list of projects that are an OpenStackClient plugin.
 - python-mistralclient
 - python-muranoclient
 - python-neutronclient\*\*\*
+- python-octaviaclient
 - python-saharaclient
 - python-searchlightclient
 - python-senlinclient
diff --git a/test-requirements.txt b/test-requirements.txt
index 661aa73d9a..40093e3972 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -35,6 +35,7 @@ python-karborclient>=0.2.0 # Apache-2.0
 python-mistralclient>=3.1.0 # Apache-2.0
 python-muranoclient>=0.8.2 # Apache-2.0
 python-neutronclient>=6.3.0 # Apache-2.0
+python-octaviaclient>=1.0.0 # Apache-2.0
 python-saharaclient>=1.1.0 # Apache-2.0
 python-searchlightclient>=1.0.0 #Apache-2.0
 python-senlinclient>=1.1.0 # Apache-2.0