Codebase list python-castellan / 428c669 debian / patches / Replace_the_deprecated_argument_tenant.patch
428c669

Tree @428c669 (Download .tar.gz)

Replace_the_deprecated_argument_tenant.patch @428c669 — raw · history · blame 

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
Author: Joel Capitao <jcapitao@redhat.com>
Date: Tue, 15 Mar 2022 08:30:04 +0100
Description: Replace the deprecated argument tenant
 The deprecated argument tenant from RequestContext
 has been removed since [1], so we switch to 'project_id'.
 .
 [1] https://review.opendev.org/c/openstack/oslo.context/+/815938
Change-Id: I4e3e4c50ba5d829ed739e278b5286f2bf4808870
Origin: upstream, https://review.opendev.org/c/openstack/castellan/+/834669
Bug-Debian: https://bugs.debian.org/1009455
Last-Update: 2022-04-14

diff --git a/castellan/tests/unit/test_utils.py b/castellan/tests/unit/test_utils.py
index 00e9346..2ead8ce 100644
--- a/castellan/tests/unit/test_utils.py
+++ b/castellan/tests/unit/test_utils.py
@@ -182,18 +182,18 @@
 
     def test_oslo_context_to_keystone_token(self):
         auth_token_value = '16bd612f28ec479b8ffe8e124fc37b43'
-        tenant_value = '00c6ef5ad2984af2acd7d42c299935c0'
+        project_id_value = '00c6ef5ad2984af2acd7d42c299935c0'
 
         ctxt = context.RequestContext(
             auth_token=auth_token_value,
-            tenant=tenant_value)
+            project_id=project_id_value)
 
         ks_token_context = utils.credential_factory(context=ctxt)
         ks_token_context_class = ks_token_context.__class__.__name__
 
         self.assertEqual('KeystoneToken', ks_token_context_class)
         self.assertEqual(auth_token_value, ks_token_context.token)
-        self.assertEqual(tenant_value, ks_token_context.project_id)
+        self.assertEqual(project_id_value, ks_token_context.project_id)
 
     def test_invalid_auth_type(self):
         self.config_fixture.config(
diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst
index e04d703..cc564e3 100644
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -107,7 +107,7 @@
     sess = session.Session()
 
     ctxt = context.RequestContext(auth_token=auth.get_token(sess),
-                                  tenant=auth.get_project_id(sess))
+                                  project_id=auth.get_project_id(sess))
 
 ctxt can then be passed into any key_manager api call.