Update TOX_CONSTRAINTS_FILE for stable/2024.1

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

Change-Id: I99a5a9eaa2e99c36d9312a5588437e04507398c8

.gitreview

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

test-requirements.txt

@@ -1,8 +1,9 @@
 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.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>=2.2.0 # MIT
+tempest>=17.1.0 # Apache-2.0

tox.ini

@@ -10,7 +10,7 @@ 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:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 allowlist_externals =
@@ -42,7 +42,7 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 

watcherclient/common/httpclient.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 import copy
+from distutils import version
 import functools
 import hashlib
 import http.client
@@ -122,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
 

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