Update TOX/UPPER_CONSTRAINTS_FILE for stable/train

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/train branch, tests will continue to use the upper-constraints list on master. Change-Id: I0abb4375f76549f4b06d0acfa257e754955736f7
Update .gitreview for stable/train
2019-09-12 09:30:47 +00:00 · 2019-09-12 09:30:44 +00:00
44 changed files with 361 additions and 269 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/python-watcherclient.git
+defaultbranch=stable/train
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,9 @@
 - project:
    templates:
      - openstack-cover-jobs
-      - openstack-python3-jobs
+      - openstack-lower-constraints-jobs
+      - openstack-python-jobs
+      - openstack-python3-train-jobs
      - publish-openstack-docs-pti
      - check-requirements
      - openstackclient-plugin-jobs
--- a/babel.cfg
+++ b/babel.cfg
@@ -0,0 +1,2 @@
+[python: **.py]
+
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,7 +2,6 @@
 # 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
-
+openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD
--- a/doc/source/cli/details.rst
+++ b/doc/source/cli/details.rst
@@ -620,43 +620,38 @@ Create new audit template.
 ``--scope <path>``
  Part of the cluster on which an audit will be done.
  Can be provided either in yaml or json file.
-
-YAML example:
-::
-
-  ---
-  - host_aggregates:
-    - id: 1
-    - id: 2
-    - id: 3
+  YAML example:
+  ---- host_aggregates:
+  - id: 1
+  - id: 2
+  - id: 3
  - availability_zones:
-    - name: AZ1
-    - name: AZ2
+  - name: AZ1
+  - name: AZ2
  - exclude:
-    - instances:
-      - uuid: UUID1
-      - uuid: UUID2
-    - compute_nodes:
-      - name: compute1
-
-JSON example:
-::
-
-    [
-        {'host_aggregates': [
-            {'id': 1},
-            {'id': 2},
-            {'id': 3}]},
-        {'availability_zones': [
-            {'name': 'AZ1'},
-            {'name': 'AZ2'}]},
-        {'exclude': [
-            {'instances': [
-                {'uuid': 'UUID1'},
-                {'uuid': 'UUID2'}]},
-            {'compute_nodes': [
-                {'name': 'compute1'}]}]}
-    ]
+  - instances:
+  - uuid: UUID1
+  - uuid: UUID2
+  - compute_nodes:
+  - name: compute1
+  
+  JSON example:
+  [{'host_aggregates': [
+  {'id': 1},
+  {'id': 2},
+  {'id': 3}]},
+  {'availability_zones': [
+  {'name': 'AZ1'},
+  {'name': 'AZ2'}]},
+  {'exclude': [
+  {'instances': [
+  {'uuid': 'UUID1'},
+  {'uuid': 'UUID2'}
+  ]},
+  {'compute_nodes': [
+  {'name': 'compute1'}
+  ]}
+  ]}]

 .. _watcher_audittemplate_delete:

--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -12,26 +12,20 @@
 # limitations under the License.


+from watcherclient import version as watcherclient_version
+
 # -- General configuration ----------------------------------------------------

 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc',
              'sphinx.ext.viewcode',
-              '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']

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

 # General information about the project.
-project = 'python-watcherclient'
-copyright = 'OpenStack Foundation'
+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()

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

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

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

