Update TOX_CONSTRAINTS_FILE for stable/xena

Update the URL to the upper-constraints file to point to the redirect rule on releases.openstack.org so that anyone working on this branch will switch to the correct upper-constraints list automatically when the requirements repository branches. Until the requirements repository has as stable/xena branch, tests will continue to use the upper-constraints list on master. Change-Id: I76573020a2a9ed503b1a35faff3e37a5b0561cd0
Update .gitreview for stable/xena
2021-09-10 14:32:21 +00:00 · 2021-09-10 14:32:19 +00:00 · 2021-07-13 08:42:38 +00:00 · 2021-07-06 16:16:01 +08:00 · 2021-07-05 15:11:46 +02:00 · 2021-07-05 15:11:15 +02:00
138 changed files with 3308 additions and 1962 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -0,0 +1,11 @@
+[run]
+branch = True
+source = watcherclient
+omit =
+    watcherclient/tests/*
+
+[report]
+ignore_errors = True
+exclude_lines =
+    @abc.abstract
+    raise NotImplementedError
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 # Packages
 *.egg
 *.egg-info
+.eggs
 dist
 build
 eggs
@@ -22,11 +23,12 @@ lib64
 pip-log.txt

 # Unit test / coverage reports
-.coverage
+.coverage*
 .tox
 nosetests.xml
-.testrepository
+.stestr/
 .venv
+.testrepository/

 # Translations
 *.mo
@@ -42,7 +44,7 @@ output/*/index.html

 # Sphinx
 doc/build
-doc/source/api
+doc/source/reference/api

 # pbr generates these
 AUTHORS
@@ -55,3 +57,10 @@ ChangeLog

 sftp-config.json
 /.idea/
+/cover/
+
+# Desktop Service Store
+*.DS_Store
+
+# Atom
+.remote-sync.json
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/python-watcherclient.git
+defaultbranch=stable/xena
--- a/.stestr.conf
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./watcherclient/tests/unit
+top_dir=./
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,7 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./watcherclient/tests} $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -0,0 +1,10 @@
+- project:
+    templates:
+      - openstack-cover-jobs
+      - openstack-python3-xena-jobs
+      - publish-openstack-docs-pti
+      - check-requirements
+      - openstackclient-plugin-jobs
+    check:
+      jobs:
+        - watcherclient-tempest-functional
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,13 +1,13 @@
 If you would like to contribute to the development of OpenStack,
 you must follow the steps in this page:

-   http://docs.openstack.org/infra/manual/developers.html
+   https://docs.openstack.org/infra/manual/developers.html

 Once those steps have been completed, changes to OpenStack
 should be submitted for review via the Gerrit tool, following
 the workflow documented at:

-   http://docs.openstack.org/infra/manual/developers.html#development-workflow
+   https://docs.openstack.org/infra/manual/developers.html#development-workflow

 Pull requests submitted through GitHub will be ignored.

--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,4 @@
 python-watcherclient Style Commandments
 =======================================

-Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
+Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
 Team and repository tags
 ========================

-.. image:: http://governance.openstack.org/badges/python-watcherclient.svg
-    :target: http://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/tc/badges/python-watcherclient.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html

 .. Change things from this point on

@@ -20,12 +20,12 @@ metrics receiver, complex event processor and profiler, optimization processor
 and an action plan applier. This provides a robust framework to realize a wide
 range of cloud optimization goals, including the reduction of data center
 operating costs, increased system performance via intelligent virtual machine
-migration, increased energy efficiency-and more!
+migration, increased energy efficiency and more!

 * Free software: Apache license
-* Wiki: http://wiki.openstack.org/wiki/Watcher
-* Source: http://git.openstack.org/cgit/openstack/python-watcher
-* Bugs: http://bugs.launchpad.net/watcher
+* Wiki: https://wiki.openstack.org/wiki/Watcher
+* Source: https://opendev.org/openstack/python-watcherclient
+* Bugs: https://bugs.launchpad.net/watcher

 Installation
 ============
@@ -61,7 +61,7 @@ You can install the Watcher CLI with the following command:
   sudo pip install python-watcherclient


-You can also use the `OpenStack client <http://docs.openstack.org/cli-reference/overview.html>`_
+You can also use the `OpenStack client <https://docs.openstack.org/python-openstackclient/latest/>`_
 with Watcher (our watcher plugin for OpenStack client is included in the
 python-watcherclient package). To install it, you have just to run this command:

--- a/babel.cfg
+++ b/babel.cfg
@@ -1,2 +0,0 @@
-[python: **.py]
-
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+openstackdocstheme>=2.2.1 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+sphinxcontrib-apidoc>=0.2.0 # BSD
+
--- a/doc/source/api/watcherclient.client.rst
+++ b/doc/source/api/watcherclient.client.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.client` Module
-======================================
-
-.. automodule:: watcherclient.client
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.common.apiclient.auth.rst
+++ b/doc/source/api/watcherclient.common.apiclient.auth.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.common.apiclient.auth` Module
-=====================================================
-
-.. automodule:: watcherclient.common.apiclient.auth
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.common.apiclient.base.rst
+++ b/doc/source/api/watcherclient.common.apiclient.base.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.common.apiclient.base` Module
-=====================================================
-
-.. automodule:: watcherclient.common.apiclient.base
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.common.apiclient.client.rst
+++ b/doc/source/api/watcherclient.common.apiclient.client.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.common.apiclient.client` Module
-=======================================================
-
-.. automodule:: watcherclient.common.apiclient.client
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.common.apiclient.exceptions.rst
+++ b/doc/source/api/watcherclient.common.apiclient.exceptions.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.common.apiclient.exceptions` Module
-===========================================================
-
-.. automodule:: watcherclient.common.apiclient.exceptions
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.common.apiclient.utils.rst
+++ b/doc/source/api/watcherclient.common.apiclient.utils.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.common.apiclient.utils` Module
-======================================================
-
-.. automodule:: watcherclient.common.apiclient.utils
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.common.base.rst
+++ b/doc/source/api/watcherclient.common.base.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.common.base` Module
-===========================================
-
-.. automodule:: watcherclient.common.base
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.common.cliutils.rst
+++ b/doc/source/api/watcherclient.common.cliutils.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.common.cliutils` Module
-===============================================
-
-.. automodule:: watcherclient.common.cliutils
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.common.http.rst
+++ b/doc/source/api/watcherclient.common.http.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.common.http` Module
-===========================================
-
-.. automodule:: watcherclient.common.http
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.common.i18n.rst
+++ b/doc/source/api/watcherclient.common.i18n.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.common.i18n` Module
-===========================================
-
-.. automodule:: watcherclient.common.i18n
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.common.utils.rst
+++ b/doc/source/api/watcherclient.common.utils.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.common.utils` Module
-============================================
-
-.. automodule:: watcherclient.common.utils
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.exceptions.rst
+++ b/doc/source/api/watcherclient.exceptions.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.exceptions` Module
-==========================================
-
-.. automodule:: watcherclient.exceptions
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.shell.rst
+++ b/doc/source/api/watcherclient.shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.shell` Module
-=====================================
-
-.. automodule:: watcherclient.shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.keystone_client_fixtures.rst
+++ b/doc/source/api/watcherclient.tests.keystone_client_fixtures.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.keystone_client_fixtures` Module
-==============================================================
-
-.. automodule:: watcherclient.tests.keystone_client_fixtures
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.test_client.rst
+++ b/doc/source/api/watcherclient.tests.test_client.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.test_client` Module
-=================================================
-
-.. automodule:: watcherclient.tests.test_client
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.test_http.rst
+++ b/doc/source/api/watcherclient.tests.test_http.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.test_http` Module
-===============================================
-
-.. automodule:: watcherclient.tests.test_http
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.test_import.rst
+++ b/doc/source/api/watcherclient.tests.test_import.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.test_import` Module
-=================================================
-
-.. automodule:: watcherclient.tests.test_import
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.test_shell.rst
+++ b/doc/source/api/watcherclient.tests.test_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.test_shell` Module
-================================================
-
-.. automodule:: watcherclient.tests.test_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.test_utils.rst
+++ b/doc/source/api/watcherclient.tests.test_utils.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.test_utils` Module
-================================================
-
-.. automodule:: watcherclient.tests.test_utils
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.utils.rst
+++ b/doc/source/api/watcherclient.tests.utils.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.utils` Module
-===========================================
-
-.. automodule:: watcherclient.tests.utils
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_action.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_action.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_action` Module
-====================================================
-
-.. automodule:: watcherclient.tests.v1.test_action
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_action_plan.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_action_plan.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_action_plan` Module
-=========================================================
-
-.. automodule:: watcherclient.tests.v1.test_action_plan
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_action_plan_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_action_plan_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_action_plan_shell` Module
-===============================================================
-
-.. automodule:: watcherclient.tests.v1.test_action_plan_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_action_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_action_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_action_shell` Module
-==========================================================
-
-.. automodule:: watcherclient.tests.v1.test_action_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_audit.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_audit.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_audit` Module
-===================================================
-
-.. automodule:: watcherclient.tests.v1.test_audit
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_audit_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_audit_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_audit_shell` Module
-=========================================================
-
-.. automodule:: watcherclient.tests.v1.test_audit_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_audit_template.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_audit_template.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_audit_template` Module
-============================================================
-
-.. automodule:: watcherclient.tests.v1.test_audit_template
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_audit_template_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_audit_template_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_audit_template_shell` Module
-==================================================================
-
-.. automodule:: watcherclient.tests.v1.test_audit_template_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_goal.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_goal.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_goal` Module
-==================================================
-
-.. automodule:: watcherclient.tests.v1.test_goal
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_goal_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_goal_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_goal_shell` Module
-========================================================
-
-.. automodule:: watcherclient.tests.v1.test_goal_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_metric_collector.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_metric_collector.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_metric_collector` Module
-==============================================================
-
-.. automodule:: watcherclient.tests.v1.test_metric_collector
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.tests.v1.test_metric_collector_shell.rst
+++ b/doc/source/api/watcherclient.tests.v1.test_metric_collector_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.tests.v1.test_metric_collector_shell` Module
-====================================================================
-
-.. automodule:: watcherclient.tests.v1.test_metric_collector_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.action.rst
+++ b/doc/source/api/watcherclient.v1.action.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.action` Module
-=========================================
-
-.. automodule:: watcherclient.v1.action
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.action_plan.rst
+++ b/doc/source/api/watcherclient.v1.action_plan.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.action_plan` Module
-==============================================
-
-.. automodule:: watcherclient.v1.action_plan
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.action_plan_shell.rst
+++ b/doc/source/api/watcherclient.v1.action_plan_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.action_plan_shell` Module
-====================================================
-
-.. automodule:: watcherclient.v1.action_plan_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.action_shell.rst
+++ b/doc/source/api/watcherclient.v1.action_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.action_shell` Module
-===============================================
-
-.. automodule:: watcherclient.v1.action_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.audit.rst
+++ b/doc/source/api/watcherclient.v1.audit.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.audit` Module
-========================================
-
-.. automodule:: watcherclient.v1.audit
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.audit_shell.rst
+++ b/doc/source/api/watcherclient.v1.audit_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.audit_shell` Module
-==============================================
-
-.. automodule:: watcherclient.v1.audit_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.audit_template.rst
+++ b/doc/source/api/watcherclient.v1.audit_template.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.audit_template` Module
-=================================================
-
-.. automodule:: watcherclient.v1.audit_template
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.audit_template_shell.rst
+++ b/doc/source/api/watcherclient.v1.audit_template_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.audit_template_shell` Module
-=======================================================
-
-.. automodule:: watcherclient.v1.audit_template_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.client.rst
+++ b/doc/source/api/watcherclient.v1.client.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.client` Module
-=========================================
-
-.. automodule:: watcherclient.v1.client
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.goal.rst
+++ b/doc/source/api/watcherclient.v1.goal.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.goal` Module
-=======================================
-
-.. automodule:: watcherclient.v1.goal
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.goal_shell.rst
+++ b/doc/source/api/watcherclient.v1.goal_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.goal_shell` Module
-=============================================
-
-.. automodule:: watcherclient.v1.goal_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.metric_collector.rst
+++ b/doc/source/api/watcherclient.v1.metric_collector.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.metric_collector` Module
-===================================================
-
-.. automodule:: watcherclient.v1.metric_collector
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.metric_collector_shell.rst
+++ b/doc/source/api/watcherclient.v1.metric_collector_shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.metric_collector_shell` Module
-=========================================================
-
-.. automodule:: watcherclient.v1.metric_collector_shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.resource_fields.rst
+++ b/doc/source/api/watcherclient.v1.resource_fields.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.resource_fields` Module
-==================================================
-
-.. automodule:: watcherclient.v1.resource_fields
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.v1.shell.rst
+++ b/doc/source/api/watcherclient.v1.shell.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.v1.shell` Module
-========================================
-
-.. automodule:: watcherclient.v1.shell
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/api/watcherclient.version.rst
+++ b/doc/source/api/watcherclient.version.rst
@@ -1,7 +0,0 @@
-The :mod:`watcherclient.version` Module
-=======================================
-
-.. automodule:: watcherclient.version
-  :members:
-  :undoc-members:
-  :show-inheritance:
--- a/doc/source/cli/details.rst
+++ b/doc/source/cli/details.rst
--- a/doc/source/cli/index.rst
+++ b/doc/source/cli/index.rst
@@ -0,0 +1,32 @@
+=============================
+ Command-line Tool Reference
+=============================
+
+In order to use the CLI, you must provide your OpenStack username,
+password, tenant, and auth endpoint. Use the corresponding
+configuration options (``--os-username``, ``--os-password``,
+``--os-tenant-id``, and ``--os-auth-url``) or set them in environment
+variables::
+
+    export OS_USERNAME=user
+    export OS_PASSWORD=pass
+    export OS_TENANT_ID=b363706f891f48019483f8bd6503c54b
+    export OS_AUTH_URL=http://auth.example.com:5000/v3/
+
+The command line tool will attempt to reauthenticate using your
+provided credentials for every request. You can override this behavior
+by manually supplying an auth token using ``--os-watcher-url`` and
+``--os-auth-token``. You can alternatively set these environment
+variables::
+
+    export OS_WATCHER_URL=http://watcher.example.org:9322/
+    export OS_AUTH_TOKEN=3bcc3d3a03f44e3d8377f9247b0ad155
+
+Once you've configured your authentication parameters, you can run
+``watcher help`` to see a complete listing of available commands.
+
+.. toctree::
+
+   watcher
+   openstack_cli
+   details
--- a/doc/source/cli/openstack_cli.rst
+++ b/doc/source/cli/openstack_cli.rst
@@ -24,27 +24,27 @@ OpenStack infra-optim Service (Watcher), by using our additional plugin

 In order to use the CLI, you must provide your OpenStack username, password,
 project (historically called tenant), and auth endpoint. You can use
-configuration options :option:`--os-username`, :option:`--os-password`,
-:option:`--os-tenant-id` (or :option:`--os-tenant-name`),
-and :option:`--os-auth-url`, or set the corresponding
+configuration options :option:``--os-username``, :option:``--os-password``,
+:option:``--os-tenant-id`` (or :option:``--os-tenant-name``),
+and :option:``--os-auth-url``, or set the corresponding
 environment variables::

    $ export OS_USERNAME=user
    $ export OS_PASSWORD=password
    $ export OS_TENANT_ID=b363706f891f48019483f8bd6503c54b   # or OS_TENANT_NAME
    $ export OS_TENANT_NAME=project                          # or OS_TENANT_ID
-    $ export OS_AUTH_URL=http://auth.example.com:5000/v2.0
+    $ export OS_AUTH_URL=http://auth.example.com:5000/v3/

 The command-line tool will attempt to reauthenticate using the provided
 credentials for every request. You can override this behavior by manually
-supplying an auth token using :option:`--watcher-url` and
-:option:`--os-auth-token`, or by setting the corresponding environment variables::
+supplying an auth token using :option:``--watcher-url`` and
+:option:``--os-auth-token``, or by setting the corresponding environment variables::

    export WATCHER_URL=http://watcher.example.org:9322/
    export OS_AUTH_TOKEN=3bcc3d3a03f44e3d8377f9247b0ad155

 Since Keystone can return multiple regions in the Service Catalog, you can
-specify the one you want with :option:`--os-region-name` or set the following
+specify the one you want with :option:``--os-region-name`` or set the following
 environment variable. (It defaults to the first in the list returned.)
 ::

--- a/doc/source/cli/watcher.rst
+++ b/doc/source/cli/watcher.rst
@@ -1,6 +1,6 @@
-==============================================
+===============================================
 :program:`watcher` Command-Line Interface (CLI)
-==============================================
+===============================================

 .. program:: watcher
 .. highlight:: bash
@@ -23,27 +23,27 @@ OpenStack infra-optim Service (Watcher).

 In order to use the CLI, you must provide your OpenStack username, password,
 project (historically called tenant), and auth endpoint. You can use
-configuration options :option:`--os-username`, :option:`--os-password`,
-:option:`--os-tenant-id` (or :option:`--os-tenant-name`),
-and :option:`--os-auth-url`, or set the corresponding
+configuration options :option:``--os-username``, :option:``--os-password``,
+:option:``--os-tenant-id`` (or :option:``--os-tenant-name``),
+and :option:``--os-auth-url``, or set the corresponding
 environment variables::

    $ export OS_USERNAME=user
    $ export OS_PASSWORD=password
    $ export OS_TENANT_ID=b363706f891f48019483f8bd6503c54b   # or OS_TENANT_NAME
    $ export OS_TENANT_NAME=project                          # or OS_TENANT_ID
-    $ export OS_AUTH_URL=http://auth.example.com:5000/v2.0
+    $ export OS_AUTH_URL=http://auth.example.com:5000/v3/

 The command-line tool will attempt to reauthenticate using the provided
 credentials for every request. You can override this behavior by manually
-supplying an auth token using :option:`--watcher-url` and
-:option:`--os-auth-token`, or by setting the corresponding environment variables::
+supplying an auth token using :option:``--watcher-url`` and
+:option:``--os-auth-token``, or by setting the corresponding environment variables::

    $ export WATCHER_URL=http://watcher.example.org:9322/
    $ export OS_AUTH_TOKEN=3bcc3d3a03f44e3d8377f9247b0ad155

 Since Keystone can return multiple regions in the Service Catalog, you can
-specify the one you want with :option:`--os-region-name` or set the following
+specify the one you want with :option:``--os-region-name`` or set the following
 environment variable. (It defaults to the first in the list returned.)
 ::

@@ -52,10 +52,10 @@ environment variable. (It defaults to the first in the list returned.)
 Watcher CLI supports bash completion. The command-line tool can automatically
 fill partially typed commands. To use this feature, source the below file
 (available at
-https://git.openstack.org/cgit/openstack/python-watcherclient/tree/tools/watcher.bash_completion)
+https://opendev.org/openstack/python-watcherclient/src/branch/master/tools/watcher.bash_completion)
 to your terminal and then bash completion should work::

-    $ source watcher.bash_completion
+    $ . watcher.bash_completion

 To avoid doing this every time, add this to your ``.bashrc`` or copy the
 watcher.bash_completion file to the default bash completion scripts directory
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from watcherclient import version as watcherclient_version

 # -- General configuration ----------------------------------------------------

@@ -19,13 +18,20 @@ from watcherclient import version as watcherclient_version
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc',
              'sphinx.ext.viewcode',
-              'oslosphinx',
-              ]
-
+              'sphinxcontrib.apidoc',
+              'openstackdocstheme',
+             ]
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
 # text edit cycles.
 # execute "export SPHINX_DEBUG=1" in your terminal to disable

+# sphinxcontrib.apidoc options
+apidoc_module_dir = '../../watcherclient'
+apidoc_output_dir = 'reference/api'
+apidoc_excluded_paths = [
+    'tests/*']
+apidoc_separate_modules = True
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

@@ -36,18 +42,8 @@ source_suffix = '.rst'
 master_doc = 'index'

 # General information about the project.
-project = u'python-watcherclient'
-copyright = u'OpenStack Foundation'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-# The full version, including alpha/beta/rc tags.
-release = watcherclient_version.version_info.release_string()
-# The short X.Y version.
-version = watcherclient_version.version_info.version_string()
+project = 'python-watcherclient'
+copyright = 'OpenStack Foundation'

 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['watcherclient.']
@@ -60,7 +56,7 @@ add_function_parentheses = True
 add_module_names = True

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'

 # -- Options for HTML output --------------------------------------------------

@@ -69,7 +65,8 @@ pygments_style = 'sphinx'
 # html_theme_path = ["."]
 # html_theme = '_theme'
 # html_static_path = ['_static']
-html_theme_options = {'incubating': True}
+html_theme = 'openstackdocs'
+# html_theme_path = [openstackdocstheme.get_html_theme_path()]

 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project
@@ -82,7 +79,27 @@ latex_documents = [
    (
        'index',
        '%s.tex' % project,
-        u'%s Documentation' % project,
-        u'OpenStack Foundation', 'manual'
+        '%s Documentation' % project,
+        'OpenStack Foundation', 'manual'
    ),
 ]
+
+# Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664
+latex_use_xindy = False
+
+latex_domain_indices = False
+
+latex_elements = {
+    'makeindex': '',
+    'printindex': '',
+    'preamble': r'\setcounter{tocdepth}{3}',
+}
+
+# openstackdocstheme options
+openstackdocs_repo_name = 'openstack/python-watcherclient'
+openstackdocs_pdf_link = True
+openstackdocs_bug_project = 'python-watcherclient'
+openstackdocs_bug_tag = ''
+
+
+#html_theme_options = {"show_other_versions": "True"}
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@@ -1,8 +1,8 @@
 .. _contributing:

-===================================
+====================================
 Contributing to python-watcherclient
-===================================
+====================================

 If you're interested in contributing to the python-watcherclient project,
 the following will help get you started.
@@ -19,8 +19,8 @@ signed OpenStack's contributor's agreement.

 .. seealso::

-   * http://docs.openstack.org/infra/manual/developers.html
-   * http://wiki.openstack.org/CLA
+   * https://docs.openstack.org/infra/manual/developers.html
+   * https://wiki.openstack.org/CLA

 LaunchPad Project
 -----------------
@@ -41,14 +41,14 @@ Project Hosting Details
 -------------------------

 Bug tracker
-    http://launchpad.net/python-watcherclient
+    https://launchpad.net/python-watcherclient

 Mailing list (prefix subjects with ``[watcher]`` for faster responses)
-    http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
+    http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss

 Code Hosting
-    https://git.openstack.org/cgit/openstack/python-watcherclient
+    https://opendev.org/openstack/python-watcherclient

 Code Review
-    https://review.openstack.org/#/q/status:open+project:openstack/python-watcherclient,n,z
+    https://review.opendev.org/#/q/status:open+project:openstack/python-watcherclient,n,z

--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,42 +1,15 @@
 Python bindings to the OpenStack Watcher API
 ============================================

-This is a client for OpenStack Watcher API. There's :doc:`a Python API
-<api_v1>` (the :mod:`watcherclient` modules), and a :doc:`command-line script
-<cli>` (installed as :program:`watcher`). Each implements the entire
+This is a client for OpenStack Watcher API. There's a Python API
+(the :mod:`watcherclient` modules), and a command-line script
+(installed as :program:`watcher`). Each implements the entire
 OpenStack Watcher API.

-You'll need credentials for an OpenStack cloud in order to use the watcher client.
-
-
-Contents:
-
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2

+   cli/index
+   reference/index
   installation
-   api_v1
-   cli
-   openstack_cli
   contributing
-
-Contributing
-============
-
-Code is hosted at `git.openstack.org`_. Submit bugs to the Watcher project on
-`Launchpad`_. Submit code to the openstack/python-watcherclient project using
-`Gerrit`_.
-
-.. _git.openstack.org: https://git.openstack.org/cgit/openstack/python-watcherclient
-.. _Launchpad: https://launchpad.net/watcher
-.. _Gerrit: http://docs.openstack.org/infra/manual/developers.html#development-workflow
-
-Testing
-------
-
-The preferred way to run the unit tests is using ``tox``.
-
-See `Consistent Testing Interface`_ for more details.
-
-.. _Consistent Testing Interface: http://git.openstack.org/cgit/openstack/governance/tree/reference/project-testing-interface.rst
-.. _Watcher: https://wiki.openstack.org/wiki/Watcher
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -5,6 +5,6 @@ Installation
 If you have `virtualenvwrapper <https://virtualenvwrapper.readthedocs.org/en/latest/install.html>`_   installed::

    $ mkvirtualenv python-watcherclient
-    $ git clone https://git.openstack.org/openstack/python-watcherclient
+    $ git clone https://opendev.org/openstack/python-watcherclient
    $ cd python-watcherclient && python setup.py install
    $ pip install -r ./requirements.txt
--- a/doc/source/reference/api_v1.rst
+++ b/doc/source/reference/api_v1.rst
@@ -68,11 +68,10 @@ Once you have an watcher `Client`_, you can perform various tasks::

   >>> watcher.action.list()  # list of actions
   >>> watcher.action_plan.list()  # list of action_plan
-   >>> watcher.audit.get(audit_uuid)  # information about a particular audit
+   >>> watcher.audit.get(audit_uuid_or_name)  # information about a particular audit

 When the `Client`_ needs to propagate an exception, it will usually
-raise an instance subclassed from
-`watcherclient.exc.BaseException`_ or `watcherclient.exc.ClientException`_.
+raise an instance listed in `watcherclient.exceptions`_.

 Refer to the modules themselves, for more details.

