diff options
| author | Jason Kölker <jason@koelker.net> | 2011-05-23 13:38:33 -0500 |
|---|---|---|
| committer | Jason Kölker <jason@koelker.net> | 2011-05-23 13:38:33 -0500 |
| commit | 950e830df8f6e1628739424809a71b1e6a91866a (patch) | |
| tree | 198ae5e5d30cc2bfe53a09cc64b9db075926f36e | |
| parent | 15a02b247436ba71c4f64a8ac8d79b32cc8883f1 (diff) | |
must have the class defined before referencing it
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 062a8cac0..a725ee1d0 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -485,6 +485,17 @@ class Network(BASE, NovaBase): host = Column(String(255)) # , ForeignKey('hosts.id')) +class MacAddress(BASE, NovaBase): + """Represents a mac address used by an instance""" + __tablename__ = 'mac_addresses' + id = Column(Integer, primary_key=True) + address = Column(String(255), unique=True) + network_id = Column(Integer, ForeignKey('networks.id'), nullable=False) + network = relationship(Network, backref=backref('mac_addresses')) + instance_id = Column(Integer, ForeignKey('instances.id'), nullable=False) + instance = relationship(Instance, backref=backref('mac_addresses')) + + # TODO(vish): can these both come from the same baseclass? class FixedIp(BASE, NovaBase): """Represents a fixed ip for an instance.""" @@ -524,17 +535,6 @@ class FloatingIp(BASE, NovaBase): host = Column(String(255)) # , ForeignKey('hosts.id')) -class MacAddress(BASE, NovaBase): - """Represents a mac address used by an instance""" - __tablename__ = 'mac_addresses' - id = Column(Integer, primary_key=True) - address = Column(String(255), unique=True) - network_id = Column(Integer, ForeignKey('networks.id'), nullable=False) - network = relationship(Network, backref=backref('mac_addresses')) - instance_id = Column(Integer, ForeignKey('instances.id'), nullable=False) - instance = relationship(Instance, backref=backref('mac_addresses')) - - class AuthToken(BASE, NovaBase): """Represents an authorization token for all API transactions. |
