Merge "Update models to use the base model for tenant details"

This commit is contained in:
Jenkins 2016-08-03 07:16:44 +00:00 committed by Gerrit Code Review
commit ac98bf6bfe

View File

@ -191,7 +191,7 @@ class MultiProviderNetworks(model_base.BASEV2, models.TimestampMixin):
self.network_id = network_id
class NetworkConnection(model_base.BASEV2, models_v2.HasTenant,
class NetworkConnection(model_base.BASEV2, model_base.HasTenant,
models.TimestampMixin):
"""Defines a connection between a network gateway and a network."""
# We use port_id as the primary key as one can connect a gateway
@ -226,8 +226,8 @@ class NetworkGatewayDeviceReference(model_base.BASEV2, models.TimestampMixin):
interface_name = sa.Column(sa.String(64), primary_key=True)
class NetworkGatewayDevice(model_base.BASEV2, models_v2.HasId,
models_v2.HasTenant, models.TimestampMixin):
class NetworkGatewayDevice(model_base.BASEV2, model_base.HasId,
model_base.HasTenant, models.TimestampMixin):
nsx_id = sa.Column(sa.String(36))
# Optional name for the gateway device
name = sa.Column(sa.String(255))
@ -240,8 +240,8 @@ class NetworkGatewayDevice(model_base.BASEV2, models_v2.HasId,
status = sa.Column(sa.String(16))
class NetworkGateway(model_base.BASEV2, models_v2.HasId,
models_v2.HasTenant, models.TimestampMixin):
class NetworkGateway(model_base.BASEV2, model_base.HasId,
model_base.HasTenant, models.TimestampMixin):
"""Defines the data model for a network gateway."""
name = sa.Column(sa.String(255))
default = sa.Column(sa.Boolean())
@ -296,7 +296,7 @@ class Lsn(models_v2.model_base.BASEV2, models.TimestampMixin):
self.lsn_id = lsn_id
class QoSQueue(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant,
class QoSQueue(model_base.BASEV2, model_base.HasId, model_base.HasTenant,
models.TimestampMixin):
name = sa.Column(sa.String(255))
default = sa.Column(sa.Boolean, default=False, server_default=sql.false())