openstack
/
sushy
Code Issues Proposed changes

Merge "Fix 'None' field value processing"

This commit is contained in:
Zuul 2020-02-10 18:03:05 +00:00 committed by Gerrit Code Review
parent c961d8fa80 1ec13aaba2
commit 6f885c3067
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sushy/resources/base.py
View File

@ -101,16 +101,12 @@ class Field(object):
# Do not run the adapter on the default value
return self._default
try:
# Get the value based on the name, defaulting to an empty dict
# Check to ensure that value is implemented by OEM
# TODO(etingof): we should revisit this logic/code
if (item is not None and item != {} and
str(item).lower() != 'none'):
value = self._adapter(item)
# NOTE(etingof): this is just to account for schema violation
if item is None:
return
else:
value = item
try:
return self._adapter(item)
except (UnicodeError, ValueError, TypeError) as exc:
path = (nested_in or []) + self._path
@ -119,8 +115,6 @@ class Field(object):
resource=resource.path,
error=exc)
return value
def _collect_fields(resource):
"""Collect fields from the JSON.