From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 18 Aug 2014 15:05:44 +0000 (+0000)
Subject: Merge "Replace nullable from primary keys in tz_network_bindings with default"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=06254d8fb2d151ca8d452378cdddfd59f4ebf5d0;p=openstack-build%2Fneutron-build.git

Merge "Replace nullable from primary keys in tz_network_bindings with default"
---

06254d8fb2d151ca8d452378cdddfd59f4ebf5d0
diff --cc neutron/plugins/vmware/dbexts/models.py
index 0c87dfa30,47d735c3e..3337c9f25
--- a/neutron/plugins/vmware/dbexts/models.py
+++ b/neutron/plugins/vmware/dbexts/models.py
@@@ -115,4 -117,21 +114,4 @@@ class MultiProviderNetworks(model_base.
                          primary_key=True)
  
      def __init__(self, network_id):
-         self.network_id = network_id
+         self.network_id = network_id
 -
 -
 -class NSXRouterExtAttributes(model_base.BASEV2):
 -    """Router attributes managed by NSX plugin extensions."""
 -    router_id = Column(String(36),
 -                       ForeignKey('routers.id', ondelete="CASCADE"),
 -                       primary_key=True)
 -    distributed = Column(Boolean, default=False, server_default=sql.false(),
 -                         nullable=False)
 -    service_router = Column(Boolean, default=False, server_default=sql.false(),
 -                            nullable=False)
 -    # Add a relationship to the Router model in order to instruct
 -    # SQLAlchemy to eagerly load this association
 -    router = orm.relationship(
 -        l3_db.Router,
 -        backref=orm.backref("nsx_attributes", lazy='joined',
 -                            uselist=False, cascade='delete'))