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
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
Author: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 06 Nov 2024 20:06:22 +0900
Description: Fix missing version argument for v1 client
Currently v1 Client class does not work without the version argument
explicitly given, but this requirement is quite redundant because
v1 Client class, instead of the base Client class, is used.
.
Restore a few defaults which were removed by [1], to fix direct usage
of v1 Client.
.
[1] b3f3912a71ff1c2e85e5c2e3bed40c744312de3d
.
Change-Id: I4c65d4e5d79dc75f92c7445477463e2dda22ab34
Origin: upstream, https://review.opendev.org/c/openstack/python-barbicanclient/+/934227
Last-Update: 2024-11-018
diff --git a/barbicanclient/client.py b/barbicanclient/client.py
index 309432e..fc1ade6 100644
--- a/barbicanclient/client.py
+++ b/barbicanclient/client.py
@@ -27,8 +27,8 @@
LOG = logging.getLogger(__name__)
-_DEFAULT_SERVICE_TYPE = 'key-manager'
-_DEFAULT_SERVICE_INTERFACE = 'public'
+DEFAULT_SERVICE_TYPE = 'key-manager'
+DEFAULT_SERVICE_INTERFACE = 'public'
_DEFAULT_API_VERSION = 'v1'
_SUPPORTED_API_VERSION_MAP = {'v1': 'barbicanclient.v1.client.Client'}
@@ -177,8 +177,8 @@
session.auth = kwargs['auth']
kwargs['version'] = version or _DEFAULT_API_VERSION
- kwargs.setdefault('service_type', _DEFAULT_SERVICE_TYPE)
- kwargs.setdefault('interface', _DEFAULT_SERVICE_INTERFACE)
+ kwargs.setdefault('service_type', DEFAULT_SERVICE_TYPE)
+ kwargs.setdefault('interface', DEFAULT_SERVICE_INTERFACE)
try:
client_path = _SUPPORTED_API_VERSION_MAP[kwargs['version']]
diff --git a/barbicanclient/tests/test_barbican.py b/barbicanclient/tests/test_barbican.py
index 545580d..706aeb7 100644
--- a/barbicanclient/tests/test_barbican.py
+++ b/barbicanclient/tests/test_barbican.py
@@ -203,9 +203,9 @@
barbican_client = self.barbican.create_client(argv)
httpclient = barbican_client.secrets._api
- self.assertEqual(client._DEFAULT_SERVICE_INTERFACE,
+ self.assertEqual(client.DEFAULT_SERVICE_INTERFACE,
httpclient.interface)
- self.assertEqual(client._DEFAULT_SERVICE_TYPE, httpclient.service_type)
+ self.assertEqual(client.DEFAULT_SERVICE_TYPE, httpclient.service_type)
self.assertEqual(client._DEFAULT_API_VERSION, httpclient.version)
self.assertIsNone(httpclient.service_name)
diff --git a/barbicanclient/v1/client.py b/barbicanclient/v1/client.py
index f0e91ca..63c1551 100644
--- a/barbicanclient/v1/client.py
+++ b/barbicanclient/v1/client.py
@@ -27,6 +27,7 @@
LOG = logging.getLogger(__name__)
+DEFAULT_API_VERSION = 'v1'
_SUPPORTED_MICROVERSIONS = [(1, 0),
(1, 1)]
# For microversion 1.0, API status is "stable"
@@ -42,6 +43,10 @@
`barbicanclient.client.Client`. It's recommended to use that
function instead of making instances of this class directly.
"""
+ kwargs.setdefault('version', 'v1')
+ kwargs.setdefault('service_type', base_client.DEFAULT_SERVICE_TYPE)
+ kwargs.setdefault('interface', base_client.DEFAULT_SERVICE_INTERFACE)
+
microversion = self._get_normalized_microversion(
kwargs.pop('microversion', None))
normalized_microversion = self._get_max_supported_version(
diff --git a/functionaltests/client/test_client_connectivity.py b/functionaltests/client/test_client_connectivity.py
index f0af575..357ef2f 100644
--- a/functionaltests/client/test_client_connectivity.py
+++ b/functionaltests/client/test_client_connectivity.py
@@ -97,8 +97,8 @@
barbicanclient = client.Client(
project_id=CONF.keymanager.project_id,
auth=self.auth,
- interface=client._DEFAULT_SERVICE_INTERFACE,
- service_type=client._DEFAULT_SERVICE_TYPE,
+ interface=client.DEFAULT_SERVICE_INTERFACE,
+ service_type=client.DEFAULT_SERVICE_TYPE,
version=client._DEFAULT_API_VERSION)
self.assert_client_can_contact_barbican(barbicanclient)
@@ -109,7 +109,7 @@
client.Client,
project_id=CONF.keymanager.project_id,
auth=self.auth,
- interface=client._DEFAULT_SERVICE_INTERFACE,
+ interface=client.DEFAULT_SERVICE_INTERFACE,
service_type='wrong-service-type',
version=client._DEFAULT_API_VERSION)
@@ -119,7 +119,7 @@
project_id=CONF.keymanager.project_id,
auth=self.auth,
interface='wrong-interface',
- service_type=client._DEFAULT_SERVICE_TYPE,
+ service_type=client.DEFAULT_SERVICE_TYPE,
version=client._DEFAULT_API_VERSION)
self.assertRaises(
@@ -127,8 +127,8 @@
client.Client,
project_id=CONF.keymanager.project_id,
auth=self.auth,
- interface=client._DEFAULT_SERVICE_INTERFACE,
- service_type=client._DEFAULT_SERVICE_TYPE,
+ interface=client.DEFAULT_SERVICE_INTERFACE,
+ service_type=client.DEFAULT_SERVICE_TYPE,
service_name='wrong-service-name',
version=client._DEFAULT_API_VERSION)
@@ -137,8 +137,8 @@
client.Client,
project_id=CONF.keymanager.project_id,
auth=self.auth,
- interface=client._DEFAULT_SERVICE_INTERFACE,
- service_type=client._DEFAULT_SERVICE_TYPE,
+ interface=client.DEFAULT_SERVICE_INTERFACE,
+ service_type=client.DEFAULT_SERVICE_TYPE,
region_name='wrong-region-name',
version=client._DEFAULT_API_VERSION)
@@ -147,8 +147,8 @@
client.Client,
**{"project_id": CONF.keymanager.project_id,
"auth": self.auth,
- "interface": client._DEFAULT_SERVICE_INTERFACE,
- "service_type": client._DEFAULT_SERVICE_TYPE,
+ "interface": client.DEFAULT_SERVICE_INTERFACE,
+ "service_type": client.DEFAULT_SERVICE_TYPE,
"version": 'wrong-version'})
self.assertRaises(exceptions.UnsupportedVersion,
@@ -162,7 +162,7 @@
barbicanclient = client.Client(
project_id=CONF.keymanager.project_id,
auth=self.auth,
- interface=client._DEFAULT_SERVICE_INTERFACE,
- service_type=client._DEFAULT_SERVICE_TYPE)
+ interface=client.DEFAULT_SERVICE_INTERFACE,
+ service_type=client.DEFAULT_SERVICE_TYPE)
self.assert_client_can_contact_barbican(barbicanclient)
|
