Sam what happens in your environment if you try:
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 95456bf..49cf23e 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -842,28 +842,18 @@ class Aggregate(BASE, NovaBase): name = Column(String(255)) _hosts = relationship(AggregateHost, lazy="joined", - secondary="aggregate_hosts", primaryjoin='and_(' 'Aggregate.id == AggregateHost.aggregate_id,' 'AggregateHost.deleted == 0,' 'Aggregate.deleted == 0)', - secondaryjoin='and_(' - 'AggregateHost.aggregate_id == Aggregate.id, ' - 'AggregateHost.deleted == 0,' - 'Aggregate.deleted == 0)', backref='aggregates')
_metadata = relationship(AggregateMetadata, - secondary="aggregate_metadata", primaryjoin='and_(' 'Aggregate.id == AggregateMetadata.aggregate_id,' 'AggregateMetadata.deleted == 0,' 'Aggregate.deleted == 0)', - secondaryjoin='and_(' - 'AggregateMetadata.aggregate_id == Aggregate.id, ' - 'AggregateMetadata.deleted == 0,' - 'Aggregate.deleted == 0)', - backref='aggregates') + backref='aggregates')
def _extra_keys(self): return ['hosts', 'metadetails', 'availability_zone']
Sam what happens in your environment if you try:
diff --git a/nova/ db/sqlalchemy/ models. py b/nova/ db/sqlalchemy/ models. py db/sqlalchemy/ models. py db/sqlalchemy/ models. py AggregateHost,
lazy= "joined" , "aggregate_ hosts",
primaryjo in='and_ ('
' Aggregate. id == AggregateHost. aggregate_ id,'
' AggregateHost. deleted == 0,'
' Aggregate. deleted == 0)', 'and_(' aggregate_ id == Aggregate.id, ' deleted == 0,'
backref= 'aggregates' )
index 95456bf..49cf23e 100644
--- a/nova/
+++ b/nova/
@@ -842,28 +842,18 @@ class Aggregate(BASE, NovaBase):
name = Column(String(255))
_hosts = relationship(
- secondary=
- secondaryjoin=
- 'AggregateHost.
- 'AggregateHost.
- 'Aggregate.deleted == 0)',
_metadata = relationship( AggregateMetada ta, "aggregate_ metadata" ,
primaryjoi n='and_ ('
'Aggregate. id == AggregateMetada ta.aggregate_ id,'
'AggregateMet adata.deleted == 0,'
'Aggregate. deleted == 0)', 'and_(' ata.aggregate_ id == Aggregate.id, ' ata.deleted == 0,' 'aggregates' ) 'aggregates' )
- secondary=
- secondaryjoin=
- 'AggregateMetad
- 'AggregateMetad
- 'Aggregate.deleted == 0)',
- backref=
+ backref=
def _extra_keys(self): zone']
return ['hosts', 'metadetails', 'availability_