openstack
/
neutron
Code Issues Proposed changes

Merge "Fix port relationship for DVRPortBinding" into stable/liberty

This commit is contained in:
Jenkins 2016-04-22 15:02:00 +00:00 committed by Gerrit Code Review
parent 3d2d3c5574 0bce029749
commit c6d7302cd8
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ml2/models.py
View File

@ -127,5 +127,5 @@ class DVRPortBinding(model_base.BASEV2):
port = orm.relationship(
models_v2.Port,
backref=orm.backref("dvr_port_binding",
lazy='joined', uselist=False,
lazy='joined',
cascade='delete'))

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

@ -13,10 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import warnings
import mock
from oslo_utils import uuidutils
from sqlalchemy.orm import query
from neutron.common import constants
from neutron import context
from neutron.db import db_base_plugin_v2
from neutron.db import l3_db
@ -385,3 +388,34 @@ class Ml2DvrDBTestCase(testlib_api.SqlTestCase):
network_id, port_id_1, router.id, 'foo_host_id_2')
ports = ml2_db.get_dvr_port_bindings(self.ctx.session, 'foo_port_id')
self.assertEqual(2, len(ports))
def test_dvr_port_binding_deleted_by_port_deletion(self):
with self.ctx.session.begin(subtransactions=True):
self.ctx.session.add(models_v2.Network(id='network_id'))
device_owner = constants.DEVICE_OWNER_DVR_INTERFACE
port = models_v2.Port(
id='port_id',
network_id='network_id',
mac_address='00:11:22:33:44:55',
admin_state_up=True,
status=constants.PORT_STATUS_ACTIVE,
device_id='device_id',
device_owner=device_owner)
self.ctx.session.add(port)
binding_kwarg = {
'port_id': 'port_id',
'host': 'host',
'vif_type': portbindings.VIF_TYPE_UNBOUND,
'vnic_type': portbindings.VNIC_NORMAL,
'router_id': 'router_id',
'status': constants.PORT_STATUS_DOWN
}
self.ctx.session.add(models.DVRPortBinding(**binding_kwarg))
binding_kwarg['host'] = 'another-host'
self.ctx.session.add(models.DVRPortBinding(**binding_kwarg))
with warnings.catch_warnings(record=True) as warning_list:
with self.ctx.session.begin(subtransactions=True):
self.ctx.session.delete(port)
self.assertEqual([], warning_list)
ports = ml2_db.get_dvr_port_bindings(self.ctx.session, 'port_id')
self.assertEqual(0, len(ports))