starlingx/openstack-armada-app
Code Issues Proposed changes

Upversion python-openstackclient to v6.6.0-5

Browse Source 
As part of the STX-Openstack upversion to CARACAL, the python-
openstackclient is being upversioned to version 6.6.0-5 [1], which is
the latest supported on CARACAL [2] and Debian.

The commit hash of the used repo is:
e90cc3256ba56481729ceacebe5563f20636d1dd

All patches were updated in order to make the package buildable in the
new version.

[1] https://salsa.debian.org/openstack-team/clients/python-openstackclient/-/tree/debian/6.6.0-5?ref_type=tags
[2] https://releases.openstack.org/caracal/index.html#caracal-python-openstackclient

Story: 2011303
Task: 51497

Test Plan:
PASS: Build the python-openstackclient package
PASS: Build the stx-openstackclients image
PASS: Tested custom image in a running stx-openstack
PASS: Check version used in system on test plan

Depends-on: https://review.opendev.org/c/starlingx/root/+/938292

Change-Id: I94117a3d60554043c12c6b8ab5908c6e3238dc75
Signed-off-by: Jose Claudio <joseclaudio.paespires@windriver.com>
This commit is contained in:
Jose Claudio
2024-12-23 15:49:16 -03:00
committed by Murillo Arantes
parent eb92e8be5b
commit 878e1ebd73
6 changed files with 94 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
upstream/openstack/python-openstackclient/debian/deb_patches/0001-Add-wheel-package.patch
+6 -6
View File
@@ -1,4 +1,4 @@
From 25a9e8325b319aba48fe2f5703381af2823887f6 Mon Sep 17 00:00:00 2001
From 129e890076816c5d132e260ef3987d71d0154c4f Mon Sep 17 00:00:00 2001
From: Charles Short <charles.short@windriver.com>
Date: Wed, 27 Oct 2021 13:57:42 +0000
Subject: [PATCH] Add wheel package
@@ -12,10 +12,10 @@ Signed-off-by: Charles Short <charles.short@windriver.com>
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index b1951c76..71609fa8 100644
index 8a09181c..2eaa1545 100644
--- a/debian/control
+++ b/debian/control
@@ -126,3 +126,24 @@ Description: OpenStack Command-line Client - Python 3.x
@@ -125,3 +125,24 @@ Description: OpenStack Command-line Client - Python 3.x
operations in OpenStack.
.
This package contains the Python 3.x module.
@@ -41,10 +41,10 @@ index b1951c76..71609fa8 100644
+ .
+ This package contains the Python wheel.
diff --git a/debian/rules b/debian/rules
index 98193bc2..8c257cd8 100755
index 65f97b66..f032e337 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ override_dh_auto_build:
@@ -14,7 +14,7 @@ override_dh_auto_build:
echo "Do nothing..."
override_dh_auto_install:
@@ -54,5 +54,5 @@ index 98193bc2..8c257cd8 100755
# Generate bash completion
pkgos-gen-completion --py3 openstack
--
2.25.1
2.34.1
upstream/openstack/python-openstackclient/debian/deb_patches/0002-Allow-external-bash-completion.patch
+7 -5
View File
@@ -1,4 +1,4 @@
From 4e07c23b3d1a3d194545fe2ee4e8ba3281f447a4 Mon Sep 17 00:00:00 2001
From 6b0824bd7da3d208b64f0caaf589b5f6d1d56c2a Mon Sep 17 00:00:00 2001
From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Date: Thu, 2 Jun 2022 20:20:50 +0300
Subject: [PATCH] Allow external bash completion
@@ -8,6 +8,8 @@ than the one generated at runtime. Allow bash completion to be
generated at /etc/bash_completion.d .
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
[ Ported this patch to python-openstackclient v6.6.0-5 @ Caracal ]
Signed-off-by: Jose Claudio <joseclaudio.paespires@windriver.com>
---
debian/python3-openstackclient.dirs | 1 +
debian/rules | 3 ---
@@ -22,10 +24,10 @@ index 00000000..bc3b6805
@@ -0,0 +1 @@
+etc/bash_completion.d/
diff --git a/debian/rules b/debian/rules
index 8c257cd8..9b71b705 100755
index f032e337..638ee8d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,6 @@ override_dh_auto_build:
@@ -16,9 +16,6 @@ override_dh_auto_build:
override_dh_auto_install:
pkgos-dh_auto_install --no-py2 --wheel
@@ -34,7 +36,7 @@ index 8c257cd8..9b71b705 100755
-
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
pkgos-dh_auto_test --no-py2 'openstackclient\.tests.*'
# See https://bugs.debian.org/1058097
--
2.25.1
2.34.1
upstream/openstack/python-openstackclient/debian/meta_data.yaml
+5 -5
View File
@@ -1,11 +1,11 @@
---
debname: python-openstackclient
debver: 6.2.0-1
debver: 6.6.0-5
dl_path:
name: python-openstackclient-debian-6.2.0-1.tar.gz
url: https://salsa.debian.org/openstack-team/clients/python-openstackclient/-/archive/debian/6.2.0-1/python-openstackclient-debian-6.2.0-1.tar.gz
md5sum: db8235ad534de91738f1dab8e3865a8a
sha256sum: 91e35f3e6bc8113cdd228709360b383e0c4e7c7f884bb3ec47e61f37c4110da3
name: python-openstackclient-debian-6.6.0-5.tar.gz
url: https://salsa.debian.org/openstack-team/clients/python-openstackclient/-/archive/debian/6.6.0-5/python-openstackclient-debian-6.6.0-5.tar.gz
md5sum: a17e9e85bdbdd42b72ef81b3663e6ba9
sha256sum: bbb697a6d13697c3c527c07d349e706e2802dd12afaa300a43d3083c66c5f224
revision:
dist: $STX_DIST
GITREVCOUNT:
upstream/openstack/python-openstackclient/debian/patches/0001-Add-plugin-entry-point-sorting-mechanism.patch
+17 -17
View File
@@ -1,4 +1,4 @@
From ceb23453a2ac814e752393aaef841a1024f243d8 Mon Sep 17 00:00:00 2001
From ddf75bde7116bed571b33a41888e2ef98a3fb783 Mon Sep 17 00:00:00 2001
From: Luan Nunes Utimura <LuanNunes.Utimura@windriver.com>
Date: Fri, 24 Feb 2023 08:47:48 -0300
Subject: [PATCH] Add plugin entry point sorting mechanism
@@ -43,13 +43,15 @@ default in the list.
[6] https://opendev.org/openstack/cliff/src/branch/stable/victoria/cliff/commandmanager.py#L75
Signed-off-by: Luan Nunes Utimura <LuanNunes.Utimura@windriver.com>
[ Ported this patch to python-openstackclient v6.6.0-5 @ Caracal ]
Signed-off-by: Jose Claudio <joseclaudio.paespires@windriver.com>
---
openstackclient/common/clientmanager.py | 173 +++++++++++++++++++++++-
openstackclient/common/clientmanager.py | 172 +++++++++++++++++++++++-
openstackclient/shell.py | 32 ++++-
2 files changed, 202 insertions(+), 3 deletions(-)
2 files changed, 201 insertions(+), 3 deletions(-)
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 1ed6aa24..def7f2ca 100644
index 35c79247..bf193dbc 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -19,14 +19,17 @@ import importlib
@@ -70,7 +72,7 @@ index 1ed6aa24..def7f2ca 100644
USER_AGENT = 'python-openstackclient'
@@ -143,11 +146,177 @@ class ClientManager(clientmanager.ClientManager):
@@ -147,12 +150,177 @@ class ClientManager(clientmanager.ClientManager):
# Plugin Support
@@ -239,7 +241,7 @@ index 1ed6aa24..def7f2ca 100644
+
+ return before_entry_points + entry_points + after_entry_points
+
+
def get_plugin_modules(group):
"""Find plugin entry points"""
mod_list = []
@@ -251,10 +253,10 @@ index 1ed6aa24..def7f2ca 100644
# Different versions of stevedore use different
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index bc88e1f1..1db9eaca 100644
index 68ebf8a4..13626a2e 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -20,7 +20,9 @@ import sys
@@ -21,7 +21,9 @@ import warnings
from osc_lib.api import auth
from osc_lib.command import commandmanager
@@ -264,7 +266,7 @@ index bc88e1f1..1db9eaca 100644
import openstackclient
from openstackclient.common import clientmanager
@@ -29,6 +31,19 @@ from openstackclient.common import clientmanager
@@ -30,12 +32,25 @@ from openstackclient.common import clientmanager
DEFAULT_DOMAIN = 'default'
@@ -282,19 +284,17 @@ index bc88e1f1..1db9eaca 100644
+
+
class OpenStackShell(shell.OpenStackShell):
def __init__(self):
@@ -36,7 +51,7 @@ class OpenStackShell(shell.OpenStackShell):
super(OpenStackShell, self).__init__(
description=__doc__.strip(),
version=openstackclient.__version__,
- command_manager=commandmanager.CommandManager('openstack.cli'),
+ command_manager=CommandManager('openstack.cli'),
deferred_help=True)
deferred_help=True,
)
self.api_version = {}
@@ -50,6 +65,18 @@ class OpenStackShell(shell.OpenStackShell):
version)
@@ -54,6 +69,18 @@ class OpenStackShell(shell.OpenStackShell):
)
parser = clientmanager.build_plugin_option_parser(parser)
parser = auth.build_auth_plugins_option_parser(parser)
+
@@ -312,7 +312,7 @@ index bc88e1f1..1db9eaca 100644
return parser
def _final_defaults(self):
@@ -62,6 +89,9 @@ class OpenStackShell(shell.OpenStackShell):
@@ -66,6 +93,9 @@ class OpenStackShell(shell.OpenStackShell):
else:
self._auth_type = 'password'
@@ -323,5 +323,5 @@ index bc88e1f1..1db9eaca 100644
"""Load plugins via stevedore
--
2.25.1
2.34.1
upstream/openstack/python-openstackclient/debian/patches/0002-Add-location-parameter-for-volume-backup-creation.patch
+45 -44
View File
@@ -1,4 +1,4 @@
From c2c7f074270c687dde542d061518ee9aeefbc4ba Mon Sep 17 00:00:00 2001
From dcb551f89a110b750cd18a3bf6e271b8567bcb34 Mon Sep 17 00:00:00 2001
From: Luan Nunes Utimura <LuanNunes.Utimura@windriver.com>
Date: Mon, 6 Mar 2023 09:52:22 -0300
Subject: [PATCH] Add location parameter for volume backup creation
@@ -12,18 +12,20 @@ This change also updates the unit tests accordingly.
Signed-off-by: Luan Nunes Utimura <LuanNunes.Utimura@windriver.com>
[ Fixed backup creation with --location flag ]
Signed-off-by: Lucas de Ataides <lucas.deataidesbarreto@windriver.com>
[ Ported this patch to python-openstackclient v6.6.0-5 @ Caracal ]
Signed-off-by: Jose Claudio <joseclaudio.paespires@windriver.com>
---
openstackclient/tests/unit/volume/v2/fakes.py | 1 +
.../tests/unit/volume/v2/test_volume_backup.py | 8 ++++++++
openstackclient/volume/v2/volume_backup.py | 6 ++++++
3 files changed, 15 insertions(+)
openstackclient/tests/unit/volume/v2/fakes.py | 1 +
.../tests/unit/volume/v2/test_volume_backup.py | 9 +++++++++
openstackclient/volume/v2/volume_backup.py | 6 ++++++
3 files changed, 16 insertions(+)
diff --git a/openstackclient/tests/unit/volume/v2/fakes.py b/openstackclient/tests/unit/volume/v2/fakes.py
index a3ef142f..2e320863 100644
index 4d04fcdb..056b5b6e 100644
--- a/openstackclient/tests/unit/volume/v2/fakes.py
+++ b/openstackclient/tests/unit/volume/v2/fakes.py
@@ -553,6 +553,7 @@ def create_one_backup(attrs=None):
"size": random.randint(1, 20),
@@ -542,6 +542,7 @@ def create_one_backup(attrs=None):
"is_incremental": False,
"status": "error",
"availability_zone": 'zone' + uuid.uuid4().hex,
+ "location": 'location-' + uuid.uuid4().hex,
@@ -31,34 +33,33 @@ index a3ef142f..2e320863 100644
# Overwrite default attributes.
diff --git a/openstackclient/tests/unit/volume/v2/test_volume_backup.py b/openstackclient/tests/unit/volume/v2/test_volume_backup.py
index 7d00b8bf..6c22f3b6 100644
index aa0c050c..8b0c7688 100644
--- a/openstackclient/tests/unit/volume/v2/test_volume_backup.py
+++ b/openstackclient/tests/unit/volume/v2/test_volume_backup.py
@@ -50,6 +50,7 @@ class TestBackupCreate(TestBackup):
'container',
'description',
@@ -68,11 +68,13 @@ class TestBackupCreate(TestBackup):
columns = (
'id',
+ 'location',
'name',
'object_count',
'size',
@@ -62,6 +63,7 @@ class TestBackupCreate(TestBackup):
new_backup.container,
new_backup.description,
'volume_id',
)
data = (
new_backup.id,
+ new_backup.location,
new_backup.name,
new_backup.object_count,
new_backup.size,
@@ -88,6 +90,7 @@ class TestBackupCreate(TestBackup):
"--force",
new_backup.volume_id,
)
@@ -99,6 +101,8 @@ class TestBackupCreate(TestBackup):
"--incremental",
"--snapshot", self.new_backup.snapshot_id,
+ "--location", self.new_backup.location,
"--snapshot",
self.new_backup.snapshot_id,
+ "--location",
+ self.new_backup.location,
self.new_backup.volume_id,
]
verifylist = [
@@ -97,6 +100,7 @@ class TestBackupCreate(TestBackup):
@@ -108,6 +112,7 @@ class TestBackupCreate(TestBackup):
("force", True),
("incremental", True),
("snapshot", self.new_backup.snapshot_id),
@@ -66,7 +67,7 @@ index 7d00b8bf..6c22f3b6 100644
("volume", self.new_backup.volume_id),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -111,6 +115,7 @@ class TestBackupCreate(TestBackup):
@@ -122,6 +127,7 @@ class TestBackupCreate(TestBackup):
force=True,
incremental=True,
snapshot_id=self.new_backup.snapshot_id,
@@ -74,7 +75,7 @@ index 7d00b8bf..6c22f3b6 100644
)
self.assertEqual(self.columns, columns)
self.assertEqual(self.data, data)
@@ -139,6 +144,7 @@ class TestBackupCreate(TestBackup):
@@ -151,6 +157,7 @@ class TestBackupCreate(TestBackup):
description=None,
force=False,
incremental=False,
@@ -82,29 +83,29 @@ index 7d00b8bf..6c22f3b6 100644
metadata={"foo": "bar", "wow": "much-cool"},
)
self.assertEqual(self.columns, columns)
@@ -852,6 +858,7 @@ class TestBackupShow(TestBackup):
'container',
'description',
'id',
+ 'location',
'name',
'object_count',
'size',
@@ -864,6 +871,7 @@ class TestBackupShow(TestBackup):
backup.container,
backup.description,
"fail_reason",
"has_dependent_backups",
"id",
+ "location",
"is_incremental",
"metadata",
"name",
@@ -886,6 +894,7 @@ class TestBackupShow(TestBackup):
backup.fail_reason,
backup.has_dependent_backups,
backup.id,
+ backup.location,
backup.is_incremental,
backup.metadata,
backup.name,
backup.object_count,
backup.size,
diff --git a/openstackclient/volume/v2/volume_backup.py b/openstackclient/volume/v2/volume_backup.py
index d96b28e9..eac6167d 100644
index 64c78651..92770f55 100644
--- a/openstackclient/volume/v2/volume_backup.py
+++ b/openstackclient/volume/v2/volume_backup.py
@@ -88,6 +88,11 @@ class CreateVolumeBackup(command.ShowOne):
@@ -87,6 +87,11 @@ class CreateVolumeBackup(command.ShowOne):
metavar="<snapshot>",
help=_("Snapshot to backup (name or ID)")
help=_("Snapshot to backup (name or ID)"),
)
+ parser.add_argument(
+ "--location",
@@ -114,14 +115,14 @@ index d96b28e9..eac6167d 100644
parser.add_argument(
'--force',
action='store_true',
@@ -168,6 +173,7 @@ class CreateVolumeBackup(command.ShowOne):
@@ -174,6 +179,7 @@ class CreateVolumeBackup(command.ShowOne):
description=parsed_args.description,
force=parsed_args.force,
incremental=parsed_args.incremental,
+ location=parsed_args.location,
**kwargs,
)
backup._info.pop("links", None)
data = utils.get_dict_properties(backup, columns)
--
2.25.1
2.34.1
upstream/openstack/python-openstackclient/debian/patches/0003-Fix-output-for-openstack-volume-backup-restore.patch
+14 -12
View File
@@ -1,4 +1,4 @@
From a3591cdd38b46cc360bbd579c02a0a82224d91f1 Mon Sep 17 00:00:00 2001
From 0fdefb9c0ff7ffae1b618a1e3fb5e06f4aab9cdd Mon Sep 17 00:00:00 2001
From: Lucas de Ataides <lucas.deataidesbarreto@windriver.com>
Date: Wed, 29 Nov 2023 17:12:09 -0300
Subject: [PATCH] Fix output for "openstack volume backup restore"
@@ -24,28 +24,30 @@ issue to reappear.
[5] https://review.opendev.org/c/openstack/python-openstackclient/+/353931
Signed-off-by: Lucas de Ataides <lucas.deataidesbarreto@windriver.com>
[ Ported this patch to python-openstackclient v6.6.0-5 @ Caracal ]
Signed-off-by: Jose Claudio <joseclaudio.paespires@windriver.com>
---
openstackclient/volume/v2/volume_backup.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
openstackclient/volume/v2/volume_backup.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/openstackclient/volume/v2/volume_backup.py b/openstackclient/volume/v2/volume_backup.py
index eac6167d..c1bb0b2c 100644
index 92770f55..57909e0d 100644
--- a/openstackclient/volume/v2/volume_backup.py
+++ b/openstackclient/volume/v2/volume_backup.py
@@ -410,9 +410,12 @@ class RestoreVolumeBackup(command.ShowOne):
) % parsed_args.volume
raise exceptions.CommandError(msg)
@@ -440,11 +440,12 @@ class RestoreVolumeBackup(command.ShowOne):
)
raise exceptions.CommandError(msg % parsed_args.volume)
- return volume_client.restores.restore(
- return volume_client.restore_backup(
+ backup_restore = volume_client.restores.restore(
backup.id, volume_id, volume_name,
backup.id,
volume_id=volume_id,
name=volume_name,
)
+ return zip(*sorted(backup_restore._info.items()))
+
+
class SetVolumeBackup(command.Command):
--
2.25.1
2.34.1