openstack
/
neutron
Code Issues Proposed changes

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

This commit is contained in:
Jenkins 2014-08-18 15:05:44 +00:00 committed by Gerrit Code Review
parent f907677f1d e416a5420f
commit 06254d8fb2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/plugins/vmware/dbexts/models.py
View File

@ -37,9 +37,8 @@ class TzNetworkBinding(model_base.BASEV2):
binding_type = Column(Enum('flat', 'vlan', 'stt', 'gre', 'l3_ext',
name='tz_network_bindings_binding_type'),
nullable=False, primary_key=True)
phy_uuid = Column(String(36), primary_key=True, nullable=True)
vlan_id = Column(Integer, primary_key=True, nullable=True,
autoincrement=False)
phy_uuid = Column(String(36), primary_key=True, default='')
vlan_id = Column(Integer, primary_key=True, autoincrement=False, default=0)
def __init__(self, network_id, binding_type, phy_uuid, vlan_id):
self.network_id = network_id
@ -115,4 +114,4 @@ class MultiProviderNetworks(model_base.BASEV2):
primary_key=True)
def __init__(self, network_id):
self.network_id = network_id
self.network_id = network_id