openstack
/
ironic-inspector
Code Issues Proposed changes

Merge "Support manage_firewall during deprecation period"

This commit is contained in:
Zuul 2017-10-20 16:02:56 +00:00 committed by Gerrit Code Review
parent f02eda0315 acb51f642d
commit fa6163c8f8
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic_inspector/pxe_filter/base.py
View File

@ -218,6 +218,11 @@ def _driver_manager():
global _DRIVER_MANAGER
name = CONF.pxe_filter.driver
# FIXME(milan): to be removed after the transition period of deprecating
# the firewall option group
if name == 'iptables' and not CONF.iptables.manage_firewall:
name = 'noop'
if _DRIVER_MANAGER is None:
_DRIVER_MANAGER = stevedore.driver.DriverManager(
_STEVEDORE_DRIVER_NAMESPACE,

14
ironic_inspector/test/unit/test_pxe_filter.py
View File

@ -64,6 +64,20 @@ class TestDriverManager(test_base.BaseTest):
self.stevedore_driver_mock.assert_not_called()
self.assertIs(pxe_filter._DRIVER_MANAGER, driver_manager)
def test_manage_firewall(self):
# FIXME(milan): to be removed after the transition period of
# deprecating the firewall option group
# NOTE(milan) the default filter driver is iptables
# this should revert it to noop
CONF.set_override('manage_firewall', False, 'iptables')
driver_manager = pxe_filter._driver_manager()
self.stevedore_driver_mock.assert_called_once_with(
pxe_filter._STEVEDORE_DRIVER_NAMESPACE,
name='noop',
invoke_on_load=True)
self.assertIsNotNone(driver_manager)
self.assertIs(pxe_filter._DRIVER_MANAGER, driver_manager)
class TestDriverManagerLoading(test_base.BaseTest):
def setUp(self):