55737a749e
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
122 lines
5.0 KiB
Python
122 lines
5.0 KiB
Python
# Copyright 2014 OneConvergence, Inc. 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.
|
|
#
|
|
# @author: Kedar Kulkarni, One Convergence, Inc.
|
|
|
|
import uuid
|
|
|
|
import mock
|
|
|
|
from neutron.api.v2 import attributes
|
|
from neutron.extensions import securitygroup as ext_sg
|
|
from neutron import manager
|
|
from neutron.plugins.oneconvergence import plugin as nvsd_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 = ('neutron.plugins.oneconvergence.'
|
|
'plugin.OneConvergencePluginV2')
|
|
AGENTNOTIFIER = ('neutron.plugins.oneconvergence.'
|
|
'plugin.NVSDPluginV2AgentNotifierApi')
|
|
DUMMY_NVSD_LIB = ('neutron.tests.unit.oneconvergence.dummynvsdlib.NVSDApi')
|
|
|
|
|
|
class OneConvergenceSecurityGroupsTestCase(test_sg.SecurityGroupDBTestCase):
|
|
_plugin_name = PLUGIN_NAME
|
|
|
|
def setUp(self):
|
|
if 'v6' in self._testMethodName:
|
|
self.skipTest("NVSD Plugin does not support IPV6.")
|
|
|
|
def mocked_oneconvergence_init(self):
|
|
def side_effect(*args, **kwargs):
|
|
return {'id': str(uuid.uuid4())}
|
|
|
|
self.nvsdlib = mock.Mock()
|
|
self.nvsdlib.create_network.side_effect = side_effect
|
|
|
|
test_sg_rpc.set_firewall_driver(test_sg_rpc.FIREWALL_HYBRID_DRIVER)
|
|
notifier_cls = mock.patch(AGENTNOTIFIER).start()
|
|
self.notifier = mock.Mock()
|
|
notifier_cls.return_value = self.notifier
|
|
self._attribute_map_bk_ = {}
|
|
for item in attributes.RESOURCE_ATTRIBUTE_MAP:
|
|
self._attribute_map_bk_[item] = (attributes.
|
|
RESOURCE_ATTRIBUTE_MAP[item].
|
|
copy())
|
|
with mock.patch.object(nvsd_plugin.OneConvergencePluginV2,
|
|
'oneconvergence_init',
|
|
new=mocked_oneconvergence_init):
|
|
super(OneConvergenceSecurityGroupsTestCase,
|
|
self).setUp(PLUGIN_NAME)
|
|
|
|
def tearDown(self):
|
|
super(OneConvergenceSecurityGroupsTestCase, self).tearDown()
|
|
attributes.RESOURCE_ATTRIBUTE_MAP = self._attribute_map_bk_
|
|
|
|
|
|
class TestOneConvergenceSGServerRpcCallBack(
|
|
OneConvergenceSecurityGroupsTestCase,
|
|
test_sg_rpc.SGServerRpcCallBackTestCase):
|
|
pass
|
|
|
|
|
|
class TestOneConvergenceSGServerRpcCallBackXML(
|
|
OneConvergenceSecurityGroupsTestCase,
|
|
test_sg_rpc.SGServerRpcCallBackTestCaseXML):
|
|
pass
|
|
|
|
|
|
class TestOneConvergenceSecurityGroups(OneConvergenceSecurityGroupsTestCase,
|
|
test_sg.TestSecurityGroups,
|
|
test_sg_rpc.SGNotificationTestMixin):
|
|
|
|
def test_security_group_get_port_from_device(self):
|
|
with self.network() as n:
|
|
with self.subnet(n):
|
|
with self.security_group() as sg:
|
|
security_group_id = sg['security_group']['id']
|
|
res = self._create_port(self.fmt, n['network']['id'])
|
|
port = self.deserialize(self.fmt, res)
|
|
fixed_ips = port['port']['fixed_ips']
|
|
data = {'port': {'fixed_ips': fixed_ips,
|
|
'name': port['port']['name'],
|
|
ext_sg.SECURITYGROUPS:
|
|
[security_group_id]}}
|
|
|
|
req = self.new_update_request('ports', data,
|
|
port['port']['id'])
|
|
res = self.deserialize(self.fmt,
|
|
req.get_response(self.api))
|
|
port_id = res['port']['id']
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
port_dict = plugin.get_port_from_device(port_id)
|
|
self.assertEqual(port_id, port_dict['id'])
|
|
self.assertEqual([security_group_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)
|
|
|
|
def test_security_group_get_port_from_device_with_no_port(self):
|
|
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
port_dict = plugin.get_port_from_device('bad_device_id')
|
|
self.assertIsNone(port_dict)
|
|
|
|
|
|
class TestOneConvergenceSecurityGroupsXML(TestOneConvergenceSecurityGroups):
|
|
fmt = 'xml'
|