2781fce238
RPC has a version of itself. In Neutron a plugin implements several RPC interface, so a single RPC version doesn't work. In Mixin callback class approach, RPC versioning depends on each plugin implementation and it makes harder to maintain RPC version appropriately. This patch series replaces mixin RPC callback of server side with a separate class. This commit handles server-side callback of security group RPC interface. * The server-side callback of Security group RPC is moved to api/rpc/handler and db/securitygroups_rpc_base now only contains a mixin class to add agent-based security group implementation with db operations. * get_port_from_device method in server-side callback class is moved to a mixin class of plugin implementation (SecurityGroupServerRpcMixin) because it involves DB lookup and is tightly coupled with plugin implementation rather than RPC interface definition. Most unit tests for SGServerRpcCallBackTestCase were skipped in the base class before, but now they are no longer skipped. The following items will be planned in later patches to avoid drastic changes in a single patch. * Merge security group RPC API and agent callback classes in agent/securitygroups_rpc into api/rpc/handlers/securitygroup_rpc * Remove completely duplicated db access code in get_port_from_device and get_port_and_sgs Partial-Bug: #1359416 Change-Id: Ia6535217d2e3b849a95667c1b53dd09675002892
99 lines
3.8 KiB
Python
99 lines
3.8 KiB
Python
# Copyright 2013, NEC Corporation
|
|
# All Rights Reserved.
|
|
#
|
|
# 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 contextlib
|
|
|
|
import mock
|
|
|
|
from neutron.api.v2 import attributes
|
|
from neutron.extensions import securitygroup as ext_sg
|
|
from neutron import manager
|
|
from neutron.tests.unit.nec import test_nec_plugin
|
|
from neutron.tests.unit import test_extension_security_group as test_sg
|
|
from neutron.tests.unit import test_security_groups_rpc as test_sg_rpc
|
|
|
|
PLUGIN_NAME = test_nec_plugin.PLUGIN_NAME
|
|
OFC_MANAGER = 'neutron.plugins.nec.nec_plugin.ofc_manager.OFCManager'
|
|
NOTIFIER = 'neutron.plugins.nec.nec_plugin.NECPluginV2AgentNotifierApi'
|
|
|
|
|
|
class NecSecurityGroupsTestCase(test_sg.SecurityGroupDBTestCase):
|
|
|
|
def setUp(self, plugin=None):
|
|
test_sg_rpc.set_firewall_driver(test_sg_rpc.FIREWALL_HYBRID_DRIVER)
|
|
mock.patch(NOTIFIER).start()
|
|
mock.patch(OFC_MANAGER).start()
|
|
self._attribute_map_bk_ = {}
|
|
for item in attributes.RESOURCE_ATTRIBUTE_MAP:
|
|
self._attribute_map_bk_[item] = (attributes.
|
|
RESOURCE_ATTRIBUTE_MAP[item].
|
|
copy())
|
|
super(NecSecurityGroupsTestCase, self).setUp(PLUGIN_NAME)
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
self.notifier = plugin.notifier
|
|
self.rpc = plugin.callback_sg
|
|
|
|
def tearDown(self):
|
|
super(NecSecurityGroupsTestCase, self).tearDown()
|
|
attributes.RESOURCE_ATTRIBUTE_MAP = self._attribute_map_bk_
|
|
|
|
|
|
class TestNecSGServerRpcCallBack(
|
|
test_sg_rpc.SGServerRpcCallBackTestCase,
|
|
NecSecurityGroupsTestCase):
|
|
pass
|
|
|
|
|
|
class TestNecSGServerRpcCallBackXML(
|
|
test_sg_rpc.SGServerRpcCallBackTestCaseXML,
|
|
NecSecurityGroupsTestCase):
|
|
pass
|
|
|
|
|
|
class TestNecSecurityGroups(NecSecurityGroupsTestCase,
|
|
test_sg.TestSecurityGroups,
|
|
test_sg_rpc.SGNotificationTestMixin):
|
|
|
|
def test_security_group_get_port_from_device(self):
|
|
with contextlib.nested(self.network(),
|
|
self.security_group()) as (n, sg):
|
|
with self.subnet(n):
|
|
res = self._create_port(self.fmt, n['network']['id'])
|
|
port = self.deserialize(self.fmt, res)
|
|
port_id = port['port']['id']
|
|
sg_id = sg['security_group']['id']
|
|
fixed_ips = port['port']['fixed_ips']
|
|
|
|
data = {'port': {'fixed_ips': fixed_ips,
|
|
'name': port['port']['name'],
|
|
ext_sg.SECURITYGROUPS: [sg_id]}}
|
|
req = self.new_update_request('ports', data, port_id)
|
|
res = self.deserialize(self.fmt,
|
|
req.get_response(self.api))
|
|
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
port_dict = plugin.get_port_from_device(port_id)
|
|
self.assertEqual(port_id, port_dict['id'])
|
|
self.assertEqual([sg_id],
|
|
port_dict[ext_sg.SECURITYGROUPS])
|
|
self.assertEqual([], port_dict['security_group_rules'])
|
|
self.assertEqual([fixed_ips[0]['ip_address']],
|
|
port_dict['fixed_ips'])
|
|
self._delete('ports', port_id)
|
|
|
|
|
|
class TestNecSecurityGroupsXML(TestNecSecurityGroups):
|
|
fmt = 'xml'
|