Update TOX/UPPER_CONSTRAINTS_FILE for stable/ussuri

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/ussuri branch, tests will
continue to use the upper-constraints list on master.

Change-Id: I9fe8d91eca50c75107b7c181b98b9af0964cd36d

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/python-watcherclient.git
-defaultbranch=stable/2025.1
+defaultbranch=stable/ussuri

.zuul.yaml

@@ -1,7 +1,8 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-python3-jobs
+      - openstack-lower-constraints-jobs
+      - openstack-python3-ussuri-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - openstackclient-plugin-jobs

babel.cfg

@@ -0,0 +1,2 @@
+[python: **.py]
+

doc/requirements.txt

@@ -2,7 +2,7 @@
 # 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
+openstackdocstheme>=1.32.1 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
 sphinxcontrib-apidoc>=0.2.0 # BSD
 

doc/source/conf.py

@@ -12,6 +12,8 @@
 # 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
@@ -42,8 +44,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 +68,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,8 +91,8 @@ latex_documents = [
     (
         'index',
         '%s.tex' % project,
-        '%s Documentation' % project,
-        'OpenStack Foundation', 'manual'
+        u'%s Documentation' % project,
+        u'OpenStack Foundation', 'manual'
     ),
 ]
 
@@ -96,10 +108,9 @@ latex_elements = {
 }
 
 # 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 = ''
 
 
 #html_theme_options = {"show_other_versions": "True"}

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

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

setup.cfg

@@ -1,12 +1,12 @@
 [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.9
+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
@@ -15,10 +15,8 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
-    Programming Language :: Python :: 3.12
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =
@@ -114,3 +112,17 @@ autodoc_index_modules = True
 autodoc_exclude_modules =
   watcherclient.tests.*
 api_doc_dir = reference/api
+
+[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

test-requirements.txt

@@ -1,8 +1,14 @@
+# 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>=3.0,<3.1.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
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
+tempest>=17.1.0 # Apache-2.0

tox.ini

@@ -1,6 +1,7 @@
 [tox]
-minversion = 3.18.0
-envlist = py3,pep8
+minversion = 2.0
+envlist = py36,py37,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/2025.1}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
   -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,7 +43,8 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.1}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+  -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
@@ -51,7 +53,7 @@ commands = sphinx-build -W -b html doc/source doc/build/html
 basepython = python3
 envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
-allowlist_externals =
+whitelist_externals =
   rm
   make
 commands =
@@ -77,3 +79,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

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

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
 

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
 

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)

watcherclient/common/httpclient.py

@@ -14,24 +14,24 @@
 #    under the License.
 
 import copy
+from distutils import version
 import functools
 import hashlib
-import http.client
-import io
 import logging
 import os
-import re
 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
@@ -62,7 +62,7 @@ SUPPORTED_ENDPOINT_SCHEME = ('http', 'https')
 
 def _trim_endpoint_api_version(url):
     """Trim API version and trailing slash from endpoint."""
-    return re.sub(f'{API_VERSION}$', '', url.rstrip('/'))
+    return url.rstrip('/').rstrip(API_VERSION)
 
 
 def _extract_error_json(body):
@@ -123,19 +123,16 @@ class VersionNegotiationMixin(object):
                 % {'req': self.os_infra_optim_api_version,
                    'min': min_ver, 'max': max_ver}))
 
-        negotiated_ver = api_versioning.APIVersion(
-            self.os_infra_optim_api_version)
-        min_ver = api_versioning.APIVersion(min_ver)
-        max_ver = api_versioning.APIVersion(max_ver)
-        if negotiated_ver > max_ver:
-            negotiated_ver = max_ver
+        negotiated_ver = str(
+            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_infra_optim_api_version = negotiated_ver.get_string()
-        LOG.debug('Negotiated API version is %s', negotiated_ver.get_string())
+        self.os_infra_optim_api_version = negotiated_ver
+        LOG.debug('Negotiated API version is %s', negotiated_ver)
 
         return negotiated_ver
 
@@ -250,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:
@@ -328,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]))
@@ -360,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
@@ -390,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()
 
@@ -413,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/
@@ -422,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:
@@ -437,6 +435,11 @@ class VerifiedHTTPSConnection(http.client.HTTPSConnection):
         """Connect to a host on a given (SSL) port.
 
         If ca_file is pointing somewhere, use it to check Server Certificate.
+
+        Redefined/copied and extended from httplib.py:1105 (Python 2.6.x).
+        This is needed to pass cert_reqs=ssl.CERT_REQUIRED as parameter to
+        ssl.wrap_socket(), which forces SSL to check server certificate against
+        our client certificate.
         """
         sock = socket.create_connection((self.host, self.port), self.timeout)
 
@@ -444,21 +447,17 @@ class VerifiedHTTPSConnection(http.client.HTTPSConnection):
             self.sock = sock
             self._tunnel()
 
-        context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-
         if self.insecure is True:
-            context.check_hostname = False
-            context.verify_mode = ssl.CERT_NONE
+            kwargs = {'cert_reqs': ssl.CERT_NONE}
         else:
-            context.load_verify_locations(self.ca_file)
+            kwargs = {'cert_reqs': ssl.CERT_REQUIRED, 'ca_certs': self.ca_file}
 
         if self.cert_file:
+            kwargs['certfile'] = self.cert_file
             if self.key_file:
-                context.load_cert_chain(self.cert_file, self.key_file)
-            else:
-                context.load_cert_chain(self.cert_file)
+                kwargs['keyfile'] = self.key_file
 
-        self.sock = context.wrap_socket(sock)
+        self.sock = ssl.wrap_socket(sock, **kwargs)
 
     @staticmethod
     def get_system_ca_file():
@@ -504,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)
@@ -528,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
 
@@ -559,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:

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

watcherclient/shell.py

@@ -203,9 +203,7 @@ class WatcherShell(app.App):
             LOG.info("END return value: %s", ret_val)
 
 
-def main(argv=None):
-    if argv is None:
-        argv = sys.argv[1:]
+def main(argv=sys.argv[1:]):
     watcher_app = WatcherShell()
     return watcher_app.run(argv)
 

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

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
 
@@ -358,8 +358,3 @@ class ClientTest(utils.BaseTestCase):
         client = httpclient.HTTPClient(endpoint)
         conn_url = client._make_connection_url(url)
         self.assertEqual(expected_url, conn_url)
-
-    def test_port_ends_with_one(self):
-        endpoint = "http://localhost:8081/"
-        http_client = httpclient.HTTPClient(endpoint)
-        self.assertEqual(endpoint, http_client._make_connection_url(""))

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

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):

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
 

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

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):

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):

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):

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

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):

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):

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):

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):

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):

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):

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),

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(

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

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