56cac98626
The linuxbridge, openvswitch, and hyperv plugins all use the same basic RPC interface between their plugins and L2 agents. But the attributes describing a virtual network passed from the plugin to the agent over this interface differed for historical reasons. The openvswitch and hyperv plugins each pass network_type, physical_network, and segmentation_id attributes, whereas the linuxbridge plugin previously passed vlan_id and physical_network attributes, using special vlan_id values to indicate flat or local network types. This patch changes the linuxbridge plugin to pass network_type and segmentation_id attributes instead of the vlan_id attribute, bringing its message formats into sync with the other plugins. RPC compatibility is required for blueprint modular-l2 so that the ml2 plugin can work with all three existing types of L2 agent. This RPC message format change is also required for blueprint vxlan-linuxbridge. Unlike the vxlan-linuxbridge patch on which it is based (see https://review.openstack.org/#/c/26516/), this patch does not bump the linuxbridge RPC version number, as the ml2 plugin will require all three L2 agents to use the same RPC version. Instead, the updated linuxbridge agent maintains compatibility with old linuxbridge plugins by accepting either the old or new attributes. There is also a configuration option, currently turned on by default, to enable the updated linuxbridge plugin to pass the vlan_id attribute expected by old linuxbridge agents along with the new attributes. These message format compatibility mechanisms are intended to aid during upgrades, and can eventually be removed. Change-Id: I7cc1c9f96b09db6bab2c7d9f2b30b79fa4dab919
129 lines
5.4 KiB
Python
129 lines
5.4 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012, 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.
|
|
|
|
"""
|
|
Unit Tests for linuxbridge rpc
|
|
"""
|
|
|
|
from oslo.config import cfg
|
|
import stubout
|
|
|
|
from quantum.agent import rpc as agent_rpc
|
|
from quantum.common import topics
|
|
from quantum.openstack.common import context
|
|
from quantum.openstack.common import rpc
|
|
from quantum.plugins.linuxbridge import lb_quantum_plugin as plb
|
|
from quantum.tests import base
|
|
|
|
|
|
class rpcApiTestCase(base.BaseTestCase):
|
|
def _test_lb_api(self, rpcapi, topic, method, rpc_method,
|
|
expected_msg=None, **kwargs):
|
|
ctxt = context.RequestContext('fake_user', 'fake_project')
|
|
expected_retval = 'foo' if method == 'call' else None
|
|
if not expected_msg:
|
|
expected_msg = rpcapi.make_msg(method, **kwargs)
|
|
expected_msg['version'] = rpcapi.BASE_RPC_API_VERSION
|
|
if rpc_method == 'cast' and method == 'run_instance':
|
|
kwargs['call'] = False
|
|
|
|
self.fake_args = None
|
|
self.fake_kwargs = None
|
|
|
|
def _fake_rpc_method(*args, **kwargs):
|
|
self.fake_args = args
|
|
self.fake_kwargs = kwargs
|
|
if expected_retval:
|
|
return expected_retval
|
|
|
|
self.stubs = stubout.StubOutForTesting()
|
|
self.stubs.Set(rpc, rpc_method, _fake_rpc_method)
|
|
|
|
retval = getattr(rpcapi, method)(ctxt, **kwargs)
|
|
|
|
self.assertEqual(expected_retval, retval)
|
|
expected_args = [ctxt, topic, expected_msg]
|
|
|
|
for arg, expected_arg in zip(self.fake_args, expected_args):
|
|
self.assertEqual(expected_arg, arg)
|
|
|
|
def test_delete_network(self):
|
|
rpcapi = plb.AgentNotifierApi(topics.AGENT)
|
|
self._test_lb_api(rpcapi,
|
|
topics.get_topic_name(topics.AGENT,
|
|
topics.NETWORK,
|
|
topics.DELETE),
|
|
'network_delete', rpc_method='fanout_cast',
|
|
network_id='fake_request_spec')
|
|
|
|
def test_port_update(self):
|
|
cfg.CONF.set_override('rpc_support_old_agents', False, 'AGENT')
|
|
rpcapi = plb.AgentNotifierApi(topics.AGENT)
|
|
expected_msg = rpcapi.make_msg('port_update',
|
|
port='fake_port',
|
|
network_type='vlan',
|
|
physical_network='fake_net',
|
|
segmentation_id='fake_vlan_id')
|
|
self._test_lb_api(rpcapi,
|
|
topics.get_topic_name(topics.AGENT,
|
|
topics.PORT,
|
|
topics.UPDATE),
|
|
'port_update', rpc_method='fanout_cast',
|
|
expected_msg=expected_msg,
|
|
port='fake_port',
|
|
physical_network='fake_net',
|
|
vlan_id='fake_vlan_id')
|
|
|
|
def test_port_update_old_agent(self):
|
|
cfg.CONF.set_override('rpc_support_old_agents', True, 'AGENT')
|
|
rpcapi = plb.AgentNotifierApi(topics.AGENT)
|
|
expected_msg = rpcapi.make_msg('port_update',
|
|
port='fake_port',
|
|
network_type='vlan',
|
|
physical_network='fake_net',
|
|
segmentation_id='fake_vlan_id',
|
|
vlan_id='fake_vlan_id')
|
|
self._test_lb_api(rpcapi,
|
|
topics.get_topic_name(topics.AGENT,
|
|
topics.PORT,
|
|
topics.UPDATE),
|
|
'port_update', rpc_method='fanout_cast',
|
|
expected_msg=expected_msg,
|
|
port='fake_port',
|
|
physical_network='fake_net',
|
|
vlan_id='fake_vlan_id')
|
|
|
|
def test_device_details(self):
|
|
rpcapi = agent_rpc.PluginApi(topics.PLUGIN)
|
|
self._test_lb_api(rpcapi, topics.PLUGIN,
|
|
'get_device_details', rpc_method='call',
|
|
device='fake_device',
|
|
agent_id='fake_agent_id')
|
|
|
|
def test_update_device_down(self):
|
|
rpcapi = agent_rpc.PluginApi(topics.PLUGIN)
|
|
self._test_lb_api(rpcapi, topics.PLUGIN,
|
|
'update_device_down', rpc_method='call',
|
|
device='fake_device',
|
|
agent_id='fake_agent_id')
|
|
|
|
def test_update_device_up(self):
|
|
rpcapi = agent_rpc.PluginApi(topics.PLUGIN)
|
|
self._test_lb_api(rpcapi, topics.PLUGIN,
|
|
'update_device_up', rpc_method='call',
|
|
device='fake_device',
|
|
agent_id='fake_agent_id')
|