Fix reprocessing POST request

The POST request for triggering reprocessing needs to be made to
``/v2/task/reprocesses``. This is the same as for other requests, so we
can drop ``url_for_post``.

Change-Id: If630d4f313c875733dbe1937ff7ca625821e04af
(cherry picked from commit 6ee36ef0e3)

.gitignore

@@ -16,4 +16,3 @@ dist
 AUTHORS
 ChangeLog
 releasenotes/build
-.idea/

.gitreview

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

.zuul.yaml

@@ -21,6 +21,8 @@
         cloudkitty: https://opendev.org/openstack/cloudkitty
       devstack_localrc:
         CLOUDKITTY_FETCHER: keystone
+        DEVSTACK_GATE_USE_PYTHON3: "True"
+        USE_PYTHON3: True
       devstack_services:
         ck-api: true
         horizon: false

cloudkittyclient/tests/functional/base.py

@@ -15,57 +15,26 @@
 #
 import json
 import os
+import shlex
 import subprocess
 
 from cloudkittyclient.tests import utils
 
-from oslo_log import log
-
-LOG = log.getLogger(__name__)
-
 
 class BaseFunctionalTest(utils.BaseTestCase):
 
-    # DevStack is using VENV by default. Therefore, to execute the commands,
-    # we need to activate the VENV. And, to do that, we need the VENV path.
-    # This path is hardcoded here because we could not find a variable in this
-    # Python code to retrieve the VENV variable from the test machine.
-    # It seems that because of the stack TOX -> stestr -> this python code, and
-    # so on, we are not able to access the DevStack variables here.
-    #
-    # If somebody finds a solution, we can remove the hardcoded path here.
-    DEV_STACK_VENV_BASE_PATH = "/opt/stack/data/venv"
-
-    BASE_COMMAND_WITH_VENV = "source %s/bin/activate && %s "
-
     def _run(self, executable, action,
              flags='', params='', fmt='-f json', stdin=None, has_output=True):
         if not has_output:
             fmt = ''
-
-        does_venv_exist = not os.system("ls -lah /opt/stack/data/venv")
-        LOG.info("Test to check if the VENV file exist returned: [%s].",
-                 does_venv_exist)
-
-        system_variables = os.environ.copy()
-        LOG.info("System variables [%s] found when executing the tests.",
-                 system_variables)
-
         cmd = ' '.join([executable, flags, action, params, fmt])
-
-        actual_command_with_venv = self.BASE_COMMAND_WITH_VENV % (
-            self.DEV_STACK_VENV_BASE_PATH, cmd)
-
-        LOG.info("Command being executed: [%s].", actual_command_with_venv)
-
+        cmd = shlex.split(cmd)
         p = subprocess.Popen(
-            ["bash", "-c", actual_command_with_venv],
-            env=os.environ.copy(), shell=False, stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE, stdin=subprocess.PIPE if stdin else None
+            cmd, env=os.environ.copy(), shell=False,
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+            stdin=subprocess.PIPE if stdin else None,
         )
         stdout, stderr = p.communicate(input=stdin)
-        LOG.info("Standard output [%s] and error output [%s] for command "
-                 "[%s]. ", stdout, stderr, actual_command_with_venv)
         if p.returncode != 0:
             raise RuntimeError('"{cmd}" returned {val}: {msg}'.format(
                 cmd=' '.join(cmd), val=p.returncode, msg=stderr))

cloudkittyclient/utils.py

@@ -13,6 +13,7 @@
 #    under the License.
 #
 import inspect
+import sys
 
 import pbr.version
 
