openstack
/
neutron-fwaas
Code Issues Proposed changes

Merge "FWaaS: Refactor callback mechanism"

This commit is contained in:
Jenkins 2015-03-31 20:30:34 +00:00 committed by Gerrit Code Review
parent e4d2a280e4 b3ecce8b5d
commit 3a6cca8dd5
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron_fwaas/services/firewall/agents/firewall_service.py
View File

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.services import advanced_service
from neutron.services import provider_configuration as provconf
from oslo_config import cfg
from oslo_log import log as logging
@ -24,7 +23,7 @@ LOG = logging.getLogger(__name__)
FIREWALL_DRIVERS = 'firewall_drivers'
class FirewallService(advanced_service.AdvancedService):
class FirewallService(object):
"""Firewall Service observer."""
def load_device_drivers(self):
@ -32,9 +31,9 @@ class FirewallService(advanced_service.AdvancedService):
device_driver = provconf.get_provider_driver_class(
cfg.CONF.fwaas.driver, FIREWALL_DRIVERS)
try:
self.devices = importutils.import_object(device_driver)
driver = importutils.import_object(device_driver)
LOG.debug('Loaded FWaaS device driver: %s', device_driver)
return self.devices
return driver
except ImportError:
msg = _('Error importing FWaaS device driver: %s')
raise ImportError(msg % device_driver)

3
neutron_fwaas/services/firewall/agents/l3reference/firewall_l3_agent.py
View File

@ -70,8 +70,7 @@ class FWaaSL3AgentRpcCallback(api.FWaaSAgentRpcCallbackMixin):
if self.fwaas_enabled:
# NOTE: Temp location for creating service and loading driver
self.fw_service = firewall_service.FirewallService(self)
self.event_observers.add(self.fw_service)
self.fw_service = firewall_service.FirewallService()
self.fwaas_driver = self.fw_service.load_device_drivers()
self.services_sync_needed = False
# setup RPC to msg fwaas plugin

4
neutron_fwaas/tests/unit/services/firewall/test_firewall_service.py
View File

@ -13,8 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from neutron.tests import base
from oslo_config import cfg
@ -28,7 +26,7 @@ class TestFirewallDeviceDriverLoading(base.BaseTestCase):
def setUp(self):
super(TestFirewallDeviceDriverLoading, self).setUp()
self.service = firewall_service.FirewallService(mock.Mock())
self.service = firewall_service.FirewallService()
def test_loading_firewall_device_driver(self):
"""Get the sole device driver for FWaaS."""