Skip to content

Commit e9b720e

Browse files
Zuulopenstack-gerrit
Zuul
authored and
openstack-gerrit
committed
Merge "trivial: Add missing ignore_missing arguments"
2 parents 0b88ea4 + 7302116 commit e9b720e

19 files changed

Lines changed: 116 additions & 52 deletions

File tree

‎openstackclient/compute/v2/server.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2180,7 +2180,9 @@ def get_parser(self, prog_name):
21802180
def take_action(self, parsed_args):
21812181
compute_client = self.app.client_manager.compute
21822182
for name_or_id in parsed_args.server:
2183-
server = compute_client.find_server(name_or_id)
2183+
server = compute_client.find_server(
2184+
name_or_id, ignore_missing=False
2185+
)
21842186
server.trigger_crash_dump(compute_client)
21852187

21862188

‎openstackclient/identity/v3/application_credential.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def take_action(self, parsed_args):
278278
for ac in parsed_args.application_credential:
279279
try:
280280
app_cred = identity_client.find_application_credential(
281-
user_id, ac
281+
user_id, ac, ignore_missing=False
282282
)
283283
identity_client.delete_application_credential(
284284
user_id, app_cred.id

‎openstackclient/identity/v3/domain.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ def take_action(self, parsed_args):
107107
)
108108
except sdk_exceptions.ConflictException:
109109
if parsed_args.or_show:
110-
domain = identity_client.find_domain(parsed_args.name)
110+
domain = identity_client.find_domain(
111+
parsed_args.name, ignore_missing=False
112+
)
111113
LOG.info(_('Returning existing domain %s'), domain.name)
112114
else:
113115
raise
@@ -238,7 +240,9 @@ def get_parser(self, prog_name):
238240

239241
def take_action(self, parsed_args):
240242
identity_client = self.app.client_manager.sdk_connection.identity
241-
domain = identity_client.find_domain(parsed_args.domain)
243+
domain = identity_client.find_domain(
244+
parsed_args.domain, ignore_missing=False
245+
)
242246
kwargs = {}
243247
if parsed_args.name:
244248
kwargs['name'] = parsed_args.name
@@ -266,6 +270,8 @@ def get_parser(self, prog_name):
266270

267271
def take_action(self, parsed_args):
268272
identity_client = self.app.client_manager.sdk_connection.identity
269-
domain = identity_client.find_domain(parsed_args.domain)
273+
domain = identity_client.find_domain(
274+
parsed_args.domain, ignore_missing=False
275+
)
270276

271277
return _format_domain(domain)

‎openstackclient/identity/v3/endpoint.py‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,9 @@ def take_action(self, parsed_args):
169169
result = 0
170170
for i in parsed_args.endpoint:
171171
try:
172-
endpoint_id = identity_client.find_endpoint(i).id
172+
endpoint_id = identity_client.find_endpoint(
173+
i, ignore_missing=False
174+
).id
173175
identity_client.delete_endpoint(endpoint_id)
174176
except Exception as e:
175177
result += 1
@@ -230,7 +232,9 @@ def take_action(self, parsed_args):
230232

231233
endpoint = None
232234
if parsed_args.endpoint:
233-
endpoint = identity_client.find_endpoint(parsed_args.endpoint)
235+
endpoint = identity_client.find_endpoint(
236+
parsed_args.endpoint, ignore_missing=False
237+
)
234238

235239
project_domain_id = None
236240
if parsed_args.project_domain:
@@ -292,7 +296,9 @@ def take_action(self, parsed_args):
292296
data = list(identity_client.endpoints(**kwargs))
293297

294298
for ep in data:
295-
service = identity_client.find_service(ep.service_id)
299+
service = identity_client.find_service(
300+
ep.service_id, ignore_missing=False
301+
)
296302
ep.service_name = getattr(service, 'name', '')
297303
ep.service_type = service.type
298304

@@ -393,7 +399,9 @@ def get_parser(self, prog_name):
393399

394400
def take_action(self, parsed_args):
395401
identity_client = self.app.client_manager.sdk_connection.identity
396-
endpoint = identity_client.find_endpoint(parsed_args.endpoint)
402+
endpoint = identity_client.find_endpoint(
403+
parsed_args.endpoint, ignore_missing=False
404+
)
397405

398406
kwargs = {}
399407

@@ -440,7 +448,9 @@ def get_parser(self, prog_name):
440448

441449
def take_action(self, parsed_args):
442450
identity_client = self.app.client_manager.sdk_connection.identity
443-
endpoint = identity_client.find_endpoint(parsed_args.endpoint)
451+
endpoint = identity_client.find_endpoint(
452+
parsed_args.endpoint, ignore_missing=False
453+
)
444454

445455
service = common.find_service_sdk(identity_client, endpoint.service_id)
446456

