openstack
/
neutron
Code Issues Proposed changes

Merge "Correctly inherit __table_args__ from parent class" into milestone-proposed

This commit is contained in:
Jenkins 2014-04-09 00:11:21 +00:00 committed by Gerrit Code Review
parent 467b5ca5c7 3547788a22
commit 528544502e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/db/extradhcpopt_db.py
View File

@ -43,7 +43,8 @@ class ExtraDhcpOpt(model_base.BASEV2, models_v2.HasId):
opt_value = sa.Column(sa.String(255), nullable=False)
__table_args__ = (sa.UniqueConstraint('port_id',
'opt_name',
name='uidx_portid_optname'),)
name='uidx_portid_optname'),
model_base.BASEV2.__table_args__,)
# Add a relationship to the Port model in order to instruct SQLAlchemy to
# eagerly load extra_dhcp_opts bindings

1
neutron/plugins/openvswitch/ovs_models_v2.py
View File

@ -93,6 +93,7 @@ class TunnelEndpoint(model_base.BASEV2):
__tablename__ = 'ovs_tunnel_endpoints'
__table_args__ = (
UniqueConstraint('id', name='uniq_ovs_tunnel_endpoints0id'),
model_base.BASEV2.__table_args__,
)
ip_address = Column(String(64), primary_key=True)