@@ -80,15 +79,8 @@ Refer to the modules themselves, for more details.
 watcherclient Modules
 =====================

-.. toctree::
-    :maxdepth: 1
-
-    modules <api/autoindex>
-
-
 .. _watcherclient.v1.audit: api/watcherclient.v1.audit.html#watcherclient.v1.audit.Audit
 .. _watcherclient.v1.client.Client: api/watcherclient.v1.client.html#watcherclient.v1.client.Client
 .. _Client: api/watcherclient.v1.client.html#watcherclient.v1.client.Client
 .. _watcherclient.client.get_client(): api/watcherclient.client.html#watcherclient.client.get_client
-.. _watcherclient.exc.BaseException: api/watcherclient.exc.html#watcherclient.exc.BaseException
-.. _watcherclient.exc.ClientException: api/watcherclient.exc.html#watcherclient.exc.ClientException
+.. _watcherclient.exceptions: api/watcherclient.exceptions.html
--- a/doc/source/reference/index.rst
+++ b/doc/source/reference/index.rst
@@ -0,0 +1,14 @@
+==========================
+ Python Library Reference
+==========================
+
+In order to use the python api directly, you must first obtain an auth
+token and identify which endpoint you wish to speak to. Once you have
+done so, you can use the API like so.
+
+
+.. toctree::
+   :maxdepth: 2
+
+   api/modules
+   api_v1
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -0,0 +1,82 @@
+alabaster==0.7.10
+appdirs==1.4.3
+asn1crypto==0.23.0
+certifi==2018.1.18
+cffi==1.14.0
+chardet==3.0.4
+cliff==2.11.0
+cmd2==0.8.2
+coverage==4.0
+cryptography==2.7
+debtcollector==1.19.0
+decorator==4.2.1
+deprecation==2.0
+docutils==0.11
+dogpile.cache==0.6.5
+dulwich==0.15.0
+extras==1.0.0
+fasteners==0.7.0
+fixtures==3.0.0
+flake8==2.5.5
+hacking==0.12.0
+idna==2.6
+imagesize==0.7.1
+iso8601==0.1.12
+Jinja2==2.10
+jmespath==0.9.3
+jsonpatch==1.21
+jsonpointer==2.0
+jsonschema==2.6.0
+keystoneauth1==3.4.0
+linecache2==1.0.0
+MarkupSafe==1.0
+mccabe==0.2.1
+monotonic==1.4
+msgpack-python==0.4.0
+munch==2.2.0
+netaddr==0.7.19
+netifaces==0.10.6
+openstacksdk==0.12.0
+os-client-config==1.29.0
+os-service-types==1.2.0
+os-testr==1.0.0
+osc-lib==1.10.0
+oslo.concurrency==3.25.0
+oslo.config==5.2.0
+oslo.context==2.19.2
+oslo.i18n==3.20.0
+oslo.log==3.36.0
+oslo.serialization==2.18.0
+oslo.utils==3.36.0
+oslotest==3.2.0
+packaging==17.1
+paramiko==2.0.0
+pbr==3.1.1
+pep8==1.5.7
+pyasn1==0.1.8
+pycparser==2.18
+pyflakes==0.8.1
+Pygments==2.2.0
+pyinotify==0.9.6
+pyparsing==2.2.0
+pyperclip==1.6.0
+python-dateutil==2.5.3
+python-mimeparse==1.6.0
+python-subunit==1.0.0
+pytz==2018.3
+PyYAML==3.13
+requests==2.18.4
+requestsexceptions==1.4.0
+rfc3986==0.3.1
+simplejson==3.13.2
+six==1.11.0
+snowballstemmer==1.2.1
+stestr==2.0.0
+stevedore==1.28.0
+tempest==17.1.0
+testscenarios==0.4
+testtools==2.2.0
+traceback2==1.4.0
+unittest2==1.1.0
+urllib3==1.22
+wrapt==1.10.11
--- a/releasenotes/notes/drop-py-2-7-f7078b44cf99cae1.yaml
+++ b/releasenotes/notes/drop-py-2-7-f7078b44cf99cae1.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of python-watcherclient
+    to support py2.7 is OpenStack Train. The minimum version of Python now
+    supported by python-watcherclient is Python 3.6.
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,13 +2,12 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.

-Babel>=2.3.4 # BSD
-cliff>=2.3.0 # Apache-2.0
-osc-lib>=1.2.0 # Apache-2.0
-oslo.i18n>=2.1.0 # Apache-2.0
-oslo.utils>=3.18.0 # Apache-2.0
-pbr>=1.8 # Apache-2.0
-PrettyTable<0.8,>=0.7.1 # BSD
-keystoneauth1>=2.17.0 # Apache-2.0
-six>=1.9.0 # MIT
-PyYAML>=3.10.0 # MIT
+cliff!=2.9.0,>=2.11.0 # Apache-2.0
+osc-lib>=1.10.0 # Apache-2.0
+oslo.i18n>=3.20.0 # Apache-2.0
+oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
+oslo.utils>=3.36.0 # Apache-2.0
+pbr!=2.1.0,>=3.1.1 # Apache-2.0
+keystoneauth1>=3.4.0 # Apache-2.0
+six>=1.11.0 # MIT
+PyYAML>=3.13 # MIT
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,11 +1,12 @@
 [metadata]
 name = python-watcherclient
 summary = Python client library for Watcher API
-description-file =
+description_file =
    README.rst
 author = OpenStack
-author-email = openstack-dev@lists.openstack.org
-home-page =  http://docs.openstack.org/developer/python-watcherclient
+author_email = openstack-discuss@lists.openstack.org
+home_page =  https://docs.openstack.org/python-watcherclient/latest/
+python_requires = >=3.6
 classifier =
    Environment :: OpenStack
    Intended Audience :: Information Technology
@@ -13,11 +14,10 @@ classifier =
    License :: OSI Approved :: Apache Software License
    Operating System :: POSIX :: Linux
    Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.4
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8

 [files]
 packages =
@@ -37,6 +37,7 @@ openstack.infra_optim.v1 =

    optimize_strategy_show = watcherclient.v1.strategy_shell:ShowStrategy
    optimize_strategy_list = watcherclient.v1.strategy_shell:ListStrategy
+    optimize_strategy_state = watcherclient.v1.strategy_shell:StateStrategy

    optimize_audittemplate_show = watcherclient.v1.audit_template_shell:ShowAuditTemplate
    optimize_audittemplate_list = watcherclient.v1.audit_template_shell:ListAuditTemplate
@@ -51,10 +52,11 @@ openstack.infra_optim.v1 =
    optimize_audit_delete = watcherclient.v1.audit_shell:DeleteAudit

    optimize_actionplan_show = watcherclient.v1.action_plan_shell:ShowActionPlan
+    optimize_actionplan_delete = watcherclient.v1.action_plan_shell:DeleteActionPlan
    optimize_actionplan_list = watcherclient.v1.action_plan_shell:ListActionPlan
-    optimize_actionplan_create = watcherclient.v1.action_plan_shell:CreateActionPlan
    optimize_actionplan_update = watcherclient.v1.action_plan_shell:UpdateActionPlan
    optimize_actionplan_start = watcherclient.v1.action_plan_shell:StartActionPlan
+    optimize_actionplan_cancel = watcherclient.v1.action_plan_shell:CancelActionPlan

    optimize_action_show = watcherclient.v1.action_shell:ShowAction
    optimize_action_list = watcherclient.v1.action_shell:ListAction
@@ -65,6 +67,8 @@ openstack.infra_optim.v1 =
    optimize_service_show = watcherclient.v1.service_shell:ShowService
    optimize_service_list = watcherclient.v1.service_shell:ListService

+    optimize_datamodel_list = watcherclient.v1.data_model_shell:ListDataModel
+
 # The same as above but used by the 'watcher' command
 watcherclient.v1 =
    goal_show = watcherclient.v1.goal_shell:ShowGoal
@@ -72,6 +76,7 @@ watcherclient.v1 =

    strategy_show = watcherclient.v1.strategy_shell:ShowStrategy
    strategy_list = watcherclient.v1.strategy_shell:ListStrategy
+    strategy_state = watcherclient.v1.strategy_shell:StateStrategy

    audittemplate_show = watcherclient.v1.audit_template_shell:ShowAuditTemplate
    audittemplate_list = watcherclient.v1.audit_template_shell:ListAuditTemplate
@@ -87,10 +92,10 @@ watcherclient.v1 =

    actionplan_show = watcherclient.v1.action_plan_shell:ShowActionPlan
    actionplan_list = watcherclient.v1.action_plan_shell:ListActionPlan
-    actionplan_create = watcherclient.v1.action_plan_shell:CreateActionPlan
    actionplan_update = watcherclient.v1.action_plan_shell:UpdateActionPlan
    actionplan_start = watcherclient.v1.action_plan_shell:StartActionPlan
    actionplan_delete = watcherclient.v1.action_plan_shell:DeleteActionPlan
+    actionplan_cancel = watcherclient.v1.action_plan_shell:CancelActionPlan

    action_show = watcherclient.v1.action_shell:ShowAction
    action_list = watcherclient.v1.action_shell:ListAction
@@ -101,27 +106,10 @@ watcherclient.v1 =
    service_show = watcherclient.v1.service_shell:ShowService
    service_list = watcherclient.v1.service_shell:ListService

+    datamodel_list = watcherclient.v1.data_model_shell:ListDataModel
+
 [pbr]
 autodoc_index_modules = True
-
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-
-[bdist_wheel]
-universal = 1
-
-[compile_catalog]
-directory = watcherclient/locale
-domain = watcherclient
-
-[update_catalog]
-domain = watcherclient
-output_dir = watcherclient/locale
-input_file = watcherclient/locale/watcherclient.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext  _LI _LW _LE _LC
-mapping_file = babel.cfg
-output_file = watcherclient/locale/watcherclient.pot
+autodoc_exclude_modules =
+  watcherclient.tests.*
+api_doc_dir = reference/api
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools

-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
-    setup_requires=['pbr>=1.8'],
+    setup_requires=['pbr>=2.0.0'],
    pbr=True)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,17 +2,12 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.

-coverage>=4.0 # Apache-2.0
+coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-hacking<0.11,>=0.10.2
-mock>=2.0 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
-oslotest>=1.10.0 # Apache-2.0
-python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
-testrepository>=0.0.18 # Apache-2.0/BSD
+hacking>=3.0.1,<3.1.0 # Apache-2.0
+oslotest>=3.2.0 # Apache-2.0
+python-subunit>=1.0.0 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
-testtools>=1.4.0 # MIT
-
-# Needed for pypi packaging
-wheel # MIT
+testtools>=2.2.0 # MIT
+tempest>=17.1.0 # Apache-2.0
--- a/tox.ini
+++ b/tox.ini
@@ -1,44 +1,79 @@
 [tox]
-minversion = 1.8
-envlist = py35,py34,py27,pep8
+minversion = 3.18.0
+envlist = py3,pep8
 skipsdist = True

 [testenv]
 usedevelop = True
-install_command =
-                  constraints: pip install -U --force-reinstall -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
-                  pip install -U {opts} {packages}
+passenv = ZUUL_CACHE_DIR
+          REQUIREMENTS_PIP_LOCATION
+install_command = pip install {opts} {packages}
 setenv =
   VIRTUAL_ENV={envdir}
-   OS_TEST_PATH=./watcherclient/tests/unit
-deps = -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+deps =
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/requirements.txt
+allowlist_externals =
+  rm
+commands = rm -f .testrepository/times.dbm
+           # The --test-path is defined in .stestr.conf
+           stestr run {posargs}
+           stestr slowest

 [testenv:pep8]
+basepython = python3
 commands = flake8

 [testenv:venv]
+basepython = python3
 commands = {posargs}

 [testenv:cover]
+basepython = python3
+setenv =
+    PYTHON=coverage run --source watcherclient --parallel-mode
 commands =
-   python setup.py testr --coverage --testr-args='{posargs}'
-   coverage report
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
+    coverage report

 [testenv:docs]
-commands = python setup.py build_sphinx
+basepython = python3
+deps =
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
+  -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -b html doc/source doc/build/html
+
+
+[testenv:pdf-docs]
+basepython = python3
+envdir = {toxworkdir}/docs
+deps = {[testenv:docs]deps}
+allowlist_externals =
+  rm
+  make
+commands =
+  rm -rf doc/build/pdf
+  sphinx-build -W -b latex doc/source doc/build/pdf
+  make -C doc/build/pdf

 [testenv:debug]
-commands = oslo_debug_helper {posargs}
+basepython = python3
+commands = oslo_debug_helper -t watcherclient/tests/unit {posargs}

 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
 show-source = True
-ignore = E123,E125
+enable-extensions = H203,H106
+ignore = E123,E125,W504
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build

 [testenv:wheel]
