openstack/ironic
Code Issues Proposed changes

Merge "rfc3986: Replace deprecated URIReference.is_valid"

Browse Source
This commit is contained in:
Zuul 2021-08-23 10:58:37 +00:00 committed by Gerrit Code Review
commit 9f32ceda1a
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ironic/drivers/modules/redfish/utils.py
View File

@ -108,8 +108,14 @@ def parse_driver_info(node):
if not parsed.scheme or not parsed.authority:
address = 'https://%s' % address
parsed = rfc3986.uri_reference(address)
# TODO(vdrok): Workaround this check, in py3 we need to use validator class
if not parsed.is_valid(require_scheme=True, require_authority=True):
validator = rfc3986.validators.Validator().require_presence_of(
'scheme', 'host',
).check_validity_of(
'scheme', 'userinfo', 'host', 'path', 'query', 'fragment',
)
try:
validator.validate(parsed)
except rfc3986.exceptions.RFC3986Exception:
raise exception.InvalidParameterValue(
_('Invalid Redfish address %(address)s set in '
'driver_info/redfish_address on node %(node)s') %

10
ironic/drivers/modules/redfish/vendor.py
View File

@ -137,8 +137,14 @@ class RedfishVendorPassthru(base.VendorInterface):
try:
parsed = rfc3986.uri_reference(destination)
if not parsed.is_valid(require_scheme=True,
require_authority=True):
validator = rfc3986.validators.Validator().require_presence_of(
'scheme', 'host',
).check_validity_of(
'scheme', 'userinfo', 'host', 'path', 'query', 'fragment',
)
try:
validator.validate(parsed)
except rfc3986.exceptions.RFC3986Exception:
# NOTE(iurygregory): raise error because the parsed
# destination does not contain scheme or authority.
raise TypeError