@@ -79,27 +83,17 @@ latex_documents = [
    (
        'index',
        '%s.tex' % project,
-        '%s Documentation' % project,
-        'OpenStack Foundation', 'manual'
+        u'%s Documentation' % project,
+        u'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 = ''
+repository_name = 'openstack/python-watcherclient'
+bug_project = 'python-watcherclient'
+bug_tag = ''

+# Must set this variable to include year, month, day, hours, and minutes.
+html_last_updated_fmt = '%Y-%m-%d %H:%M'

 #html_theme_options = {"show_other_versions": "True"}
--- a/doc/source/reference/api/index.rst
+++ b/doc/source/reference/api/index.rst
@@ -0,0 +1,8 @@
+======================
+ Python API Reference
+======================
+
+.. toctree::
+   :maxdepth: 2
+
+   autoindex
--- a/doc/source/reference/index.rst
+++ b/doc/source/reference/index.rst
@@ -10,5 +10,5 @@ done so, you can use the API like so.
 .. toctree::
   :maxdepth: 2

-   api/modules
+   api/index
   api_v1
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -0,0 +1,89 @@
+alabaster==0.7.10
+appdirs==1.4.3
+asn1crypto==0.23.0
+Babel==2.5.3
+certifi==2018.1.18
+cffi==1.7.0
+chardet==3.0.4
+cliff==2.11.0
+cmd2==0.8.2
+coverage==4.0
+cryptography==2.1
+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
+future==0.16.0
+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
+mock==2.0.0
+monotonic==1.4
+mox3==0.20.0
+msgpack-python==0.4.0
+munch==2.2.0
+netaddr==0.7.19
+netifaces==0.10.6
+openstackdocstheme==1.18.1
+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.12
+requests==2.18.4
+requestsexceptions==1.4.0
+rfc3986==0.3.1
+simplejson==3.13.2
+six==1.11.0
+snowballstemmer==1.2.1
+Sphinx==1.6.5
+sphinxcontrib-websupport==1.0.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
@@ -1,6 +0,0 @@
---
-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
@@ -1,3 +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.
+
+Babel!=2.4.0,>=2.5.3 # BSD
 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
@@ -5,4 +10,5 @@ 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
-PyYAML>=3.13 # MIT
+six>=1.11.0 # MIT
+PyYAML>=3.12 # MIT
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,11 @@
 [metadata]
 name = python-watcherclient
 summary = Python client library for Watcher API
-description_file =
+description-file =
    README.rst
 author = OpenStack
-author_email = openstack-discuss@lists.openstack.org
-home_page =  https://docs.openstack.org/python-watcherclient/latest/
-python_requires = >=3.8
+author-email = openstack-discuss@lists.openstack.org
+home-page =  https://docs.openstack.org/python-watcherclient/latest/
 classifier =
    Environment :: OpenStack
    Intended Audience :: Information Technology
@@ -14,11 +13,11 @@ 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.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7

 [files]
 packages =
@@ -114,3 +113,26 @@ autodoc_index_modules = True
 autodoc_exclude_modules =
  watcherclient.tests.*
 api_doc_dir = reference/api
+
+[build_sphinx]
+source-dir = doc/source
+build-dir = doc/build
+all_files = 1
+warning-is-error = 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
--- a/setup.py
+++ b/setup.py
@@ -13,8 +13,17 @@
 # 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>=2.0.0'],
    pbr=True)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,11 @@
+# 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.
+
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-hacking>=7.0.0,<7.1.0 # Apache-2.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
+mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 stestr>=2.0.0 # Apache-2.0
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
-minversion = 3.18.0
-envlist = py3,pep8
+minversion = 2.0
+envlist = py36,py37,py27,pep8
+skipsdist = True

 [testenv]
 usedevelop = True
@@ -10,10 +11,10 @@ install_command = pip install {opts} {packages}
 setenv =
   VIRTUAL_ENV={envdir}
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
  -r{toxinidir}/test-requirements.txt
  -r{toxinidir}/requirements.txt
-allowlist_externals =
+whitelist_externals =
  rm
 commands = rm -f .testrepository/times.dbm
           # The --test-path is defined in .stestr.conf
@@ -42,22 +43,10 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
+  -r{toxinidir}/requirements.txt
  -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
+commands = python setup.py build_sphinx

 [testenv:debug]
 basepython = python3
@@ -67,7 +56,7 @@ commands = oslo_debug_helper -t watcherclient/tests/unit {posargs}
 # E123, E125 skipped as they are invalid PEP-8.
 show-source = True
 enable-extensions = H203,H106
-ignore = E123,E125,W504
+ignore = E123,E125
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build

@@ -77,3 +66,11 @@ commands = python setup.py bdist_wheel

 [hacking]
 import_exceptions = watcherclient._i18n
+
+[testenv:lower-constraints]
+basepython = python3
+install_command = pip install -U {opts} {packages}
+deps =
+  -c{toxinidir}/lower-constraints.txt
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/requirements.txt
--- a/watcherclient/common/apiclient/base.py
+++ b/watcherclient/common/apiclient/base.py
@@ -39,9 +39,10 @@ Base utilities to build API operation managers and objects on top of.

 import abc
 import copy
-from urllib import parse

 from oslo_utils import strutils
+import six
+from six.moves.urllib import parse

 from watcherclient._i18n import _
 from watcherclient.common.apiclient import exceptions
@@ -223,7 +224,8 @@ class BaseManager(HookableMixin):
        return self.client.delete(url)


-class ManagerWithFind(BaseManager, metaclass=abc.ABCMeta):
+@six.add_metaclass(abc.ABCMeta)
+class ManagerWithFind(BaseManager):
    """Manager with additional `find()`/`findall()` methods."""

    @abc.abstractmethod
--- a/watcherclient/common/apiclient/exceptions.py
+++ b/watcherclient/common/apiclient/exceptions.py
@@ -36,6 +36,8 @@ Exception definitions.
 import inspect
 import sys

+import six
+
 from watcherclient._i18n import _


@@ -455,7 +457,7 @@ def from_response(response, method, url):
                    kwargs["message"] = (error.get("message") or
                                         error.get("faultstring"))
                    kwargs["details"] = (error.get("details") or
-                                         str(body))
+                                         six.text_type(body))
    elif content_type.startswith("text/"):
        kwargs["details"] = response.text

