Merge "Network_id should not be a foreign key"

Code Issues Proposed changes

This commit is contained in:

Jenkins

2015年06月29日 12:18:58 +00:00

committed by Gerrit Code Review

parent b89c4b3533 711aa7e6bf

commit 64d8e664f8

1 changed files with 1 additions and 4 deletions

@@ -22,7 +22,6 @@ from neutron.db import common_db_mixin

from neutron.db import model_base

from neutron.db import models_v2

from oslo_log import log

from sqlalchemy import orm

from sqlalchemy.orm import exc

from networking_bgpvpn.neutron.extensions.bgpvpn.bgpvpn import BGPVPNPluginBase

@@ -44,9 +43,7 @@ class BGPVPNConnection(model_base.BASEV2,

import_targets = sa.Column(sa.String(255), nullable=False)

export_targets = sa.Column(sa.String(255), nullable=False)

auto_aggregate = sa.Column(sa.Boolean(), nullable=False)

network_id = sa.Column(sa.String(36),

sa.ForeignKey('networks.id'))

network = orm.relationship(models_v2.Network)

network_id = sa.Column(sa.String(36))

class BGPVPNConnectionNotFound(q_exc.NotFound):