6136b347c3
Updated patch [1] so sort_plugin_entry_points keeps the entry-point
ordering behavior intact, ensuring plugin load order stays consistent
with the original pkg_resources flow.
Patches [2], [3] and [5] address the same enhancement, enabling the
location parameter for optional use in the VolumeBackup workflow.
Since they modify the same logic and resolve the same issue, the best
approach is to consolidate them into a single, well-documented patch
to improve maintainability and reduce future rebase complexity.
During the upgrade from 6.6.0 to 7.4.0-3, these patches were impacted
by upstream changes introduced in commit [6].
This upstream update refactored Volume Backup handling by:
- introducing v3 (volume_backup.py v3),
- moving several backup operations from v2 to v3,
- updating setup.cfg to stop referencing v2 backup functions and to
point to v3 as the default.
Due to this refactoring, our patches must now be ported to
v3/volume_backup.py, and the associated tests should be updated or
recreated to target the v3 implementation.
The patch [4] from commit [7] can be safely dropped. Its functionality
is already included in version 7.4.0-3 through commit [8]. Therefore,
the patch is no longer needed, as upstream already includes all
required changes. Commit [8] also ports the equivalent updates for
v3 volume_backup, making the original patch redundant.
TEST PLAN:
PASS - Build all STX-O packages and wheels
PASS - Build STX-O tarball
PASS - Build STX docker images
PASS - Assert clients version on upgraded built images
BLOCKED - Apply STX-O overriding generated images
BLOCKED - Create a volume using the openstack cli
BLOCKED - Create a volume backup using the openstack cli and passing
the location parameter "--location ceph"
The apply failed due to an issue related to db_sync, which will be
handled in the Task: 53501
[1] - https://opendev.org/starlingx/openstack-armada-app/src/branch/master/upstream/openstack/python-openstackclient/debian/patches/0001-Add-plugin-entry-point-sorting-mechanism.patch
[2] - https://opendev.org/starlingx/openstack-armada-app/src/branch/master/upstream/openstack/python-openstackclient/debian/patches/0002-Add-location-parameter-for-volume-backup-creation.patch
[3] - https://opendev.org/starlingx/openstack-armada-app/src/branch/master/upstream/openstack/python-openstackclient/debian/patches/0003-Support-location-metadata-for-volume-backups.patch
[4] - https://opendev.org/starlingx/openstack-armada-app/src/branch/master/upstream/openstack/python-openstackclient/debian/patches/0004-Fix-Volume-backup-restore-output.patch
[5] - https://opendev.org/starlingx/openstack-armada-app/src/branch/master/upstream/openstack/python-openstackclient/debian/patches/0005-Volume-backup-support-with-Openstack-plugin.patch
[6] - https://review.opendev.org/c/openstack/python-openstackclient/+/918787
[7] - https://review.opendev.org/c/openstack/openstacksdk/+/931755
[8] - https://review.opendev.org/c/openstack/python-openstackclient/+/931756
Depends-on: https://review.opendev.org/c/starlingx/openstack-armada-app/+/968474
Story: 2011516
Task: 52976
Change-Id: Id6083c3970872714c88295813abac4b7def7b9f2
Signed-off-by: cbohlhal <Caique.BohlhalterdeSouza@windriver.com>
14 lines
575 B
YAML
14 lines
575 B
YAML
---
|
|
debname: python-openstackclient
|
|
debver: 7.4.0-3
|
|
dl_path:
|
|
name: python-openstackclient-debian-7.4.0-3.tar.gz
|
|
url: https://salsa.debian.org/openstack-team/clients/python-openstackclient/-/archive/debian/7.4.0-3/python-openstackclient-debian-7.4.0-3.tar.gz
|
|
md5sum: 5a1c206baaa7203fee1ec916b73508ee
|
|
sha256sum: 3fb7814cdc164762fb31e610481250521cd846814b95b708afcfe57b7fed04f4
|
|
revision:
|
|
dist: $STX_DIST
|
|
GITREVCOUNT:
|
|
BASE_SRCREV: 27acda9a6b4885a50064cebc0858892e71aa37ce
|
|
SRC_DIR: ${MY_REPO}/stx/openstack-armada-app/upstream/openstack/python-openstackclient
|