9d9fc01dd3
This change adds the ability to monitor the local ovsdb for interface changes so that the l2 agent can avoid unnecessary polling. Minimal changes are made to the agent so the risk of breakage should be low. Future efforts to make the agent entirely event-based may be able to use OvsdbMonitor as a starting point. By default polling minimization is not done, and can only be enabled by setting 'minimize_polling = True' in the ovs section of the l2 agent's config file. Closes-Bug: #1177973 Change-Id: I26c035b48a74df2148696869c5a9affae5ab3d27
113 lines
4.5 KiB
Python
113 lines
4.5 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2013 Red Hat, Inc.
|
|
#
|
|
# 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 eventlet.event
|
|
import mock
|
|
|
|
from neutron.agent.linux import ovsdb_monitor
|
|
from neutron.tests import base
|
|
|
|
|
|
class TestOvsdbMonitor(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(TestOvsdbMonitor, self).setUp()
|
|
self.root_helper = 'sudo'
|
|
self.monitor = ovsdb_monitor.OvsdbMonitor('Interface',
|
|
root_helper=self.root_helper)
|
|
|
|
def read_output_queues_and_returns_result(self, output_type, output):
|
|
with mock.patch.object(self.monitor, '_process') as mock_process:
|
|
with mock.patch.object(mock_process, output_type) as mock_file:
|
|
with mock.patch.object(mock_file, 'readline') as mock_readline:
|
|
mock_readline.return_value = output
|
|
func = getattr(self.monitor,
|
|
'_read_%s' % output_type,
|
|
None)
|
|
return func()
|
|
|
|
def test__read_stdout_returns_none_for_empty_read(self):
|
|
result = self.read_output_queues_and_returns_result('stdout', '')
|
|
self.assertIsNone(result)
|
|
|
|
def test__read_stdout_queues_root_wrapper_errors_to_stderr_output(self):
|
|
result = self.read_output_queues_and_returns_result('stdout',
|
|
self.root_helper)
|
|
self.assertIsNone(result)
|
|
self.assertEqual(self.monitor._stderr_lines.get_nowait(),
|
|
self.root_helper)
|
|
|
|
def test__read_stdout_queues_normal_output_to_stdout_queue(self):
|
|
output = 'foo'
|
|
result = self.read_output_queues_and_returns_result('stdout', output)
|
|
self.assertEqual(result, output)
|
|
self.assertEqual(self.monitor._stdout_lines.get_nowait(), output)
|
|
|
|
def test__read_stderr_returns_none(self):
|
|
result = self.read_output_queues_and_returns_result('stderr', '')
|
|
self.assertIsNone(result)
|
|
|
|
|
|
class TestSimpleInterfaceMonitor(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(TestSimpleInterfaceMonitor, self).setUp()
|
|
self.root_helper = 'sudo'
|
|
self.monitor = ovsdb_monitor.SimpleInterfaceMonitor(
|
|
root_helper=self.root_helper)
|
|
|
|
def test_is_active_is_false_by_default(self):
|
|
self.assertFalse(self.monitor.is_active)
|
|
|
|
def test_is_active_can_be_true(self):
|
|
self.monitor.data_received = True
|
|
self.monitor._kill_event = eventlet.event.Event()
|
|
self.assertTrue(self.monitor.is_active)
|
|
|
|
def test_has_updates_is_true_by_default(self):
|
|
self.assertTrue(self.monitor.has_updates)
|
|
|
|
def test_has_updates_is_false_if_active_with_no_output(self):
|
|
target = ('neutron.agent.linux.ovsdb_monitor.SimpleInterfaceMonitor'
|
|
'.is_active')
|
|
with mock.patch(target,
|
|
new_callable=mock.PropertyMock(return_value=True)):
|
|
self.assertFalse(self.monitor.has_updates)
|
|
|
|
def test__kill_sets_data_received_to_false(self):
|
|
self.monitor.data_received = True
|
|
with mock.patch(
|
|
'neutron.agent.linux.ovsdb_monitor.OvsdbMonitor._kill'):
|
|
self.monitor._kill()
|
|
self.assertFalse(self.monitor.data_received)
|
|
|
|
def test__read_stdout_sets_data_received_and_returns_output(self):
|
|
output = 'foo'
|
|
with mock.patch(
|
|
'neutron.agent.linux.ovsdb_monitor.OvsdbMonitor._read_stdout',
|
|
return_value=output):
|
|
result = self.monitor._read_stdout()
|
|
self.assertTrue(self.monitor.data_received)
|
|
self.assertEqual(result, output)
|
|
|
|
def test__read_stdout_does_not_set_data_received_for_empty_ouput(self):
|
|
output = None
|
|
with mock.patch(
|
|
'neutron.agent.linux.ovsdb_monitor.OvsdbMonitor._read_stdout',
|
|
return_value=output):
|
|
self.monitor._read_stdout()
|
|
self.assertFalse(self.monitor.data_received)
|