Skip to content

Commit dae2539

Browse files
stephenfinstephenfin
committed
compute: Migrate to 'compute' client alias
This is no longer assigned to novaclient, meaning we can use it for SDK. Change-Id: I43d9ede39d36cc29301f94fa462b9b9d9441807c Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent 2148a86 commit dae2539

30 files changed

+110
-118
lines changed

‎doc/source/contributor/command-errors.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ opened.
4141
## ...
4242
4343
def take_action(self, parsed_args):
44-
compute_client = self.app.client_manager.sdk_connection.compute
44+
compute_client = self.app.client_manager.compute
4545
4646
public_key = parsed_args.public_key
4747
if public_key:

‎openstackclient/common/availability_zone.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def get_parser(self, prog_name):
117117
return parser
118118

119119
def _get_compute_availability_zones(self, parsed_args):
120-
compute_client = self.app.client_manager.sdk_connection.compute
120+
compute_client = self.app.client_manager.compute
121121
try:
122122
data = list(compute_client.availability_zones(details=True))
123123
except sdk_exceptions.ForbiddenException: # policy doesn't allow

‎openstackclient/common/extension.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def take_action(self, parsed_args):
9898
LOG.warning(message)
9999

100100
if parsed_args.compute or show_all:
101-
compute_client = self.app.client_manager.sdk_connection.compute
101+
compute_client = self.app.client_manager.compute
102102
try:
103103
data += compute_client.extensions()
104104
except Exception:

‎openstackclient/common/limits.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def take_action(self, parsed_args):
122122
volume_limits = None
123123

124124
if self.app.client_manager.is_compute_endpoint_enabled():
125-
compute_client = self.app.client_manager.sdk_connection.compute
125+
compute_client = self.app.client_manager.compute
126126
compute_limits = compute_client.get_limits(
127127
reserved=parsed_args.is_reserved, tenant_id=project_id
128128
)

‎openstackclient/common/quota.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def get_compute_quotas(
133133
default=False,
134134
):
135135
try:
136-
client = app.client_manager.sdk_connection.compute
136+
client = app.client_manager.compute
137137
if default:
138138
quota = client.get_quota_set_defaults(project_id)
139139
else:
@@ -256,7 +256,7 @@ def get_parser(self, prog_name):
256256
return parser
257257

258258
def _list_quota_compute(self, parsed_args, project_ids):
259-
compute_client = self.app.client_manager.sdk_connection.compute
259+
compute_client = self.app.client_manager.compute
260260
result = []
261261

262262
for project_id in project_ids:
@@ -588,7 +588,7 @@ def take_action(self, parsed_args):
588588
network_kwargs = {}
589589

590590
if self.app.client_manager.is_compute_endpoint_enabled():
591-
compute_client = self.app.client_manager.sdk_connection.compute
591+
compute_client = self.app.client_manager.compute
592592

593593
for k, v in COMPUTE_QUOTAS.items():
594594
value = getattr(parsed_args, k, None)
@@ -907,7 +907,7 @@ def take_action(self, parsed_args):
907907

908908
# compute quotas
909909
if parsed_args.service in {'all', 'compute'}:
910-
compute_client = self.app.client_manager.sdk_connection.compute
910+
compute_client = self.app.client_manager.compute
911911
compute_client.revert_quota_set(project.id)
912912

913913
# volume quotas

‎openstackclient/compute/v2/agent.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def get_parser(self, prog_name):
5656
return parser
5757

5858
def take_action(self, parsed_args):
59-
compute_client = self.app.client_manager.sdk_connection.compute
59+
compute_client = self.app.client_manager.compute
6060

6161
# doing this since openstacksdk has decided not to support this
6262
# deprecated command
@@ -95,7 +95,7 @@ def get_parser(self, prog_name):
9595
return parser
9696

9797
def take_action(self, parsed_args):
98-
compute_client = self.app.client_manager.sdk_connection.compute
98+
compute_client = self.app.client_manager.compute
9999
result = 0
100100
for id in parsed_args.id:
101101
try:
@@ -139,7 +139,7 @@ def get_parser(self, prog_name):
139139
return parser
140140

