diff -pruN 2.4.1-2/AUTHORS 2.5.0-0ubuntu1/AUTHORS
--- 2.4.1-2/AUTHORS	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/AUTHORS	2022-02-17 10:34:26.000000000 +0000
@@ -0,0 +1,24 @@
+Adam Harwell <flux.adam@gmail.com>
+Ajay Kumar <ajay.k@india.nec.com>
+Andreas Jaeger <aj@suse.com>
+Brian Haley <bhaley@redhat.com>
+Carlos Goncalves <cgoncalves@redhat.com>
+Corey Bryant <corey.bryant@canonical.com>
+Ghanshyam Mann <gmann@ghanshyammann.com>
+Gregory Thiemonge <gthiemon@redhat.com>
+Maciej Józefczyk <mjozefcz@redhat.com>
+Michael Johnson <johnsomor@gmail.com>
+Noah Mickus <noah.mickus@gmail.com>
+OpenStack Release Bot <infra-root@openstack.org>
+Sam Morrison <sorrison@gmail.com>
+Steven Glasford <stevenglasford@gmail.com>
+Thomas Bechtold <tbechtold@suse.com>
+Yang JianFeng <yjf1970231893@gmail.com>
+caoyuan <cao.yuan@99cloud.net>
+lidong <lidongbj@inspur.com>
+likui <likui@yovole.com>
+melissaml <ma.lei@99cloud.net>
+pengyuesheng <pengyuesheng@gohighsec.com>
+sunxifa <sunxifa@inspur.com>
+wu.chunyang <wuchunyang@yovole.com>
+zhangboye <zhangboye@inspur.com>
diff -pruN 2.4.1-2/ChangeLog 2.5.0-0ubuntu1/ChangeLog
--- 2.4.1-2/ChangeLog	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/ChangeLog	2022-02-17 10:34:26.000000000 +0000
@@ -0,0 +1,150 @@
+CHANGES
+=======
+
+2.5.0
+-----
+
+* Add "PROMETHEUS" protocol
+* Ignore new pylint checker
+* Update master for stable/xena
+
+2.4.1
+-----
+
+* Add Python3 xena unit tests
+
+2.4.0
+-----
+
+* Fix loadbalancer\_update argument typo
+* Fix PDF docs build
+* Replace deprecated UPPER\_CONSTRAINTS\_FILE variable
+* setup.cfg: Replace dashes with underscores
+* Update master for stable/wallaby
+
+2.3.1
+-----
+
+
+2.3.0
+-----
+
+* Add alpn\_protocols to the pool data model
+* Fix lower-constraints
+* Remove unicode to adapt to Python3
+* Remove babel.cfg
+* Stop configuring install\_command in tox
+* Add Python3 wallaby unit tests
+* Update master for stable/victoria
+
+2.2.0
+-----
+
+* Add Proxy protocol version 2 support
+* Add alpn\_protocols to the listener data model
+* Fix new pylint errors
+
+2.1.1
+-----
+
+* Fix NotFound exception in docstring
+
+2.1.0
+-----
+
+* Add missing assertIsInstance checks
+* Switch to victoria jobs
+* Add NotFound exception class
+* Update test-requirements to match Octavia repo
+* Add py38 classifier
+* Add SCTP protocol and health-monitor constants
+* Define the protocols supported by listener and pool respectively
+* Add releasenotes link to README
+* Switch to newer openstackdocstheme and reno versions
+* Fix hacking min version to 3.0.1
+* Update master for stable/ussuri
+
+2.0.0
+-----
+
+* Add TLS protocols for listener and pool model
+* Update hacking for Python3
+* Adding cipher list Support for provider drivers
+* Remove the dependency on the "mock" package
+* Re-home constants here from octavia
+* Remove all usage of six library
+* Complete dropping py27 support goal
+* Fix flake8 tox.ini directive
+* Missed some flavor references in the AZ methods
+* Stop testing python 2
+* Return tips jobs to voting
+
+1.5.0
+-----
+
+* Add availability\_zone to the LoadBalancer model
+* Availability zone / metadata validation
+* Switch to Ussuri jobs
+* Batch member update needs pool\_id explicitly
+* Generate PDF documentation
+* Update master for stable/train
+
+1.4.0
+-----
+
+* Add Octavia tox tips job template as voting
+* Clean up octavia-lib docs and remove oslo.log
+
+1.3.1
+-----
+
+* Update for storyboard
+* Fix docstring and avoid such errors
+
+1.3.0
+-----
+
+* Blacklist sphinx 2.1.0 (autodoc bug)
+* Add constants to octavia-lib
+* Add get methods to the driver-lib
+* Bump the openstackdocstheme extension to 1.20
+* Add new LB Algorithm - SOURCE\_IP\_PORT
+* Add Python 3 Train unit tests
+* Update tox.ini for new upper constraints strategy
+* Add tox "requirements" env
+* Additional VIPs is also relevant in provider\_base
+* Add allowed\_cidrs to Listener data model
+
+1.2.0
+-----
+
+* Add 'additional\_vips' field to driver datamodel
+* Replace git.openstack.org URLs with opendev.org URLs
+* Add project\_id to all of the data model objects
+* Cap sphinx for py2 to match global requirements
+* Add python 3.7 testing
+* OpenDev Migration Patch
+* Remove python3.5 jobs for Train
+* Remove testtools from test-requirements.txt
+* Do not install README.rst and LICENSE
+* Update master for stable/stein
+
+1.1.1
+-----
+
+* Sync data models and import new constants from Octavia
+
+1.1.0
+-----
+
+* Fix some driver library bugs
+* Add FLAVOR as a constant
+* Add missing libraries to requirement files
+
+1.0.0
+-----
+
+* Change openstack-dev to openstack-discuss
+* Initial provider driver library checkin
+* Initial cookie-cutter commit for octavia-lib
+* Added .gitreview
diff -pruN 2.4.1-2/debian/changelog 2.5.0-0ubuntu1/debian/changelog
--- 2.4.1-2/debian/changelog	2021-09-29 08:39:30.000000000 +0000
+++ 2.5.0-0ubuntu1/debian/changelog	2022-03-03 19:21:16.000000000 +0000
@@ -1,92 +1,80 @@
-python-octavia-lib (2.4.1-2) unstable; urgency=medium
+python-octavia-lib (2.5.0-0ubuntu1) jammy; urgency=medium
 