--- a/watcherclient/common/base.py
+++ b/watcherclient/common/base.py
@@ -19,7 +19,8 @@ Base utilities to build API operation managers and objects on top of.
 """

 import copy
-from urllib import parse as urlparse
+
+import six.moves.urllib.parse as urlparse

 from watcherclient.common.apiclient import base

--- a/watcherclient/common/command.py
+++ b/watcherclient/common/command.py
@@ -18,6 +18,7 @@ import logging
 from cliff import command
 from cliff import lister
 from cliff import show
+import six


 class CommandMeta(abc.ABCMeta):
@@ -29,7 +30,8 @@ class CommandMeta(abc.ABCMeta):
        return super(CommandMeta, mcs).__new__(mcs, name, bases, cls_dict)


-class Command(command.Command, metaclass=CommandMeta):
+@six.add_metaclass(CommandMeta)
+class Command(command.Command):

    def run(self, parsed_args):
        self.log.debug('run(%s)', parsed_args)
--- a/watcherclient/common/httpclient.py
+++ b/watcherclient/common/httpclient.py
@@ -17,21 +17,21 @@ import copy
 from distutils import version
 import functools
 import hashlib
-import http.client
-import io
 import logging
 import os
 import socket
 import ssl
 import textwrap
 import time
-from urllib import parse as urlparse

 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 _
 from watcherclient.common import api_versioning
@@ -40,8 +40,8 @@ from watcherclient import exceptions

 # 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
+# Minor version 2 for adding force option to audit
+LAST_KNOWN_API_VERSION = 2
 LATEST_VERSION = '1.{}'.format(LAST_KNOWN_API_VERSION)

 LOG = logging.getLogger(__name__)
@@ -247,7 +247,7 @@ class HTTPClient(VersionNegotiationMixin):

        if not self.session.verify:
            curl.append('-k')
-        elif isinstance(self.session.verify, str):
+        elif isinstance(self.session.verify, six.string_types):
            curl.append('--cacert %s' % self.session.verify)

        if self.session.cert:
@@ -325,7 +325,7 @@ class HTTPClient(VersionNegotiationMixin):
            # to servers that did not support microversions. Details here:
            # http://specs.openstack.org/openstack/watcher-specs/specs/kilo/api-microversions.html#use-case-3b-new-client-communicating-with-a-old-watcher-user-specified  # noqa

-            if resp.status_code == http.client.NOT_ACCEPTABLE:
+            if resp.status_code == http_client.NOT_ACCEPTABLE:
                negotiated_ver = self.negotiate_version(self.session, resp)
                kwargs['headers']['OpenStack-API-Version'] = (
                    ' '.join(['infra-optim', negotiated_ver]))
@@ -357,21 +357,21 @@ class HTTPClient(VersionNegotiationMixin):
            ]
            body_str = ''.join(body_list)
            self.log_http_response(resp, body_str)
-            body_iter = io.StringIO(body_str)
+            body_iter = six.StringIO(body_str)
        else:
            self.log_http_response(resp)

-        if resp.status_code >= http.client.BAD_REQUEST:
+        if resp.status_code >= http_client.BAD_REQUEST:
            error_json = _extract_error_json(body_str)
            raise exceptions.from_response(
                resp, error_json.get('faultstring'),
                error_json.get('debuginfo'), method, url)
-        elif resp.status_code in (http.client.MOVED_PERMANENTLY,
-                                  http.client.FOUND,
-                                  http.client.USE_PROXY):
+        elif resp.status_code in (http_client.MOVED_PERMANENTLY,
+                                  http_client.FOUND,
+                                  http_client.USE_PROXY):
            # Redirected. Reissue the request to the new location.
            return self._http_request(resp['location'], method, **kwargs)
-        elif resp.status_code == http.client.MULTIPLE_CHOICES:
+        elif resp.status_code == http_client.MULTIPLE_CHOICES:
            raise exceptions.from_response(resp, method=method, url=url)

        return resp, body_iter
@@ -387,8 +387,8 @@ class HTTPClient(VersionNegotiationMixin):
        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
+        if (resp.status_code in (http_client.NO_CONTENT,
+                                 http_client.RESET_CONTENT) or
                content_type is None):
            return resp, list()

@@ -410,7 +410,7 @@ class HTTPClient(VersionNegotiationMixin):
        return self._http_request(url, method, **kwargs)


-class VerifiedHTTPSConnection(http.client.HTTPSConnection):
+class VerifiedHTTPSConnection(six.moves.http_client.HTTPSConnection):
    """httplib-compatible connection using client-side SSL authentication

    :see http://code.activestate.com/recipes/
