![Ihar Hrachyshka](/assets/img/avatar_default.png)
Now that all preparations are done, actually port the code to use oslo.messaging. This patch does as little as possible. Follow up patches that refactor and cleanup the code and configuration files, will be merged later. The reason for this is to make the patch as slim as possible, to make review process more smooth and concentrated. Details: * neutron/common/rpc.py: - added init() and cleanup() to set global RPC layer state. - added utility functions: get_server(), get_client(), get_notifier() that wrap up oslo.messaging API a bit, enforcing eventlet executor and setting serializer, among other things. - removed PluginRpcDispatcher, instead introduced PluginRpcSerializer to use as a default serializer for API callbacks. * neutron/common/rpc_compat.py: - emulated incubator RPC layer behaviour thru previously introduced stub classes (RpcCallback, RpcProxy, ...) using new oslo.messaging API. - switched to using new oslo.messaging exception types. * neutron/service.py: - expect multiple RPC listeners that are of MessageHandlingServer type, not GreenThread. * neutron/common/config.py: - initialize RPC layer in init() * setup.cfg: - added entry points for old notifier drivers to retain backward compatibility. * neutron/tests/...: - introduced fake_notifier to replace impl_fake. - faked out consume_in_thread() to avoid starting RPC listeners when running unit tests. - used 'fake' transport driver. - made sure neutron.test.* exceptions are caught. - initialize and clean up RPC layer for each test case. * Ported all affected code from using neutron.openstack.common.notifier API to oslo.messaging.Notifier. * rpc.set_defaults() was renamed to rpc.set_transport_defaults() * other changes not worth mentioning here. blueprint oslo-messaging DocImpact Change-Id: I5a91c34df6e300f2dc46217b1b16352fcc3039fc
161 lines
6.2 KiB
Python
161 lines
6.2 KiB
Python
# Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
|
|
#
|
|
# Author: Sylvain Afchain <sylvain.afchain@enovance.com>
|
|
#
|
|
# 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.
|
|
|
|
import mock
|
|
from oslo.config import cfg
|
|
|
|
from neutron.agent.common import config
|
|
from neutron.openstack.common import uuidutils
|
|
from neutron.services.metering.agents import metering_agent
|
|
from neutron.tests import base
|
|
from neutron.tests import fake_notifier
|
|
|
|
|
|
_uuid = uuidutils.generate_uuid
|
|
|
|
TENANT_ID = _uuid()
|
|
LABEL_ID = _uuid()
|
|
ROUTERS = [{'status': 'ACTIVE',
|
|
'name': 'router1',
|
|
'gw_port_id': None,
|
|
'admin_state_up': True,
|
|
'tenant_id': TENANT_ID,
|
|
'_metering_labels': [{'rules': [],
|
|
'id': LABEL_ID}],
|
|
'id': _uuid()}]
|
|
|
|
|
|
class TestMeteringOperations(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(TestMeteringOperations, self).setUp()
|
|
cfg.CONF.register_opts(metering_agent.MeteringAgent.Opts)
|
|
config.register_root_helper(cfg.CONF)
|
|
|
|
self.noop_driver = ('neutron.services.metering.drivers.noop.'
|
|
'noop_driver.NoopMeteringDriver')
|
|
cfg.CONF.set_override('driver', self.noop_driver)
|
|
cfg.CONF.set_override('measure_interval', 0)
|
|
cfg.CONF.set_override('report_interval', 0)
|
|
|
|
self.setup_notification_driver()
|
|
|
|
metering_rpc = ('neutron.services.metering.agents.metering_agent.'
|
|
'MeteringPluginRpc._get_sync_data_metering')
|
|
self.metering_rpc_patch = mock.patch(metering_rpc, return_value=[])
|
|
self.metering_rpc_patch.start()
|
|
|
|
self.driver_patch = mock.patch(self.noop_driver, autospec=True)
|
|
self.driver_patch.start()
|
|
|
|
loopingcall_patch = mock.patch(
|
|
'neutron.openstack.common.loopingcall.FixedIntervalLoopingCall')
|
|
loopingcall_patch.start()
|
|
|
|
self.agent = metering_agent.MeteringAgent('my agent', cfg.CONF)
|
|
self.driver = self.agent.metering_driver
|
|
|
|
def test_add_metering_label(self):
|
|
self.agent.add_metering_label(None, ROUTERS)
|
|
self.assertEqual(self.driver.add_metering_label.call_count, 1)
|
|
|
|
def test_remove_metering_label(self):
|
|
self.agent.remove_metering_label(None, ROUTERS)
|
|
self.assertEqual(self.driver.remove_metering_label.call_count, 1)
|
|
|
|
def test_update_metering_label_rule(self):
|
|
self.agent.update_metering_label_rules(None, ROUTERS)
|
|
self.assertEqual(self.driver.update_metering_label_rules.call_count, 1)
|
|
|
|
def test_routers_updated(self):
|
|
self.agent.routers_updated(None, ROUTERS)
|
|
self.assertEqual(self.driver.update_routers.call_count, 1)
|
|
|
|
def test_get_traffic_counters(self):
|
|
self.agent._get_traffic_counters(None, ROUTERS)
|
|
self.assertEqual(self.driver.get_traffic_counters.call_count, 1)
|
|
|
|
def test_notification_report(self):
|
|
self.agent.routers_updated(None, ROUTERS)
|
|
|
|
self.driver.get_traffic_counters.return_value = {LABEL_ID:
|
|
{'pkts': 88,
|
|
'bytes': 444}}
|
|
self.agent._metering_loop()
|
|
|
|
self.assertNotEqual(len(fake_notifier.NOTIFICATIONS), 0)
|
|
for n in fake_notifier.NOTIFICATIONS:
|
|
if n['event_type'] == 'l3.meter':
|
|
break
|
|
|
|
self.assertEqual(n['event_type'], 'l3.meter')
|
|
|
|
payload = n['payload']
|
|
self.assertEqual(payload['tenant_id'], TENANT_ID)
|
|
self.assertEqual(payload['label_id'], LABEL_ID)
|
|
self.assertEqual(payload['pkts'], 88)
|
|
self.assertEqual(payload['bytes'], 444)
|
|
|
|
def test_router_deleted(self):
|
|
label_id = _uuid()
|
|
self.driver.get_traffic_counters = mock.MagicMock()
|
|
self.driver.get_traffic_counters.return_value = {label_id:
|
|
{'pkts': 44,
|
|
'bytes': 222}}
|
|
self.agent._add_metering_info = mock.MagicMock()
|
|
|
|
self.agent.routers_updated(None, ROUTERS)
|
|
self.agent.router_deleted(None, ROUTERS[0]['id'])
|
|
|
|
self.assertEqual(self.agent._add_metering_info.call_count, 1)
|
|
self.assertEqual(self.driver.remove_router.call_count, 1)
|
|
|
|
self.agent._add_metering_info.assert_called_with(label_id, 44, 222)
|
|
|
|
|
|
class TestMeteringDriver(base.BaseTestCase):
|
|
def setUp(self):
|
|
super(TestMeteringDriver, self).setUp()
|
|
cfg.CONF.register_opts(metering_agent.MeteringAgent.Opts)
|
|
config.register_root_helper(cfg.CONF)
|
|
|
|
self.noop_driver = ('neutron.services.metering.drivers.noop.'
|
|
'noop_driver.NoopMeteringDriver')
|
|
cfg.CONF.set_override('driver', self.noop_driver)
|
|
|
|
self.agent = metering_agent.MeteringAgent('my agent', cfg.CONF)
|
|
self.driver = mock.Mock()
|
|
self.agent.metering_driver = self.driver
|
|
|
|
def test_add_metering_label_with_bad_driver_impl(self):
|
|
del self.driver.add_metering_label
|
|
|
|
with mock.patch.object(metering_agent, 'LOG') as log:
|
|
self.agent.add_metering_label(None, ROUTERS)
|
|
log.exception.assert_called_with(mock.ANY,
|
|
{'driver': self.noop_driver,
|
|
'func': 'add_metering_label'})
|
|
|
|
def test_add_metering_label_runtime_error(self):
|
|
self.driver.add_metering_label.side_effect = RuntimeError
|
|
|
|
with mock.patch.object(metering_agent, 'LOG') as log:
|
|
self.agent.add_metering_label(None, ROUTERS)
|
|
log.exception.assert_called_with(mock.ANY,
|
|
{'driver': self.noop_driver,
|
|
'func':
|
|
'add_metering_label'})
|