From b4d8c3b0ad675ac77b5465e3050a592c2edc4f11 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 16 Jan 2015 10:29:04 -0500 Subject: [PATCH] tests: drop usage of SecurityGroupServerRpcApiMixin Drop usage of SecurityGroupServerRpcApiMixin in the unit tests. This is required to be able to eventually move this API into a messaging namespace. It needs to use its own messaging client instance, instead of a different one it gets after being used as a mixin. Part of blueprint rpc-docs-and-namespaces. Change-Id: I2b66545ebfe5e7acf0a89fac58dc22e72d0df099 --- neutron/tests/unit/test_security_groups_rpc.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/neutron/tests/unit/test_security_groups_rpc.py b/neutron/tests/unit/test_security_groups_rpc.py index d25d15812..e31fa2f44 100644 --- a/neutron/tests/unit/test_security_groups_rpc.py +++ b/neutron/tests/unit/test_security_groups_rpc.py @@ -25,7 +25,6 @@ import webob.exc from neutron.agent.common import config from neutron.agent import firewall as firewall_base from neutron.agent.linux import iptables_manager -from neutron.agent import rpc as agent_rpc from neutron.agent import securitygroups_rpc as sg_rpc from neutron.api.rpc.handlers import securitygroups_rpc from neutron.common import constants as const @@ -1604,14 +1603,9 @@ class SecurityGroupAgentRpcWithDeferredRefreshTestCase( self.assertFalse(self.agent.prepare_devices_filter.called) -class FakeSGRpcApi(agent_rpc.PluginApi, - sg_rpc.SecurityGroupServerRpcApiMixin): - pass - - class SecurityGroupServerRpcApiTestCase(base.BaseTestCase): def test_security_group_rules_for_devices(self): - rpcapi = FakeSGRpcApi('fake_topic') + rpcapi = sg_rpc.SecurityGroupServerRpcApi('fake_topic') with contextlib.nested( mock.patch.object(rpcapi.client, 'call'), -- 2.45.2