x/tap-as-a-service-tempest-plugin
Code Issues Proposed changes

Merge "Fix a few db vs migration mismatch"

Browse Source
This commit is contained in:
Jenkins 2016-08-12 09:34:21 +00:00 committed by Gerrit Code Review
commit 3b009c3e97
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron_taas/db/taas_db.py
View File

@ -14,6 +14,7 @@
# under the License. # under the License.
from neutron.api.v2 import attributes as attr
from neutron.db import common_db_mixin as base_db from neutron.db import common_db_mixin as base_db
from neutron.db import model_base from neutron.db import model_base
from neutron.db import models_v2 from neutron.db import models_v2
@ -29,19 +30,21 @@ from sqlalchemy.orm import exc
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
class TapService(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant): class TapService(model_base.BASEV2, models_v2.HasId):
# Represents a V2 TapService Object # Represents a V2 TapService Object
__tablename__ = 'tap_services' __tablename__ = 'tap_services'
tenant_id = sa.Column(sa.String(attr.TENANT_ID_MAX_LEN))
name = sa.Column(sa.String(255), nullable=True) name = sa.Column(sa.String(255), nullable=True)
description = sa.Column(sa.String(1024), nullable=True) description = sa.Column(sa.String(1024), nullable=True)
port_id = sa.Column(sa.String(36), nullable=False) port_id = sa.Column(sa.String(36), nullable=False)
class TapFlow(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant): class TapFlow(model_base.BASEV2, models_v2.HasId):
# Represents a V2 TapFlow Object # Represents a V2 TapFlow Object
__tablename__ = 'tap_flows' __tablename__ = 'tap_flows'
tenant_id = sa.Column(sa.String(attr.TENANT_ID_MAX_LEN))
name = sa.Column(sa.String(255), nullable=True) name = sa.Column(sa.String(255), nullable=True)
description = sa.Column(sa.String(1024), nullable=True) description = sa.Column(sa.String(1024), nullable=True)
tap_service_id = sa.Column(sa.String(36), tap_service_id = sa.Column(sa.String(36),
@ -50,7 +53,8 @@ class TapFlow(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant):
nullable=False) nullable=False)
source_port = sa.Column(sa.String(36), nullable=False) source_port = sa.Column(sa.String(36), nullable=False)
direction = sa.Column(sa.Enum('IN', 'OUT', 'BOTH', direction = sa.Column(sa.Enum('IN', 'OUT', 'BOTH',
name='tapflows_direction')) name='tapflows_direction'),
nullable=False)
class TapIdAssociation(model_base.BASEV2): class TapIdAssociation(model_base.BASEV2):