@@ -419,8 +419,9 @@ class VerifiedHTTPSConnection(http.client.HTTPSConnection):

    def __init__(self, host, port, key_file=None, cert_file=None,
                 ca_file=None, timeout=None, insecure=False):
-        super(VerifiedHTTPSConnection, self).__init__(
-            self, host, port, key_file=key_file, cert_file=cert_file)
+        six.moves.http_client.HTTPSConnection.__init__(self, host, port,
+                                                       key_file=key_file,
+                                                       cert_file=cert_file)
        self.key_file = key_file
        self.cert_file = cert_file
        if ca_file is not None:
@@ -502,7 +503,7 @@ class SessionClient(VersionNegotiationMixin, adapter.LegacyJsonAdapter):
    def _http_request(self, url, method, **kwargs):
        kwargs.setdefault('user_agent', USER_AGENT)
        kwargs.setdefault('auth', self.auth)
-        if isinstance(self.endpoint_override, str):
+        if isinstance(self.endpoint_override, six.string_types):
            kwargs.setdefault(
                'endpoint_override',
                _trim_endpoint_api_version(self.endpoint_override)
@@ -526,22 +527,22 @@ class SessionClient(VersionNegotiationMixin, adapter.LegacyJsonAdapter):

        resp = self.session.request(url, method,
                                    raise_exc=False, **kwargs)
-        if resp.status_code == http.client.NOT_ACCEPTABLE:
+        if resp.status_code == http_client.NOT_ACCEPTABLE:
            negotiated_ver = self.negotiate_version(self.session, resp)
            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:
+        if resp.status_code >= http_client.BAD_REQUEST:
            error_json = _extract_error_json(resp.content)
            raise exceptions.from_response(
                resp, error_json.get('faultstring'),
                error_json.get('debuginfo'), method, url)
-        elif resp.status_code in (http.client.MOVED_PERMANENTLY,
-                                  http.client.FOUND, http.client.USE_PROXY):
+        elif resp.status_code in (http_client.MOVED_PERMANENTLY,
+                                  http_client.FOUND, http_client.USE_PROXY):
            # Redirected. Reissue the request to the new location.
            location = resp.headers.get('location')
            resp = self._http_request(location, method, **kwargs)
-        elif resp.status_code == http.client.MULTIPLE_CHOICES:
+        elif resp.status_code == http_client.MULTIPLE_CHOICES:
            raise exceptions.from_response(resp, method=method, url=url)
        return resp

@@ -557,7 +558,7 @@ class SessionClient(VersionNegotiationMixin, adapter.LegacyJsonAdapter):
        body = resp.content
        content_type = resp.headers.get('content-type', None)
        status = resp.status_code
-        if (status in (http.client.NO_CONTENT, http.client.RESET_CONTENT) or
+        if (status in (http_client.NO_CONTENT, http_client.RESET_CONTENT) or
                content_type is None):
            return resp, list()
        if 'application/json' in content_type:
--- a/watcherclient/common/utils.py
+++ b/watcherclient/common/utils.py
@@ -14,6 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

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

-
 # Alias for backwards compatibility
 AmbigiousAuthSystem = AmbiguousAuthSystem

--- 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.

-from unittest import mock
+import mock

 from watcherclient.common import api_versioning
 from watcherclient import exceptions
--- a/watcherclient/tests/unit/test_client.py
+++ b/watcherclient/tests/unit/test_client.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-from unittest import mock
+import mock

 from keystoneauth1 import loading as kaloading

--- a/watcherclient/tests/unit/test_utils.py
+++ b/watcherclient/tests/unit/test_utils.py
@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-from unittest import mock
+import mock

 from watcherclient.common.apiclient import exceptions as exc
 from watcherclient.common import utils
--- a/watcherclient/tests/unit/utils.py
+++ b/watcherclient/tests/unit/utils.py
@@ -14,12 +14,12 @@
 #    under the License.

 import copy
-import io
 import os
-from unittest import mock

 import fixtures
+import mock
 from oslo_utils import strutils
+import six
 import testtools


@@ -51,7 +51,7 @@ class FakeAPI(object):

    def raw_request(self, *args, **kwargs):
        response = self._request(*args, **kwargs)
-        body_iter = iter(io.StringIO(response[1]))
+        body_iter = iter(six.StringIO(response[1]))
        return FakeResponse(response[0]), body_iter

    def json_request(self, *args, **kwargs):
--- a/watcherclient/tests/unit/v1/base.py
+++ b/watcherclient/tests/unit/v1/base.py
@@ -14,8 +14,8 @@
 # limitations under the License.

 import shlex
-from unittest import mock

+import mock
 from osc_lib import utils as oscutils
 from oslo_serialization import jsonutils

--- a/watcherclient/tests/unit/v1/test_action_plan.py
+++ b/watcherclient/tests/unit/v1/test_action_plan.py
@@ -14,7 +14,7 @@
 #    under the License.

 import copy
-from unittest import mock
+import mock

 import testtools
 from testtools import matchers
--- a/watcherclient/tests/unit/v1/test_action_plan_shell.py
+++ b/watcherclient/tests/unit/v1/test_action_plan_shell.py
@@ -14,11 +14,10 @@
 # limitations under the License.

 import datetime
-import io
-from unittest import mock
+import mock
+import six

 from oslo_utils.uuidutils import generate_uuid
-
 from watcherclient import exceptions
 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base
@@ -104,7 +103,7 @@ class ActionPlanShellTest(base.CommandTestCase):
        self.m_audit_template_mgr_cls.return_value = self.m_audit_template_mgr
        self.m_action_plan_mgr_cls.return_value = self.m_action_plan_mgr

-        self.stdout = io.StringIO()
+        self.stdout = six.StringIO()
        self.cmd = shell.WatcherShell(stdout=self.stdout)

    def test_do_action_plan_list(self):
--- a/watcherclient/tests/unit/v1/test_action_shell.py
+++ b/watcherclient/tests/unit/v1/test_action_shell.py
@@ -14,8 +14,8 @@
 #   under the License.

 import datetime
-import io
-from unittest import mock
+import mock
+import six

 from watcherclient import exceptions
 from watcherclient import shell
@@ -95,7 +95,7 @@ class ActionShellTest(base.CommandTestCase):
        self.m_action_mgr_cls.return_value = self.m_action_mgr
        self.m_action_plan_mgr_cls.return_value = self.m_action_plan_mgr

-        self.stdout = io.StringIO()
+        self.stdout = six.StringIO()
        self.cmd = shell.WatcherShell(stdout=self.stdout)

    def test_do_action_list(self):
--- a/watcherclient/tests/unit/v1/test_audit_shell.py
+++ b/watcherclient/tests/unit/v1/test_audit_shell.py
@@ -14,8 +14,8 @@
 #   under the License.

 import datetime
-import io
-from unittest import mock
+import mock
+import six

 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base
@@ -163,7 +163,7 @@ class AuditShellTest(base.CommandTestCase):
        self.m_audit_template_mgr_cls.return_value = self.m_audit_template_mgr

        # stdout mock
-        self.stdout = io.StringIO()
+        self.stdout = six.StringIO()
        self.cmd = shell.WatcherShell(stdout=self.stdout)

    def test_do_audit_list(self):
@@ -426,23 +426,6 @@ class AuditShellTest(base.CommandTestCase):
            parameters={'para1': 10, 'para2': 20}
        )

-    def test_do_audit_create_with_type_event(self):
-        audit = resource.Audit(mock.Mock(), self.AUDIT_1)
-        self.m_audit_mgr.create.return_value = audit
-
-        exit_code, result = self.run_cmd(
-            'audit create -g fc087747-61be-4aad-8126-b701731ae836 -t EVENT')
-
-        self.assertEqual(0, exit_code)
-        self.assertEqual(
-            self.resource_as_dict(audit, self.FIELDS, self.FIELD_LABELS),
-            result)
-        self.m_audit_mgr.create.assert_called_once_with(
-            goal='fc087747-61be-4aad-8126-b701731ae836',
-            auto_trigger=False,
-            audit_type='EVENT'
-        )
-
    def test_do_audit_create_with_type_continuous(self):
        audit = resource.Audit(mock.Mock(), self.AUDIT_1)
        self.m_audit_mgr.create.return_value = audit
@@ -659,24 +642,6 @@ class AuditShellTestv12(AuditShellTest):
            force=False
        )

