| 0 | |
Author: Joel Capitao <jcapitao@redhat.com>
|
| 1 | |
Date: Tue, 15 Mar 2022 08:30:04 +0100
|
| 2 | |
Description: Replace the deprecated argument tenant
|
| 3 | |
The deprecated argument tenant from RequestContext
|
| 4 | |
has been removed since [1], so we switch to 'project_id'.
|
| 5 | |
.
|
| 6 | |
[1] https://review.opendev.org/c/openstack/oslo.context/+/815938
|
| 7 | |
Change-Id: I4e3e4c50ba5d829ed739e278b5286f2bf4808870
|
| 8 | |
Origin: upstream, https://review.opendev.org/c/openstack/castellan/+/834669
|
| 9 | |
Bug-Debian: https://bugs.debian.org/1009455
|
| 10 | |
Last-Update: 2022-04-14
|
| 11 | |
|
| 12 | |
diff --git a/castellan/tests/unit/test_utils.py b/castellan/tests/unit/test_utils.py
|
| 13 | |
index 00e9346..2ead8ce 100644
|
| 14 | |
--- a/castellan/tests/unit/test_utils.py
|
| 15 | |
+++ b/castellan/tests/unit/test_utils.py
|
| 16 | |
@@ -182,18 +182,18 @@
|
| 17 | |
|
| 18 | |
def test_oslo_context_to_keystone_token(self):
|
| 19 | |
auth_token_value = '16bd612f28ec479b8ffe8e124fc37b43'
|
| 20 | |
- tenant_value = '00c6ef5ad2984af2acd7d42c299935c0'
|
| 21 | |
+ project_id_value = '00c6ef5ad2984af2acd7d42c299935c0'
|
| 22 | |
|
| 23 | |
ctxt = context.RequestContext(
|
| 24 | |
auth_token=auth_token_value,
|
| 25 | |
- tenant=tenant_value)
|
| 26 | |
+ project_id=project_id_value)
|
| 27 | |
|
| 28 | |
ks_token_context = utils.credential_factory(context=ctxt)
|
| 29 | |
ks_token_context_class = ks_token_context.__class__.__name__
|
| 30 | |
|
| 31 | |
self.assertEqual('KeystoneToken', ks_token_context_class)
|
| 32 | |
self.assertEqual(auth_token_value, ks_token_context.token)
|
| 33 | |
- self.assertEqual(tenant_value, ks_token_context.project_id)
|
| 34 | |
+ self.assertEqual(project_id_value, ks_token_context.project_id)
|
| 35 | |
|
| 36 | |
def test_invalid_auth_type(self):
|
| 37 | |
self.config_fixture.config(
|
| 38 | |
diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
|
| 39 | |
index e04d703..cc564e3 100644
|
| 40 | |
--- a/doc/source/user/index.rst
|
| 41 | |
+++ b/doc/source/user/index.rst
|
| 42 | |
@@ -107,7 +107,7 @@
|
| 43 | |
sess = session.Session()
|
| 44 | |
|
| 45 | |
ctxt = context.RequestContext(auth_token=auth.get_token(sess),
|
| 46 | |
- tenant=auth.get_project_id(sess))
|
| 47 | |
+ project_id=auth.get_project_id(sess))
|
| 48 | |
|
| 49 | |
ctxt can then be passed into any key_manager api call.
|
| 50 | |
|