+basepython = python3
 commands = python setup.py bdist_wheel

 [hacking]
--- a/watcherclient/init.py
+++ b/watcherclient/init.py
@@ -17,6 +17,7 @@
 import pbr.version

 from watcherclient import client
+from watcherclient.common import api_versioning
 from watcherclient import exceptions


@@ -24,3 +25,11 @@ __version__ = pbr.version.VersionInfo(
    'python-watcherclient').version_string()

 __all__ = ['client', 'exceptions', ]
+
+API_MIN_VERSION = api_versioning.APIVersion("1.0")
+# The max version should be the latest version that is supported in the client,
+# not necessarily the latest that the server can provide. This is only bumped
+# when client supported the max version, and bumped sequentially, otherwise
+# the client may break due to server side new version may include some
+# backward incompatible change.
+API_MAX_VERSION = api_versioning.APIVersion("1.1")
--- a/watcherclient/_i18n.py
+++ b/watcherclient/_i18n.py
@@ -30,16 +30,6 @@ _C = _translators.contextual_form
 # requires oslo.i18n >=2.1.0
 _P = _translators.plural_form

-# Translators for log levels.
-#
-# The abbreviated names are meant to reflect the usual use of a short
-# name like '_'. The "L" is for "log" and the other letter comes from
-# the level.
-_LI = _translators.log_info
-_LW = _translators.log_warning
-_LE = _translators.log_error
-_LC = _translators.log_critical
-

 def get_available_languages():
    return oslo_i18n.get_available_languages(DOMAIN)
--- a/watcherclient/client.py
+++ b/watcherclient/client.py
@@ -28,7 +28,7 @@ def get_client(api_version, os_auth_token=None, watcher_url=None,
               os_service_type=None, os_endpoint_type=None,
               insecure=None, timeout=None, os_cacert=None, ca_file=None,
               os_cert=None, cert_file=None, os_key=None, key_file=None,
-               os_watcher_api_version=None, max_retries=None,
+               os_infra_optim_api_version=None, max_retries=None,
               retry_interval=None, session=None, os_endpoint_override=None,
               **ignored_kwargs):
    """Get an authenticated client, based on the credentials.
@@ -61,7 +61,7 @@ def get_client(api_version, os_auth_token=None, watcher_url=None,
    :param cert_file: path to cert file, deprecated in favour of os_cert
    :param os_key: path to key file
    :param key_file: path to key file, deprecated in favour of os_key
-    :param os_watcher_api_version: watcher API version to use
+    :param os_infra_optim_api_version: watcher API version to use
    :param max_retries: Maximum number of retries in case of conflict error
    :param retry_interval: Amount of time (in seconds) between retries in case
        of conflict error
@@ -75,7 +75,7 @@ def get_client(api_version, os_auth_token=None, watcher_url=None,
    project_id = (os_project_id or os_tenant_id)
    project_name = (os_project_name or os_tenant_name)
    kwargs = {
-        'os_watcher_api_version': os_watcher_api_version,
+        'os_infra_optim_api_version': os_infra_optim_api_version,
        'max_retries': max_retries,
        'retry_interval': retry_interval,
    }
@@ -182,4 +182,11 @@ def Client(version, *args, **kwargs):
    python-watcherclient's doc.
    """
    api_version, client_class = _get_client_class_and_version(version)
+
+    kw_api = kwargs.get('os_infra_optim_api_version')
+    endpoint = kwargs.get('endpoint')
+    # If both os_infra_optim_api_version and endpoint are not provided, get
+    # API version from arg.
+    if not kw_api and not endpoint:
+        kwargs['os_infra_optim_api_version'] = api_version.get_string()
    return client_class(*args, **kwargs)
--- a/watcherclient/common/api_versioning.py
+++ b/watcherclient/common/api_versioning.py
@@ -18,7 +18,7 @@ import re

 from oslo_utils import strutils

-from watcherclient._i18n import _, _LW
+from watcherclient._i18n import _
 from watcherclient import exceptions

 LOG = logging.getLogger(__name__)
@@ -26,14 +26,34 @@ if not LOG.handlers:
    LOG.addHandler(logging.StreamHandler())


+MINOR_1_START_END_TIMING = '1.1'
+MINOR_2_FORCE_AUDIT = '1.2'
 HEADER_NAME = "OpenStack-API-Version"
-SERVICE_TYPE = "infra-optim"
 # key is a deprecated version and value is an alternative version.
 DEPRECATED_VERSIONS = {}

 _type_error_msg = _("'%(other)s' should be an instance of '%(cls)s'")


+def allow_start_end_audit_time(requested_version):
+    """Check if we should support optional start/end attributes for Audit.
+
+    Version 1.1 of the API added support for start and end time of continuous
+    audits.
+    """
+    return (APIVersion(requested_version) >=
+            APIVersion(MINOR_1_START_END_TIMING))
+
+
+def launch_audit_forced(requested_version):
+    """Check if we should support force option for Audit.
+
+    Version 1.2 of the API added support for force option.
+    """
+    return (APIVersion(requested_version) >=
+            APIVersion(MINOR_2_FORCE_AUDIT))
+
+
 class APIVersion(object):
    """This class represents an API Version Request.

@@ -202,8 +222,8 @@ def get_api_version(version_string):
    version_string = str(version_string)
    if version_string in DEPRECATED_VERSIONS:
        LOG.warning(
-            _LW("Version %(deprecated_version)s is deprecated, using "
-                "alternative version %(alternative)s instead."),
+            "Version %(deprecated_version)s is deprecated, using "
+            "alternative version %(alternative)s instead.",
            {"deprecated_version": version_string,
             "alternative": DEPRECATED_VERSIONS[version_string]})
        version_string = DEPRECATED_VERSIONS[version_string]
--- a/watcherclient/common/base.py
+++ b/watcherclient/common/base.py
@@ -31,10 +31,7 @@ def getid(obj):
    Abstracts the common pattern of allowing both an object or an
    object's ID (UUID) as a parameter when dealing with relationships.
    """
-    try:
-        return obj.id
-    except AttributeError:
-        return obj
+    return getattr(obj, 'id', obj)


 class Manager(object):
@@ -134,6 +131,11 @@ class Manager(object):
    def _delete(self, url):
        self.api.raw_request('DELETE', url)