@@ -81,6 +82,11 @@ def format_http_errors(ignore):
     """
 
     def wrap(cls):
+        # If you want pretty errors, use python3.
+        # __qualname__ does not exist in python 2
+        if sys.version_info.major < 3:
+            return cls
+
         def predicate(item):
             # This avoids decorating functions of parent classes
             return (inspect.isfunction(item)

cloudkittyclient/v2/scope.py

@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-from oslo_utils import strutils
-
 from cloudkittyclient.common import base
 from cloudkittyclient import exc
 
+from distutils.util import strtobool
+
 
 class ScopeManager(base.BaseManager):
     """Class used to handle /v2/scope endpoint"""
@@ -133,8 +133,7 @@ class ScopeManager(base.BaseManager):
         )
 
         if kwargs.get('active'):
-            body['active'] = strutils.bool_from_string(
-                kwargs.get('active'), strict=True)
+            body['active'] = strtobool(kwargs.get('active'))
 
         # Stripping None
         body = dict(filter(lambda elem: elem[1] is not None, body.items()))

cloudkittyclient/v2/summary_cli.py

@@ -35,20 +35,10 @@ class CliSummaryGet(lister.Lister):
                             help='Maximal number of elements')
         parser.add_argument('-g', '--groupby', type=str, action='append',
                             help='Attribute to group the summary by. Can be '
-                                 'specified several times. One can also group '
-                                 'by different time options such as: "time-d" '
-                                 'to group by day of the year, "time-w" to '
-                                 'group by week of the year, "time-m" to '
-                                 'group by month, and "time-y" to group data '
-                                 'by year.')
+                            'specified several times')
         parser.add_argument('--filter', type=filter_, action='append',
                             help="Optional filter, in 'key:value' format. Can "
-                                 "be specified several times. It is also "
-                                 "possible to filter data using the group by "
-                                 "values. However, one needs to group by as "
-                                 "well; for instance, if one wants to filter "
-                                 "by resource id (id), then we need to group "
-                                 "by id via the option '-g id'.")
+                            "be specified several times.")
         parser.add_argument('-b', '--begin', type=timeutils.parse_isotime,
                             help="Start of the period to query, in iso8601 "
                             "format. Example: 2019-05-01T00:00:00Z.")

releasenotes/source/2023.1.rst

@@ -1,6 +0,0 @@
-===========================
-2023.1 Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: unmaintained/2023.1

releasenotes/source/2023.2.rst

@@ -1,6 +0,0 @@
-===========================
-2023.2 Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: stable/2023.2

releasenotes/source/2024.1.rst

@@ -1,6 +0,0 @@
-===========================
-2024.1 Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: stable/2024.1

releasenotes/source/2024.2.rst

@@ -1,6 +0,0 @@
-===========================
-2024.2 Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: stable/2024.2

releasenotes/source/2025.1.rst

@@ -1,6 +0,0 @@
-===========================
-2025.1 Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: stable/2025.1

releasenotes/source/index.rst

@@ -8,11 +8,6 @@ Contents
    :maxdepth: 2
 
    unreleased
-   2025.1
-   2024.2
-   2024.1
-   2023.2
-   2023.1
    zed
    yoga
    xena

releasenotes/source/victoria.rst

@@ -3,4 +3,4 @@ Victoria Series Release Notes
 =============================
 
 .. release-notes::
-   :branch: unmaintained/victoria
+   :branch: stable/victoria

releasenotes/source/wallaby.rst

@@ -3,4 +3,4 @@ Wallaby Series Release Notes
 ============================
 
 .. release-notes::
-   :branch: unmaintained/wallaby
+   :branch: stable/wallaby

releasenotes/source/xena.rst

@@ -3,4 +3,4 @@ Xena Series Release Notes
 =========================
 
 .. release-notes::
-   :branch: unmaintained/xena
+   :branch: stable/xena

releasenotes/source/yoga.rst

@@ -3,4 +3,4 @@ Yoga Series Release Notes
 =========================
 
 .. release-notes::
-   :branch: unmaintained/yoga
+   :branch: stable/yoga

releasenotes/source/zed.rst

@@ -3,4 +3,4 @@ Zed Series Release Notes
 ========================
 
 .. release-notes::
-   :branch: unmaintained/zed
+   :branch: stable/zed

requirements.txt

@@ -2,6 +2,10 @@
 # date but we do not test them so no guarantee of having them all correct. If
 # you find any incorrect lower bounds, let us know or propose a fix.
 
+# 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.
+
 pbr>=5.5.1 # Apache-2.0
 cliff>=3.5.0 # Apache-2.0
 keystoneauth1>=4.3.0 # Apache-2.0

setup.cfg

@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/python-cloudkittyclient/latest/
-python_requires = >=3.8
+python_requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -17,10 +17,10 @@ classifier =
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
 
 [files]
 packages =

test-requirements.txt

@@ -1,4 +1,14 @@
-hacking>=7.0.0,<7.1.0 # Apache-2.0
+# 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.
+
+hacking>=3.0.1,<3.1.0 # Apache-2.0
+
+# remove this pyflakes from here once you bump the
+# hacking to 3.2.0 or above. hacking 3.2.0 takes
+# care of pyflakes version compatibilty.
+pyflakes>=2.1.1
+
 coverage>=4.0,!=4.4 # Apache-2.0
 python-subunit>=1.4.0 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0

tox.ini

@@ -9,13 +9,14 @@ basepython = python3
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv =
-   DEVSTACK_VENV={env:DEVSTACK_VENV}
+   VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:cover]
 setenv =
+    VIRTUAL_ENV={envdir}
     PYTHON=coverage run --source cloudkittyclient --parallel-mode
 commands =
     stestr run {posargs}
@@ -28,40 +29,12 @@ commands =
 commands = oslo_debug_helper -t cloudkittyclient/tests {posargs}
 
 [testenv:functional-v1]
-passenv =
-      OS_CLOUD
-      OS_PROJECT_DOMAIN_ID
-      OS_USER_DOMAIN_ID
-      OS_PROJECT_DOMAIN_NAME
-      OS_USER_DOMAIN_NAME
-      OS_PROJECT_NAME
-      OS_IDENTITY_API_VERSION
-      OS_PASSWORD
-      OS_AUTH_TYPE
-      OS_AUTH_URL
-      OS_USERNAME
-      OS_ENDPOINT
-      DEVSTACK_VENV
-      VIRTUAL_ENV
+passenv = OS_CLOUD OS_PROJECT_DOMAIN_ID OS_USER_DOMAIN_ID OS_PROJECT_DOMAIN_NAME OS_USER_DOMAIN_NAME OS_PROJECT_NAME OS_IDENTITY_API_VERSION OS_PASSWORD OS_AUTH_TYPE OS_AUTH_URL OS_USERNAME OS_ENDPOINT
 setenv = OS_RATING_API_VERSION=1
 commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v1
 
 [testenv:functional-v2]
-passenv = 
-      OS_CLOUD
-      OS_PROJECT_DOMAIN_ID
-      OS_USER_DOMAIN_ID
-      OS_PROJECT_DOMAIN_NAME
-      OS_USER_DOMAIN_NAME
-      OS_PROJECT_NAME
-      OS_IDENTITY_API_VERSION
-      OS_PASSWORD
-      OS_AUTH_TYPE
-      OS_AUTH_URL
-      OS_USERNAME
-      OS_ENDPOINT
-      DEVSTACK_VENV
-      VIRTUAL_ENV
+passenv = OS_CLOUD OS_PROJECT_DOMAIN_ID OS_USER_DOMAIN_ID OS_PROJECT_DOMAIN_NAME OS_USER_DOMAIN_NAME OS_PROJECT_NAME OS_IDENTITY_API_VERSION OS_PASSWORD OS_AUTH_TYPE OS_AUTH_URL OS_USERNAME OS_ENDPOINT
 setenv = OS_RATING_API_VERSION=2
 commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v2
 
@@ -73,11 +46,12 @@ commands = {posargs}
 
 [testenv:docs]
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build --keep-going -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
+envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
 allowlist_externals =
   make
@@ -98,7 +72,7 @@ import_exceptions = cloudkittyclient.i18n
 
 [testenv:releasenotes]
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
   -r{toxinidir}/doc/requirements.txt
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html