141141
def take_action(self, parsed_args):
142-
compute_client = self.app.client_manager.sdk_connection.compute
142+
compute_client = self.app.client_manager.compute
143143
columns = (
144144
"Agent ID",
145145
"Hypervisor",
@@ -194,7 +194,7 @@ def get_parser(self, prog_name):
194194
return parser
195195

196196
def take_action(self, parsed_args):
197-
compute_client = self.app.client_manager.sdk_connection.compute
197+
compute_client = self.app.client_manager.compute
198198

199199
response = compute_client.get('/os-agents', microversion='2.1')
200200
sdk_exceptions.raise_from_response(response)

‎openstackclient/compute/v2/aggregate.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def get_parser(self, prog_name):
6868
return parser
6969

7070
def take_action(self, parsed_args):
71-
compute_client = self.app.client_manager.sdk_connection.compute
71+
compute_client = self.app.client_manager.compute
7272

7373
aggregate = compute_client.find_aggregate(
7474
parsed_args.aggregate, ignore_missing=False
@@ -111,7 +111,7 @@ def get_parser(self, prog_name):
111111
return parser
112112

113113
def take_action(self, parsed_args):
114-
compute_client = self.app.client_manager.sdk_connection.compute
114+
compute_client = self.app.client_manager.compute
115115

116116
attrs = {'name': parsed_args.name}
117117

@@ -147,7 +147,7 @@ def get_parser(self, prog_name):
147147
return parser
148148

149149
def take_action(self, parsed_args):
150-
compute_client = self.app.client_manager.sdk_connection.compute
150+
compute_client = self.app.client_manager.compute
151151
result = 0
152152
for a in parsed_args.aggregate:
153153
try:
@@ -190,7 +190,7 @@ def get_parser(self, prog_name):
190190
return parser
191191

192192
def take_action(self, parsed_args):
193-
compute_client = self.app.client_manager.sdk_connection.compute
193+
compute_client = self.app.client_manager.compute
194194

195195
aggregates = list(compute_client.aggregates())
196196

@@ -252,7 +252,7 @@ def get_parser(self, prog_name):
252252
return parser
253253

254254
def take_action(self, parsed_args):
255-
compute_client = self.app.client_manager.sdk_connection.compute
255+
compute_client = self.app.client_manager.compute
256256

257257
aggregate = compute_client.find_aggregate(
258258
parsed_args.aggregate, ignore_missing=False
@@ -309,7 +309,7 @@ def get_parser(self, prog_name):
309309
return parser
310310

311311
def take_action(self, parsed_args):
312-
compute_client = self.app.client_manager.sdk_connection.compute
312+
compute_client = self.app.client_manager.compute
313313
aggregate = compute_client.find_aggregate(
314314
parsed_args.aggregate, ignore_missing=False
315315
)
@@ -354,7 +354,7 @@ def get_parser(self, prog_name):
354354
return parser
355355

356356
def take_action(self, parsed_args):
357-
compute_client = self.app.client_manager.sdk_connection.compute
357+
compute_client = self.app.client_manager.compute
358358
aggregate = compute_client.find_aggregate(
359359
parsed_args.aggregate, ignore_missing=False
360360
)
@@ -394,7 +394,7 @@ def get_parser(self, prog_name):
394394
return parser
395395

396396
def take_action(self, parsed_args):
397-
compute_client = self.app.client_manager.sdk_connection.compute
397+
compute_client = self.app.client_manager.compute
398398
aggregate = compute_client.find_aggregate(
399399
parsed_args.aggregate, ignore_missing=False
400400
)
@@ -429,7 +429,7 @@ def get_parser(self, prog_name):
429429
return parser
430430

431431
def take_action(self, parsed_args):
432-
compute_client = self.app.client_manager.sdk_connection.compute
432+
compute_client = self.app.client_manager.compute
433433

434434
if not sdk_utils.supports_microversion(compute_client, '2.81'):
435435
msg = _(

‎openstackclient/compute/v2/console.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def get_parser(self, prog_name):
5555
return parser
5656

5757
def take_action(self, parsed_args):
58-
compute_client = self.app.client_manager.sdk_connection.compute
58+
compute_client = self.app.client_manager.compute
5959

6060
server = compute_client.find_server(
6161
name_or_id=parsed_args.server, ignore_missing=False
@@ -130,7 +130,7 @@ def get_parser(self, prog_name):
130130
return parser
131131

132132
def take_action(self, parsed_args):
133-
compute_client = self.app.client_manager.sdk_connection.compute
133+
compute_client = self.app.client_manager.compute
134134
server = compute_client.find_server(
135135
parsed_args.server, ignore_missing=False
136136
)

‎openstackclient/compute/v2/flavor.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def get_parser(self, prog_name):
149149
return parser
150150

151151
def take_action(self, parsed_args):
152-
compute_client = self.app.client_manager.sdk_connection.compute
152+
compute_client = self.app.client_manager.compute
153153
identity_client = self.app.client_manager.identity
154154

155155
if parsed_args.project and parsed_args.public:
@@ -223,7 +223,7 @@ def get_parser(self, prog_name):
223223
return parser
224224

225225
def take_action(self, parsed_args):
226-
compute_client = self.app.client_manager.sdk_connection.compute
226+
compute_client = self.app.client_manager.compute
227227
result = 0
228228
for f in parsed_args.flavor:
229229
try:
@@ -296,7 +296,7 @@ def get_parser(self, prog_name):
296296
return parser
297297

298298
def take_action(self, parsed_args):
299-
compute_client = self.app.client_manager.sdk_connection.compute
299+
compute_client = self.app.client_manager.compute
300300
# is_public is ternary - None means give all flavors,
301301
# True is public only and False is private only
302302
# By default Nova assumes True and gives admins public flavors
@@ -418,7 +418,7 @@ def get_parser(self, prog_name):
418418
return parser
419419

420420
def take_action(self, parsed_args):
421-
compute_client = self.app.client_manager.sdk_connection.compute
421+
compute_client = self.app.client_manager.compute
422422
identity_client = self.app.client_manager.identity
423423

424424
try:
@@ -497,7 +497,7 @@ def get_parser(self, prog_name):
497497
return parser
498498

499499
def take_action(self, parsed_args):
500-
compute_client = self.app.client_manager.sdk_connection.compute
500+
compute_client = self.app.client_manager.compute
501501
flavor = compute_client.find_flavor(
502502
parsed_args.flavor, get_extra_specs=True, ignore_missing=False
503503
)
@@ -565,7 +565,7 @@ def get_parser(self, prog_name):
565565
return parser
566566

567567
def take_action(self, parsed_args):
568-
compute_client = self.app.client_manager.sdk_connection.compute
568+
compute_client = self.app.client_manager.compute
569569
identity_client = self.app.client_manager.identity
570570

571571
try:

‎openstackclient/compute/v2/host.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def get_parser(self, prog_name):
3535
return parser
3636

3737
def take_action(self, parsed_args):
38-
compute_client = self.app.client_manager.sdk_connection.compute
38+
compute_client = self.app.client_manager.compute
3939

4040
self.log.warning(
4141
"API has been deprecated; "
@@ -83,7 +83,7 @@ def get_parser(self, prog_name):
8383
return parser
8484

8585
def take_action(self, parsed_args):
86-
compute_client = self.app.client_manager.sdk_connection.compute
86+
compute_client = self.app.client_manager.compute
8787

8888
self.log.warning(
8989
"API has been deprecated; "
@@ -121,7 +121,7 @@ def get_parser(self, prog_name):
121121
return parser
122122

123123
def take_action(self, parsed_args):
124-
compute_client = self.app.client_manager.sdk_connection.compute
124+
compute_client = self.app.client_manager.compute
125125

126126
self.log.warning(
127127
"API has been deprecated; "

0 commit comments

Comments
 (0)