+    def _start(self, url, body=None, method='POST'):
+        resp, body = self.api.json_request(method, url, body={})
+        if body:
+            return self.resource_class(self, body)
+

 class Resource(base.Resource):
    """Represents a particular instance of an object (tenant, user, etc).
--- a/watcherclient/common/cliutils.py
+++ b/watcherclient/common/cliutils.py
@@ -1,276 +0,0 @@
-# Copyright 2012 Red Hat, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-# W0603: Using the global statement
-# W0621: Redefining name %s from outer scope
-# pylint: disable=W0603,W0621
-
-from __future__ import print_function
-
-import getpass
-import inspect
-import os
-import sys
-import textwrap
-
-from oslo_utils import encodeutils
-from oslo_utils import strutils
-import prettytable
-import six
-from six import moves
-
-from watcherclient._i18n import _
-
-
-class MissingArgs(Exception):
-    """Supplied arguments are not sufficient for calling a function."""
-    def __init__(self, missing):
-        self.missing = missing
-        msg = _("Missing arguments: %s") % ", ".join(missing)
-        super(MissingArgs, self).__init__(msg)
-
-
-def validate_args(fn, *args, **kwargs):
-    """Check that the supplied args are sufficient for calling a function.
-
-    >>> validate_args(lambda a: None)
-    Traceback (most recent call last):
-        ...
-    MissingArgs: Missing argument(s): a
-    >>> validate_args(lambda a, b, c, d: None, 0, c=1)
-    Traceback (most recent call last):
-        ...
-    MissingArgs: Missing argument(s): b, d
-
-    :param fn: the function to check
-    :param arg: the positional arguments supplied
-    :param kwargs: the keyword arguments supplied
-    """
-    argspec = inspect.getargspec(fn)
-
-    num_defaults = len(argspec.defaults or [])
-    required_args = argspec.args[:len(argspec.args) - num_defaults]
-
-    def isbound(method):
-        return getattr(method, '__self__', None) is not None
-
-    if isbound(fn):
-        required_args.pop(0)
-
-    missing = [arg for arg in required_args if arg not in kwargs]
-    missing = missing[len(args):]
-    if missing:
-        raise MissingArgs(missing)
-
-
-def arg(*args, **kwargs):
-    """Decorator for CLI args.
-
-    Example:
-
-    >>> @arg("name", help="Name of the new entity")
-    ... def entity_create(args):
-    ...     pass
-    """
-    def _decorator(func):
-        add_arg(func, *args, **kwargs)
-        return func
-    return _decorator
-
-
-def env(*args, **kwargs):
-    """Returns the first environment variable set.
-
-    If all are empty, defaults to '' or keyword arg `default`.
-    """
-    for arg in args:
-        value = os.environ.get(arg)
-        if value:
-            return value
-    return kwargs.get('default', '')
-
-
-def add_arg(func, *args, **kwargs):
-    """Bind CLI arguments to a shell.py `do_foo` function."""
-
-    if not hasattr(func, 'arguments'):
-        func.arguments = []
-
-    # NOTE(sirp): avoid dups that can occur when the module is shared across
-    # tests.
-    if (args, kwargs) not in func.arguments:
-        # Because of the semantics of decorator composition if we just append
-        # to the options list positional options will appear to be backwards.
-        func.arguments.insert(0, (args, kwargs))
-
-
-def unauthenticated(func):
-    """Adds 'unauthenticated' attribute to decorated function.
-
-    Usage:
-
-    >>> @unauthenticated
-    ... def mymethod(f):
-    ...     pass
-    """
-    func.unauthenticated = True
-    return func
-
-
-def isunauthenticated(func):
-    """Checks if the function does not require authentication.
-
-    Mark such functions with the `@unauthenticated` decorator.
-
-    :returns: bool
-    """
-    return getattr(func, 'unauthenticated', False)
-
-
-def print_list(objs, fields, formatters=None, sortby_index=0,
-               mixed_case_fields=None, field_labels=None):
-    """Print a list or objects as a table, one row per object.
-
-    :param objs: iterable of :class:`Resource`
-    :param fields: attributes that correspond to columns, in order
-    :param formatters: `dict` of callables for field formatting
-    :param sortby_index: index of the field for sorting table rows
-    :param mixed_case_fields: fields corresponding to object attributes that
-        have mixed case names (e.g., 'serverId')
-    :param field_labels: Labels to use in the heading of the table, default to
-        fields.
-    """
-    formatters = formatters or {}
-    mixed_case_fields = mixed_case_fields or []
-    field_labels = field_labels or fields
-    if len(field_labels) != len(fields):
-        raise ValueError(_("Field labels list %(labels)s has different number "
-                           "of elements than fields list %(fields)s"),
-                         {'labels': field_labels, 'fields': fields})
-
-    if sortby_index is None:
-        kwargs = {}
-    else:
-        kwargs = {'sortby': field_labels[sortby_index]}
-    pt = prettytable.PrettyTable(field_labels)
-    pt.align = 'l'
-
-    for o in objs:
-        row = []
-        for field in fields:
-            data = '-'
-            if field in formatters:
-                data = formatters[field](o)
-            else:
-                if field in mixed_case_fields:
-                    field_name = field.replace(' ', '_')
-                else:
-                    field_name = field.lower().replace(' ', '_')
-                data = getattr(o, field_name, '')
-            if data is None:
-                data = '-'
-            row.append(data)
-        pt.add_row(row)
-
-    if six.PY3:
-        print(encodeutils.safe_encode(pt.get_string(**kwargs)).decode())
-    else:
-        print(encodeutils.safe_encode(pt.get_string(**kwargs)))
-
-
-def print_dict(dct, dict_property="Property", wrap=0):
-    """Print a `dict` as a table of two columns.
-
-    :param dct: `dict` to print
-    :param dict_property: name of the first column
-    :param wrap: wrapping for the second column
-    """
-    pt = prettytable.PrettyTable([dict_property, 'Value'])
-    pt.align = 'l'
-    for k, v in dct.items():
-        # convert dict to str to check length
-        if isinstance(v, dict):
-            v = six.text_type(v)
-        if wrap > 0:
-            v = textwrap.fill(six.text_type(v), wrap)
-        # if value has a newline, add in multiple rows
-        # e.g. fault with stacktrace
-        if v and isinstance(v, six.string_types) and r'\n' in v:
-            lines = v.strip().split(r'\n')
-            col1 = k
-            for line in lines:
-                pt.add_row([col1, line])
-                col1 = ''
-        else:
-            if v is None:
-                v = '-'
-            pt.add_row([k, v])
-
-    if six.PY3:
-        print(encodeutils.safe_encode(pt.get_string()).decode())
-    else:
-        print(encodeutils.safe_encode(pt.get_string()))
-
-
-def get_password(max_password_prompts=3):
-    """Read password from TTY."""
-    verify = strutils.bool_from_string(env("OS_VERIFY_PASSWORD"))
-    pw = None
-    if hasattr(sys.stdin, "isatty") and sys.stdin.isatty():
-        # Check for Ctrl-D
-        try:
-            for __ in moves.range(max_password_prompts):
-                pw1 = getpass.getpass("OS Password: ")
-                if verify:
-                    pw2 = getpass.getpass("Please verify: ")
-                else:
-                    pw2 = pw1
-                if pw1 == pw2 and pw1:
-                    pw = pw1
-                    break
-        except EOFError:
-            pass
-    return pw
-
-
-def service_type(stype):
-    """Adds 'service_type' attribute to decorated function.
-
-    Usage:
-
-    .. code-block:: python
-
-       @service_type('volume')
-       def mymethod(f):
-       ...
-    """
-    def inner(f):
-        f.service_type = stype
-        return f
-    return inner
-
-
-def get_service_type(f):
-    """Retrieves service type from function."""
-    return getattr(f, 'service_type', None)
-
-
-def pretty_choice_list(l):
-    return ', '.join("'%s'" % i for i in l)
-
-
-def exit(msg=''):
-    if msg:
-        print(msg, file=sys.stderr)
-    sys.exit(1)
--- a/watcherclient/common/httpclient.py
+++ b/watcherclient/common/httpclient.py
@@ -17,7 +17,6 @@ import copy
 from distutils import version
 import functools
 import hashlib
-import json
 import logging
 import os
 import socket
@@ -27,23 +26,23 @@ import time

 from keystoneauth1 import adapter
 from keystoneauth1 import exceptions as kexceptions
+from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import requests
 import six
 from six.moves import http_client
 import six.moves.urllib.parse as urlparse

-from watcherclient._i18n import _, _LE, _LW
+from watcherclient._i18n import _
+from watcherclient.common import api_versioning
 from watcherclient import exceptions


-# NOTE(deva): Record the latest version that this client was tested with.
-#             We still have a lot of work to do in the client to implement
-#             microversion support in the client properly! See
-#             http://specs.openstack.org/openstack/watcher-specs/specs/kilo/api-microversions.html # noqa
-#             for full details.
-DEFAULT_VER = '1.0'
-
+# Record the latest version that this client was tested with.
+DEFAULT_VER = '1.latest'
+# Minor version 4 for adding webhook API
+LAST_KNOWN_API_VERSION = 4
+LATEST_VERSION = '1.{}'.format(LAST_KNOWN_API_VERSION)

 LOG = logging.getLogger(__name__)
 USER_AGENT = 'python-watcherclient'
@@ -70,10 +69,10 @@ def _extract_error_json(body):
    """Return  error_message from the HTTP response body."""
    error_json = {}
    try:
-        body_json = json.loads(body)
+        body_json = jsonutils.loads(body)
        if 'error_message' in body_json:
            raw_msg = body_json['error_message']
-            error_json = json.loads(raw_msg)
+            error_json = jsonutils.loads(raw_msg)
    except ValueError:
        pass

@@ -104,20 +103,8 @@ class VersionNegotiationMixin(object):
                {'valid': ', '.join(API_VERSION_SELECTED_STATES),
                 'value': self.api_version_select_state})
        min_ver, max_ver = self._parse_version_headers(resp)
-        # NOTE: servers before commit 32fb6e99 did not return version headers
-        # on error, so we need to perform a GET to determine
-        # the supported version range
-        if not max_ver:
-            LOG.debug('No version header in response, requesting from server')
-            if self.os_watcher_api_version:
-                base_version = ("/v%s" %
-                                str(self.os_watcher_api_version).split('.')[0])
-            else:
-                base_version = API_VERSION
-            resp = self._make_simple_request(conn, 'GET', base_version)
-            min_ver, max_ver = self._parse_version_headers(resp)
        # If the user requested an explicit version or we have negotiated a
-        # version and still failing then error now.  The server could
+        # version and still failing then error now. The server could
        # support the version requested but the requested operation may not
        # be supported by the requested version.
        if self.api_version_select_state == 'user':
@@ -126,33 +113,33 @@ class VersionNegotiationMixin(object):
                  "server or the requested operation is not supported by the "
                  "requested version.  Supported version range is %(min)s to "
                  "%(max)s")
-                % {'req': self.os_watcher_api_version,
+                % {'req': self.os_infra_optim_api_version,
                   'min': min_ver, 'max': max_ver}))
        if self.api_version_select_state == 'negotiated':
            raise exceptions.UnsupportedVersion(textwrap.fill(
                _("No API version was specified and the requested operation "
                  "was not supported by the client's negotiated API version "
                  "%(req)s.  Supported version range is: %(min)s to %(max)s")
-                % {'req': self.os_watcher_api_version,
+                % {'req': self.os_infra_optim_api_version,
                   'min': min_ver, 'max': max_ver}))

        negotiated_ver = str(
-            min(version.StrictVersion(self.os_watcher_api_version),
+            min(version.StrictVersion(self.os_infra_optim_api_version),
                version.StrictVersion(max_ver)))
        if negotiated_ver < min_ver:
            negotiated_ver = min_ver
        # server handles microversions, but doesn't support
        # the requested version, so try a negotiated version
        self.api_version_select_state = 'negotiated'
-        self.os_watcher_api_version = negotiated_ver
+        self.os_infra_optim_api_version = negotiated_ver
        LOG.debug('Negotiated API version is %s', negotiated_ver)

        return negotiated_ver

    def _generic_parse_version_headers(self, accessor_func):
-        min_ver = accessor_func('X-OpenStack-Watcher-API-Minimum-Version',
+        min_ver = accessor_func('OpenStack-API-Minimum-Version',
                                None)
-        max_ver = accessor_func('X-OpenStack-Watcher-API-Maximum-Version',
+        max_ver = accessor_func('OpenStack-API-Maximum-Version',
                                None)
        return min_ver, max_ver

@@ -165,8 +152,7 @@ class VersionNegotiationMixin(object):
        raise NotImplementedError()


-_RETRY_EXCEPTIONS = (exceptions.Conflict,
-                     exceptions.ServiceUnavailable,
+_RETRY_EXCEPTIONS = (exceptions.ServiceUnavailable,
                     exceptions.ConnectionRefused,
                     kexceptions.RetriableConnectionFailure)

@@ -185,8 +171,8 @@ def with_retries(func):
            try:
                return func(self, url, method, **kwargs)
            except _RETRY_EXCEPTIONS as error:
-                msg = (_LE("Error contacting Watcher server: %(error)s. "
-                           "Attempt %(attempt)d of %(total)d") %
+                msg = ("Error contacting Watcher server: %(error)s. "
+                       "Attempt %(attempt)d of %(total)d" %
                       {'attempt': attempt,
                        'total': num_attempts,
                        'error': error})
@@ -207,8 +193,8 @@ class HTTPClient(VersionNegotiationMixin):
        self.endpoint_trimmed = _trim_endpoint_api_version(endpoint)
        self.auth_token = kwargs.get('token')
        self.auth_ref = kwargs.get('auth_ref')
-        self.os_watcher_api_version = kwargs.get('os_watcher_api_version',
-                                                 DEFAULT_VER)
+        self.os_infra_optim_api_version = kwargs.get(
+            'os_infra_optim_api_version', DEFAULT_VER)
        self.api_version_select_state = kwargs.get(
            'api_version_select_state', 'default')
        self.conflict_max_retries = kwargs.pop('max_retries',
@@ -290,7 +276,7 @@ class HTTPClient(VersionNegotiationMixin):
        LOG.debug('\n'.join(dump))

    def _make_connection_url(self, url):
-        return urlparse.urljoin(self.endpoint_trimmed, url)
+        return '%s/%s' % (self.endpoint_trimmed.rstrip('/'), url.lstrip('/'))

    def _parse_version_headers(self, resp):
        return self._generic_parse_version_headers(resp.headers.get)
@@ -308,9 +294,15 @@ class HTTPClient(VersionNegotiationMixin):
        # Copy the kwargs so we can reuse the original in case of redirects
        kwargs['headers'] = copy.deepcopy(kwargs.get('headers', {}))
        kwargs['headers'].setdefault('User-Agent', USER_AGENT)
-        if self.os_watcher_api_version:
-            kwargs['headers'].setdefault('X-OpenStack-Watcher-API-Version',
-                                         self.os_watcher_api_version)
+        if self.os_infra_optim_api_version:
+            api_version = api_versioning.get_api_version(
+                self.os_infra_optim_api_version)
+            if api_version.is_latest():
+                api_version = api_versioning.get_api_version(
+                    LATEST_VERSION)
+            kwargs['headers'].setdefault(
+                'OpenStack-API-Version',
+                ' '.join(['infra-optim', api_version.get_string()]))
        if self.auth_token:
            kwargs['headers'].setdefault('X-Auth-Token', self.auth_token)

@@ -335,8 +327,8 @@ class HTTPClient(VersionNegotiationMixin):

            if resp.status_code == http_client.NOT_ACCEPTABLE:
                negotiated_ver = self.negotiate_version(self.session, resp)
-                kwargs['headers']['X-OpenStack-Watcher-API-Version'] = (
-                    negotiated_ver)
+                kwargs['headers']['OpenStack-API-Version'] = (
+                    ' '.join(['infra-optim', negotiated_ver]))
                return self._http_request(url, method, **kwargs)

        except requests.exceptions.RequestException as e:
@@ -355,7 +347,15 @@ class HTTPClient(VersionNegotiationMixin):
        # Read body into string if it isn't obviously image data
        body_str = None
        if resp.headers.get('Content-Type') != 'application/octet-stream':
-            body_str = ''.join([chunk for chunk in body_iter])
+            # decoding byte to string is necessary for Python 3 compatibility
+            # this issues has not been found with Python 3 unit tests
+            # because the test creates a fake http response of type str
+            # the if statement satisfies test (str) and real (bytes) behavior
+            body_list = [
+                chunk.decode("utf-8") if isinstance(chunk, bytes)
+                else chunk for chunk in body_iter
+            ]
+            body_str = ''.join(body_list)
            self.log_http_response(resp, body_str)
            body_iter = six.StringIO(body_str)
        else:
@@ -382,22 +382,22 @@ class HTTPClient(VersionNegotiationMixin):
        kwargs['headers'].setdefault('Accept', 'application/json')

        if 'body' in kwargs:
-            kwargs['body'] = json.dumps(kwargs['body'])
+            kwargs['body'] = jsonutils.dumps(kwargs['body'])

        resp, body_iter = self._http_request(url, method, **kwargs)
        content_type = resp.headers.get('Content-Type')

        if (resp.status_code in (http_client.NO_CONTENT,
-                                 http_client.RESET_CONTENT)
-                or content_type is None):
+                                 http_client.RESET_CONTENT) or
+                content_type is None):
            return resp, list()

        if 'application/json' in content_type:
            body = ''.join([chunk for chunk in body_iter])
            try:
-                body = json.loads(body)
+                body = jsonutils.loads(body)
            except ValueError:
-                LOG.error(_LE('Could not decode response body as JSON'))
+                LOG.error('Could not decode response body as JSON')
        else:
            body = None

@@ -478,13 +478,13 @@ class SessionClient(VersionNegotiationMixin, adapter.LegacyJsonAdapter):
    """HTTP client based on Keystone client session."""

    def __init__(self,
-                 os_watcher_api_version,
+                 os_infra_optim_api_version,
                 api_version_select_state,
                 max_retries,
                 retry_interval,
                 endpoint,
                 **kwargs):
-        self.os_watcher_api_version = os_watcher_api_version
+        self.os_infra_optim_api_version = os_infra_optim_api_version
        self.api_version_select_state = api_version_select_state
        self.conflict_max_retries = max_retries
        self.conflict_retry_interval = retry_interval
@@ -509,9 +509,16 @@ class SessionClient(VersionNegotiationMixin, adapter.LegacyJsonAdapter):
                _trim_endpoint_api_version(self.endpoint_override)
            )

-        if getattr(self, 'os_watcher_api_version', None):
-            kwargs['headers'].setdefault('X-OpenStack-Watcher-API-Version',
-                                         self.os_watcher_api_version)
+        if getattr(self, 'os_infra_optim_api_version', None):
+            api_version = api_versioning.get_api_version(
+                self.os_infra_optim_api_version)
+            if api_version.is_latest():
+                api_version = api_versioning.get_api_version(
+                    LATEST_VERSION)
+            kwargs['headers'].setdefault(
+                'OpenStack-API-Version',
+                ' '.join(['infra-optim',
+                          api_version.get_string()]))

        endpoint_filter = kwargs.setdefault('endpoint_filter', {})
        endpoint_filter.setdefault('interface', self.interface)
@@ -522,8 +529,8 @@ class SessionClient(VersionNegotiationMixin, adapter.LegacyJsonAdapter):
                                    raise_exc=False, **kwargs)
        if resp.status_code == http_client.NOT_ACCEPTABLE:
            negotiated_ver = self.negotiate_version(self.session, resp)
-            kwargs['headers']['X-OpenStack-Watcher-API-Version'] = (
-                negotiated_ver)
+            kwargs['headers']['OpenStack-API-Version'] = (
+                ' '.join(['infra-optim', negotiated_ver]))
            return self._http_request(url, method, **kwargs)
        if resp.status_code >= http_client.BAD_REQUEST:
            error_json = _extract_error_json(resp.content)
@@ -545,7 +552,7 @@ class SessionClient(VersionNegotiationMixin, adapter.LegacyJsonAdapter):
        kwargs['headers'].setdefault('Accept', 'application/json')

        if 'body' in kwargs:
-            kwargs['data'] = json.dumps(kwargs.pop('body'))
+            kwargs['data'] = jsonutils.dumps(kwargs.pop('body'))

        resp = self._http_request(url, method, **kwargs)
        body = resp.content
@@ -558,7 +565,7 @@ class SessionClient(VersionNegotiationMixin, adapter.LegacyJsonAdapter):
            try:
                body = resp.json()
            except ValueError:
-                LOG.error(_LE('Could not decode response body as JSON'))
+                LOG.error('Could not decode response body as JSON')
        else:
            body = None

@@ -575,7 +582,7 @@ def _construct_http_client(endpoint=None,
                           session=None,
                           token=None,
                           auth_ref=None,
-                           os_watcher_api_version=DEFAULT_VER,
+                           os_infra_optim_api_version=DEFAULT_VER,
                           api_version_select_state='default',
                           max_retries=DEFAULT_MAX_RETRIES,
                           retry_interval=DEFAULT_RETRY_INTERVAL,
@@ -602,31 +609,33 @@ def _construct_http_client(endpoint=None,
        dvars = [k for k, v in ignored.items() if v]

        if dvars:
-            LOG.warning(_LW('The following arguments are ignored when using '
-                            'the session to construct a client: %s'),
+            LOG.warning('The following arguments are ignored when using '
+                        'the session to construct a client: %s',
                        ', '.join(dvars))

-        return SessionClient(session=session,
-                             os_watcher_api_version=os_watcher_api_version,
-                             api_version_select_state=api_version_select_state,
-                             max_retries=max_retries,
-                             retry_interval=retry_interval,
-                             endpoint=endpoint,
-                             **kwargs)
+        return SessionClient(
+            session=session,
+            os_infra_optim_api_version=os_infra_optim_api_version,
+            api_version_select_state=api_version_select_state,
+            max_retries=max_retries,
+            retry_interval=retry_interval,
+            endpoint=endpoint,
+            **kwargs)
    else:
        if kwargs:
-            LOG.warning(_LW('The following arguments are being ignored when '
-                            'constructing the client: %s'), ', '.join(kwargs))
+            LOG.warning('The following arguments are being ignored when '
+                        'constructing the client: %s', ', '.join(kwargs))

-        return HTTPClient(endpoint=endpoint,
-                          token=token,
-                          auth_ref=auth_ref,
-                          os_watcher_api_version=os_watcher_api_version,
-                          api_version_select_state=api_version_select_state,
-                          max_retries=max_retries,
-                          retry_interval=retry_interval,
-                          timeout=timeout,
-                          ca_file=ca_file,
-                          cert_file=cert_file,
-                          key_file=key_file,
-                          insecure=insecure)
+        return HTTPClient(
+            endpoint=endpoint,
+            token=token,
+            auth_ref=auth_ref,
+            os_infra_optim_api_version=os_infra_optim_api_version,
+            api_version_select_state=api_version_select_state,
+            max_retries=max_retries,
+            retry_interval=retry_interval,
+            timeout=timeout,
+            ca_file=ca_file,
+            cert_file=cert_file,
+            key_file=key_file,
+            insecure=insecure)
--- a/watcherclient/common/utils.py
+++ b/watcherclient/common/utils.py
@@ -14,14 +14,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-from __future__ import print_function
-
 import argparse
-import json
 import os
 import uuid
 import yaml

+from oslo_serialization import jsonutils
 from oslo_utils import importutils

 from watcherclient._i18n import _
@@ -75,7 +73,7 @@ def import_versioned_module(version, submodule=None):
    return importutils.import_module(module)


-def split_and_deserialize(string):
+def split_and_deserialize(string, exclude_fields=[]):
    """Split and try to JSON deserialize a string.

    Gets a string with the KEY=VALUE format, split it (using '=' as the
@@ -88,10 +86,11 @@ def split_and_deserialize(string):
    except ValueError:
        raise exc.CommandError(_('Attributes must be a list of '
                                 'PATH=VALUE not "%s"') % string)
-    try:
-        value = json.loads(value)
-    except ValueError:
-        pass
+    if key not in exclude_fields:
+        try:
+            value = jsonutils.loads(value)
+        except ValueError:
+            pass

    return (key, value)

@@ -104,7 +103,7 @@ def args_array_to_dict(kwargs, key_to_convert):
    return kwargs


-def args_array_to_patch(op, attributes):
+def args_array_to_patch(op, attributes, exclude_fields=[]):
    patch = []
    for attr in attributes:
        # Sanitize
@@ -112,7 +111,8 @@ def args_array_to_patch(op, attributes):
            attr = '/' + attr

        if op in ['add', 'replace']:
-            path, value = split_and_deserialize(attr)
+            path, value = split_and_deserialize(attr,
+                                                exclude_fields=exclude_fields)
            patch.append({'op': op, 'path': path, 'value': value})

        elif op == "remove":
@@ -159,17 +159,21 @@ def common_params_for_list(args, fields, field_labels):
                args.sort_dir)
        params['sort_dir'] = args.sort_dir

