diff -pruN 5.3.0-1/debian/changelog 5.3.0-0ubuntu1/debian/changelog --- 5.3.0-1/debian/changelog 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/changelog 2025-09-25 21:27:10.000000000 +0000 @@ -1,227 +1,210 @@ -python-vitrageclient (5.3.0-1) experimental; urgency=medium +python-vitrageclient (5.3.0-0ubuntu1) questing; urgency=medium - * New upstream release. - - -- Thomas Goirand Mon, 01 Sep 2025 18:41:07 +0200 - -python-vitrageclient (5.2.0-2) unstable; urgency=medium - - * Uploading to unstable. - - -- Thomas Goirand Fri, 28 Mar 2025 12:47:51 +0100 - -python-vitrageclient (5.2.0-1) experimental; urgency=medium - - * New upstream release. - * d/watch: switch to version=4 and mode=git. - - -- Thomas Goirand Mon, 03 Mar 2025 12:21:38 +0100 + [ Guillaume Boutry ] + * d/gbp.conf, .launchpad.yaml: Sync from cloud-archive-tools for + flamingo. -python-vitrageclient (5.1.1-4) unstable; urgency=medium + [ Myles Penner ] + * New upstream release for OpenStack Flamingo (LP: #2125956). + * d/p/disable-install-bash-completion-from-git.patch: Refresh. + * d/p/drop-pydot.patch: Refresh. + * d/control: Align (Build-)Depends with upstream. + * d/s/options: Ignore .launchpad.yaml when generating diffs. - * Upgrade -doc to bootstrap 5 (Closes: #1088511). + -- Myles Penner Thu, 25 Sep 2025 14:27:10 -0700 - -- Thomas Goirand Thu, 02 Jan 2025 11:56:06 +0100 +python-vitrageclient (5.2.0-0ubuntu1) plucky; urgency=medium -python-vitrageclient (5.1.1-3) unstable; urgency=medium + * d/gbp.conf, .launchpad.yaml: Sync from cloud-archive-tools for + epoxy. + * New upstream release for OpenStack Epoxy. + * d/p/pydot-2.0.0-compat.patch: Refresh with new reverts. - * Switch to pybuild (Closes: #1090631). + -- James Page Thu, 13 Feb 2025 16:16:41 +0000 - -- Thomas Goirand Wed, 18 Dec 2024 22:01:52 +0100 +python-vitrageclient (5.1.1-0ubuntu1) oracular; urgency=medium -python-vitrageclient (5.1.1-2) unstable; urgency=medium + * d/gbp.conf: upstream-branch -> upstream-dalmatian. + * New upstream release for OpenStack Dalmatian. + * d/p/pydot-2.0.0-compat.patch: Fix test compatibility with pydot < 3. - * Uploading to unstable. + -- James Page Fri, 27 Sep 2024 10:04:02 +0100 - -- Thomas Goirand Fri, 20 Sep 2024 10:56:12 +0200 - -python-vitrageclient (5.1.1-1) experimental; urgency=medium +python-vitrageclient (5.1.0-0ubuntu1) oracular; urgency=medium * New upstream release. - * Blacklist TopologyShowTest.test_dot_emitter, see: - https://bugs.launchpad.net/python-vitrageclient/+bug/2078682. + * d/p/*: Refresh. - -- Thomas Goirand Mon, 02 Sep 2024 11:58:14 +0200 + -- James Page Wed, 07 Aug 2024 07:40:19 +0100 -python-vitrageclient (5.1.0-1) experimental; urgency=medium +python-vitrageclient (5.0.0-0ubuntu1) noble; urgency=medium - * New upstream release. - * Removed support-networkx-3.patch applied upstream. + [ Corey Bryant ] + * d/gbp.conf, .launchpad.yaml: Sync from cloud-archive-tools for + caracal. - -- Thomas Goirand Fri, 30 Aug 2024 10:29:54 +0200 + [ James Page ] + * New upstream release for OpenStack Caracal. + * d/p/*: Refresh. -python-vitrageclient (5.0.0-3) unstable; urgency=medium + -- James Page Mon, 11 Mar 2024 13:13:48 +0000 - * Add support-networkx-3.patch. +python-vitrageclient (4.8.0-0ubuntu1) mantic; urgency=medium - -- Thomas Goirand Fri, 17 May 2024 13:59:46 +0200 + * d/gbp.conf, .launchpad.yaml: Sync from cloud-archive-tools for + bobcat. + * New upstream release for OpenStack Bobcat. -python-vitrageclient (5.0.0-2) unstable; urgency=medium + -- Corey Bryant Tue, 05 Sep 2023 15:32:37 -0400 - * Uploading to unstable. +python-vitrageclient (4.7.0-0ubuntu1) lunar; urgency=medium - -- Thomas Goirand Thu, 04 Apr 2024 08:48:34 +0200 + * New upstream release for OpenStack Antelope. + * d/p/skip-test_dot_emitter-for-cloud-archive.patch: Dropped. No + longer needed. + * d/control: Drop lsb-release BD. No longer needed. -python-vitrageclient (5.0.0-1) experimental; urgency=medium + -- Corey Bryant Thu, 23 Feb 2023 13:46:44 -0500 - * New upstream release. +python-vitrageclient (4.6.0-0ubuntu1) kinetic; urgency=medium - -- Thomas Goirand Fri, 01 Mar 2024 21:42:33 +0100 + * New upstream release for OpenStack Zed. -python-vitrageclient (4.8.0-2) unstable; urgency=medium + -- Corey Bryant Thu, 08 Sep 2022 20:45:20 -0400 - * Uploading to unstable. +python-vitrageclient (4.5.0-0ubuntu1) kinetic; urgency=medium - -- Thomas Goirand Wed, 04 Oct 2023 17:22:04 +0200 + * New upstream release for OpenStack Zed. + * d/control: Update standards version to 4.6.1. -python-vitrageclient (4.8.0-1) experimental; urgency=medium + -- Corey Bryant Tue, 31 May 2022 17:10:05 -0400 - * New upstream release. - * Cleans better. +python-vitrageclient (4.4.0-0ubuntu2) jammy; urgency=medium - -- Thomas Goirand Thu, 31 Aug 2023 11:05:26 +0200 + * d/control: Drop python3-pydot(plus) Depends as they are Suggests + dependencies of networkx. + * d/p/drop-pydot.patch: Drop python3-pydot from requirements.txt. -python-vitrageclient (4.7.0-2) unstable; urgency=medium + -- Corey Bryant Wed, 26 Jan 2022 14:32:00 -0500 - * Uploading to unstable. +python-vitrageclient (4.4.0-0ubuntu1) jammy; urgency=medium - -- Thomas Goirand Mon, 19 Jun 2023 13:29:19 +0200 + * New upstream release for OpenStack Yoga. + * d/control: Align (Build-)Depends with upstream. + * d/control, d/rules: Bump debhelper compat to 13 and switch to pybuild. -python-vitrageclient (4.7.0-1) experimental; urgency=medium + -- Corey Bryant Wed, 01 Dec 2021 16:06:17 -0500 - * New upstream release. +python-vitrageclient (4.3.0-0ubuntu1) hirsute; urgency=medium - -- Thomas Goirand Wed, 22 Feb 2023 14:27:23 +0100 + * New upstream release for OpenStack Wallaby. -python-vitrageclient (4.6.0-2) unstable; urgency=medium + -- Corey Bryant Wed, 17 Mar 2021 10:45:12 -0400 - * Uploading to unstable. +python-vitrageclient (4.2.0-0ubuntu1) hirsute; urgency=medium - -- Thomas Goirand Fri, 23 Sep 2022 14:46:29 +0200 + * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev. + * New upstream release for OpenStack Wallaby. + * d/p/skip-test_dot_emitter-for-cloud-archive.patch: Refreshed. -python-vitrageclient (4.6.0-1) experimental; urgency=medium + -- Chris MacNaughton Thu, 03 Dec 2020 15:30:57 +0000 - * New upstream release. +python-vitrageclient (4.1.1-0ubuntu1) groovy; urgency=medium - -- Thomas Goirand Wed, 31 Aug 2022 13:17:40 +0200 + * New upstream release for OpenStack Victoria. + * d/control: Align (Build-)Depends with upstream. -python-vitrageclient (4.5.0-2) unstable; urgency=medium + -- Corey Bryant Fri, 11 Sep 2020 16:38:10 -0400 - * Uploading to unstable. - * Add autopkgtest. +python-vitrageclient (4.1.0-0ubuntu1) groovy; urgency=medium - -- Thomas Goirand Fri, 25 Mar 2022 11:58:28 +0100 + * New upstream release for OpenStack Victoria. + * d/control: Align (Build-)Depends with upstream. + * d/p/*: Refreshed. -python-vitrageclient (4.5.0-1) experimental; urgency=medium + -- Chris MacNaughton Wed, 29 Jul 2020 12:00:59 +0000 - * New upstream release. +python-vitrageclient (4.0.1-0ubuntu1) focal; urgency=medium - -- Thomas Goirand Tue, 22 Feb 2022 16:03:16 +0100 + * New upstream release for OpenStack Ussuri. + * d/p/disable-install-bash-completion-from-git.patch: Rebased. -python-vitrageclient (4.4.0-2) unstable; urgency=medium + -- Corey Bryant Thu, 09 Apr 2020 15:33:53 -0400 - * Uploading to unstable. +python-vitrageclient (4.0.0-0ubuntu1) focal; urgency=medium - -- Thomas Goirand Wed, 29 Sep 2021 17:55:27 +0200 + * New upstream release for OpenStack Ussuri. + * d/control: Align (Build-)Depends with upstream. -python-vitrageclient (4.4.0-1) experimental; urgency=medium + -- Corey Bryant Wed, 11 Mar 2020 16:36:44 -0400 - * New upstream release. - * Switch to subunit+stestr. +python-vitrageclient (3.0.0-0ubuntu1) eoan; urgency=medium - -- Thomas Goirand Thu, 02 Sep 2021 13:05:06 +0200 + * New upstream release for OpenStack Train. -python-vitrageclient (4.3.0-1) experimental; urgency=medium + -- James Page Thu, 26 Sep 2019 10:38:36 +0100 - * New upstream release. - * Debhelper 11. - * Standards-Version: 4.5.1. - - -- Thomas Goirand Sun, 14 Mar 2021 15:51:21 +0100 - -python-vitrageclient (4.1.1-2) unstable; urgency=medium - - * Uploading to unstable. - * Fixed debian/watch. - * Add a debian/salsa-ci.yml. - - -- Thomas Goirand Fri, 16 Oct 2020 17:34:05 +0200 - -python-vitrageclient (4.1.1-1) experimental; urgency=medium - - * New upstream release. - * Fixed (build-)depends for this release. +python-vitrageclient (2.7.0-0ubuntu2) eoan; urgency=medium - -- Thomas Goirand Wed, 09 Sep 2020 22:19:33 +0200 + * d/control, d/rules, d/python(3)-*: Drop Python 2 support. -python-vitrageclient (4.0.1-2) unstable; urgency=medium + -- Corey Bryant Wed, 10 Jul 2019 14:17:20 -0400 - * Uploading to unstable. +python-vitrageclient (2.7.0-0ubuntu1) disco; urgency=medium - -- Thomas Goirand Fri, 08 May 2020 23:51:53 +0200 + * New upstream release for OpenStack Stein. -python-vitrageclient (4.0.1-1) experimental; urgency=medium + -- Corey Bryant Wed, 13 Mar 2019 14:40:36 -0400 - * New upstream release. - * Fixed (build-)depends for this release. - * Rebased disable-install-bash-completion-from-git.patch. - - -- Thomas Goirand Wed, 08 Apr 2020 17:36:12 +0200 - -python-vitrageclient (3.0.0-2) unstable; urgency=medium - - [ Ondřej Nový ] - * Bump Standards-Version to 4.4.1. +python-vitrageclient (2.5.0-0ubuntu3) disco; urgency=medium - [ Thomas Goirand ] - * Uploading to unstable. + * d/control: Add python(3)-pydotplus to (Build-)Depends as it is + a suggested package for python(3)-networkx in bionic, enabling bionic + cloud archive support. + * d/control, d/p/skip-test_dot_emitter-for-cloud-archive.patch: Added + patch to skip test_dot_emitter() on backport to cloud-archive. - -- Thomas Goirand Mon, 21 Oct 2019 01:52:18 +0200 + -- Corey Bryant Fri, 08 Feb 2019 16:26:58 -0500 -python-vitrageclient (3.0.0-1) experimental; urgency=medium +python-vitrageclient (2.5.0-0ubuntu2) disco; urgency=medium - [ Ondřej Nový ] - * Use debhelper-compat instead of debian/compat. - * Bump Standards-Version to 4.4.0. + * d/control: Drop min version of python(3)-networkx, enabling cloud + archive backports. - [ Thomas Goirand ] - * New upstream release. - * Note: current version needs networkx >= 2.3 which isn't available yet in - Debian (bug filled). - - -- Thomas Goirand Tue, 17 Sep 2019 09:34:46 +0200 + -- Corey Bryant Wed, 06 Feb 2019 11:14:48 -0500 -python-vitrageclient (2.7.0-2) unstable; urgency=medium +python-vitrageclient (2.5.0-0ubuntu1) disco; urgency=medium - * Uploading to unstable. + * New upstream release for OpenStack Stein. + * d/control: Align (Build-)Depends with upstream. - -- Thomas Goirand Wed, 17 Jul 2019 14:40:09 +0200 + -- Corey Bryant Wed, 30 Jan 2019 10:16:26 -0500 -python-vitrageclient (2.7.0-1) experimental; urgency=medium +python-vitrageclient (2.4.0-0ubuntu1) disco; urgency=medium - * New upstream release. - * Removed versions when satisfied in Buster. + * New upstream release for OpenStack Stein. + * d/control: Align (Build-)Depends with upstream. - -- Thomas Goirand Mon, 25 Mar 2019 22:31:28 +0100 + -- Corey Bryant Wed, 14 Nov 2018 15:09:39 -0500 -python-vitrageclient (2.3.0-2) unstable; urgency=medium +python-vitrageclient (2.3.0-0ubuntu1) cosmic; urgency=medium - * Uploading to unstable. + * New upstream release for OpenStack Rocky. + * d/p/remove-privacy-breach-generic-lintian.patch: Rebased. - -- Michal Arbet Tue, 04 Sep 2018 22:37:30 +0200 + -- Corey Bryant Fri, 03 Aug 2018 14:44:23 -0400 -python-vitrageclient (2.3.0-1) experimental; urgency=medium +python-vitrageclient (2.1.0-0ubuntu1) cosmic; urgency=medium - [ Michal Arbet ] + * d/gbp.conf: Update gbp configuration file. + * d/control: Update Vcs-* links and maintainers. + * d/control, d/rules, d/python(3)-vitrageclient-p*: Add support for + python-vitrageclient. * New upstream release. - * d/control: Fix dependencies for new version - * d/patches: Update remove-privacy-breach-generic-lintian.patch - - [ Ondřej Nový ] - * d/copyright: Use https protocol in Format field - * d/control: Use team+openstack@tracker.debian.org as maintainer + * d/control: Align (Build-)Depends with upstream. + * d/control, d/tests/*: Enable autopkgtest-pkg-python testsuite. - -- Michal Arbet Tue, 21 Aug 2018 12:04:23 +0100 + -- Corey Bryant Thu, 14 Jun 2018 13:58:24 -0400 python-vitrageclient (2.0.0-1) unstable; urgency=medium diff -pruN 5.3.0-1/debian/control 5.3.0-0ubuntu1/debian/control --- 5.3.0-1/debian/control 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/control 2025-09-25 21:27:10.000000000 +0000 @@ -1,48 +1,49 @@ Source: python-vitrageclient Section: python Priority: optional -Maintainer: Debian OpenStack +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian OpenStack Uploaders: Thomas Goirand , Michal Arbet , Build-Depends: - debhelper-compat (= 11), + debhelper-compat (= 13), dh-python, openstack-pkg-tools, python3-all, - python3-pbr, + python3-pbr (>= 3.1.1), python3-setuptools, - python3-sphinx, + python3-sphinx (>= 2.0.0), Build-Depends-Indep: - python3-attr, - python3-cliff, + python3-cliff (>= 4.6.0), python3-coverage, python3-hacking, - python3-iso8601, - python3-keystoneauth1, - python3-networkx, - python3-openstackdocstheme, - python3-osc-lib, - python3-oslo.log, - python3-oslo.utils, - python3-oslotest, - python3-pydot, - python3-reno, - python3-subunit, - python3-testscenarios, - python3-testtools, - python3-stestr, - subunit, -Standards-Version: 4.5.1 -Homepage: https://github.com/openstack/python-vitrageclient.git -Vcs-Git: https://salsa.debian.org/openstack-team/clients/python-vitrageclient.git -Vcs-Browser: https://salsa.debian.org/openstack-team/clients/python-vitrageclient + python3-iso8601 (>= 0.1.11), + python3-keystoneauth1 (>= 3.4.0), + python3-mock (>= 2.0.0), + python3-networkx (>= 2.3), + python3-openstackdocstheme (>= 2.2.0), + python3-osc-lib (>= 1.8.0), + python3-oslo.log (>= 5.5.1), + python3-oslo.utils (>= 3.33.0), + python3-oslotest (>= 1:3.3.0), + python3-pydot (>= 1.4.1), + python3-pydotplus, + python3-stestr (>= 2.0.0), + python3-subunit (>= 1.2.0), + python3-testrepository (>= 0.0.18), + python3-testscenarios (>= 0.5.0), + python3-testtools (>= 2.3.0), +Standards-Version: 4.6.1 +Homepage: https://opendev.org/openstack/python-vitrageclient.git +Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-vitrageclient +Testsuite: autopkgtest-pkg-python Package: python-vitrageclient-doc Section: doc Architecture: all Depends: - libjs-bootstrap5, + libjs-bootstrap, libjs-jquery, ${misc:Depends}, ${sphinxdoc:Depends}, @@ -58,18 +59,17 @@ Package: python3-vitrageclient Section: python Architecture: all Depends: - python3-cliff, - python3-iso8601, - python3-keystoneauth1, - python3-networkx, - python3-osc-lib, - python3-oslo.log, - python3-oslo.utils, - python3-pbr, - python3-pydot, + python3-cliff (>= 4.6.0), + python3-iso8601 (>= 0.1.11), + python3-keystoneauth1 (>= 3.4.0), + python3-networkx (>= 2.3), + python3-osc-lib (>= 1.8.0), + python3-oslo.log (>= 5.5.1), + python3-oslo.utils (>= 3.33.0), + python3-pbr (>= 3.1.1), ${misc:Depends}, ${python3:Depends}, -Description: OpenStack root cause analysis as a Service client. +Description: OpenStack root cause analysis as a Service client - Python 3.x Vitrage is the OpenStack RCA (Root Cause Analysis) Service for organizing, analyzing and expanding OpenStack alarms & events, yielding insights regarding the root cause of problems and deducing diff -pruN 5.3.0-1/debian/copyright 5.3.0-0ubuntu1/debian/copyright --- 5.3.0-1/debian/copyright 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/copyright 2025-09-25 21:27:10.000000000 +0000 @@ -1,4 +1,4 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: python-vitrageclient Source: https://github.com/openstack/python-vitrageclient.git diff -pruN 5.3.0-1/debian/gbp.conf 5.3.0-0ubuntu1/debian/gbp.conf --- 5.3.0-1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/gbp.conf 2025-09-25 21:27:10.000000000 +0000 @@ -0,0 +1,9 @@ +[DEFAULT] +debian-branch = master +upstream-tag = %(version)s +pristine-tar = True +upstream-branch = upstream-flamingo + +[buildpackage] +export-dir = ../build-area +prebuild = [ ! -f .launchpad.yaml ] || rm .launchpad.yaml diff -pruN 5.3.0-1/debian/patches/disable-install-bash-completion-from-git.patch 5.3.0-0ubuntu1/debian/patches/disable-install-bash-completion-from-git.patch --- 5.3.0-1/debian/patches/disable-install-bash-completion-from-git.patch 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/patches/disable-install-bash-completion-from-git.patch 2025-09-25 21:27:10.000000000 +0000 @@ -3,7 +3,7 @@ Description: Disable installing of bash_ bash_completion Author: Michal Arbet Forwarded: no -Last-Update: 2020-04-08 +Last-Update: 2018-08-03 Index: python-vitrageclient/setup.cfg =================================================================== diff -pruN 5.3.0-1/debian/patches/drop-pydot.patch 5.3.0-0ubuntu1/debian/patches/drop-pydot.patch --- 5.3.0-1/debian/patches/drop-pydot.patch 1970-01-01 00:00:00.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/patches/drop-pydot.patch 2025-09-25 21:27:10.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Drop pydot as it is a dependency + of networkx, not a dependency of vitrageclient. +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1959142 +Forwarded: No + +Index: python-vitrageclient/requirements.txt +=================================================================== +--- python-vitrageclient.orig/requirements.txt ++++ python-vitrageclient/requirements.txt +@@ -9,5 +9,4 @@ oslo.utils>=3.33.0 # Apache-2.0 + keystoneauth1>=3.4.0 # Apache-2.0 + iso8601>=0.1.11 # MIT + networkx>=2.3 # BSD +-pydot>=1.4.1 # BSD + oslo.log>=4.4.0 diff -pruN 5.3.0-1/debian/patches/pydot-2.0.0-compat.patch 5.3.0-0ubuntu1/debian/patches/pydot-2.0.0-compat.patch --- 5.3.0-1/debian/patches/pydot-2.0.0-compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/patches/pydot-2.0.0-compat.patch 2025-09-25 21:27:10.000000000 +0000 @@ -0,0 +1,75 @@ +From 57c1d598b54a70859f26f51b7d4e68995f17ad9d Mon Sep 17 00:00:00 2001 +From: James Page +Date: Thu, 13 Feb 2025 16:02:49 +0000 +Subject: [PATCH 1/2] Revert "Cover project id and vitrage cache id with + quotes" + +This reverts commit 49fd3d19a196eda8cfc627c9cf5ae8335c39b0fe. +--- + vitrageclient/tests/cli/test_topology_show.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/vitrageclient/tests/cli/test_topology_show.py b/vitrageclient/tests/cli/test_topology_show.py +index cdd1677..160d89a 100644 +--- a/vitrageclient/tests/cli/test_topology_show.py ++++ b/vitrageclient/tests/cli/test_topology_show.py +@@ -147,12 +147,12 @@ JSON_DATA = ''' + + ''' + DOT_DATA = '''\ +-strict digraph { +-0 [id=nova, vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_datasource_name="nova.zone", vitrage_operational_state=OK, state=available, update_timestamp="2018-12-31T13:44:03Z", is_real_vitrage_id=True, vitrage_id="05a19de3-e929-4730-ad81-10fa57dcfa0a", vitrage_aggregated_state=AVAILABLE, vitrage_type="nova.zone", vitrage_is_deleted=False, vitrage_category=RESOURCE, vitrage_cached_id="125f1d8c4451a6385cc2cfa2b0ba45be", vitrage_is_placeholder=False, label="nova\\nnova.zone"]; +-1 [id="OpenStack Cluster", vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_operational_state=OK, state=available, vitrage_id="070c413e-5a8c-4823-ae20-af44936de2a0", vitrage_aggregated_state=AVAILABLE, vitrage_type="openstack.cluster", is_real_vitrage_id=True, vitrage_category=RESOURCE, vitrage_cached_id="3c7f9d22d9dd1615a00404f86cb3e289", vitrage_is_deleted=False, vitrage_is_placeholder=False, label="openstack.cluster"]; +-2 [id="ebarilan-devstack", vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_datasource_name="nova.host", vitrage_operational_state=OK, state=available, update_timestamp="2018-12-31T13:44:03Z", is_real_vitrage_id=True, vitrage_id="10da4fa2-397f-4b2e-a43b-937e11ab7daf", vitrage_aggregated_state=AVAILABLE, vitrage_type="nova.host", vitrage_is_deleted=False, vitrage_category=RESOURCE, vitrage_cached_id="9ae4db6fb920e19cb5c57a428b29eb59", vitrage_is_placeholder=False, label="ebarilan-devstack\\nnova.host"]; +-3 [id="b36b4d7a-b309-4b02-9662-5abd79741750", vitrage_sample_timestamp="2018-12-31T13:44:04Z", vitrage_datasource_name="cinder.volume", project_id="210140f1f5a94af99e0adf79a883b75a", vitrage_operational_state=OK, vitrage_aggregated_state=AVAILABLE, vitrage_is_placeholder=False, state=available, attachments="[]", vitrage_id="f0ca9fac-3ebd-4748-97ba-e93a7e7108aa", size=1, vitrage_type="cinder.volume", vitrage_is_deleted=False, vitrage_category=RESOURCE, vitrage_cached_id=f998c5f7bf1851e17e3eea902800a7df, update_timestamp="2018-12-31T08:43:32Z", is_real_vitrage_id=True, volume_type="lvmdriver-1", label="cinder.volume"]; +-4 [id="cebf5d5b-d7b1-4cfb-86fa-f660306b4c1a", vitrage_sample_timestamp="2018-12-31T13:44:04Z", vitrage_datasource_name="neutron.network", project_id="210140f1f5a94af99e0adf79a883b75a", vitrage_operational_state=OK, vitrage_category=RESOURCE, vitrage_is_placeholder=False, state=ACTIVE, update_timestamp="2018-12-30T08:30:33Z", is_real_vitrage_id=True, vitrage_id="eea46e33-81dc-4430-a771-852bac37b43d", vitrage_aggregated_state=ACTIVE, vitrage_type="neutron.network", vitrage_is_deleted=False, vitrage_cached_id=a0eeca0ab2c865915e23319a2e6d0fd7, label="public\\nneutron.network"]; ++strict digraph { ++0 [id=nova, vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_datasource_name="nova.zone", vitrage_operational_state=OK, state=available, update_timestamp="2018-12-31T13:44:03Z", is_real_vitrage_id=True, vitrage_id="05a19de3-e929-4730-ad81-10fa57dcfa0a", vitrage_aggregated_state=AVAILABLE, vitrage_type="nova.zone", vitrage_is_deleted=False, vitrage_category=RESOURCE, vitrage_cached_id=125f1d8c4451a6385cc2cfa2b0ba45be, vitrage_is_placeholder=False, label="nova\\nnova.zone"]; ++1 [id="OpenStack Cluster", vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_operational_state=OK, state=available, vitrage_id="070c413e-5a8c-4823-ae20-af44936de2a0", vitrage_aggregated_state=AVAILABLE, vitrage_type="openstack.cluster", is_real_vitrage_id=True, vitrage_category=RESOURCE, vitrage_cached_id=3c7f9d22d9dd1615a00404f86cb3e289, vitrage_is_deleted=False, vitrage_is_placeholder=False, label="openstack.cluster"]; ++2 [id="ebarilan-devstack", vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_datasource_name="nova.host", vitrage_operational_state=OK, state=available, update_timestamp="2018-12-31T13:44:03Z", is_real_vitrage_id=True, vitrage_id="10da4fa2-397f-4b2e-a43b-937e11ab7daf", vitrage_aggregated_state=AVAILABLE, vitrage_type="nova.host", vitrage_is_deleted=False, vitrage_category=RESOURCE, vitrage_cached_id=9ae4db6fb920e19cb5c57a428b29eb59, vitrage_is_placeholder=False, label="ebarilan-devstack\\nnova.host"]; ++3 [id="b36b4d7a-b309-4b02-9662-5abd79741750", vitrage_sample_timestamp="2018-12-31T13:44:04Z", vitrage_datasource_name="cinder.volume", project_id=210140f1f5a94af99e0adf79a883b75a, vitrage_operational_state=OK, vitrage_aggregated_state=AVAILABLE, vitrage_is_placeholder=False, state=available, attachments="[]", vitrage_id="f0ca9fac-3ebd-4748-97ba-e93a7e7108aa", size=1, vitrage_type="cinder.volume", vitrage_is_deleted=False, vitrage_category=RESOURCE, vitrage_cached_id=f998c5f7bf1851e17e3eea902800a7df, update_timestamp="2018-12-31T08:43:32Z", is_real_vitrage_id=True, volume_type="lvmdriver-1", label="cinder.volume"]; ++4 [id="cebf5d5b-d7b1-4cfb-86fa-f660306b4c1a", vitrage_sample_timestamp="2018-12-31T13:44:04Z", vitrage_datasource_name="neutron.network", project_id=210140f1f5a94af99e0adf79a883b75a, vitrage_operational_state=OK, vitrage_category=RESOURCE, vitrage_is_placeholder=False, state=ACTIVE, update_timestamp="2018-12-30T08:30:33Z", is_real_vitrage_id=True, vitrage_id="eea46e33-81dc-4430-a771-852bac37b43d", vitrage_aggregated_state=ACTIVE, vitrage_type="neutron.network", vitrage_is_deleted=False, vitrage_cached_id=a0eeca0ab2c865915e23319a2e6d0fd7, label="public\\nneutron.network"]; + 0 -> 2 [vitrage_is_deleted=False, label=contains]; + 1 -> 0 [vitrage_is_deleted=False, label=contains]; + } +-- +2.47.1 + +From 8e673a655c9b5939126f25512040df29eee65f87 Mon Sep 17 00:00:00 2001 +From: James Page +Date: Thu, 13 Feb 2025 16:02:56 +0000 +Subject: [PATCH 2/2] Revert "Reorder DOT_DATA" + +This reverts commit a7b637f86e42edf984aa8c0ee4c5f5ca7a34a9cb. +--- + vitrageclient/tests/cli/test_topology_show.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/vitrageclient/tests/cli/test_topology_show.py b/vitrageclient/tests/cli/test_topology_show.py +index 160d89a..5bcaf30 100644 +--- a/vitrageclient/tests/cli/test_topology_show.py ++++ b/vitrageclient/tests/cli/test_topology_show.py +@@ -148,13 +148,13 @@ JSON_DATA = ''' + ''' + DOT_DATA = '''\ + strict digraph { +-0 [id=nova, vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_datasource_name="nova.zone", vitrage_operational_state=OK, state=available, update_timestamp="2018-12-31T13:44:03Z", is_real_vitrage_id=True, vitrage_id="05a19de3-e929-4730-ad81-10fa57dcfa0a", vitrage_aggregated_state=AVAILABLE, vitrage_type="nova.zone", vitrage_is_deleted=False, vitrage_category=RESOURCE, vitrage_cached_id=125f1d8c4451a6385cc2cfa2b0ba45be, vitrage_is_placeholder=False, label="nova\\nnova.zone"]; +-1 [id="OpenStack Cluster", vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_operational_state=OK, state=available, vitrage_id="070c413e-5a8c-4823-ae20-af44936de2a0", vitrage_aggregated_state=AVAILABLE, vitrage_type="openstack.cluster", is_real_vitrage_id=True, vitrage_category=RESOURCE, vitrage_cached_id=3c7f9d22d9dd1615a00404f86cb3e289, vitrage_is_deleted=False, vitrage_is_placeholder=False, label="openstack.cluster"]; +-2 [id="ebarilan-devstack", vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_datasource_name="nova.host", vitrage_operational_state=OK, state=available, update_timestamp="2018-12-31T13:44:03Z", is_real_vitrage_id=True, vitrage_id="10da4fa2-397f-4b2e-a43b-937e11ab7daf", vitrage_aggregated_state=AVAILABLE, vitrage_type="nova.host", vitrage_is_deleted=False, vitrage_category=RESOURCE, vitrage_cached_id=9ae4db6fb920e19cb5c57a428b29eb59, vitrage_is_placeholder=False, label="ebarilan-devstack\\nnova.host"]; +-3 [id="b36b4d7a-b309-4b02-9662-5abd79741750", vitrage_sample_timestamp="2018-12-31T13:44:04Z", vitrage_datasource_name="cinder.volume", project_id=210140f1f5a94af99e0adf79a883b75a, vitrage_operational_state=OK, vitrage_aggregated_state=AVAILABLE, vitrage_is_placeholder=False, state=available, attachments="[]", vitrage_id="f0ca9fac-3ebd-4748-97ba-e93a7e7108aa", size=1, vitrage_type="cinder.volume", vitrage_is_deleted=False, vitrage_category=RESOURCE, vitrage_cached_id=f998c5f7bf1851e17e3eea902800a7df, update_timestamp="2018-12-31T08:43:32Z", is_real_vitrage_id=True, volume_type="lvmdriver-1", label="cinder.volume"]; +-4 [id="cebf5d5b-d7b1-4cfb-86fa-f660306b4c1a", vitrage_sample_timestamp="2018-12-31T13:44:04Z", vitrage_datasource_name="neutron.network", project_id=210140f1f5a94af99e0adf79a883b75a, vitrage_operational_state=OK, vitrage_category=RESOURCE, vitrage_is_placeholder=False, state=ACTIVE, update_timestamp="2018-12-30T08:30:33Z", is_real_vitrage_id=True, vitrage_id="eea46e33-81dc-4430-a771-852bac37b43d", vitrage_aggregated_state=ACTIVE, vitrage_type="neutron.network", vitrage_is_deleted=False, vitrage_cached_id=a0eeca0ab2c865915e23319a2e6d0fd7, label="public\\nneutron.network"]; +-0 -> 2 [vitrage_is_deleted=False, label=contains]; +-1 -> 0 [vitrage_is_deleted=False, label=contains]; ++0 [id=nova, is_real_vitrage_id=True, label="nova\\nnova.zone", state=available, update_timestamp="2018-12-31T13:44:03Z", vitrage_aggregated_state=AVAILABLE, vitrage_cached_id="125f1d8c4451a6385cc2cfa2b0ba45be", vitrage_category=RESOURCE, vitrage_datasource_name="nova.zone", vitrage_id="05a19de3-e929-4730-ad81-10fa57dcfa0a", vitrage_is_deleted=False, vitrage_is_placeholder=False, vitrage_operational_state=OK, vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_type="nova.zone"]; ++1 [id="OpenStack Cluster", is_real_vitrage_id=True, label="openstack.cluster", state=available, vitrage_aggregated_state=AVAILABLE, vitrage_cached_id="3c7f9d22d9dd1615a00404f86cb3e289", vitrage_category=RESOURCE, vitrage_id="070c413e-5a8c-4823-ae20-af44936de2a0", vitrage_is_deleted=False, vitrage_is_placeholder=False, vitrage_operational_state=OK, vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_type="openstack.cluster"]; ++2 [id="ebarilan-devstack", is_real_vitrage_id=True, label="ebarilan-devstack\\nnova.host", state=available, update_timestamp="2018-12-31T13:44:03Z", vitrage_aggregated_state=AVAILABLE, vitrage_cached_id="9ae4db6fb920e19cb5c57a428b29eb59", vitrage_category=RESOURCE, vitrage_datasource_name="nova.host", vitrage_id="10da4fa2-397f-4b2e-a43b-937e11ab7daf", vitrage_is_deleted=False, vitrage_is_placeholder=False, vitrage_operational_state=OK, vitrage_sample_timestamp="2018-12-31T13:44:03Z", vitrage_type="nova.host"]; ++3 [attachments="[]", id="b36b4d7a-b309-4b02-9662-5abd79741750", is_real_vitrage_id=True, label="cinder.volume", project_id="210140f1f5a94af99e0adf79a883b75a", size=1, state=available, update_timestamp="2018-12-31T08:43:32Z", vitrage_aggregated_state=AVAILABLE, vitrage_cached_id=f998c5f7bf1851e17e3eea902800a7df, vitrage_category=RESOURCE, vitrage_datasource_name="cinder.volume", vitrage_id="f0ca9fac-3ebd-4748-97ba-e93a7e7108aa", vitrage_is_deleted=False, vitrage_is_placeholder=False, vitrage_operational_state=OK, vitrage_sample_timestamp="2018-12-31T13:44:04Z", vitrage_type="cinder.volume", volume_type="lvmdriver-1"]; ++4 [id="cebf5d5b-d7b1-4cfb-86fa-f660306b4c1a", is_real_vitrage_id=True, label="public\\nneutron.network", project_id="210140f1f5a94af99e0adf79a883b75a", state=ACTIVE, update_timestamp="2018-12-30T08:30:33Z", vitrage_aggregated_state=ACTIVE, vitrage_cached_id=a0eeca0ab2c865915e23319a2e6d0fd7, vitrage_category=RESOURCE, vitrage_datasource_name="neutron.network", vitrage_id="eea46e33-81dc-4430-a771-852bac37b43d", vitrage_is_deleted=False, vitrage_is_placeholder=False, vitrage_operational_state=OK, vitrage_sample_timestamp="2018-12-31T13:44:04Z", vitrage_type="neutron.network"]; ++0 -> 2 [label=contains, vitrage_is_deleted=False]; ++1 -> 0 [label=contains, vitrage_is_deleted=False]; + } + ''' # noqa + +-- +2.47.1 + diff -pruN 5.3.0-1/debian/patches/remove-privacy-breach-generic-lintian.patch 5.3.0-0ubuntu1/debian/patches/remove-privacy-breach-generic-lintian.patch --- 5.3.0-1/debian/patches/remove-privacy-breach-generic-lintian.patch 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/patches/remove-privacy-breach-generic-lintian.patch 2025-09-25 21:27:10.000000000 +0000 @@ -1,5 +1,3 @@ -diff --git a/README.rst b/README.rst -index 5b0ad08..ecbc1f8 100644 --- a/README.rst +++ b/README.rst @@ -2,9 +2,6 @@ diff -pruN 5.3.0-1/debian/patches/series 5.3.0-0ubuntu1/debian/patches/series --- 5.3.0-1/debian/patches/series 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/patches/series 2025-09-25 21:27:10.000000000 +0000 @@ -1,2 +1,4 @@ +drop-pydot.patch disable-install-bash-completion-from-git.patch remove-privacy-breach-generic-lintian.patch +pydot-2.0.0-compat.patch diff -pruN 5.3.0-1/debian/patches/skip-test_dot_emitter-for-cloud-archive.patch 5.3.0-0ubuntu1/debian/patches/skip-test_dot_emitter-for-cloud-archive.patch --- 5.3.0-1/debian/patches/skip-test_dot_emitter-for-cloud-archive.patch 1970-01-01 00:00:00.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/patches/skip-test_dot_emitter-for-cloud-archive.patch 2025-09-25 21:27:10.000000000 +0000 @@ -0,0 +1,34 @@ +Description: Skip test_dot_emitter() when backporting package to + bionic-based cloud archive. The call to self.assertEqual(DOT_DATA, + out.getvalue()) fails due to differences in the bionic networkx + package version. The expected strict digraph output appears to + be valid but is not exactly the same format as DOT_DATA. + Unfortunately the ordering of the output is also not consistently + the same, otherwise comparing against different output on bionic + would be simple. And I'm just not familiar enough with handling + dot-format in Python so let's just skip this test. +Author: Corey Bryant +Forwarded: no + +--- a/vitrageclient/tests/cli/test_topology_show.py ++++ b/vitrageclient/tests/cli/test_topology_show.py +@@ -18,8 +18,10 @@ from unittest import mock + import io + import json + ++import lsb_release + # noinspection PyPackageRequirements + # noinspection PyPackageRequirements ++import testtools + from testtools import ExpectedException + + from vitrageclient.common.formatters import DOTFormatter +@@ -333,6 +335,8 @@ class TopologyShowTest(CliTestCase): + '--root', 'blabla', + '--graph-type', 'tree']) + ++ @testtools.skipIf(lsb_release.get_distro_information()['RELEASE'] == '18.04', ++ "Skipped by Ubuntu") + def test_dot_emitter(self): + def dict2columns(data): + return zip(*sorted(data.items())) diff -pruN 5.3.0-1/debian/rules 5.3.0-0ubuntu1/debian/rules --- 5.3.0-1/debian/rules 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/rules 2025-09-25 21:27:10.000000000 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export PYBUILD_NAME=vitrageclient + include /usr/share/openstack-pkg-tools/pkgos.make %: @@ -20,17 +22,14 @@ override_dh_python3: override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - # https://bugs.launchpad.net/python-vitrageclient/+bug/2078682 - pkgos-dh_auto_test --no-py2 'vitrageclient\.tests\.(?!cli.test_topology_show\.TopologyShowTest\.test_dot_emitter)' + pkgos-dh_auto_test --no-py2 endif override_dh_auto_clean: python3 setup.py clean find . -iname '*.pyc' -delete + rm -rf build rm -f ChangeLog AUTHORS - rm -rf doc/build build .stestr *.egg-info doc/source/api doc/source/contributor/api - find . -iname '*.pyc' -delete - for i in $$(find . -type d -iname __pycache__) ; do rm -rf $$i ; done override_dh_sphinxdoc: ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) diff -pruN 5.3.0-1/debian/salsa-ci.yml 5.3.0-0ubuntu1/debian/salsa-ci.yml --- 5.3.0-1/debian/salsa-ci.yml 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -pruN 5.3.0-1/debian/source/options 5.3.0-0ubuntu1/debian/source/options --- 5.3.0-1/debian/source/options 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/source/options 2025-09-25 21:27:10.000000000 +0000 @@ -1 +1,2 @@ extend-diff-ignore = "^[^/]*[.]egg-info/" +extend-diff-ignore = "^.launchpad.yaml" diff -pruN 5.3.0-1/debian/tests/control 5.3.0-0ubuntu1/debian/tests/control --- 5.3.0-1/debian/tests/control 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -Tests: unittests -Depends: - @, - @builddeps@, -Restrictions: allow-stderr needs-root diff -pruN 5.3.0-1/debian/tests/unittests 5.3.0-0ubuntu1/debian/tests/unittests --- 5.3.0-1/debian/tests/unittests 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/tests/unittests 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#!/bin/sh - -set -e - -# See https://bugs.launchpad.net/python-vitrageclient/+bug/2078682 -pkgos-dh_auto_test --no-py2 'vitrageclient\.tests\.(?!cli.test_topology_show\.TopologyShowTest\.test_dot_emitter)' diff -pruN 5.3.0-1/debian/watch 5.3.0-0ubuntu1/debian/watch --- 5.3.0-1/debian/watch 2025-09-01 16:41:07.000000000 +0000 +++ 5.3.0-0ubuntu1/debian/watch 2025-09-25 21:27:10.000000000 +0000 @@ -1,3 +1,3 @@ -version=4 -opts="mode=git,uversionmangle=s/\.0rc/~rc/;s/\.0b1/~b1/;s/\.0b2/~b2/;s/\.0b3/~b3/" \ -https://github.com/openstack/python-vitrageclient refs/tags/(\d[brc\d\.]+) +version=3 +opts="uversionmangle=s/\.(b|rc)/~$1/" \ +https://github.com/openstack/python-vitrageclient/tags .*/(\d[\d\.]+)\.tar\.gz