-  * Uploading to unstable.
+  * New upstream release for OpenStack Xena.
 
- -- Thomas Goirand <zigo@debian.org>  Wed, 29 Sep 2021 10:39:30 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Thu, 03 Mar 2022 14:21:16 -0500
 
-python-octavia-lib (2.4.1-1) experimental; urgency=medium
+python-octavia-lib (2.4.1-0ubuntu1) impish; urgency=medium
 
-  [ Mickael Asseline ]
-  * New upstream release.
-  * Added myself in copyright and uploaders.
+  * New upstream release for OpenStack Xena.
 
- -- Thomas Goirand <zigo@debian.org>  Tue, 24 Aug 2021 11:24:08 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 07 Sep 2021 15:24:23 -0400
 
-python-octavia-lib (2.3.1-2) unstable; urgency=medium
+python-octavia-lib (2.4.0-0ubuntu1) impish; urgency=medium
 
-  * Upload to unstable.
+  * New upstream release for OpenStack Xena.
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 16 Aug 2021 13:30:21 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 21 Jul 2021 09:38:25 -0400
 
-python-octavia-lib (2.3.1-1) experimental; urgency=medium
+python-octavia-lib (2.3.1-0ubuntu1) impish; urgency=medium
 
-  * Fixed debian/watch file.
-  * New upstream release.
-  * Removed (build-)depends version when satisfied in Bullseye.
+  * New upstream release for OpenStack Xena.
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 08 Mar 2021 10:39:56 +0100
+ -- Chris MacNaughton <chris.macnaughton@ubuntu.com>  Wed, 09 Jun 2021 07:39:01 +0000
 
-python-octavia-lib (2.2.0-2) unstable; urgency=medium
+python-octavia-lib (2.3.0-0ubuntu1) hirsute; urgency=medium
 
-  * Uploading to unstable.
-  * Add a debian/salsa-ci.yml.
+  * d/control: Update VCS paths for move to lp:~ubuntu-openstack-dev.
+  * New release for OpenStack Wallaby.
 
- -- Thomas Goirand <zigo@debian.org>  Thu, 15 Oct 2020 10:54:13 +0200
+ -- Chris MacNaughton <chris.macnaughton@ubuntu.com>  Tue, 09 Mar 2021 14:50:57 +0000
 
-python-octavia-lib (2.2.0-1) experimental; urgency=medium
+python-octavia-lib (2.2.0-0ubuntu1) groovy; urgency=medium
 
-  * New upstream release.
+  * New upstream release for OpenStack Victoria.
+  * d/control: Align (Build-)Depends with upstream.
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 07 Sep 2020 15:47:44 +0200
+ -- Chris MacNaughton <chris.macnaughton@canonical.com>  Thu, 03 Sep 2020 08:07:56 +0000
 
-python-octavia-lib (2.0.0-2) unstable; urgency=medium
+python-octavia-lib (2.1.1-0ubuntu1) groovy; urgency=medium
 
-  * Uploading to unstable.
+  * New upstream release for OpenStack Victoria.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/control: Update Standards-Version to 4.5.0.
 
- -- Thomas Goirand <zigo@debian.org>  Fri, 08 May 2020 16:07:58 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 28 Jul 2020 20:33:05 -0400
 
-python-octavia-lib (2.0.0-1) experimental; urgency=medium
+python-octavia-lib (2.0.0-0ubuntu1) focal; urgency=medium
 
-  * New upstream release.
-  * Fixed (build-)depends for this release.
+  * New upstream release for OpenStack Ussuri.
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 06 Apr 2020 22:06:40 +0200
+ -- Corey Bryant <corey.bryant@canonical.com>  Thu, 09 Apr 2020 14:10:05 -0400
 
