Merge "Correctly inherit __table_args__ from parent class"

2014-04-08 20:24:32 +00:00
parent 55a4095ffb 269a16a9f1
commit 023fa6b1d3
2 changed files with 3 additions and 1 deletions
--- a/neutron/plugins/openvswitch/ovs_models_v2.py
+++ b/neutron/plugins/openvswitch/ovs_models_v2.py
@@ -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)