diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-03-08 13:46:59 -0500 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-03-11 11:51:29 -0400 |
| commit | fed1ea1d7528e7a3d2da181112da62cf04cb5092 (patch) | |
| tree | 1c520e200cf0ffcbe7b3a634d25227136cd8bc29 /nova/db/sqlalchemy/models.py | |
| parent | f543f347c84e7f5de2c584ca55363e4dee5b0a3d (diff) | |
| download | nova-fed1ea1d7528e7a3d2da181112da62cf04cb5092.tar.gz nova-fed1ea1d7528e7a3d2da181112da62cf04cb5092.tar.xz nova-fed1ea1d7528e7a3d2da181112da62cf04cb5092.zip | |
Remove instance['instance_type'] relationship from db api
This removes the entire relationship between an instance and the flavor
it was created from. As such, it removes two tests entirely which
examined the old behavior.
This is one change in a series aimed at removing the use of instance-linked
instance_type objects, in favor of the decoupled type data in
system_metadata. See bug 1140119 for more details.
Change-Id: I8b525a900bf2dc6b193e54aae35fc32248e4cff4
Diffstat (limited to 'nova/db/sqlalchemy/models.py')
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index a675357df..3f45c614b 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -273,13 +273,6 @@ class InstanceTypes(BASE, NovaBase): disabled = Column(Boolean, default=False) is_public = Column(Boolean, default=True) - instances = relationship(Instance, - backref=backref('instance_type', uselist=False), - foreign_keys=id, - primaryjoin='and_(' - 'Instance.instance_type_id == ' - 'InstanceTypes.id)') - class Volume(BASE, NovaBase): """Represents a block storage device that can be attached to a VM.""" |