-python-octavia-lib (1.4.0-2) unstable; urgency=medium
+python-octavia-lib (1.5.0-0ubuntu1) focal; urgency=medium
 
-  [ Ondřej Nový ]
-  * Bump Standards-Version to 4.4.1.
+  * New upstream release for OpenStack Ussuri.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/control, d/rules, d/compat: Switch to debhelper compat 12 and pybuild.
 
-  [ Thomas Goirand ]
-  * Uploading to unstable.
+ -- Corey Bryant <corey.bryant@canonical.com>  Mon, 16 Dec 2019 15:55:59 -0500
 
- -- Thomas Goirand <zigo@debian.org>  Mon, 21 Oct 2019 09:20:38 +0200
+python-octavia-lib (1.4.0-0ubuntu1) eoan; urgency=medium
 
-python-octavia-lib (1.4.0-1) experimental; urgency=medium
+  * New upstream release for OpenStack Train.
+  * d/control: Align (Build-)Depends with upstream.
 
-  [ Ondřej Nový ]
-  * Bump Standards-Version to 4.4.0.
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 25 Sep 2019 14:11:31 -0400
 
-  [ Thomas Goirand ]
-  * New upstream release.
-  * Fixed (build-)depends for this release.
+python-octavia-lib (1.2.0-0ubuntu1) eoan; urgency=medium
 
- -- Thomas Goirand <zigo@debian.org>  Tue, 17 Sep 2019 22:46:36 +0200
+  * New upstream release for OpenStack Train.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/gbp.conf: Align with other Ubuntu OpenStack packages.
 
-python-octavia-lib (1.1.1-2) unstable; urgency=medium
+ -- Corey Bryant <corey.bryant@canonical.com>  Tue, 30 Jul 2019 15:33:00 -0400
 
-  [ Thomas Goirand ]
-  * Uploading to unstable.
+python-octavia-lib (1.1.1-0ubuntu1) disco; urgency=low
 
-  [ Ondřej Nový ]
-  * d/copyright: Use https protocol in Format field.
-  * Use debhelper-compat instead of debian/compat.
-  * d/control: Fix wrong Vcs-*.
+  * Initial release.
 
