Merge "Replace nullable from primary keys in tz_network_bindings with default"
This commit is contained in:
commit
06254d8fb2
|
@ -37,9 +37,8 @@ class TzNetworkBinding(model_base.BASEV2):
|
||||||
binding_type = Column(Enum('flat', 'vlan', 'stt', 'gre', 'l3_ext',
|
binding_type = Column(Enum('flat', 'vlan', 'stt', 'gre', 'l3_ext',
|
||||||
name='tz_network_bindings_binding_type'),
|
name='tz_network_bindings_binding_type'),
|
||||||
nullable=False, primary_key=True)
|
nullable=False, primary_key=True)
|
||||||
phy_uuid = Column(String(36), primary_key=True, nullable=True)
|
phy_uuid = Column(String(36), primary_key=True, default='')
|
||||||
vlan_id = Column(Integer, primary_key=True, nullable=True,
|
vlan_id = Column(Integer, primary_key=True, autoincrement=False, default=0)
|
||||||
autoincrement=False)
|
|
||||||
|
|
||||||
def __init__(self, network_id, binding_type, phy_uuid, vlan_id):
|
def __init__(self, network_id, binding_type, phy_uuid, vlan_id):
|
||||||
self.network_id = network_id
|
self.network_id = network_id
|
||||||
|
@ -115,4 +114,4 @@ class MultiProviderNetworks(model_base.BASEV2):
|
||||||
primary_key=True)
|
primary_key=True)
|
||||||
|
|
||||||
def __init__(self, network_id):
|
def __init__(self, network_id):
|
||||||
self.network_id = network_id
|
self.network_id = network_id
|
||||||
|
|
Loading…
Reference in New Issue