openstack
/
neutron
Code Issues Proposed changes

Merge "Remove ORM relationship between ports and networks"

This commit is contained in:
Jenkins 2017-02-20 19:00:59 +00:00 committed by Gerrit Code Review
parent 2bef2e6699 7dfa64bf41
commit 6f944bab1e
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/db/models_v2.py
View File

@ -236,7 +236,6 @@ class Network(standard_attr.HasStandardAttributes, model_base.BASEV2,
"""Represents a v2 neutron network."""
name = sa.Column(sa.String(db_const.NAME_FIELD_SIZE))
ports = orm.relationship(Port, backref='networks')
subnets = orm.relationship(
Subnet, backref=orm.backref('networks', lazy='subquery'),
lazy="subquery")

7
neutron/tests/unit/db/test_provisioning_blocks.py
View File

@ -46,9 +46,10 @@ class TestStatusBarriers(testlib_api.SqlTestCase):
def _make_port(self):
net = self._make_net()
with self.ctx.session.begin():
port = models_v2.Port(networks=net, mac_address='1', tenant_id='1',
admin_state_up=True, status='DOWN',
device_id='2', device_owner='3')
port = models_v2.Port(network_id=net.id, mac_address='1',
tenant_id='1', admin_state_up=True,
status='DOWN', device_id='2',
device_owner='3')
self.ctx.session.add(port)
return port

1
neutron/tests/unit/plugins/ml2/test_db.py
View File

@ -399,6 +399,7 @@ class Ml2DvrDBTestCase(testlib_api.SqlTestCase):
def test_distributed_port_binding_deleted_by_port_deletion(self):
with self.ctx.session.begin(subtransactions=True):
self.ctx.session.add(models_v2.Network(id='network_id'))
with self.ctx.session.begin(subtransactions=True):
device_owner = constants.DEVICE_OWNER_DVR_INTERFACE
port = models_v2.Port(
id='port_id',