- -- Thomas Goirand <zigo@debian.org>  Tue, 16 Jul 2019 21:43:12 +0200
-
-python-octavia-lib (1.1.1-1) experimental; urgency=medium
-
-  * Initial release. (Closes: #925968)
-
- -- Thomas Goirand <zigo@debian.org>  Fri, 29 Mar 2019 16:06:00 +0100
+ -- James Page <james.page@ubuntu.com>  Tue, 19 Mar 2019 09:46:14 +0000
diff -pruN 2.4.1-2/debian/control 2.5.0-0ubuntu1/debian/control
--- 2.4.1-2/debian/control	2021-09-29 08:39:30.000000000 +0000
+++ 2.5.0-0ubuntu1/debian/control	2022-03-03 19:21:16.000000000 +0000
@@ -1,72 +1,55 @@
 Source: python-octavia-lib
 Section: python
 Priority: optional
-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
-Uploaders:
- Thomas Goirand <zigo@debian.org>,
- Mickael Asseline <mickael@papamica.com>,
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Build-Depends:
- debhelper-compat (= 10),
+ debhelper-compat (= 12),
  dh-python,
  openstack-pkg-tools,
  python3-all,
+ python3-pbr (>= 2.0.0),
  python3-setuptools,
- python3-sphinx,
+ python3-sphinx (>= 2.0.0),
 Build-Depends-Indep:
- bandit,
- python3-coverage,
- python3-doc8,
- python3-hacking,
- python3-openstackdocstheme,
- python3-oslo.i18n,
- python3-oslo.serialization,
- python3-oslo.utils,
- python3-oslotest,
- python3-pbr,
- python3-reno,
- python3-sphinxcontrib.apidoc,
- python3-sphinxcontrib.svg2pdfconverter,
- python3-stestr,
- python3-tenacity,
- subunit,
-Standards-Version: 4.4.1
-Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-octavia-lib
-Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-octavia-lib.git
-Homepage: https://docs.openstack.org/octavia-lib/latest/
-
-Package: python-octavia-lib-doc
-Section: doc
-Architecture: all
-Depends:
- ${misc:Depends},
- ${sphinxdoc:Depends},
-Description: library to support Octavia provider drivers - doc
- This python module provides a python library for Octavia provider driver
- developers. Drivers are enabled by entries in the Octavia configuration file.
- .
- See the provider driver development guide for more information:
- .
-  https://docs.openstack.org/octavia/latest/contributor/guides/providers.html
- .
- This package contains the documentation.
+ python3-bandit (>= 1.1.0),
+ python3-coverage (>= 4.0),
+ python3-doc8 (>= 0.6.0),
+ python3-hacking (>= 1.1.0),
+ python3-mock (>= 2.0.0),
+ python3-openstackdocstheme (>= 2.2.1),
+ python3-oslo.i18n (>= 3.15.3),
+ python3-oslo.log (>= 3.36.0),
+ python3-oslo.serialization (>= 2.28.1),
+ python3-oslo.utils (>= 3.33.0),
+ python3-oslotest (>= 1:3.2.0),
+ python3-six (>= 1.10.0),
+ python3-sphinxcontrib.apidoc (>= 0.2.1),
+ python3-sphinxcontrib.svg2pdfconverter (>= 0.1.0),
+ python3-stestr (>= 2.0.0),
+ python3-subunit (>= 1.0.0),
+ python3-tenacity (>= 5.0.2),
+ python3-testtools (>= 2.2.0),
+Standards-Version: 4.5.0
+Homepage: https://opendev.org/openstack/octavia-lib
+Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-octavia-lib
+Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-octavia-lib
 
 Package: python3-octavia-lib
 Architecture: all
 Depends:
- python3-oslo.i18n,
- python3-oslo.serialization,
- python3-pbr,
- python3-tenacity,
+ python3-oslo.i18n (>= 3.15.3),
+ python3-oslo.log (>= 3.36.0),
+ python3-oslo.serialization (>= 2.28.1),
+ python3-pbr (>= 2.0.0),
+ python3-six (>= 1.10.0),
+ python3-tenacity (>= 5.0.2),
  ${misc:Depends},
  ${python3:Depends},
-Suggests:
- python-octavia-lib-doc,
-Description: library to support Octavia provider drivers - Python 3.x
- This python module provides a python library for Octavia provider driver
- developers. Drivers are enabled by entries in the Octavia configuration file.
- .
- See the provider driver development guide for more information:
+Description: Library to support Octavia provider drivers
+ Octavia provides the Load Balancer as a Service for
+ OpenStack clouds.
  .
-  https://docs.openstack.org/octavia/latest/contributor/guides/providers.html
+ This python module provides a python library for Octavia
+ LBaaS provider driver developers.
  .
- This package contains the Python 3.x module.
+ This package contains the Python 3 module.
diff -pruN 2.4.1-2/debian/copyright 2.5.0-0ubuntu1/debian/copyright
--- 2.4.1-2/debian/copyright	2021-09-29 08:39:30.000000000 +0000
+++ 2.5.0-0ubuntu1/debian/copyright	2022-03-03 19:21:16.000000000 +0000
@@ -1,17 +1,17 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: octavia-lib
-Source: https://docs.openstack.org/octavia-lib/latest/
+Source: https://opendev.org/openstack/octavia-lib
 
 Files: *
-Copyright: (c) 2010-2019, OpenStack <openstack-discuss@lists.openstack.org>
-           (c) 2018, Rackspace, US Inc.
-           (c) 2016, Blue Box, an IBM Company
-           (c) 2013, Hewlett-Packard Development Company, L.P.
+Copyright: 2013 Hewlett-Packard Development Company, L.P.
+           2010-2014 OpenStack Foundation
+           2018 Rackspace, US Inc.
+           2014 Rackspace
+           2016 Blue Box, an IBM Company
 License: Apache-2
 
 Files: debian/*
-Copyright: (c) 2019, Thomas Goirand <zigo@debian.org>
-           (c) 2021 Mickael Asseline <mickael@papamica.com>
+Copyright: 2019 Canonical Ltd
 License: Apache-2
 
 License: Apache-2
@@ -28,4 +28,4 @@ License: Apache-2
  limitations under the License.
  .
  On Debian-based systems the full text of the Apache version 2.0 license
- can be found in /usr/share/common-licenses/Apache-2.0.
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
diff -pruN 2.4.1-2/debian/gbp.conf 2.5.0-0ubuntu1/debian/gbp.conf
--- 2.4.1-2/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/debian/gbp.conf	2022-03-03 19:21:16.000000000 +0000
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+upstream-tag = %(version)s
+pristine-tar = True
+
+[buildpackage]
+export-dir = ../build-area
diff -pruN 2.4.1-2/debian/python3-octavia-lib.install 2.5.0-0ubuntu1/debian/python3-octavia-lib.install
--- 2.4.1-2/debian/python3-octavia-lib.install	2021-09-29 08:39:30.000000000 +0000
+++ 2.5.0-0ubuntu1/debian/python3-octavia-lib.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr
diff -pruN 2.4.1-2/debian/python-octavia-lib-doc.doc-base 2.5.0-0ubuntu1/debian/python-octavia-lib-doc.doc-base
--- 2.4.1-2/debian/python-octavia-lib-doc.doc-base	2021-09-29 08:39:30.000000000 +0000
+++ 2.5.0-0ubuntu1/debian/python-octavia-lib-doc.doc-base	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-Document: python-octavia-lib-doc
-Title: octavia-lib Documentation
-Author: N/A
-Abstract: Sphinx documentation for octavia-lib
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-octavia-lib-doc/html/index.html
-Files: /usr/share/doc/python-octavia-lib-doc/html/*
diff -pruN 2.4.1-2/debian/rules 2.5.0-0ubuntu1/debian/rules
--- 2.4.1-2/debian/rules	2021-09-29 08:39:30.000000000 +0000
+++ 2.5.0-0ubuntu1/debian/rules	2022-03-03 19:21:16.000000000 +0000
@@ -1,32 +1,19 @@
 #!/usr/bin/make -f
 
-UPSTREAM_GIT := https://github.com/openstack/octavia-lib.git
-include /usr/share/openstack-pkg-tools/pkgos.make
-
-%:
-	dh $@ --buildsystem=python_distutils --with python3,sphinxdoc
+# Verbose mode
+#export DH_VERBOSE=1
 
-override_dh_auto_clean:
-	rm -rf build .stestr
-	find . -iname '*.pyc' -delete
-	for i in $$(find . -type d -iname __pycache__) ; do rm -rf $$i ; done
+export PYBUILD_NAME=octavia_lib
 
-override_dh_auto_build:
-	echo "Do nothing..."
+include /usr/share/openstack-pkg-tools/pkgos.make
 
-override_dh_auto_install:
-	pkgos-dh_auto_install --no-py2 --in-tmp
+%:
+	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	pkgos-dh_auto_test --no-py2
 endif
 
-override_dh_auto_test:
-	echo "Do nothing..."
-
-override_dh_sphinxdoc:
-ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
-	PYTHONPATH=. python3 -m sphinx -b html doc/source debian/python-octavia-lib-doc/usr/share/doc/python-octavia-lib-doc/html
-	dh_sphinxdoc
-endif
+override_dh_python3:
+	dh_python3 --shebang=/usr/bin/python3
diff -pruN 2.4.1-2/debian/salsa-ci.yml 2.5.0-0ubuntu1/debian/salsa-ci.yml
--- 2.4.1-2/debian/salsa-ci.yml	2021-09-29 08:39:30.000000000 +0000
+++ 2.5.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 2.4.1-2/debian/watch 2.5.0-0ubuntu1/debian/watch
--- 2.4.1-2/debian/watch	2021-09-29 08:39:30.000000000 +0000
+++ 2.5.0-0ubuntu1/debian/watch	2022-03-03 19:21:16.000000000 +0000
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/\.0rc/~rc/;s/\.0b1/~b1/;s/\.0b2/~b2/;s/\.0b3/~b3/" \
-https://github.com/openstack/octavia-lib/tags .*/(\d[brc\d\.]+)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+https://pypi.debian.net/octavia-lib/octavia-lib-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
diff -pruN 2.4.1-2/.gitignore 2.5.0-0ubuntu1/.gitignore
--- 2.4.1-2/.gitignore	2021-08-12 09:51:39.000000000 +0000
+++ 2.5.0-0ubuntu1/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-# Add patterns in here to exclude files created by tools integrated with this
-# repository, such as test frameworks from the project's recommended workflow,
-# rendered documentation and package builds.
-#
-# Don't add patterns to exclude files created by preferred personal tools
-# (editors, IDEs, your operating system itself even). These should instead be
-# maintained outside the repository, for example in a ~/.gitignore file added
-# with:
-#
-# git config --global core.excludesfile '~/.gitignore'
-
-# Bytecompiled Python
-*.py[cod]
-
-# C extensions
-*.so
-
-# Packages
-*.egg*
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-cover/
-.coverage*
-!.coveragerc
-.tox
-nosetests.xml
-.testrepository
-.stestr
-.venv
-
-# Translations
-*.mo
-
-# Complexity
-output/*.html
-output/*/index.html
-
-# Sphinx
-doc/build
-
-# pbr generates these
-AUTHORS
-ChangeLog
-
-# Files created by releasenotes build
-releasenotes/build
-
-# IDEs
-.idea/*
-.vscode/*
diff -pruN 2.4.1-2/.gitreview 2.5.0-0ubuntu1/.gitreview
--- 2.4.1-2/.gitreview	2021-08-12 09:51:39.000000000 +0000
+++ 2.5.0-0ubuntu1/.gitreview	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.opendev.org
-port=29418
-project=openstack/octavia-lib.git
diff -pruN 2.4.1-2/octavia_lib/common/constants.py 2.5.0-0ubuntu1/octavia_lib/common/constants.py
--- 2.4.1-2/octavia_lib/common/constants.py	2021-08-12 09:51:39.000000000 +0000
+++ 2.5.0-0ubuntu1/octavia_lib/common/constants.py	2022-02-17 10:33:39.000000000 +0000
@@ -139,12 +139,14 @@ PROTOCOL_TERMINATED_HTTPS = 'TERMINATED_
 PROTOCOL_PROXY = 'PROXY'
 PROTOCOL_PROXYV2 = 'PROXYV2'
 PROTOCOL_SCTP = 'SCTP'
+PROTOCOL_PROMETHEUS = 'PROMETHEUS'
 SUPPORTED_PROTOCOLS = (PROTOCOL_TCP, PROTOCOL_HTTPS, PROTOCOL_HTTP,
                        PROTOCOL_TERMINATED_HTTPS, PROTOCOL_PROXY,
-                       PROTOCOL_PROXYV2, PROTOCOL_UDP, PROTOCOL_SCTP)
+                       PROTOCOL_PROXYV2, PROTOCOL_UDP, PROTOCOL_SCTP,
+                       PROTOCOL_PROMETHEUS)
 LISTENER_SUPPORTED_PROTOCOLS = (PROTOCOL_TCP, PROTOCOL_HTTPS, PROTOCOL_HTTP,
                                 PROTOCOL_TERMINATED_HTTPS, PROTOCOL_UDP,
-                                PROTOCOL_SCTP)
+                                PROTOCOL_SCTP, PROTOCOL_PROMETHEUS)
 POOL_SUPPORTED_PROTOCOLS = (PROTOCOL_TCP, PROTOCOL_HTTP, PROTOCOL_HTTPS,
                             PROTOCOL_PROXY, PROTOCOL_PROXYV2, PROTOCOL_UDP,
                             PROTOCOL_SCTP)
diff -pruN 2.4.1-2/octavia_lib.egg-info/dependency_links.txt 2.5.0-0ubuntu1/octavia_lib.egg-info/dependency_links.txt
--- 2.4.1-2/octavia_lib.egg-info/dependency_links.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/octavia_lib.egg-info/dependency_links.txt	2022-02-17 10:34:26.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 2.4.1-2/octavia_lib.egg-info/not-zip-safe 2.5.0-0ubuntu1/octavia_lib.egg-info/not-zip-safe
--- 2.4.1-2/octavia_lib.egg-info/not-zip-safe	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/octavia_lib.egg-info/not-zip-safe	2022-02-17 10:34:26.000000000 +0000
@@ -0,0 +1 @@
+
diff -pruN 2.4.1-2/octavia_lib.egg-info/pbr.json 2.5.0-0ubuntu1/octavia_lib.egg-info/pbr.json
--- 2.4.1-2/octavia_lib.egg-info/pbr.json	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/octavia_lib.egg-info/pbr.json	2022-02-17 10:34:26.000000000 +0000
@@ -0,0 +1 @@
+{"git_version": "4f217dd", "is_release": true}
\ No newline at end of file
diff -pruN 2.4.1-2/octavia_lib.egg-info/PKG-INFO 2.5.0-0ubuntu1/octavia_lib.egg-info/PKG-INFO
--- 2.4.1-2/octavia_lib.egg-info/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/octavia_lib.egg-info/PKG-INFO	2022-02-17 10:34:26.000000000 +0000
@@ -0,0 +1,58 @@
+Metadata-Version: 1.2
+Name: octavia-lib
+Version: 2.5.0
+Summary: A library to support Octavia provider drivers.
+Home-page: https://docs.openstack.org/octavia-lib/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: Apache License, Version 2.0
+Description: ========================
+        Team and repository tags
+        ========================
+        
+        .. image:: https://governance.openstack.org/tc/badges/octavia-lib.svg
+            :target: https://governance.openstack.org/tc/reference/tags/index.html
+        
+        .. Change things from this point on
+        
+        ===========
+        octavia-lib
+        ===========
+        
+        .. image:: https://img.shields.io/pypi/v/octavia-lib.svg
+            :target: https://pypi.org/project/octavia-lib/
+            :alt: Latest Version
+        
+        A library to support Octavia provider drivers.
+        
+        This python module provides a python library for Octavia provider driver
+        developers.
+        
+        See the provider driver development guide for more information:
+        
+            https://docs.openstack.org/octavia/latest/contributor/guides/providers.html
+        
+        Octavia-lib is distributed under the terms of the Apache License, Version 2.0.
+        The full terms and conditions of this license are detailed in the LICENSE file.
+        
+        * Free software: Apache license
+        * Documentation: https://docs.openstack.org/octavia-lib/latest
+        * Source: https://opendev.org/openstack/octavia-lib
+        * Bugs: https://storyboard.openstack.org/#!/project/openstack/octavia-lib
+        * Release Notes: https://docs.openstack.org/releasenotes/octavia-lib/
+        
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Requires-Python: >=3.6
diff -pruN 2.4.1-2/octavia_lib.egg-info/requires.txt 2.5.0-0ubuntu1/octavia_lib.egg-info/requires.txt
--- 2.4.1-2/octavia_lib.egg-info/requires.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/octavia_lib.egg-info/requires.txt	2022-02-17 10:34:26.000000000 +0000
@@ -0,0 +1,4 @@
+oslo.i18n>=3.15.3
+oslo.serialization>=2.28.1
+pbr!=2.1.0,>=2.0.0
+tenacity>=5.0.2
diff -pruN 2.4.1-2/octavia_lib.egg-info/SOURCES.txt 2.5.0-0ubuntu1/octavia_lib.egg-info/SOURCES.txt
--- 2.4.1-2/octavia_lib.egg-info/SOURCES.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/octavia_lib.egg-info/SOURCES.txt	2022-02-17 10:34:26.000000000 +0000
@@ -0,0 +1,85 @@
+.coveragerc
+.pylintrc
+.stestr.conf
+AUTHORS
+CONTRIBUTING.rst
+ChangeLog
+HACKING.rst
+LICENSE
+README.rst
+lower-constraints.txt
+requirements.txt
+setup.cfg
+setup.py
+test-requirements.txt
+tox.ini
+doc/requirements.txt
+doc/source/conf.py
+doc/source/index.rst
+doc/source/admin/index.rst
+doc/source/cli/index.rst
+doc/source/configuration/index.rst
+doc/source/contributor/index.rst
+doc/source/install/index.rst
+doc/source/library/index.rst
+doc/source/reference/index.rst
+doc/source/user/index.rst
+octavia_lib/__init__.py
+octavia_lib/i18n.py
+octavia_lib/version.py
+octavia_lib.egg-info/PKG-INFO
+octavia_lib.egg-info/SOURCES.txt
+octavia_lib.egg-info/dependency_links.txt
+octavia_lib.egg-info/not-zip-safe
+octavia_lib.egg-info/pbr.json
+octavia_lib.egg-info/requires.txt
+octavia_lib.egg-info/top_level.txt
+octavia_lib/api/__init__.py
+octavia_lib/api/drivers/__init__.py
+octavia_lib/api/drivers/data_models.py
+octavia_lib/api/drivers/driver_lib.py
+octavia_lib/api/drivers/exceptions.py
+octavia_lib/api/drivers/provider_base.py
+octavia_lib/common/__init__.py
+octavia_lib/common/constants.py
+octavia_lib/hacking/__init__.py
+octavia_lib/hacking/checks.py
+octavia_lib/tests/__init__.py
+octavia_lib/tests/unit/__init__.py
+octavia_lib/tests/unit/base.py
+octavia_lib/tests/unit/api/__init__.py
+octavia_lib/tests/unit/api/drivers/__init__.py
+octavia_lib/tests/unit/api/drivers/test_data_models.py
+octavia_lib/tests/unit/api/drivers/test_driver_lib.py
+octavia_lib/tests/unit/api/drivers/test_exceptions.py
+octavia_lib/tests/unit/api/drivers/test_provider_base.py
+octavia_lib/tests/unit/hacking/__init__.py
+octavia_lib/tests/unit/hacking/test_checks.py
+releasenotes/notes/Add-PROMETHEUS-listener-protocol-f2903d36f5da91e5.yaml
+releasenotes/notes/Add-get-methods-to-driver-lib-dae3c217e7ac9e82.yaml
+releasenotes/notes/Initial-cookiecutter-commit-41d89a60d6328b51.yaml
+releasenotes/notes/add-additional-vip-support-becdb29c5187b514.yaml
+releasenotes/notes/add-availability-zone-validation-ed853a3ee89570be.yaml
+releasenotes/notes/add-az-to-loadbalancer-1e87b46ba29101d3.yaml
+releasenotes/notes/add-constants-66f52c4d4cfd0215.yaml
+releasenotes/notes/add-lb-algorithm-source-ip-port-5cc83a9e3fcf4763.yaml
+releasenotes/notes/add-listener-allowed-cidrs-ef2cd3afbc3a1ebe.yaml
+releasenotes/notes/add-listener-alpn-protocols-ecb49db86b956c71.yaml
+releasenotes/notes/add-not-found-exception-7f9d188cd22f69e1.yaml
+releasenotes/notes/add-pool-alpn-protocols-a791538ab214e780.yaml
+releasenotes/notes/add-tls-protocols-for-listener-and-pool-model-e9083b85afc62ef0.yaml
+releasenotes/notes/adding-cipher-list-support-for-provider-drivers-6a4dbec2d0254aae.yaml
+releasenotes/notes/drop-python-2-7-f17da6245b0ebc13.yaml
+releasenotes/source/conf.py
+releasenotes/source/index.rst
+releasenotes/source/stein.rst
+releasenotes/source/train.rst
+releasenotes/source/unreleased.rst
+releasenotes/source/ussuri.rst
+releasenotes/source/victoria.rst
+releasenotes/source/wallaby.rst
+releasenotes/source/xena.rst
+releasenotes/source/_static/.placeholder
+releasenotes/source/_templates/.placeholder
+tools/coding-checks.sh
+zuul.d/projects.yaml
\ No newline at end of file
diff -pruN 2.4.1-2/octavia_lib.egg-info/top_level.txt 2.5.0-0ubuntu1/octavia_lib.egg-info/top_level.txt
--- 2.4.1-2/octavia_lib.egg-info/top_level.txt	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/octavia_lib.egg-info/top_level.txt	2022-02-17 10:34:26.000000000 +0000
@@ -0,0 +1 @@
+octavia_lib
diff -pruN 2.4.1-2/PKG-INFO 2.5.0-0ubuntu1/PKG-INFO
--- 2.4.1-2/PKG-INFO	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/PKG-INFO	2022-02-17 10:34:26.368563700 +0000
@@ -0,0 +1,58 @@
+Metadata-Version: 1.2
+Name: octavia-lib
+Version: 2.5.0
+Summary: A library to support Octavia provider drivers.
+Home-page: https://docs.openstack.org/octavia-lib/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+License: Apache License, Version 2.0
+Description: ========================
+        Team and repository tags
+        ========================
+        
+        .. image:: https://governance.openstack.org/tc/badges/octavia-lib.svg
+            :target: https://governance.openstack.org/tc/reference/tags/index.html
+        
+        .. Change things from this point on
+        
+        ===========
+        octavia-lib
+        ===========
+        
+        .. image:: https://img.shields.io/pypi/v/octavia-lib.svg
+            :target: https://pypi.org/project/octavia-lib/
+            :alt: Latest Version
+        
+        A library to support Octavia provider drivers.
+        
+        This python module provides a python library for Octavia provider driver
+        developers.
+        
+        See the provider driver development guide for more information:
+        
+            https://docs.openstack.org/octavia/latest/contributor/guides/providers.html
+        
+        Octavia-lib is distributed under the terms of the Apache License, Version 2.0.
+        The full terms and conditions of this license are detailed in the LICENSE file.
+        
+        * Free software: Apache license
+        * Documentation: https://docs.openstack.org/octavia-lib/latest
+        * Source: https://opendev.org/openstack/octavia-lib
+        * Bugs: https://storyboard.openstack.org/#!/project/openstack/octavia-lib
+        * Release Notes: https://docs.openstack.org/releasenotes/octavia-lib/
+        
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Requires-Python: >=3.6
diff -pruN 2.4.1-2/.pylintrc 2.5.0-0ubuntu1/.pylintrc
--- 2.4.1-2/.pylintrc	2021-08-12 09:51:39.000000000 +0000
+++ 2.5.0-0ubuntu1/.pylintrc	2022-02-17 10:33:39.000000000 +0000
@@ -38,6 +38,7 @@ disable=
  invalid-name,
  line-too-long,
  missing-docstring,
+ consider-using-f-string,
 # "R" Refactor recommendations
  duplicate-code,
  interface-not-implemented,
diff -pruN 2.4.1-2/releasenotes/notes/Add-PROMETHEUS-listener-protocol-f2903d36f5da91e5.yaml 2.5.0-0ubuntu1/releasenotes/notes/Add-PROMETHEUS-listener-protocol-f2903d36f5da91e5.yaml
--- 2.4.1-2/releasenotes/notes/Add-PROMETHEUS-listener-protocol-f2903d36f5da91e5.yaml	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/releasenotes/notes/Add-PROMETHEUS-listener-protocol-f2903d36f5da91e5.yaml	2022-02-17 10:33:39.000000000 +0000
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Added support for the PROMETHEUS listener protocol.
diff -pruN 2.4.1-2/releasenotes/source/index.rst 2.5.0-0ubuntu1/releasenotes/source/index.rst
--- 2.4.1-2/releasenotes/source/index.rst	2021-08-12 09:51:39.000000000 +0000
+++ 2.5.0-0ubuntu1/releasenotes/source/index.rst	2022-02-17 10:33:39.000000000 +0000
@@ -6,6 +6,7 @@
    :maxdepth: 1
 
    unreleased
+   xena
    wallaby
    victoria
    ussuri
diff -pruN 2.4.1-2/releasenotes/source/xena.rst 2.5.0-0ubuntu1/releasenotes/source/xena.rst
--- 2.4.1-2/releasenotes/source/xena.rst	1970-01-01 00:00:00.000000000 +0000
+++ 2.5.0-0ubuntu1/releasenotes/source/xena.rst	2022-02-17 10:33:39.000000000 +0000
@@ -0,0 +1,6 @@
+=========================
+Xena Series Release Notes
+=========================
+
+.. release-notes::
+   :branch: stable/xena
diff -pruN 2.4.1-2/setup.cfg 2.5.0-0ubuntu1/setup.cfg
--- 2.4.1-2/setup.cfg	2021-08-12 09:51:39.000000000 +0000
+++ 2.5.0-0ubuntu1/setup.cfg	2022-02-17 10:34:26.368563700 +0000
@@ -1,28 +1,32 @@
 [metadata]
 name = octavia-lib
 summary = A library to support Octavia provider drivers.
-description_file =
-    README.rst
+description_file = 
+	README.rst
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/octavia-lib/latest/
 license = Apache License, Version 2.0
 python_requires = >=3.6
-classifier =
-    Development Status :: 5 - Production/Stable
-    Environment :: OpenStack
-    Intended Audience :: Developers
-    Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    License :: OSI Approved :: Apache Software License
-    Operating System :: POSIX :: Linux
-    Programming Language :: Python
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
+classifier = 
+	Development Status :: 5 - Production/Stable
+	Environment :: OpenStack
+	Intended Audience :: Developers
+	Intended Audience :: Information Technology
+	Intended Audience :: System Administrators
+	License :: OSI Approved :: Apache Software License
+	Operating System :: POSIX :: Linux
+	Programming Language :: Python
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.7
+	Programming Language :: Python :: 3.8
 
 [files]
-packages =
-    octavia_lib
+packages = 
+	octavia_lib
+
+[egg_info]
+tag_build = 
+tag_date = 0
 
