From aeead607fe411ba907257d2a70bc833be5c9deaa Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 5 Sep 2025 12:30:51 +0000 Subject: [PATCH 1/3] Update .gitreview for stable/2025.2 Change-Id: Icb185a21ceccd243832c706bd20d5fb3c241ab8c Signed-off-by: OpenStack Release Bot Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/functions --- .gitreview | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitreview b/.gitreview index d4bbffc3..3907f1f6 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/python-manilaclient.git +defaultbranch=stable/2025.2 From c2e6c1b1fc5e9a79ecc97596d1d125ad40e0f835 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 5 Sep 2025 12:30:52 +0000 Subject: [PATCH 2/3] Update TOX_CONSTRAINTS_FILE for stable/2025.2 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/2025.2 branch, tests will continue to use the upper-constraints list on master. Change-Id: I734212a962fd5b8cb7caf99fdf86832306e33a21 Signed-off-by: OpenStack Release Bot Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/functions --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 72c8a2ce..199cdde9 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ setenv = VIRTUAL_ENV={envdir} OS_STDERR_CAPTURE=1 PYTHONDONTWRITEBYTECODE=1 deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2} -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} @@ -26,7 +26,7 @@ commands = oslo_debug_helper -t manilaclient/tests {posargs} [testenv:newnote] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2} -r{toxinidir}/doc/requirements.txt commands = reno new {posargs} @@ -42,7 +42,7 @@ 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/2025.2} -r{toxinidir}/doc/requirements.txt allowlist_externals = rm commands = @@ -59,7 +59,7 @@ commands = [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/2025.2} -r{toxinidir}/doc/requirements.txt allowlist_externals = rm commands = From b44aae26b80e21db3f3c803ea5259fa7f58573e4 Mon Sep 17 00:00:00 2001 From: Carlos da Silva Date: Fri, 29 Aug 2025 17:26:03 -0300 Subject: [PATCH 3/3] Fixes an issue that prevented ensure shares to be run A typo in the URL for ensure shares was created and the API endpoint did not match as a result. Fixed the issue by replacing '_' by '-' to match the endpoint correctly. Closes-bug: #2109376 Change-Id: I025d0f853bced49a2d484dc75db809b3d7edb498 Signed-off-by: Carlos da Silva (cherry picked from commit 43ee9f0e59e6c44d3975e31129aefb124c96473d) --- manilaclient/v2/services.py | 2 +- ...g-2109376-fix-ensure-shares-command-69feb1794fea418a.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/bug-2109376-fix-ensure-shares-command-69feb1794fea418a.yaml diff --git a/manilaclient/v2/services.py b/manilaclient/v2/services.py index f87fff6a..0fd288c3 100644 --- a/manilaclient/v2/services.py +++ b/manilaclient/v2/services.py @@ -89,7 +89,7 @@ def disable(self, host, binary, disable_reason=None): # noqa @api_versions.wraps("2.86") def ensure_shares(self, host): # noqa - resource_path = f'{RESOURCE_PATH}/ensure_shares' + resource_path = f'{RESOURCE_PATH}/ensure-shares' body = {"host": host} return self.api.client.post(resource_path, body=body) diff --git a/releasenotes/notes/bug-2109376-fix-ensure-shares-command-69feb1794fea418a.yaml b/releasenotes/notes/bug-2109376-fix-ensure-shares-command-69feb1794fea418a.yaml new file mode 100644 index 00000000..03cf4ac9 --- /dev/null +++ b/releasenotes/notes/bug-2109376-fix-ensure-shares-command-69feb1794fea418a.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixed an issue while running ensure shares and getting a not found + response. The command should now work properly.