-    def test_do_audit_create_with_type_event(self):
-        audit = resource.Audit(mock.Mock(), self.AUDIT_1)
-        self.m_audit_mgr.create.return_value = audit
-
-        exit_code, result = self.run_cmd(
-            'audit create -g fc087747-61be-4aad-8126-b701731ae836 -t EVENT')
-
-        self.assertEqual(0, exit_code)
-        self.assertEqual(
-            self.resource_as_dict(audit, self.FIELDS, self.FIELD_LABELS),
-            result)
-        self.m_audit_mgr.create.assert_called_once_with(
-            goal='fc087747-61be-4aad-8126-b701731ae836',
-            auto_trigger=False,
-            audit_type='EVENT',
-            force=False
-        )
-
    def test_do_audit_create_with_name(self):
        audit = resource.Audit(mock.Mock(), self.AUDIT_1)
        self.m_audit_mgr.create.return_value = audit
--- a/watcherclient/tests/unit/v1/test_audit_template.py
+++ b/watcherclient/tests/unit/v1/test_audit_template.py
@@ -14,8 +14,8 @@
 #    under the License.

 import copy
-from urllib import parse as urlparse

+from six.moves.urllib import parse as urlparse
 from testtools import matchers

 from watcherclient.tests.unit import utils
--- a/watcherclient/tests/unit/v1/test_audit_template_shell.py
+++ b/watcherclient/tests/unit/v1/test_audit_template_shell.py
@@ -14,8 +14,8 @@
 #   under the License.

 import datetime
