Define orm relationships after db classes
This is to fix race conditions on neutron server init.
Please see bug for details.
Change-Id: I943e6397319b9a4a7fc1a5b3acb721920ddffb02
Partial-Bug: #1824299
(cherry picked from commit 38daf9eaae
)
This commit is contained in:
parent
f83e178e7f
commit
d7945c60b0
|
@ -23,9 +23,6 @@ class Flavor(model_base.BASEV2, model_base.HasId):
|
||||||
server_default=sa.sql.true())
|
server_default=sa.sql.true())
|
||||||
# Make it True for multi-type flavors
|
# Make it True for multi-type flavors
|
||||||
service_type = sa.Column(sa.String(36), nullable=True)
|
service_type = sa.Column(sa.String(36), nullable=True)
|
||||||
service_profiles = orm.relationship("FlavorServiceProfileBinding",
|
|
||||||
cascade="all, delete-orphan",
|
|
||||||
lazy="subquery")
|
|
||||||
|
|
||||||
|
|
||||||
class ServiceProfile(model_base.BASEV2, model_base.HasId):
|
class ServiceProfile(model_base.BASEV2, model_base.HasId):
|
||||||
|
@ -34,7 +31,6 @@ class ServiceProfile(model_base.BASEV2, model_base.HasId):
|
||||||
enabled = sa.Column(sa.Boolean, nullable=False, default=True,
|
enabled = sa.Column(sa.Boolean, nullable=False, default=True,
|
||||||
server_default=sa.sql.true())
|
server_default=sa.sql.true())
|
||||||
metainfo = sa.Column(sa.String(4096))
|
metainfo = sa.Column(sa.String(4096))
|
||||||
flavors = orm.relationship("FlavorServiceProfileBinding")
|
|
||||||
|
|
||||||
|
|
||||||
class FlavorServiceProfileBinding(model_base.BASEV2):
|
class FlavorServiceProfileBinding(model_base.BASEV2):
|
||||||
|
@ -42,9 +38,14 @@ class FlavorServiceProfileBinding(model_base.BASEV2):
|
||||||
sa.ForeignKey("flavors.id",
|
sa.ForeignKey("flavors.id",
|
||||||
ondelete="CASCADE"),
|
ondelete="CASCADE"),
|
||||||
nullable=False, primary_key=True)
|
nullable=False, primary_key=True)
|
||||||
flavor = orm.relationship(Flavor)
|
flavor = orm.relationship(Flavor,
|
||||||
|
backref=orm.backref(
|
||||||
|
"service_profiles",
|
||||||
|
lazy='subquery',
|
||||||
|
cascade="all, delete-orphan"))
|
||||||
service_profile_id = sa.Column(sa.String(36),
|
service_profile_id = sa.Column(sa.String(36),
|
||||||
sa.ForeignKey("serviceprofiles.id",
|
sa.ForeignKey("serviceprofiles.id",
|
||||||
ondelete="CASCADE"),
|
ondelete="CASCADE"),
|
||||||
nullable=False, primary_key=True)
|
nullable=False, primary_key=True)
|
||||||
service_profile = orm.relationship(ServiceProfile)
|
service_profile = orm.relationship(ServiceProfile,
|
||||||
|
backref="flavors")
|
||||||
|
|
Loading…
Reference in New Issue