openstack/neutron-fwaas
Code Issues Proposed changes

Remove deprecated use_namespaces option

Browse Source 
use_namespace option has been removed from neutron so we can cleanup
neutron-fwaas.

Closes-Bug: #1508188
Depends-On: I2fbf65df1250d9f9f1656b3964ee3b6de1ef1118
Change-Id: Iaec250bc07f2099a09a4b8831c59abe6ce34062c
This commit is contained in:
Cedric Brandily
2015-10-28 08:39:36 +09:00
parent e50e0c5a4b
commit 750cd05b34
5 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
neutron_fwaas/services/firewall/__init__.py
View File

@@ -1,21 +0,0 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from oslo_config import cfg
# FIXME(cbrandily): required until use_namespace option removal from neutron
USE_NAMESPACES_OPT = cfg.BoolOpt('use_namespaces', default=True)
def register_use_namespaces_opts_helper(conf):
conf.register_opt(USE_NAMESPACES_OPT)

2
neutron_fwaas/services/firewall/agents/varmour/varmour_router.py
View File

@@ -36,7 +36,6 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_service import service
from neutron_fwaas.services import firewall
from neutron_fwaas.services.firewall.agents.l3reference \
import firewall_l3_agent
from neutron_fwaas.services.firewall.agents.varmour import varmour_api
@@ -334,7 +333,6 @@ def main():
conf.register_opts(l3_config.OPTS)
conf.register_opts(ha.OPTS)
config.register_interface_driver_opts_helper(conf)
firewall.register_use_namespaces_opts_helper(conf)
config.register_agent_state_opts_helper(conf)
conf.register_opts(interface.OPTS)
conf.register_opts(external_process.OPTS)

3
neutron_fwaas/tests/unit/services/firewall/agents/l3reference/test_firewall_l3_agent.py
View File

@@ -24,7 +24,7 @@ from neutron.agent.linux import ip_lib
from neutron.common import config as base_config
from neutron import context
from neutron.plugins.common import constants
from neutron_fwaas.services import firewall
from neutron_fwaas.services.firewall.agents import firewall_agent_api
from neutron_fwaas.services.firewall.agents.l3reference \
import firewall_l3_agent
@@ -63,7 +63,6 @@ class TestFwaasL3AgentRpcCallback(base.BaseTestCase):
self.conf.register_opts(base_config.core_opts)
self.conf.register_opts(l3_config.OPTS)
self.conf.register_opts(ha.OPTS)
firewall.register_use_namespaces_opts_helper(self.conf)
self.conf.register_opts(firewall_agent_api.FWaaSOpts, 'fwaas')
self.api = FWaasAgent(self.conf)
self.api.fwaas_driver = test_firewall_agent_api.NoopFwaasDriver()

2
neutron_fwaas/tests/unit/services/firewall/agents/varmour/test_varmour_router.py
View File

@@ -23,7 +23,6 @@ from neutron.agent.l3 import router_info
from neutron.agent.linux import interface
from neutron.common import config as base_config
from neutron.common import constants as l3_constants
from neutron_fwaas.services import firewall
from neutron_fwaas.services.firewall.agents.varmour import varmour_router
from neutron_fwaas.tests import base
from oslo_utils import uuidutils
@@ -44,7 +43,6 @@ class TestVarmourRouter(base.BaseTestCase):
self.conf.register_opts(ha.OPTS)
agent_config.register_process_monitor_opts(self.conf)
agent_config.register_interface_driver_opts_helper(self.conf)
firewall.register_use_namespaces_opts_helper(self.conf)
self.conf.register_opts(interface.OPTS)
self.conf.set_override('interface_driver',
'neutron.agent.linux.interface.NullDriver')

2
neutron_fwaas/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py
View File

@@ -26,7 +26,6 @@ from neutron.common import constants as l3_constants
from neutron.tests import base
from oslo_utils import uuidutils
from neutron_fwaas.services import firewall
from neutron_fwaas.services.firewall.agents.varmour import varmour_router
from neutron_fwaas.services.firewall.drivers.varmour import varmour_fwaas
@@ -45,7 +44,6 @@ class TestBasicRouterOperations(base.BaseTestCase):
self.conf.register_opts(ha.OPTS)
agent_config.register_process_monitor_opts(self.conf)
agent_config.register_interface_driver_opts_helper(self.conf)
firewall.register_use_namespaces_opts_helper(self.conf)
self.conf.register_opts(interface.OPTS)
self.conf.set_override('interface_driver',
'neutron.agent.linux.interface.NullDriver')