Merge "Fix reprocessing POST request"

Update the zed release notes configuration to build from
unmaintained/zed.

Change-Id: I89f8f9f24499c2aaf663f3463143a688102e78e1

.gitignore

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

cloudkittyclient/tests/functional/base.py

@@ -15,26 +15,57 @@
 #
 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])
-        cmd = shlex.split(cmd)
+
+        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)
+
         p = subprocess.Popen(
-            cmd, env=os.environ.copy(), shell=False,
-            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-            stdin=subprocess.PIPE if stdin else None,
+            ["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
         )
         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/v2/reprocessing.py

@@ -19,8 +19,6 @@ class ReprocessingManager(base.BaseManager):
 
     url = '/v2/task/reprocesses'
 
-    url_to_post = '/v2/task/reprocess'
-
     def get_reprocessing_tasks(self, offset=0, limit=100, scope_ids=[],
                                order="DESC", **kwargs):
         """Returns a paginated list of reprocessing tasks.
@@ -75,4 +73,4 @@ class ReprocessingManager(base.BaseManager):
 
         body = dict(filter(lambda elem: bool(elem[1]), body.items()))
 
-        return self.api_client.post(self.url_to_post, json=body).json()
+        return self.api_client.post(self.url, json=body).json()

releasenotes/notes/fix-reprocessing-post-request-95512686754ee271.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed a bug where creating a reprocessing task would fail due to sending a
+    POST request to the wrong endpoint.

releasenotes/source/2023.1.rst

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

releasenotes/source/2023.2.rst

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

releasenotes/source/2024.1.rst

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

releasenotes/source/index.rst

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

releasenotes/source/victoria.rst

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

releasenotes/source/wallaby.rst

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

releasenotes/source/xena.rst

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

releasenotes/source/yoga.rst

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

releasenotes/source/zed.rst

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

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.6
+python_requires = >=3.8
 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 =

tox.ini

@@ -9,6 +9,7 @@ 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
@@ -29,12 +30,40 @@ 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
+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
 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
+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
 setenv = OS_RATING_API_VERSION=2
 commands = stestr run --concurrency=1 --test-path ./cloudkittyclient/tests/functional/v2