openstack
/
neutron
Code Issues Proposed changes

Merge "Switch to constant for 'tap' VIF_TYPE"

This commit is contained in:
Jenkins 2017-05-31 19:31:42 +00:00 committed by Gerrit Code Review
parent ed7fd6edb2 b2195bcf96
commit 2979468011
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ml2/drivers/linuxbridge/mech_driver/mech_linuxbridge.py
View File

@ -36,7 +36,7 @@ class LinuxbridgeMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
sg_enabled = securitygroups_rpc.is_firewall_enabled()
super(LinuxbridgeMechanismDriver, self).__init__(
constants.AGENT_TYPE_LINUXBRIDGE,
'tap', # const merge in I718f514e1673544114063af5e1a14ec29bf3274d
portbindings.VIF_TYPE_TAP,
{portbindings.CAP_PORT_FILTER: sg_enabled})
lb_qos_driver.register()

2
neutron/tests/unit/plugins/ml2/drivers/linuxbridge/mech_driver/test_mech_linuxbridge.py
View File

@ -24,7 +24,7 @@ from neutron.tests.unit.plugins.ml2 import _test_mech_agent as base
class LinuxbridgeMechanismBaseTestCase(base.AgentMechanismBaseTestCase):
VIF_TYPE = 'tap'
VIF_TYPE = portbindings.VIF_TYPE_TAP
CAP_PORT_FILTER = True
AGENT_TYPE = constants.AGENT_TYPE_LINUXBRIDGE