Merge "VMWare NSXv: id fields should be nullable"
This commit is contained in:
commit
ec6228b02e
@ -57,14 +57,14 @@ def upgrade():
|
|||||||
'nsxv_internal_networks',
|
'nsxv_internal_networks',
|
||||||
sa.Column('network_purpose', internal_network_purpose_enum,
|
sa.Column('network_purpose', internal_network_purpose_enum,
|
||||||
nullable=False),
|
nullable=False),
|
||||||
sa.Column('network_id', sa.String(length=36), nullable=False),
|
sa.Column('network_id', sa.String(length=36), nullable=True),
|
||||||
sa.ForeignKeyConstraint(['network_id'], ['networks.id'],
|
sa.ForeignKeyConstraint(['network_id'], ['networks.id'],
|
||||||
ondelete='CASCADE'),
|
ondelete='CASCADE'),
|
||||||
sa.PrimaryKeyConstraint('network_purpose'))
|
sa.PrimaryKeyConstraint('network_purpose'))
|
||||||
op.create_table(
|
op.create_table(
|
||||||
'nsxv_internal_edges',
|
'nsxv_internal_edges',
|
||||||
sa.Column('ext_ip_address', sa.String(length=64), nullable=False),
|
sa.Column('ext_ip_address', sa.String(length=64), nullable=False),
|
||||||
sa.Column('router_id', sa.String(length=36), nullable=False),
|
sa.Column('router_id', sa.String(length=36), nullable=True),
|
||||||
sa.Column('purpose', internal_edge_purpose_enum, nullable=True),
|
sa.Column('purpose', internal_edge_purpose_enum, nullable=True),
|
||||||
sa.PrimaryKeyConstraint('ext_ip_address'))
|
sa.PrimaryKeyConstraint('ext_ip_address'))
|
||||||
op.create_table(
|
op.create_table(
|
||||||
|
@ -84,7 +84,7 @@ class NsxvInternalNetworks(model_base.BASEV2):
|
|||||||
primary_key=True)
|
primary_key=True)
|
||||||
network_id = sa.Column(sa.String(36),
|
network_id = sa.Column(sa.String(36),
|
||||||
sa.ForeignKey("networks.id", ondelete="CASCADE"),
|
sa.ForeignKey("networks.id", ondelete="CASCADE"),
|
||||||
nullable=False)
|
nullable=True)
|
||||||
|
|
||||||
|
|
||||||
class NsxvInternalEdges(model_base.BASEV2):
|
class NsxvInternalEdges(model_base.BASEV2):
|
||||||
@ -93,7 +93,7 @@ class NsxvInternalEdges(model_base.BASEV2):
|
|||||||
__tablename__ = 'nsxv_internal_edges'
|
__tablename__ = 'nsxv_internal_edges'
|
||||||
|
|
||||||
ext_ip_address = sa.Column(sa.String(64), primary_key=True)
|
ext_ip_address = sa.Column(sa.String(64), primary_key=True)
|
||||||
router_id = sa.Column(sa.String(36), nullable=False)
|
router_id = sa.Column(sa.String(36), nullable=True)
|
||||||
purpose = sa.Column(
|
purpose = sa.Column(
|
||||||
sa.Enum(nsxv_constants.INTER_EDGE_PURPOSE,
|
sa.Enum(nsxv_constants.INTER_EDGE_PURPOSE,
|
||||||
name='nsxv_internal_edges_purpose'))
|
name='nsxv_internal_edges_purpose'))
|
||||||
|
Loading…
Reference in New Issue
Block a user