diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-29 17:19:47 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-29 17:19:47 -0500 |
| commit | 46c321d044d6a2db44a22466624a1e7dc71d5935 (patch) | |
| tree | b889e5d7f1f1960ac99843b462701c5a11bf8f5e | |
| parent | c49b1a8124fe63292d7c1191c094cc5921dbfaa9 (diff) | |
| download | nova-46c321d044d6a2db44a22466624a1e7dc71d5935.tar.gz nova-46c321d044d6a2db44a22466624a1e7dc71d5935.tar.xz nova-46c321d044d6a2db44a22466624a1e7dc71d5935.zip | |
fixed incorrect assumption that nullable defaults to false
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/029_multi_nic.py | 6 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/029_multi_nic.py b/nova/db/sqlalchemy/migrate_repo/versions/029_multi_nic.py index 61cd8ae51..4a117bb11 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/029_multi_nic.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/029_multi_nic.py @@ -38,11 +38,11 @@ virtual_interfaces = Table('virtual_interfaces', meta, unique=True), Column('network_id', Integer(), - ForeignKey('networks.id'), - nullable=True), + ForeignKey('networks.id')), Column('instance_id', Integer(), - ForeignKey('instances.id')), + ForeignKey('instances.id'), + nullable=False), mysql_engine='InnoDB') diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 03bde4f99..fe899cc4f 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -568,11 +568,11 @@ class VirtualInterface(BASE, NovaBase): __tablename__ = 'virtual_interfaces' id = Column(Integer, primary_key=True) address = Column(String(255), unique=True) - network_id = Column(Integer, ForeignKey('networks.id'), nullable=True) + network_id = Column(Integer, ForeignKey('networks.id')) network = relationship(Network, backref=backref('virtual_interfaces')) # TODO(tr3buchet): cut the cord, removed foreign key and backrefs - instance_id = Column(Integer, ForeignKey('instances.id')) + instance_id = Column(Integer, ForeignKey('instances.id'), nullable=False) instance = relationship(Instance, backref=backref('virtual_interfaces')) |