+    marker = getattr(args, 'marker', None)
+    if marker is not None:
+        params['marker'] = marker
    params['detail'] = args.detail

    return params


-def common_filters(limit=None, sort_key=None, sort_dir=None):
+def common_filters(limit=None, sort_key=None, sort_dir=None, marker=None):
    """Generate common filters for any list request.

    :param limit: maximum number of entities to return.
    :param sort_key: field to use for sorting.
    :param sort_dir: direction of sorting: 'asc' or 'desc'.
+    :param marker: The last actionplan UUID of the previous page.
    :returns: list of string filters.
    """
    filters = []
@@ -179,6 +183,8 @@ def common_filters(limit=None, sort_key=None, sort_dir=None):
        filters.append('sort_key=%s' % sort_key)
    if sort_dir is not None:
        filters.append('sort_dir=%s' % sort_dir)
+    if marker is not None:
+        filters.append('marker=%s' % marker)
    return filters


--- a/watcherclient/exceptions.py
+++ b/watcherclient/exceptions.py
@@ -71,6 +71,7 @@ class AmbiguousAuthSystem(exceptions.ClientException):
    """Could not obtain token and endpoint using provided credentials."""
    pass

+
 # Alias for backwards compatibility
 AmbigiousAuthSystem = AmbiguousAuthSystem

--- a/watcherclient/osc/plugin.py
+++ b/watcherclient/osc/plugin.py
@@ -15,9 +15,14 @@ import logging

 from osc_lib import utils

+import watcherclient
+from watcherclient.common import api_versioning
+from watcherclient.common import httpclient
+from watcherclient import exceptions
+
 LOG = logging.getLogger(__name__)

-DEFAULT_API_VERSION = '1'
+DEFAULT_API_VERSION = httpclient.LATEST_VERSION
 API_VERSION_OPTION = 'os_infra_optim_api_version'
 API_NAME = 'infra-optim'
 API_VERSIONS = {
@@ -27,14 +32,17 @@ API_VERSIONS = {

 def make_client(instance):
    """Returns an infra-optim service client."""
+
+    version = api_versioning.APIVersion(instance._api_version[API_NAME])
+
    infraoptim_client_class = utils.get_client_class(
        API_NAME,
-        instance._api_version[API_NAME],
+        version.ver_major,
        API_VERSIONS)
    LOG.debug('Instantiating infraoptim client: %s', infraoptim_client_class)

    client = infraoptim_client_class(
-        os_watcher_api_version=instance._api_version[API_NAME],
+        os_infra_optim_api_version=instance._api_version[API_NAME],
        session=instance.session,
        region_name=instance._region_name,
    )
@@ -53,3 +61,30 @@ def build_option_parser(parser):
                              DEFAULT_API_VERSION +
                              ' (Env: OS_INFRA_OPTIM_API_VERSION)'))
    return parser
+
+
+def check_api_version(check_version):
+    """Validate version supplied by user
+
+    Returns:
+    * True if version is OK
+    * False if the version has not been checked and the previous plugin
+    check should be performed
+    * throws an exception if the version is no good
+    """
+
+    infra_api_version = api_versioning.get_api_version(check_version)
+
+    # Bypass X.latest format microversion
+    if not infra_api_version.is_latest():
+        if infra_api_version > api_versioning.APIVersion("2.0"):
+            if not infra_api_version.matches(
+                watcherclient.API_MIN_VERSION,
+                watcherclient.API_MAX_VERSION,
+            ):
+                msg = "versions supported by client: %(min)s - %(max)s" % {
+                    "min": watcherclient.API_MIN_VERSION.get_string(),
+                    "max": watcherclient.API_MAX_VERSION.get_string(),
+                }
+                raise exceptions.CommandError(msg)
+    return True
--- a/watcherclient/shell.py
+++ b/watcherclient/shell.py
@@ -39,6 +39,7 @@ API_NAME = 'infra-optim'
 API_VERSIONS = {
    '1': 'watcherclient.v1.client.Client',
 }
+DEFAULT_OS_INFRA_OPTIM_API_VERSION = '1.latest'
 _DEFAULT_IDENTITY_API_VERSION = '3'
 _IDENTITY_API_VERSION_2 = ['2', '2.0']
 _IDENTITY_API_VERSION_3 = ['3']
@@ -47,8 +48,6 @@ _IDENTITY_API_VERSION_3 = ['3']
 class WatcherShell(app.App):
    """Watcher command line interface."""

-    log = logging.getLogger(__name__)
-
    def __init__(self, **kwargs):
        self.client = None

@@ -149,11 +148,13 @@ class WatcherShell(app.App):
                            metavar='<auth-token>',
                            default=utils.env('OS_AUTH_TOKEN'),
                            help='Defaults to env[OS_AUTH_TOKEN].')
