x/quark
Code Issues Proposed changes

Pep8 da models

Browse Source
This commit is contained in:
Jason Kölker
2013-03-06 17:15:08 -06:00
parent fd1759c458
commit 9f1938aa11
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
quark/db/models.py
View File

@@ -202,7 +202,8 @@ class Subnet(BASEV2, HasId, HasTenant, IsHazTags):
routes = orm.relationship(Route, backref='subnet', cascade='delete') routes = orm.relationship(Route, backref='subnet', cascade='delete')
port_ip_association_table = sa.Table("quark_port_ip_address_associations", port_ip_association_table = sa.Table(
"quark_port_ip_address_associations",
BASEV2.metadata, BASEV2.metadata,
sa.Column("port_id", sa.String(36), sa.Column("port_id", sa.String(36),
sa.ForeignKey("quark_ports.id")), sa.ForeignKey("quark_ports.id")),
@@ -210,7 +211,7 @@ port_ip_association_table = sa.Table("quark_port_ip_address_associations",
sa.ForeignKey("quark_ip_addresses.id"))) sa.ForeignKey("quark_ip_addresses.id")))
class Port(BASEV2, HasTenant): class Port(BASEV2, HasTenant, HasId):
__tablename__ = "quark_ports" __tablename__ = "quark_ports"
id = sa.Column(sa.String(36), primary_key=True) id = sa.Column(sa.String(36), primary_key=True)
network_id = sa.Column(sa.String(36), sa.ForeignKey("quark_networks.id"), network_id = sa.Column(sa.String(36), sa.ForeignKey("quark_networks.id"),
@@ -219,10 +220,14 @@ class Port(BASEV2, HasTenant):
backend_key = sa.Column(sa.String(36), nullable=False) backend_key = sa.Column(sa.String(36), nullable=False)
mac_address = sa.Column(sa.BigInteger()) mac_address = sa.Column(sa.BigInteger())
device_id = sa.Column(sa.String(255), nullable=False) device_id = sa.Column(sa.String(255), nullable=False)
ip_addresses = orm.relationship(IPAddress,
primaryjoin=id == port_ip_association_table.c.port_id, @declarative.declared_attr
secondaryjoin=port_ip_association_table.c.ip_address_id == def ip_addresses(cls):
IPAddress.id, primaryjoin = cls.id == port_ip_association_table.c.port_id
secondaryjoin = (port_ip_association_table.c.ip_address_id ==
IPAddress.id)
return orm.relationship(IPAddress, primaryjoin=primaryjoin,
secondaryjoin=secondaryjoin,
secondary=port_ip_association_table, secondary=port_ip_association_table,
backref="ports") backref="ports")