Fix reverted osc-lib interface change
The patch https://review.opendev.org/#/c/673389/ introduced a regression by changing the osc-lib interface. Two conflicting attempts to fix the regression were launched: 1) Reverting the patch. 2) The patch https://review.opendev.org/683119 changes the exception from the generic CommandError back to a specific Forbidden exception. The patch https://review.opendev.org/683118 catches this exception and passes on, i.e. re-implements the same behavior as before. The first idea was implemented, the initial patch reverted. The second idea was partially implemented. The change in python-openstackclient (683118) was merged. The change in osc-lib was approved but failed to merge because the initial change had been reverted. Now we have again a situation where the exception produced in osc-lib does not match the exception expected by the caller. It is unclear if the osc-lib interface will ever get a rebased version of https://review.opendev.org/683119 merged, so the safest way to address the issue is to also catch the exception that used to be thrown before the inital change and is again thrown after the inital change has been reverted. Conflicts: openstackclient/identity/common.py Change-Id: I2ea2def607ec5be112e42d53a1e660fef0cdd69c (cherry picked from commit0a8753dc3e
) (cherry picked from commit0a8d855764
)
This commit is contained in:
parent
a69cc3ddae
commit
de0be9db05
|
@ -207,7 +207,7 @@ def _find_identity_resource(identity_client_manager, name_or_id,
|
|||
name_or_id, **kwargs)
|
||||
if identity_resource is not None:
|
||||
return identity_resource
|
||||
except identity_exc.Forbidden:
|
||||
except (exceptions.Forbidden, identity_exc.Forbidden):
|
||||
pass
|
||||
|
||||
return resource_type(None, {'id': name_or_id, 'name': name_or_id})
|
||||
|
|
Loading…
Reference in New Issue