-import io
-from unittest import mock
+import mock
+import six

 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base
@@ -107,7 +107,7 @@ class AuditTemplateShellTest(base.CommandTestCase):
        self.m_audit_template_mgr_cls.return_value = self.m_audit_template_mgr

        # stdout mock
-        self.stdout = io.StringIO()
+        self.stdout = six.StringIO()
        self.cmd = shell.WatcherShell(stdout=self.stdout)

    def test_do_audit_template_list(self):
--- a/watcherclient/tests/unit/v1/test_data_model_shell.py
+++ b/watcherclient/tests/unit/v1/test_data_model_shell.py
@@ -12,9 +12,8 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-import io
-from unittest import mock
+import mock
+import six

 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base
@@ -91,7 +90,7 @@ class DataModelShellTest(base.CommandTestCase):

        self.m_data_model_mgr_cls.return_value = self.m_data_model_mgr

-        self.stdout = io.StringIO()
+        self.stdout = six.StringIO()
        self.cmd = shell.WatcherShell(stdout=self.stdout)

    def test_do_data_model_list(self):
--- a/watcherclient/tests/unit/v1/test_goal_shell.py
+++ b/watcherclient/tests/unit/v1/test_goal_shell.py
@@ -14,8 +14,8 @@
 # limitations under the License.

 import datetime
-import io
-from unittest import mock
+import mock
+import six

 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base
@@ -72,7 +72,7 @@ class GoalShellTest(base.CommandTestCase):
        self.m_goal_mgr = mock.Mock()
        self.m_goal_mgr_cls.return_value = self.m_goal_mgr

-        self.stdout = io.StringIO()
+        self.stdout = six.StringIO()
        self.cmd = shell.WatcherShell(stdout=self.stdout)

    def test_do_goal_list(self):
--- a/watcherclient/tests/unit/v1/test_scoring_engine_shell.py
+++ b/watcherclient/tests/unit/v1/test_scoring_engine_shell.py
@@ -14,8 +14,8 @@
 # limitations under the License.

 import datetime
-import io
-from unittest import mock
+import mock
+import six

 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base
@@ -62,7 +62,7 @@ class ScoringEngineShellTest(base.CommandTestCase):
        self.m_se_mgr = mock.Mock()
        self.m_se_mgr_cls.return_value = self.m_se_mgr

-        self.stdout = io.StringIO()
+        self.stdout = six.StringIO()
        self.cmd = shell.WatcherShell(stdout=self.stdout)

    def test_do_scoringengine_list(self):
--- a/watcherclient/tests/unit/v1/test_service_shell.py
+++ b/watcherclient/tests/unit/v1/test_service_shell.py
@@ -14,8 +14,8 @@
 # limitations under the License.

 import datetime
-import io
-from unittest import mock
+import mock
+import six

 from watcherclient import shell
 from watcherclient.tests.unit.v1 import base
@@ -61,7 +61,7 @@ class ServiceShellTest(base.CommandTestCase):
        self.m_service_mgr = mock.Mock()
        self.m_service_mgr_cls.return_value = self.m_service_mgr

-        self.stdout = io.StringIO()
+        self.stdout = six.StringIO()
        self.cmd = shell.WatcherShell(stdout=self.stdout)

    def test_do_service_list(self):
--- a/watcherclient/tests/unit/v1/test_strategy_shell.py
+++ b/watcherclient/tests/unit/v1/test_strategy_shell.py
@@ -14,8 +14,8 @@
 # limitations under the License.

 import datetime
-import io
-from unittest import mock
+import mock
+import six

 from oslo_serialization import jsonutils

@@ -69,7 +69,7 @@ class StrategyShellTest(base.CommandTestCase):
        self.m_strategy_mgr = mock.Mock()
        self.m_strategy_mgr_cls.return_value = self.m_strategy_mgr

-        self.stdout = io.StringIO()
+        self.stdout = six.StringIO()
        self.cmd = shell.WatcherShell(stdout=self.stdout)

    def test_do_strategy_list(self):
--- a/watcherclient/v1/action_plan_shell.py
+++ b/watcherclient/v1/action_plan_shell.py
@@ -13,11 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-import io
-
 from cliff.formatters import yaml_format
 from osc_lib import utils
 from oslo_utils import uuidutils
