starlingx
/
config
Code Issues Proposed changes

Merge "Fix accessing SysinvObject optional foreign fields"

This commit is contained in:
Zuul 2019-06-25 20:58:42 +00:00 committed by Gerrit Code Review
parent c1648ed02e a867995943
commit a468d5225e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysinv/sysinv/sysinv/sysinv/db/sqlalchemy/models.py
View File

@ -1168,7 +1168,8 @@ class DataNetworks(Base):
__mapper_args__ = {
'polymorphic_identity': 'datanetwork',
'polymorphic_on': network_type
'polymorphic_on': network_type,
'with_polymorphic': '*',
}

8
sysinv/sysinv/sysinv/sysinv/objects/base.py
View File

@ -463,15 +463,15 @@ class SysinvObject(object):
def _from_db_object(cls_object, db_object):
"""Converts a database entity to a formal object."""
for field in cls_object.fields:
if field in cls_object._optional_fields:
if not hasattr(db_object, field):
continue
if field in cls_object._foreign_fields:
cls_object[field] = cls_object._get_foreign_field(
field, db_object)
continue
if field in cls_object._optional_fields:
if not hasattr(db_object, field):
continue
cls_object[field] = db_object[field]
cls_object.obj_reset_changes()