-        parser.add_argument('--os-watcher-api-version',
-                            metavar='<os-watcher-api-version>',
-                            default=utils.env('OS_WATCHER_API_VERSION',
-                                              default='1'),
-                            help='Defaults to env[OS_WATCHER_API_VERSION].')
+        parser.add_argument(
+            '--os-infra-optim-api-version',
+            metavar='<infra-optim-api-version>',
+            default=utils.env('OS_INFRA_OPTIM_API_VERSION',
+                              default=DEFAULT_OS_INFRA_OPTIM_API_VERSION),
+            help='Accepts X, X.Y (where X is major and Y is minor part) or '
+                 '"X.latest", defaults to env[OS_INFRA_OPTIM_API_VERSION].')
        parser.add_argument('--os-endpoint-type',
                            default=utils.env('OS_ENDPOINT_TYPE'),
                            help='Defaults to env[OS_ENDPOINT_TYPE] or '
@@ -194,17 +195,18 @@ class WatcherShell(app.App):
        except Exception as e:
            if not logging.getLogger('').handlers:
                logging.basicConfig()
-            self.log.error('Exception raised: %s', str(e))
+            LOG.error('Exception raised: %s', str(e))

            return ret_val

        finally:
-            self.log.info("END return value: %s", ret_val)
+            LOG.info("END return value: %s", ret_val)


 def main(argv=sys.argv[1:]):
    watcher_app = WatcherShell()
    return watcher_app.run(argv)

+
 if __name__ == '__main__':   # pragma: no cover
    sys.exit(main(sys.argv[1:]))
--- a/watcherclient/tests/README.rst
+++ b/watcherclient/tests/README.rst
@@ -1,61 +0,0 @@
-..
-      Except where otherwise noted, this document is licensed under Creative
-      Commons Attribution 3.0 License.  You can view the license at:
-
-          https://creativecommons.org/licenses/by/3.0/
-
-=======
-Testing
-=======
-
-.. _functional_tests:
-
-Functional tests
-================
-
-The following procedure gets you started with Tempest testing but you can also
-refer to the `Tempest documentation`_ for more details.
-
-.. _Tempest documentation: http://docs.openstack.org/developer/tempest/
-
-
-Tempest installation
--------------------
-
-You need to install virtualenv, create a virtual environment and activate it::
-
-    $ pip install virtualenv
-    $ virtualenv watcher-env
-    $ source watcher-env/bin/activate
-
-Then, to install Tempest you can issue the following commands::
-
-    $ git clone https://github.com/openstack/tempest/
-    $ pip install tempest/
-
-There should be set environment variables using the OpenStack RC file. If
-you don't have RC file yet, create ``admin-openrc`` file and fill it using
-the following example::
-
-    export OS_PROJECT_DOMAIN_NAME=default
-    export OS_USER_DOMAIN_NAME=default
-    export OS_PROJECT_NAME=admin
-    export OS_USERNAME=admin
-    export OS_PASSWORD=admin
-    export OS_AUTH_URL=http://controller:35357/v3
-    export OS_IDENTITY_API_VERSION=3
-    export OS_IMAGE_API_VERSION=2
-
-Then, save file and execute ``source admin-openrc`` to set environment
-variables.
-
-To run functional tests you need to go to python-watcherclient folder, install
-all requirements and execute ``tempest run`` command::
-
-    $ pip install -r requirements.txt test-requirements.txt
-    $ pip install .
-    $ tempest run --regex watcherclient.tests.functional
-
-You can run specified test(s) by using regular expression::
-
-    $ tempest run --regex watcherclient.tests.functional.v1.test_action.ActionTests.test_action_list
--- a/watcherclient/tests/functional/init.py
+++ b/watcherclient/tests/functional/init.py
--- a/watcherclient/tests/functional/v1/init.py
+++ b/watcherclient/tests/functional/v1/init.py
--- a/watcherclient/tests/functional/v1/base.py
+++ b/watcherclient/tests/functional/v1/base.py
@@ -1,108 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import re
-import shlex
-import subprocess
-import testtools
-
-import six
-from tempest.lib.cli import output_parser
-from tempest.lib import exceptions
-
-
-def execute(cmd, fail_ok=False, merge_stderr=False):
-    """Executes specified command for the given action."""
-    cmdlist = shlex.split(cmd)
-    stdout = subprocess.PIPE
-    stderr = subprocess.STDOUT if merge_stderr else subprocess.PIPE
-    proc = subprocess.Popen(cmdlist, stdout=stdout, stderr=stderr)
-    result, result_err = proc.communicate()
-    result = result.decode('utf-8')
-    if not fail_ok and proc.returncode != 0:
-        raise exceptions.CommandFailed(proc.returncode, cmd, result,
-                                       result_err)
-    return result
-
-
-class TestCase(testtools.TestCase):
-
-    delimiter_line = re.compile('^\+\-[\+\-]+\-\+$')
-
-    @classmethod
-    def watcher(cls, cmd, fail_ok=False):
-        """Executes watcherclient command for the given action."""
-        return execute('watcher {0}'.format(cmd), fail_ok=fail_ok)
-
-    @classmethod
-    def get_opts(cls, fields, format='value'):
-        return ' -f {0} {1}'.format(format,
-                                    ' '.join(['-c ' + it for it in fields]))
-
-    @classmethod
-    def assertOutput(cls, expected, actual):
-        if expected != actual:
-            raise Exception('{0} != {1}'.format(expected, actual))
-
-    @classmethod
-    def assertInOutput(cls, expected, actual):
-        if expected not in actual:
-            raise Exception('{0} not in {1}'.format(expected, actual))
-
-    def assert_table_structure(self, items, field_names):
-        """Verify that all items have keys listed in field_names."""
-        for item in items:
-            for field in field_names:
-                self.assertIn(field, item)
-
-    def assert_show_fields(self, items, field_names):
-        """Verify that all items have keys listed in field_names."""
-        for item in items:
-            for key in six.iterkeys(item):
-                self.assertIn(key, field_names)
-
-    def assert_show_structure(self, items, field_names):
-        """Verify that all field_names listed in keys of all items."""
-        if isinstance(items, list):
-            o = {}
-            for d in items:
-                o.update(d)
-        else:
-            o = items
-        item_keys = o.keys()
-        for field in field_names:
-            self.assertIn(field, item_keys)
-
-    @staticmethod
-    def parse_show_as_object(raw_output):
-        """Return a dict with values parsed from cli output."""
-        items = TestCase.parse_show(raw_output)
-        o = {}
-        for item in items:
-            o.update(item)
-        return o
-
-    @staticmethod
-    def parse_show(raw_output):
-        """Return list of dicts with item values parsed from cli output."""
-
-        items = []
-        table_ = output_parser.table(raw_output)
-        for row in table_['values']:
-            item = {}
-            item[row[0]] = row[1]
-            items.append(item)
-        return items
-
-    def parse_listing(self, raw_output):
-        """Return list of dicts with basic item parsed from cli output."""
-        return output_parser.listing(raw_output)
--- a/watcherclient/tests/functional/v1/test_action.py
+++ b/watcherclient/tests/functional/v1/test_action.py
@@ -1,72 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2016 Servionica
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from oslo_utils import uuidutils
-
-from watcherclient.tests.functional.v1 import base
-
-
-class ActionTests(base.TestCase):
-    """Functional tests for action."""
-
-    dummy_name = 'dummy'
-    list_fields = ['UUID', 'Parents', 'State', 'Action Plan', 'Action']
-    detailed_list_fields = list_fields + ['Created At', 'Updated At',
-                                          'Deleted At', 'Parameters']
-    audit_template_name = 'a' + uuidutils.generate_uuid()
-    audit_uuid = None
-
-    @classmethod
-    def setUpClass(cls):
-        template_raw_output = cls.watcher(
-            'audittemplate create %s dummy -s dummy' % cls.audit_template_name)
-        template_output = cls.parse_show_as_object(template_raw_output)
-        audit_raw_output = cls.watcher(
-            'audit create -a %s' % template_output['Name'])
-        audit_output = cls.parse_show_as_object(audit_raw_output)
-        cls.audit_uuid = audit_output['UUID']
-
-    @classmethod
-    def tearDownClass(cls):
-        # Delete Action Plan and all related actions.
-        output = cls.parse_show(
-            cls.watcher('actionplan list --audit %s' % cls.audit_uuid))
-        action_plan_uuid = output[0].keys()[0]
-        raw_output = cls.watcher('actionplan delete %s' % action_plan_uuid)
-        cls.assertOutput('', raw_output)
-        # Delete audit
-        raw_output = cls.watcher('audit delete %s' % cls.audit_uuid)
-        cls.assertOutput('', raw_output)
-        # Delete Template
-        raw_output = cls.watcher(
-            'audittemplate delete %s' % cls.audit_template_name)
-        cls.assertOutput('', raw_output)
-
-    def test_action_list(self):
-        raw_output = self.watcher('action list')
-        self.assert_table_structure([raw_output], self.list_fields)
-
-    def test_action_detailed_list(self):
-        raw_output = self.watcher('action list --detail')
-        self.assert_table_structure([raw_output], self.detailed_list_fields)
-
-    def test_action_show(self):
-        action_list = self.parse_show(self.watcher('action list'))
-        action_uuid = action_list[0].keys()[0]
-        action = self.watcher('action show ' + action_uuid)
-        self.assertIn(action_uuid, action)
-        self.assert_table_structure([action],
-                                    self.detailed_list_fields)
--- a/watcherclient/tests/functional/v1/test_action_plan.py
+++ b/watcherclient/tests/functional/v1/test_action_plan.py
@@ -1,123 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2016 Servionica
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from oslo_utils import uuidutils
-
-from watcherclient.tests.functional.v1 import base
-
-
-class ActionPlanTests(base.TestCase):
-    """Functional tests for action plan."""
-
-    dummy_name = 'dummy'
-    list_fields = ['UUID', 'Audit', 'State', 'Updated At', 'Global efficacy']
-    detailed_list_fields = list_fields + ['Created At', 'Deleted At',
-                                          'Strategy', 'Efficacy indicators']
-    audit_template_name = 'a' + uuidutils.generate_uuid()
-    audit_uuid = None
-
-    @classmethod
-    def setUpClass(cls):
-        template_raw_output = cls.watcher(
-            'audittemplate create %s dummy -s dummy' % cls.audit_template_name)
-        template_output = cls.parse_show_as_object(template_raw_output)
-        audit_raw_output = cls.watcher('audit create -a %s'
-                                       % template_output['Name'])
-        audit_output = cls.parse_show_as_object(audit_raw_output)
-        cls.audit_uuid = audit_output['UUID']
-
-    @classmethod
-    def tearDownClass(cls):
-        # Delete action plan
-        output = cls.parse_show(
-            cls.watcher('actionplan list --audit %s' % cls.audit_uuid))
-        action_plan_uuid = output[0].keys()[0]
-        raw_output = cls.watcher('actionplan delete %s' % action_plan_uuid)
-        cls.assertOutput('', raw_output)
-        # Delete audit
-        raw_output = cls.watcher('audit delete %s' % cls.audit_uuid)
-        cls.assertOutput('', raw_output)
-        # Delete Template
-        raw_output = cls.watcher(
-            'audittemplate delete %s' % cls.audit_template_name)
-        cls.assertOutput('', raw_output)
-
-    def test_action_plan_list(self):
-        raw_output = self.watcher('actionplan list')
-        self.assert_table_structure([raw_output], self.list_fields)
-
-    def test_action_plan_detailed_list(self):
-        raw_output = self.watcher('actionplan list --detail')
-        self.assert_table_structure([raw_output], self.detailed_list_fields)
-
-    def test_action_plan_show(self):
-        action_plan_list = self.parse_show(self.watcher('actionplan list'))
-        action_plan_uuid = action_plan_list[0].keys()[0]
-        actionplan = self.watcher('actionplan show %s' % action_plan_uuid)
-        self.assertIn(action_plan_uuid, actionplan)
-        self.assert_table_structure([actionplan],
-                                    self.detailed_list_fields)
-
-    def test_action_plan_start(self):
-        output = self.parse_show(self.watcher('actionplan list --audit %s'
-                                              % self.audit_uuid))
-        action_plan_uuid = output[0].keys()[0]
-        self.watcher('actionplan start %s' % action_plan_uuid)
-        raw_output = self.watcher('actionplan show %s' % action_plan_uuid)
-        self.assert_table_structure([raw_output], self.detailed_list_fields)
-
-
-class ActionPlanActiveTests(base.TestCase):
-
-    audit_uuid = None
-    audit_template_name = 'b' + uuidutils.generate_uuid()
-
-    list_fields = ['UUID', 'Audit', 'State', 'Updated At', 'Global efficacy']
-    detailed_list_fields = list_fields + ['Created At', 'Deleted At',
-                                          'Strategy', 'Efficacy indicators']
-
-    def _delete_action_plan(self):
-        output = self.parse_show(
-            self.watcher('actionplan list --audit %s' % self.audit_uuid))
-        action_plan_uuid = output[0].keys()[0]
-        raw_output = self.watcher('actionplan delete %s' % action_plan_uuid)
-        self.assertOutput('', raw_output)
-
-    def _delete_audit(self):
-        raw_output = self.watcher('audit delete %s' % self.audit_uuid)
-        self.assertOutput('', raw_output)
-
-    def _delete_audit_template(self):
-        raw_output = self.watcher(
-            'audittemplate delete %s' % self.audit_template_name)
-        self.assertOutput('', raw_output)
-
-    def _create_audit_template(self):
-        template_raw_output = self.watcher(
-            'audittemplate create %s dummy -s dummy'
-            % self.audit_template_name)
-        template_output = self.parse_show_as_object(template_raw_output)
-        return template_output
-
-    def test_action_plan_create(self):
-        template_output = self._create_audit_template()
-        action_plan = self.watcher(
-            'actionplan create -a %s' % template_output['Name'])
-        self.audit_uuid = self.parse_show_as_object(action_plan)['UUID']
-        self.assert_table_structure([action_plan], self.detailed_list_fields)
-        self._delete_action_plan()
-        self._delete_audit()
-        self._delete_audit_template()
--- a/watcherclient/tests/functional/v1/test_audit.py
+++ b/watcherclient/tests/functional/v1/test_audit.py
@@ -1,114 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2016 Servionica
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from oslo_utils import uuidutils
-
-from watcherclient.tests.functional.v1 import base
-
-
-class AuditTests(base.TestCase):
-    """Functional tests for audit."""
-
-    dummy_name = 'dummy'
-    list_fields = ['UUID', 'Audit Type', 'State', 'Goal', 'Strategy']
-    detailed_list_fields = list_fields + ['Created At', 'Updated At',
-                                          'Deleted At', 'Parameters',
-                                          'Interval', 'Audit Scope']
-    audit_template_name = 'a' + uuidutils.generate_uuid()
-    audit_uuid = None
-
-    @classmethod
-    def setUpClass(cls):
-        raw_output = cls.watcher('audittemplate create %s dummy -s dummy'
-                                 % cls.audit_template_name)
-        template_output = cls.parse_show_as_object(raw_output)
-        audit_raw_output = cls.watcher(
-            'audit create -a %s' % template_output['Name'])
-        audit_output = cls.parse_show_as_object(audit_raw_output)
-        cls.audit_uuid = audit_output['UUID']
-
-    @classmethod
-    def tearDownClass(cls):
-        output = cls.parse_show(
-            cls.watcher('actionplan list --audit %s' % cls.audit_uuid))
-        action_plan_uuid = output[0].keys()[0]
-        cls.watcher('actionplan delete %s' % action_plan_uuid)
-        cls.watcher('audit delete %s' % cls.audit_uuid)
-        cls.watcher('audittemplate delete %s' % cls.audit_template_name)
-
-    def test_audit_list(self):
-        raw_output = self.watcher('audit list')
-        self.assert_table_structure([raw_output], self.list_fields)
-
-    def test_audit_detailed_list(self):
-        raw_output = self.watcher('audit list --detail')
-        self.assert_table_structure([raw_output], self.detailed_list_fields)
-
-    def test_audit_show(self):
-        audit = self.watcher('audit show ' + self.audit_uuid)
-        self.assertIn(self.audit_uuid, audit)
-        self.assert_table_structure([audit], self.detailed_list_fields)
-
-    def test_audit_update(self):
-        audit_raw_output = self.watcher('audit update %s add interval=2'
-                                        % self.audit_uuid)
-        audit_output = self.parse_show_as_object(audit_raw_output)
-        assert int(audit_output['Interval']) == 2
-
-
-class AuditActiveTests(base.TestCase):
-
-    list_fields = ['UUID', 'Audit Type', 'State', 'Goal', 'Strategy']
-    detailed_list_fields = list_fields + ['Created At', 'Updated At',
-                                          'Deleted At', 'Parameters',
-                                          'Interval', 'Audit Scope']
-    audit_template_name = 'a' + uuidutils.generate_uuid()
-    audit_uuid = None
-
-    def _create_audit(self):
-        raw_output = self.watcher('audittemplate create %s dummy -s dummy'
-                                  % self.audit_template_name)
-        template_output = self.parse_show_as_object(raw_output)
-        self.audit_uuid = self.parse_show_as_object(
-            self.watcher('audit create -a %s'
-                         % template_output['Name']))['UUID']
-
-    def _delete_audit(self):
-        output = self.parse_show(
-            self.watcher('actionplan list --audit %s' % self.audit_uuid))
-        action_plan_uuid = output[0].keys()[0]
-        self.watcher('actionplan delete %s' % action_plan_uuid)
-        self.watcher('audit delete %s' % self.audit_uuid)
-        self.watcher('audittemplate delete %s' % self.audit_template_name)
-
-    def test_create_audit(self):
-        raw_output = self.watcher('audittemplate create %s dummy -s dummy'
-                                  % self.audit_template_name)
-        template_output = self.parse_show_as_object(raw_output)
-        audit = self.watcher('audit create -a %s' % template_output['Name'])
-        self.audit_uuid = self.parse_show_as_object(audit)['UUID']
-        self.assert_table_structure([audit], self.detailed_list_fields)
-        self._delete_audit()
-
-    def test_delete_audit(self):
-        self._create_audit()
-        raw_output = self.watcher('audit delete %s' % self.audit_uuid)
-        self.assertOutput('', raw_output)
-        output = self.parse_show(
-            self.watcher('actionplan list --audit %s' % self.audit_uuid))
-        action_plan_uuid = output[0].keys()[0]
-        self.watcher('actionplan delete %s' % action_plan_uuid)
-        self.watcher('audittemplate delete %s' % self.audit_template_name)
--- a/watcherclient/tests/functional/v1/test_audit_template.py
+++ b/watcherclient/tests/functional/v1/test_audit_template.py
@@ -1,90 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2016 Servionica
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from oslo_utils import uuidutils
-
-from watcherclient.tests.functional.v1 import base
-
-
-class AuditTemplateTests(base.TestCase):
-    """Functional tests for audit template."""
-
-    dummy_name = 'dummy'
-    list_fields = ['UUID', 'Name', 'Goal', 'Strategy']
-    detailed_list_fields = list_fields + ['Created At', 'Updated At',
-                                          'Deleted At', 'Description',
-                                          'Audit Scope']
-    audit_template_name = 'a' + uuidutils.generate_uuid()
-
-    @classmethod
-    def setUpClass(cls):
-        cls.watcher('audittemplate create %s dummy -s dummy'
-                    % cls.audit_template_name)
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.watcher('audittemplate delete %s' % cls.audit_template_name)
-
-    def test_audit_template_list(self):
-        raw_output = self.watcher('audittemplate list')
-        self.assert_table_structure([raw_output], self.list_fields)
-
-    def test_audit_template_detailed_list(self):
-        raw_output = self.watcher('audittemplate list --detail')
-        self.assert_table_structure([raw_output], self.detailed_list_fields)
-
-    def test_audit_template_show(self):
-        audit_template = self.watcher(
-            'audittemplate show %s' % self.audit_template_name)
-        self.assertIn(self.audit_template_name, audit_template)
-        self.assert_table_structure([audit_template],
-                                    self.detailed_list_fields)
-
-    def test_audit_template_update(self):
-        raw_output = self.watcher('audittemplate update %s replace '
-                                  'description="Updated Desc"'
-                                  % self.audit_template_name)
-        audit_template_output = self.parse_show_as_object(raw_output)
-        assert audit_template_output['Description'] == 'Updated Desc'
-
-
-class AuditTemplateActiveTests(base.TestCase):
-
-    audit_template_name = 'b' + uuidutils.generate_uuid()
-    list_fields = ['UUID', 'Name', 'Goal', 'Strategy']
-    detailed_list_fields = list_fields + ['Created At', 'Updated At',
-                                          'Deleted At', 'Description',
-                                          'Audit Scope']
-
-    def _create_audit_template(self):
-        self.watcher('audittemplate create %s dummy -s dummy '
-                     '-d "Test Audit Template"' % self.audit_template_name)
-
-    def _delete_audit_template(self):
-        self.watcher('audittemplate delete %s' % self.audit_template_name)
-
-    def test_create_audit_template(self):
-        raw_output = self.watcher('audittemplate create %s dummy '
-                                  '-s dummy -d "Test Audit Template"'
-                                  % self.audit_template_name)
-        self.assert_table_structure([raw_output], self.detailed_list_fields)
-        self._delete_audit_template()
-
-    def test_delete_audit_template(self):
-        self._create_audit_template()
-        raw_output = self.watcher('audittemplate delete %s'
-                                  % self.audit_template_name)
-        self.assertOutput('', raw_output)
--- a/watcherclient/tests/functional/v1/test_goal.py
+++ b/watcherclient/tests/functional/v1/test_goal.py
@@ -1,42 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2016 Servionica
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from watcherclient.tests.functional.v1 import base
-
-
-class GoalTests(base.TestCase):
-    """Functional tests for goal."""
-
-    dummy_name = 'dummy'
-    list_fields = ['UUID', 'Name', 'Display name']
-
-    def test_goal_list(self):
-        raw_output = self.watcher('goal list')
-        self.assertIn(self.dummy_name, raw_output)
-        self.assert_table_structure([raw_output], self.list_fields)
-
-    def test_goal_detailed_list(self):
-        raw_output = self.watcher('goal list --detail')
-        self.assertIn(self.dummy_name, raw_output)
-        self.assert_table_structure(
-            [raw_output], self.list_fields + ['Efficacy specification'])
-
-    def test_goal_show(self):
-        raw_output = self.watcher('goal show %s' % self.dummy_name)
-        self.assertIn(self.dummy_name, raw_output)
-        self.assert_table_structure(
-            [raw_output], self.list_fields + ['Efficacy specification'])
-        self.assertNotIn('server_consolidation', raw_output)
--- a/watcherclient/tests/functional/v1/test_scoring_engine.py
+++ b/watcherclient/tests/functional/v1/test_scoring_engine.py
@@ -1,41 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2016 Servionica
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from watcherclient.tests.functional.v1 import base
-
-
-class ScoringEngineTests(base.TestCase):
-    """Functional tests for scoring engine."""
-
-    dummy_name = 'dummy_scorer'
-    list_fields = ['UUID', 'Name', 'Description']
-    detailed_list_fields = list_fields + ['Metainfo']
-
-    def test_scoringengine_list(self):
-        raw_output = self.watcher('scoringengine list')
-        self.assertIn(self.dummy_name, raw_output)
-        self.assert_table_structure([raw_output], self.list_fields)
-
-    def test_scoringengine_detailed_list(self):
-        raw_output = self.watcher('scoringengine list --detail')
-        self.assertIn(self.dummy_name, raw_output)
-        self.assert_table_structure([raw_output], self.detailed_list_fields)
-
-    def test_scoringengine_show(self):
-        raw_output = self.watcher('scoringengine show %s' % self.dummy_name)
-        self.assertIn(self.dummy_name, raw_output)
-        self.assert_table_structure([raw_output], self.detailed_list_fields)
-        self.assertNotIn('dummy_avg_scorer', raw_output)
--- a/watcherclient/tests/functional/v1/test_service.py
+++ b/watcherclient/tests/functional/v1/test_service.py
@@ -1,46 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2016 Servionica
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from watcherclient.tests.functional.v1 import base
-
-
-class ServiceTests(base.TestCase):
-    """Functional tests for service."""
-
-    decision_engine_name = 'watcher-decision-engine'
-    applier_name = 'watcher-applier'
-    list_fields = ['ID', 'Name', 'Host', 'Status']
-
-    def test_service_list(self):
-        raw_output = self.watcher('service list')
-        self.assertIn(self.decision_engine_name, raw_output)
-        self.assertIn(self.applier_name, raw_output)
-        self.assert_table_structure([raw_output], self.list_fields)
-
-    def test_service_detailed_list(self):
-        raw_output = self.watcher('service list --detail')
-        self.assertIn(self.decision_engine_name, raw_output)
-        self.assertIn(self.applier_name, raw_output)
-        self.assert_table_structure([raw_output],
-                                    self.list_fields + ['Last seen up'])
-
-    def test_service_show(self):
-        raw_output = self.watcher('service show %s'
-                                  % self.decision_engine_name)
-        self.assertIn(self.decision_engine_name, raw_output)
-        self.assert_table_structure([raw_output],
-                                    self.list_fields + ['Last seen up'])
-        self.assertNotIn(self.applier_name, raw_output)
--- a/watcherclient/tests/functional/v1/test_strategy.py
+++ b/watcherclient/tests/functional/v1/test_strategy.py
@@ -1,42 +0,0 @@
-# -*- encoding: utf-8 -*-
-# Copyright (c) 2016 Servionica
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from watcherclient.tests.functional.v1 import base
-
-
-class StrategyTests(base.TestCase):
-    """Functional tests for strategy."""
-
-    dummy_name = 'dummy'
-    list_fields = ['UUID', 'Name', 'Display name', 'Goal']
-
-    def test_strategy_list(self):
-        raw_output = self.watcher('strategy list')
-        self.assertIn(self.dummy_name, raw_output)
-        self.assert_table_structure([raw_output], self.list_fields)
-
-    def test_strategy_detailed_list(self):
-        raw_output = self.watcher('strategy list --detail')
-        self.assertIn(self.dummy_name, raw_output)
-        self.assert_table_structure([raw_output],
-                                    self.list_fields + ['Parameters spec'])
-
-    def test_strategy_show(self):
-        raw_output = self.watcher('strategy show %s' % self.dummy_name)
-        self.assertIn(self.dummy_name, raw_output)
-        self.assert_table_structure([raw_output],
-                                    self.list_fields + ['Parameters spec'])
-        self.assertNotIn('basic', raw_output)
--- a/watcherclient/tests/unit/common/test_api_versioning.py
+++ b/watcherclient/tests/unit/common/test_api_versioning.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-import mock
+from unittest import mock

 from watcherclient.common import api_versioning
 from watcherclient import exceptions
@@ -82,12 +82,12 @@ class APIVersionTestCase(utils.BaseTestCase):
        v4 = api_versioning.APIVersion("2.0")
        v_null = api_versioning.APIVersion()

-        self.assertTrue(v1 < v2)
-        self.assertTrue(v3 > v2)
-        self.assertTrue(v1 != v2)
-        self.assertTrue(v1 == v4)
-        self.assertTrue(v1 != v_null)
-        self.assertTrue(v_null == v_null)
+        self.assertLess(v1, v2)
+        self.assertGreater(v3, v2)
+        self.assertNotEqual(v1, v2)
+        self.assertEqual(v1, v4)
+        self.assertNotEqual(v1, v_null)
+        self.assertEqual(v_null, v_null)
        self.assertRaises(TypeError, v1.__le__, "2.1")

    def test_version_matches(self):
--- a/Show More
+++ b/Show More