‎openstackclient/identity/v3/group.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,15 @@ def take_action(self, parsed_args):
211211
if parsed_args.or_show:
212212
if parsed_args.domain:
213213
group = identity_client.find_group(
214-
parsed_args.name, domain_id=parsed_args.domain
214+
parsed_args.name,
215+
domain_id=parsed_args.domain,
216+
ignore_missing=False,
215217
)
216218
else:
217-
group = identity_client.find_group(parsed_args.name)
219+
group = identity_client.find_group(
220+
parsed_args.name,
221+
ignore_missing=False,
222+
)
218223
LOG.info(_('Returning existing group %s'), group.name)
219224
else:
220225
raise

‎openstackclient/identity/v3/role.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ def take_action(self, parsed_args):
410410
if parsed_args.domain:
411411
domain = identity_client.find_domain(
412412
name_or_id=parsed_args.domain,
413+
ignore_missing=False,
413414
)
414415
data = identity_client.roles(domain_id=domain.id)
415416
return (

‎openstackclient/identity/v3/trust.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,9 @@ def take_action(self, parsed_args):
179179
roles = []
180180
for role in parsed_args.roles:
181181
try:
182-
role_id = identity_client.find_role(role).id
182+
role_id = identity_client.find_role(
183+
role, ignore_missing=False
184+
).id
183185
except sdk_exceptions.ForbiddenException:
184186
role_id = role
185187
roles.append({"id": role_id})

‎openstackclient/identity/v3/user.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@ def take_action(self, parsed_args):
441441
if parsed_args.domain:
442442
domain = identity_client.find_domain(
443443
name_or_id=parsed_args.domain,
444+
ignore_missing=False,
444445
).id
445446

446447
group = None

‎openstackclient/network/v2/network_trunk.py‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,10 @@ def take_action(self, parsed_args):
119119
result = 0
120120
for trunk in parsed_args.trunk:
121121
try:
122-
trunk_id = network_client.find_trunk(trunk).id
122+
trunk_id = network_client.find_trunk(
123+
trunk,
124+
ignore_missing=False,
125+
).id
123126
network_client.delete_trunk(trunk_id)
124127
except Exception as e:
125128
result += 1
@@ -220,7 +223,10 @@ def get_parser(self, prog_name):
220223
def take_action(self, parsed_args):
221224
network_client = self.app.client_manager.network
222225
identity_client = self.app.client_manager.identity
223-
trunk_id = network_client.find_trunk(parsed_args.trunk)
226+
trunk_id = network_client.find_trunk(
227+
parsed_args.trunk,
228+
ignore_missing=False,
229+
)
224230
attrs = _get_attrs_for_trunk(
225231
network_client, identity_client, parsed_args
226232
)
@@ -258,7 +264,10 @@ def get_parser(self, prog_name):
258264

259265
def take_action(self, parsed_args):
260266
network_client = self.app.client_manager.network
261-
trunk_id = network_client.find_trunk(parsed_args.trunk).id
267+
trunk_id = network_client.find_trunk(
268+
parsed_args.trunk,
269+
ignore_missing=False,
270+
).id
262271
obj = network_client.get_trunk(trunk_id)
263272
display_columns, columns = _get_columns(obj)
264273
data = osc_utils.get_dict_properties(
@@ -282,7 +291,10 @@ def get_parser(self, prog_name):
282291

283292
def take_action(self, parsed_args):
284293
network_client = self.app.client_manager.network
285-
trunk_id = network_client.find_trunk(parsed_args.trunk)
294+
trunk_id = network_client.find_trunk(
295+
parsed_args.trunk,
296+
ignore_missing=False,
297+
)
286298
data = network_client.get_trunk_subports(trunk_id)
287299
headers: tuple[str, ...] = (
288300
'Port',
@@ -332,7 +344,10 @@ def get_parser(self, prog_name):
332344
def take_action(self, parsed_args):
333345
network_client = self.app.client_manager.network
334346
attrs = _get_attrs_for_subports(network_client, parsed_args)
335-
trunk_id = network_client.find_trunk(parsed_args.trunk)
347+
trunk_id = network_client.find_trunk(
348+
parsed_args.trunk,
349+
ignore_missing=False,
350+
)
336351
network_client.delete_trunk_subports(trunk_id, attrs)
337352

338353

@@ -360,7 +375,10 @@ def _get_attrs_for_trunk(network_client, identity_client, parsed_args):
360375
if parsed_args.disable:
361376
attrs['admin_state_up'] = False
362377
if 'parent_port' in parsed_args and parsed_args.parent_port is not None:
363-
port_id = network_client.find_port(parsed_args.parent_port)['id']
378+
port_id = network_client.find_port(
379+
parsed_args.parent_port,
380+
ignore_missing=False,
381+
).id
364382
attrs['port_id'] = port_id
365383
if 'add_subports' in parsed_args and parsed_args.add_subports is not None:
366384
attrs[SUB_PORTS] = _format_subports(
@@ -384,7 +402,10 @@ def _format_subports(network_client, subports):
384402
for subport in subports:
385403
subport_attrs = {}
386404
if subport.get('port'):
387-
port_id = network_client.find_port(subport['port'])['id']
405+
port_id = network_client.find_port(
406+
subport['port'],
407+
ignore_missing=False,
408+
).id
388409
subport_attrs['port_id'] = port_id
389410
if subport.get('segmentation-id'):
390411
try:
@@ -413,11 +434,10 @@ def _get_attrs_for_subports(network_client, parsed_args):
413434
):
414435
subports_list = []
415436
for subport in parsed_args.unset_subports:
416-
port_id = network_client.find_port(subport)['id']
437+
port_id = network_client.find_port(
438+
subport,
439+
ignore_missing=False,
440+
)['id']
417441
subports_list.append({'port_id': port_id})
418442
attrs = subports_list
419443
return attrs
420-
421-
422-
def _get_id(client, id_or_name, resource):
423-
return client.find_resource(resource, str(id_or_name))['id']

‎openstackclient/network/v2/port.py‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -636,11 +636,11 @@ def get_parser(self, prog_name):
636636
return parser
637637

638638
def take_action(self, parsed_args):
639-
client = self.app.client_manager.network
640-
_network = client.find_network(
639+
network_client = self.app.client_manager.network
640+
network = network_client.find_network(
641641
parsed_args.network, ignore_missing=False
642642
)
643-
parsed_args.network = _network.id
643+
parsed_args.network = network.id
644644
_prepare_fixed_ips(self.app.client_manager, parsed_args)
645645
attrs = _get_attrs(self.app.client_manager, parsed_args)
646646

@@ -654,7 +654,7 @@ def take_action(self, parsed_args):
654654

655655
if parsed_args.security_groups is not None:
656656
attrs['security_group_ids'] = [
657-
client.find_security_group(sg, ignore_missing=False).id
657+
network_client.find_security_group(sg, ignore_missing=False).id
658658
for sg in parsed_args.security_groups
659659
]
660660

@@ -667,15 +667,17 @@ def take_action(self, parsed_args):
667667
attrs["extra_dhcp_opts"] = _convert_extra_dhcp_options(parsed_args)
668668

669669
if parsed_args.qos_policy:
670-
attrs['qos_policy_id'] = client.find_qos_policy(
670+
attrs['qos_policy_id'] = network_client.find_qos_policy(
671671
parsed_args.qos_policy, ignore_missing=False
672672
).id
673673

674674
if parsed_args.hint:
675675
_validate_port_hints(parsed_args.hint)
676676
expanded_hints = _expand_port_hint_aliases(parsed_args.hint)
677677
try:
678-
client.find_extension('port-hints', ignore_missing=False)
678+
network_client.find_extension(
679+
'port-hints', ignore_missing=False
680+
)
679681
except Exception as e:
680682
msg = _('Not supported by Network API: %(e)s') % {'e': e}
681683
raise exceptions.CommandError(msg)
@@ -686,7 +688,7 @@ def take_action(self, parsed_args):
686688
in expanded_hints['openvswitch']['other_config']
687689
):
688690
try:
689-
client.find_extension(
691+
network_client.find_extension(
690692
'port-hint-ovs-tx-steering', ignore_missing=False
691693
)
692694
except Exception as e:
@@ -695,7 +697,9 @@ def take_action(self, parsed_args):
695697
attrs['hints'] = expanded_hints
696698

697699
set_tags_in_post = bool(
698-
client.find_extension('tag-ports-during-bulk-creation')
700+
network_client.find_extension(
701+
'tag-ports-during-bulk-creation', ignore_missing=True
702+
)
699703
)
700704
if set_tags_in_post:
701705
if parsed_args.no_tag:
@@ -707,14 +711,12 @@ def take_action(self, parsed_args):
707711
self._parse_extra_properties(parsed_args.extra_properties)
708712
)
709713

710-
with common.check_missing_extension_if_error(
711-
self.app.client_manager.network, attrs
712-
):
713-
obj = client.create_port(**attrs)
714+
with common.check_missing_extension_if_error(network_client, attrs):
715+
obj = network_client.create_port(**attrs)
714716

715717
if not set_tags_in_post:
716718
# tags cannot be set when created, so tags need to be set later.
717-
_tag.update_tags_for_set(client, obj, parsed_args)
719+
_tag.update_tags_for_set(network_client, obj, parsed_args)
718720

719721
display_columns, columns = _get_columns(obj)
720722
data = utils.get_item_properties(obj, columns, formatters=_formatters)

0 commit comments

Comments
 (0)