From 3547788a22f2008a062ccf0ddcec04f834b097c8 Mon Sep 17 00:00:00 2001 From: Darren Birkett Date: Thu, 6 Mar 2014 16:17:03 +0000 Subject: [PATCH] Correctly inherit __table_args__ from parent class Where unique constraints are added to certain tables by populating __table_args__, we need to ensure we inherit the top level __table_args__ that define the default storage engine to use when creating tables. Change-Id: Ib886b84922830b60282b4f882591e43f5041e713 Fixes: bug 1288358 (cherry picked from commit 72e37ddcd067432675543c8f4d327fe766bc8044) --- neutron/db/extradhcpopt_db.py | 3 ++- neutron/plugins/openvswitch/ovs_models_v2.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/neutron/db/extradhcpopt_db.py b/neutron/db/extradhcpopt_db.py index fabe7565132..4693457f7ca 100644 --- a/neutron/db/extradhcpopt_db.py +++ b/neutron/db/extradhcpopt_db.py @@ -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 diff --git a/neutron/plugins/openvswitch/ovs_models_v2.py b/neutron/plugins/openvswitch/ovs_models_v2.py index ffb6cd0b8c6..b50074cc517 100644 --- 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)