openstack/neutron
Code Issues Proposed changes

Merge "Add enable_security_group option"

Browse Source
This commit is contained in:
Jenkins
2014-03-22 02:15:52 +00:00
committed by Gerrit Code Review
parent 5de19c1227 f87e7d964c
commit e892f85d06
30 changed files with 202 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
View File

@@ -100,6 +100,9 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
cfg.CONF.set_override('report_interval', 0, 'AGENT')
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
cfg.CONF.set_default('firewall_driver',
'neutron.agent.firewall.NoopFirewallDriver',
group='SECURITYGROUP')
self.execute_p = mock.patch.object(ip_lib.IPWrapper, '_execute')
self.execute = self.execute_p.start()
self.addCleanup(self.execute_p.stop)

6
neutron/tests/unit/linuxbridge/test_linuxbridge_plugin.py
View File

@@ -16,6 +16,7 @@
import contextlib
import mock
from oslo.config import cfg
from neutron.common import constants as q_const
from neutron.extensions import portbindings
@@ -65,15 +66,20 @@ class TestLinuxBridgePortBinding(LinuxBridgePluginV2TestCase,
test_bindings.PortBindingsTestCase):
VIF_TYPE = portbindings.VIF_TYPE_BRIDGE
HAS_PORT_FILTER = True
ENABLE_SG = True
FIREWALL_DRIVER = test_sg_rpc.FIREWALL_IPTABLES_DRIVER
def setUp(self):
test_sg_rpc.set_firewall_driver(self.FIREWALL_DRIVER)
cfg.CONF.set_override(
'enable_security_group', self.ENABLE_SG,
group='SECURITYGROUP')
super(TestLinuxBridgePortBinding, self).setUp()
class TestLinuxBridgePortBindingNoSG(TestLinuxBridgePortBinding):
HAS_PORT_FILTER = False
ENABLE_SG = False
FIREWALL_DRIVER = test_sg_rpc.FIREWALL_NOOP_DRIVER