summaryrefslogtreecommitdiff
path: root/neutron/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-01 11:31:38 +0000
committerGerrit Code Review <review@openstack.org>2016-06-01 11:31:39 +0000
commit10a713824517d6e637f041a95a165ce6b40deea6 (patch)
tree1ed87d5e693f361218915f0a35a0d98ffe9aeebc /neutron/tests
parentd0b349f08db97233c4985312788151541b0810ea (diff)
parent96d1d914ca0976fb6e8c7962d4d97f8553c4847e (diff)
downloadneutron-10a713824517d6e637f041a95a165ce6b40deea6.tar.gz
Merge "Macvtap: Allow noop alias as FW driver"
Diffstat (limited to 'neutron/tests')
-rw-r--r--neutron/tests/unit/plugins/ml2/drivers/macvtap/agent/test_macvtap_neutron_agent.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/neutron/tests/unit/plugins/ml2/drivers/macvtap/agent/test_macvtap_neutron_agent.py b/neutron/tests/unit/plugins/ml2/drivers/macvtap/agent/test_macvtap_neutron_agent.py
index fb20980bf5..0101b49188 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/macvtap/agent/test_macvtap_neutron_agent.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/macvtap/agent/test_macvtap_neutron_agent.py
@@ -191,12 +191,18 @@ class TestMacvtapMain(base.BaseTestCase):
macvtap_neutron_agent.parse_interface_mappings()
mock_exit.assert_called_with(1)
- def test_validate_firewall_driver_noop(self):
+ def test_validate_firewall_driver_noop_long(self):
cfg.CONF.set_override('firewall_driver',
'neutron.agent.firewall.NoopFirewallDriver',
'SECURITYGROUP')
macvtap_neutron_agent.validate_firewall_driver()
+ def test_validate_firewall_driver_noop(self):
+ cfg.CONF.set_override('firewall_driver',
+ 'noop',
+ 'SECURITYGROUP')
+ macvtap_neutron_agent.validate_firewall_driver()
+
def test_validate_firewall_driver_other(self):
cfg.CONF.set_override('firewall_driver',
'foo',