+import six

 from watcherclient._i18n import _
 from watcherclient.common import command
@@ -52,7 +51,7 @@ class ShowActionPlan(command.ShowOne):
        return parser

    def _format_indicators(self, action_plan, parsed_args):
-        out = io.StringIO()
+        out = six.StringIO()
        efficacy_indicators = action_plan.efficacy_indicators
        fields = ['name', 'description', 'value', 'unit']
        yaml_format.YAMLFormatter().emit_list(
@@ -67,7 +66,7 @@ class ShowActionPlan(command.ShowOne):

    def _format_global_efficacy(self, global_efficacy, parsed_args):
        formatted_global_efficacy = format_global_efficacy(global_efficacy)
-        out = io.StringIO()
+        out = six.StringIO()
        yaml_format.YAMLFormatter().emit_one(
            column_names=list(resource.capitalize()
                              for resource in formatted_global_efficacy),
@@ -144,7 +143,7 @@ class ListActionPlan(command.Lister):
        return parser

    def _format_indicators(self, action_plan, parsed_args):
-        out = io.StringIO()
+        out = six.StringIO()
        efficacy_indicators = action_plan.efficacy_indicators
        fields = ['name', 'value', 'unit']
        yaml_format.YAMLFormatter().emit_list(
@@ -159,7 +158,7 @@ class ListActionPlan(command.Lister):

    def _format_global_efficacy(self, global_efficacy, parsed_args):
        formatted_global_efficacy = format_global_efficacy(global_efficacy)
-        out = io.StringIO()
+        out = six.StringIO()
        yaml_format.YAMLFormatter().emit_one(
            column_names=list(resource.capitalize()
                              for resource in formatted_global_efficacy),
--- a/watcherclient/v1/audit_shell.py
+++ b/watcherclient/v1/audit_shell.py
@@ -167,8 +167,8 @@ class CreateAudit(command.ShowOne):
            dest='audit_type',
            metavar='<audit_type>',
            default='ONESHOT',
-            choices=['ONESHOT', 'CONTINUOUS', 'EVENT'],
-            help=_("Audit type. It must be ONESHOT, CONTINUOUS or EVENT. "
+            choices=['ONESHOT', 'CONTINUOUS'],
+            help=_("Audit type. It must be ONESHOT or CONTINUOUS. "
                   "Default is ONESHOT."))
        parser.add_argument(
            '-p', '--parameter',
@@ -182,7 +182,7 @@ class CreateAudit(command.ShowOne):
            dest='interval',
            metavar='<interval>',
            help=_('Audit interval (in seconds or cron format). '
-                   'Cron interval can be used like: ``*/5 * * * *``. '
+                   'Cron inteval can be used like: "*/5 * * * *". '
                   'Only used if the audit is CONTINUOUS.'))
        parser.add_argument(
            '-g', '--goal',
--- a/watcherclient/v1/audit_template_shell.py
+++ b/watcherclient/v1/audit_template_shell.py
@@ -167,8 +167,8 @@ class CreateAuditTemplate(command.ShowOne):
            metavar='<path>',
            help=_("Part of the cluster on which an audit will be done.\n"
                   "Can be provided either in yaml or json file.\n"
-                   "YAML example::\n"
-                   "\n"
+                   "YAML example:\n"
+                   "---\n"
                   " - compute:\n"
                   "   - host_aggregates:\n"
                   "     - id: 1\n"
@@ -201,49 +201,48 @@ class CreateAuditTemplate(command.ShowOne):
                   "       - uuid: UUID1\n"
                   "       - uuid: UUID2\n"
                   "\n"
-                   "JSON example::\n"
-                   "\n"
-                   " [\n"
-                   "  {\"compute\":\n"
-                   "       [{\"host_aggregates\": [\n"
-                   "             {\"id\": 1},\n"
-                   "             {\"id\": 2},\n"
-                   "             {\"id\": 3}]},\n"
-                   "        {\"availability_zones\": [\n"
-                   "             {\"name\": \"AZ1\"},\n"
-                   "             {\"name\": \"AZ2\"}]},\n"
-                   "        {\"exclude\": [\n"
-                   "             {\"instances\": [\n"
-                   "                  {\"uuid\": \"UUID1\"},\n"
-                   "                  {\"uuid\": \"UUID2\"}\n"
-                   "             ]},\n"
-                   "             {\"compute_nodes\": [\n"
-                   "                  {\"name\": \"compute1\"}\n"
-                   "             ]}\n"
-                   "        ]}]\n"
-                   "   },\n"
-                   "  {\"storage\":\n"
-                   "       [{\"availability_zones\": [\n"
-                   "             {\"name\": \"AZ1\"},\n"
-                   "             {\"name\": \"AZ2\"}]},\n"
-                   "        {\"volume_types\": [\n"
-                   "             {\"name\": \"lvm1\"},\n"
-                   "             {\"name\": \"lvm2\"}]},\n"
-                   "        {\"exclude\": [\n"
-                   "             {\"storage_pools\": [\n"
-                   "                  {\"name\": \"host0@backend0#pool0\"},\n"
-                   "                  {\"name\": \"host1@backend1#pool1\"}\n"
-                   "             ]},\n"
-                   "             {\"volumes\": [\n"
-                   "                  {\"uuid\": \"UUID1\"},\n"
-                   "                  {\"uuid\": \"UUID2\"}\n"
-                   "             ]},\n"
-                   "             {\"projects\": [\n"
-                   "                  {\"uuid\": \"UUID1\"},\n"
-                   "                  {\"uuid\": \"UUID2\"}\n"
-                   "             ]},\n"
-                   "        ]}]\n"
-                   "   }\n"
+                   "JSON example:\n"
+                   "[\n"
+                   " {\"compute\":\n"
+                   "      [{\"host_aggregates\": [\n"
+                   "            {\"id\": 1},\n"
+                   "            {\"id\": 2},\n"
+                   "            {\"id\": 3}]},\n"
+                   "       {\"availability_zones\": [\n"
+                   "            {\"name\": \"AZ1\"},\n"
+                   "            {\"name\": \"AZ2\"}]},\n"
+                   "       {\"exclude\": [\n"
+                   "            {\"instances\": [\n"
+                   "                 {\"uuid\": \"UUID1\"},\n"
+                   "                 {\"uuid\": \"UUID2\"}\n"
+                   "            ]},\n"
+                   "            {\"compute_nodes\": [\n"
+                   "                 {\"name\": \"compute1\"}\n"
+                   "            ]}\n"
+                   "       ]}]\n"
+                   "  },\n"
+                   " {\"storage\":\n"
+                   "      [{\"availability_zones\": [\n"
+                   "            {\"name\": \"AZ1\"},\n"
+                   "            {\"name\": \"AZ2\"}]},\n"
+                   "       {\"volume_types\": [\n"
+                   "            {\"name\": \"lvm1\"},\n"
+                   "            {\"name\": \"lvm2\"}]},\n"
+                   "       {\"exclude\": [\n"
+                   "            {\"storage_pools\": [\n"
+                   "                 {\"name\": \"host0@backend0#pool0\"},\n"
+                   "                 {\"name\": \"host1@backend1#pool1\"}\n"
+                   "            ]},\n"
+                   "            {\"volumes\": [\n"
+                   "                 {\"uuid\": \"UUID1\"},\n"
+                   "                 {\"uuid\": \"UUID2\"}\n"
+                   "            ]},\n"
+                   "            {\"projects\": [\n"
+                   "                 {\"uuid\": \"UUID1\"},\n"
+                   "                 {\"uuid\": \"UUID2\"}\n"
+                   "            ]},\n"
+                   "       ]}]\n"
+                   "  }\n"
                   " ]\n"
                   )
        )
--- a/watcherclient/v1/goal_shell.py
+++ b/watcherclient/v1/goal_shell.py
@@ -14,9 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-import io
-
 from osc_lib import utils
+import six

 from watcherclient._i18n import _
 from watcherclient.common import command
@@ -38,7 +37,7 @@ class ShowGoal(command.ShowOne):
        return parser

    def _format_indicator_spec_table(self, spec, parsed_args):
-        out = io.StringIO()
+        out = six.StringIO()
        self.formatter.emit_one(
            column_names=list(field.capitalize() for field in spec.keys()),
            data=utils.get_dict_properties(spec, spec.keys()),
@@ -108,7 +107,7 @@ class ListGoal(command.Lister):
        return parser

    def _format_indicator_spec_table(self, goal, parsed_args):
-        out = io.StringIO()
+        out = six.StringIO()
        efficacy_specification = goal.efficacy_specification
        fields = ['name', 'unit']
        self.formatter.emit_list(
--- a/watcherclient/v1/strategy.py
+++ b/watcherclient/v1/strategy.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-from urllib import parse
+import six.moves.urllib.parse as parse

 from watcherclient.common import base
 from watcherclient.common import utils
--- a/watcherclient/v1/strategy_shell.py
+++ b/watcherclient/v1/strategy_shell.py
@@ -71,7 +71,7 @@ class StateStrategy(command.Lister):

    def _format_spec(self, requirements):
        for req in requirements:
-            if isinstance(req.state, list):
+            if type(req.state) == list:
                req.state = jsonutils.dumps(req.state, indent=2)
        return requirements