diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/ChangeLog openstack-trove-17.0.0/ChangeLog --- openstack-trove-16.0.0+git2022030314.39322f5a/ChangeLog 2022-03-03 19:24:05.000000000 +0000 +++ openstack-trove-17.0.0/ChangeLog 2022-03-30 12:02:55.000000000 +0000 @@ -1,6 +1,15 @@ CHANGES ======= +17.0.0 +------ + +* Removes the deprecated argument tenant from TroveContext +* Removes the deprecated argument tenant from TroveContext + +17.0.0.0rc1 +----------- + * Use os-cloud trove creds * Adapt to file injection deprecation in nova * Improve the detect backup was created when parse log diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/debian/changelog openstack-trove-17.0.0/debian/changelog --- openstack-trove-16.0.0+git2022030314.39322f5a/debian/changelog 2022-03-03 19:24:39.000000000 +0000 +++ openstack-trove-17.0.0/debian/changelog 2022-03-31 12:05:15.000000000 +0000 @@ -1,3 +1,11 @@ +openstack-trove (2:17.0.0-0ubuntu1) jammy; urgency=medium + + * d/watch: Scope to 17.x series. + * New upstream release for OpenStack Yoga. + * d/control: Align (Build-)Depends with upstream. + + -- Corey Bryant Thu, 31 Mar 2022 08:05:15 -0400 + openstack-trove (2:16.0.0+git2022030314.39322f5a-0ubuntu1) jammy; urgency=medium * New upstream snapshot for OpenStack Yoga. diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/debian/control openstack-trove-17.0.0/debian/control --- openstack-trove-16.0.0+git2022030314.39322f5a/debian/control 2022-03-03 19:24:39.000000000 +0000 +++ openstack-trove-17.0.0/debian/control 2022-03-31 12:05:15.000000000 +0000 @@ -55,7 +55,7 @@ python3-oslo.cache (>= 1.26.0), python3-oslo.concurrency (>= 3.26.0), python3-oslo.config (>= 1:6.8.0), - python3-oslo.context (>= 1:2.22.0), + python3-oslo.context (>= 1:4.0.0), python3-oslo.db (>= 4.27.0), python3-oslo.i18n (>= 3.15.3), python3-oslo.log (>= 3.36.0), @@ -128,7 +128,7 @@ python3-oslo.cache (>= 1.26.0), python3-oslo.concurrency (>= 3.26.0), python3-oslo.config (>= 1:6.8.0), - python3-oslo.context (>= 1:2.22.0), + python3-oslo.context (>= 1:4.0.0), python3-oslo.db (>= 4.27.0), python3-oslo.i18n (>= 3.15.3), python3-oslo.log (>= 3.36.0), diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/debian/watch openstack-trove-17.0.0/debian/watch --- openstack-trove-16.0.0+git2022030314.39322f5a/debian/watch 2022-03-03 19:24:39.000000000 +0000 +++ openstack-trove-17.0.0/debian/watch 2022-03-31 12:05:15.000000000 +0000 @@ -1,3 +1,3 @@ version=3 opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/;s/\.0rc/~rc/" \ - https://tarballs.opendev.org/openstack/trove/ trove-(16\.\d.*)\.tar\.gz + https://tarballs.opendev.org/openstack/trove/ trove-(17\.\d.*)\.tar\.gz diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/PKG-INFO openstack-trove-17.0.0/PKG-INFO --- openstack-trove-16.0.0+git2022030314.39322f5a/PKG-INFO 2022-03-03 19:24:06.832951800 +0000 +++ openstack-trove-17.0.0/PKG-INFO 2022-03-30 12:02:56.059700000 +0000 @@ -1,11 +1,69 @@ -Metadata-Version: 2.1 +Metadata-Version: 1.1 Name: trove -Version: 16.1.0.dev11 +Version: 17.0.0 Summary: OpenStack DBaaS Home-page: https://docs.openstack.org/trove/latest/ Author: OpenStack Author-email: openstack-discuss@lists.openstack.org License: UNKNOWN +Description: ===== + Trove + ===== + + .. image:: https://governance.openstack.org/tc/badges/trove.svg + :target: https://governance.openstack.org/tc/reference/tags/index.html + + Trove is Database as a Service for OpenStack. + + Getting Started + --------------- + + If you'd like to run from the master branch, you can clone the git repo: + + git clone https://opendev.org/openstack/trove + + For information on how to contribute to trove, please see + CONTRIBUTING.rst_ and HACKING.rst_ + + .. _CONTRIBUTING.rst: https://opendev.org/openstack/trove/src/branch/master/CONTRIBUTING.rst + .. _HACKING.rst: https://opendev.org/openstack/trove/src/branch/master/HACKING.rst + + * `Wiki `_ + * `Developer Docs `_ + + You can raise bugs here: + `Bug Tracker `_ + + The plan for trove can be found at + `Trove Specs `_ + + Release notes for the project can be found at: + https://docs.openstack.org/releasenotes/trove + + Python client + ------------- + Python-troveclient_ is a client for Trove. + + .. _Python-troveclient: https://opendev.org/openstack/python-troveclient + + Dashboard plugin + ---------------- + Trove-dashboard_ is OpenStack dashbaord plugin for Trove. + + .. _Trove-dashboard: https://opendev.org/openstack/trove-dashboard + + References + ---------- + + * `Installation docs`_ + * `Manual installation docs`_ + * `Build guest image`_ + + .. _Installation docs: https://docs.openstack.org/trove/latest/install/ + .. _Manual installation docs: https://docs.openstack.org/trove/latest/install/install-manual.html + .. _Build guest image: https://docs.openstack.org/trove/latest/admin/building_guest_images.html + + Platform: UNKNOWN Classifier: Environment :: OpenStack Classifier: Intended Audience :: Information Technology @@ -17,65 +75,3 @@ Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 -License-File: LICENSE -License-File: AUTHORS - -===== -Trove -===== - -.. image:: https://governance.openstack.org/tc/badges/trove.svg - :target: https://governance.openstack.org/tc/reference/tags/index.html - -Trove is Database as a Service for OpenStack. - -Getting Started ---------------- - -If you'd like to run from the master branch, you can clone the git repo: - - git clone https://opendev.org/openstack/trove - -For information on how to contribute to trove, please see -CONTRIBUTING.rst_ and HACKING.rst_ - -.. _CONTRIBUTING.rst: https://opendev.org/openstack/trove/src/branch/master/CONTRIBUTING.rst -.. _HACKING.rst: https://opendev.org/openstack/trove/src/branch/master/HACKING.rst - -* `Wiki `_ -* `Developer Docs `_ - -You can raise bugs here: -`Bug Tracker `_ - -The plan for trove can be found at -`Trove Specs `_ - -Release notes for the project can be found at: - https://docs.openstack.org/releasenotes/trove - -Python client -------------- -Python-troveclient_ is a client for Trove. - -.. _Python-troveclient: https://opendev.org/openstack/python-troveclient - -Dashboard plugin ----------------- -Trove-dashboard_ is OpenStack dashbaord plugin for Trove. - -.. _Trove-dashboard: https://opendev.org/openstack/trove-dashboard - -References ----------- - -* `Installation docs`_ -* `Manual installation docs`_ -* `Build guest image`_ - -.. _Installation docs: https://docs.openstack.org/trove/latest/install/ -.. _Manual installation docs: https://docs.openstack.org/trove/latest/install/install-manual.html -.. _Build guest image: https://docs.openstack.org/trove/latest/admin/building_guest_images.html - - - diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/requirements.txt openstack-trove-17.0.0/requirements.txt --- openstack-trove-16.0.0+git2022030314.39322f5a/requirements.txt 2021-12-09 15:20:38.000000000 +0000 +++ openstack-trove-17.0.0/requirements.txt 2022-03-30 12:02:22.000000000 +0000 @@ -28,7 +28,7 @@ Jinja2>=2.10 # BSD License (3 clause) pexpect!=3.3,>=3.1 # ISC License oslo.config>=6.8.0 # Apache-2.0 -oslo.context>=2.22.0 # Apache-2.0 +oslo.context>=4.0.0 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/trove/common/policies/base.py openstack-trove-17.0.0/trove/common/policies/base.py --- openstack-trove-16.0.0+git2022030314.39322f5a/trove/common/policies/base.py 2021-12-09 15:20:38.000000000 +0000 +++ openstack-trove-17.0.0/trove/common/policies/base.py 2022-03-30 12:02:22.000000000 +0000 @@ -57,7 +57,7 @@ description='Must be an administrator.'), policy.RuleDefault( 'admin_or_owner', - 'rule:admin or tenant:%(tenant)s', + 'rule:admin or project_id:%(tenant)s', description='Must be an administrator or owner of the object.'), policy.RuleDefault( 'default', diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/trove/common/wsgi.py openstack-trove-17.0.0/trove/common/wsgi.py --- openstack-trove-16.0.0+git2022030314.39322f5a/trove/common/wsgi.py 2021-12-09 15:20:38.000000000 +0000 +++ openstack-trove-17.0.0/trove/common/wsgi.py 2022-03-30 12:02:22.000000000 +0000 @@ -548,7 +548,7 @@ break limits = self._extract_limits(request.params) context = rd_context.TroveContext(auth_token=auth_token, - tenant=tenant_id, + project_id=tenant_id, user=user_id, is_admin=is_admin, limit=limits.get('limit'), diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/trove/configuration/service.py openstack-trove-17.0.0/trove/configuration/service.py --- openstack-trove-16.0.0+git2022030314.39322f5a/trove/configuration/service.py 2021-12-09 15:20:38.000000000 +0000 +++ openstack-trove-17.0.0/trove/configuration/service.py 2022-03-30 12:02:22.000000000 +0000 @@ -88,7 +88,7 @@ 'deleted': False } if not context.is_admin: - kwargs['tenant_id'] = context.tenant + kwargs['tenant_id'] = context.project_id instances = instances_models.DBInstance.find_all(**kwargs) limit = int(context.limit or CONF.instances_page_size) @@ -246,7 +246,7 @@ LOG.debug("Re-applying configuration group '%s' to all clusters.", configuration_id) clusters = cluster_models.DBCluster.find_all( - tenant_id=context.tenant, + tenant_id=context.project_id, configuration_id=configuration_id, deleted=False).all() diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/trove/taskmanager/manager.py openstack-trove-17.0.0/trove/taskmanager/manager.py --- openstack-trove-16.0.0+git2022030314.39322f5a/trove/taskmanager/manager.py 2021-12-09 15:20:38.000000000 +0000 +++ openstack-trove-17.0.0/trove/taskmanager/manager.py 2022-03-30 12:02:22.000000000 +0000 @@ -45,7 +45,7 @@ super(Manager, self).__init__(CONF) self.admin_context = TroveContext( user=CONF.service_credentials.username, - tenant=CONF.service_credentials.project_id, + project_id=CONF.service_credentials.project_id, user_domain_name=CONF.service_credentials.user_domain_name) if CONF.exists_notification_transformer: self.exists_transformer = importutils.import_object( diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/trove/tests/unittests/backup/test_backup_models.py openstack-trove-17.0.0/trove/tests/unittests/backup/test_backup_models.py --- openstack-trove-16.0.0+git2022030314.39322f5a/trove/tests/unittests/backup/test_backup_models.py 2021-12-09 15:20:38.000000000 +0000 +++ openstack-trove-17.0.0/trove/tests/unittests/backup/test_backup_models.py 2022-03-30 12:02:22.000000000 +0000 @@ -33,7 +33,7 @@ def _prep_conf(current_time): current_time = str(current_time) - _context = context.TroveContext(tenant='TENANT-' + current_time) + _context = context.TroveContext(project_id='TENANT-' + current_time) instance_id = 'INSTANCE-' + current_time return _context, instance_id diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/trove/tests/unittests/common/test_context.py openstack-trove-17.0.0/trove/tests/unittests/common/test_context.py --- openstack-trove-16.0.0+git2022030314.39322f5a/trove/tests/unittests/common/test_context.py 2021-12-09 15:20:38.000000000 +0000 +++ openstack-trove-17.0.0/trove/tests/unittests/common/test_context.py 2022-03-30 12:02:22.000000000 +0000 @@ -51,7 +51,7 @@ def test_to_dict_with_notification(self): ctx = context.TroveContext(user='test_user_id', - tenant='the_tenant', + project_id='the_tenant', request_id='test_req_id') ctx.notification = DBaaSInstanceCreate(ctx, request=Mock()) @@ -68,11 +68,11 @@ ctx = context.TroveContext.from_dict( {'user': 'test_user_id', 'request_id': 'test_req_id', - 'tenant': 'abc', + 'project_id': 'abc', 'blah_blah': 'blah blah'}) self.assertThat(ctx.user, Equals('test_user_id')) self.assertThat(ctx.request_id, Equals('test_req_id')) - self.assertThat(ctx.tenant, Equals('abc')) + self.assertThat(ctx.project_id, Equals('abc')) self.assertThat(ctx.limit, Is(None)) self.assertThat(ctx.marker, Is(None)) self.assertThat(ctx.service_catalog, Is(None)) diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/trove.egg-info/pbr.json openstack-trove-17.0.0/trove.egg-info/pbr.json --- openstack-trove-16.0.0+git2022030314.39322f5a/trove.egg-info/pbr.json 2021-12-09 15:20:40.000000000 +0000 +++ openstack-trove-17.0.0/trove.egg-info/pbr.json 2022-03-30 12:02:55.000000000 +0000 @@ -1 +1 @@ -{"git_version": "be86b791", "is_release": false} \ No newline at end of file +{"git_version": "a1815f6e", "is_release": true} \ No newline at end of file diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/trove.egg-info/PKG-INFO openstack-trove-17.0.0/trove.egg-info/PKG-INFO --- openstack-trove-16.0.0+git2022030314.39322f5a/trove.egg-info/PKG-INFO 2022-03-03 19:24:06.000000000 +0000 +++ openstack-trove-17.0.0/trove.egg-info/PKG-INFO 2022-03-30 12:02:55.000000000 +0000 @@ -1,11 +1,69 @@ -Metadata-Version: 2.1 +Metadata-Version: 1.1 Name: trove -Version: 16.1.0.dev11 +Version: 17.0.0 Summary: OpenStack DBaaS Home-page: https://docs.openstack.org/trove/latest/ Author: OpenStack Author-email: openstack-discuss@lists.openstack.org License: UNKNOWN +Description: ===== + Trove + ===== + + .. image:: https://governance.openstack.org/tc/badges/trove.svg + :target: https://governance.openstack.org/tc/reference/tags/index.html + + Trove is Database as a Service for OpenStack. + + Getting Started + --------------- + + If you'd like to run from the master branch, you can clone the git repo: + + git clone https://opendev.org/openstack/trove + + For information on how to contribute to trove, please see + CONTRIBUTING.rst_ and HACKING.rst_ + + .. _CONTRIBUTING.rst: https://opendev.org/openstack/trove/src/branch/master/CONTRIBUTING.rst + .. _HACKING.rst: https://opendev.org/openstack/trove/src/branch/master/HACKING.rst + + * `Wiki `_ + * `Developer Docs `_ + + You can raise bugs here: + `Bug Tracker `_ + + The plan for trove can be found at + `Trove Specs `_ + + Release notes for the project can be found at: + https://docs.openstack.org/releasenotes/trove + + Python client + ------------- + Python-troveclient_ is a client for Trove. + + .. _Python-troveclient: https://opendev.org/openstack/python-troveclient + + Dashboard plugin + ---------------- + Trove-dashboard_ is OpenStack dashbaord plugin for Trove. + + .. _Trove-dashboard: https://opendev.org/openstack/trove-dashboard + + References + ---------- + + * `Installation docs`_ + * `Manual installation docs`_ + * `Build guest image`_ + + .. _Installation docs: https://docs.openstack.org/trove/latest/install/ + .. _Manual installation docs: https://docs.openstack.org/trove/latest/install/install-manual.html + .. _Build guest image: https://docs.openstack.org/trove/latest/admin/building_guest_images.html + + Platform: UNKNOWN Classifier: Environment :: OpenStack Classifier: Intended Audience :: Information Technology @@ -17,65 +75,3 @@ Classifier: Programming Language :: Python :: 3.6 Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 -License-File: LICENSE -License-File: AUTHORS - -===== -Trove -===== - -.. image:: https://governance.openstack.org/tc/badges/trove.svg - :target: https://governance.openstack.org/tc/reference/tags/index.html - -Trove is Database as a Service for OpenStack. - -Getting Started ---------------- - -If you'd like to run from the master branch, you can clone the git repo: - - git clone https://opendev.org/openstack/trove - -For information on how to contribute to trove, please see -CONTRIBUTING.rst_ and HACKING.rst_ - -.. _CONTRIBUTING.rst: https://opendev.org/openstack/trove/src/branch/master/CONTRIBUTING.rst -.. _HACKING.rst: https://opendev.org/openstack/trove/src/branch/master/HACKING.rst - -* `Wiki `_ -* `Developer Docs `_ - -You can raise bugs here: -`Bug Tracker `_ - -The plan for trove can be found at -`Trove Specs `_ - -Release notes for the project can be found at: - https://docs.openstack.org/releasenotes/trove - -Python client -------------- -Python-troveclient_ is a client for Trove. - -.. _Python-troveclient: https://opendev.org/openstack/python-troveclient - -Dashboard plugin ----------------- -Trove-dashboard_ is OpenStack dashbaord plugin for Trove. - -.. _Trove-dashboard: https://opendev.org/openstack/trove-dashboard - -References ----------- - -* `Installation docs`_ -* `Manual installation docs`_ -* `Build guest image`_ - -.. _Installation docs: https://docs.openstack.org/trove/latest/install/ -.. _Manual installation docs: https://docs.openstack.org/trove/latest/install/install-manual.html -.. _Build guest image: https://docs.openstack.org/trove/latest/admin/building_guest_images.html - - - diff -Nru openstack-trove-16.0.0+git2022030314.39322f5a/trove.egg-info/requires.txt openstack-trove-17.0.0/trove.egg-info/requires.txt --- openstack-trove-16.0.0+git2022030314.39322f5a/trove.egg-info/requires.txt 2022-03-03 19:24:06.000000000 +0000 +++ openstack-trove-17.0.0/trove.egg-info/requires.txt 2022-03-30 12:02:55.000000000 +0000 @@ -18,7 +18,7 @@ oslo.cache>=1.26.0 oslo.concurrency>=3.26.0 oslo.config>=6.8.0 -oslo.context>=2.22.0 +oslo.context>=4.0.0 oslo.db>=4.27.0 oslo.i18n>=3.15.3 oslo.log>=3.36.0