From: Russell Bryant <rbryant@redhat.com>
Date: Wed, 21 Jan 2015 21:39:37 +0000 (-0500)
Subject: Drop SecurityGroupServerRpcApiMixin
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=482f41b8c1e68699075162cc92737794700f25a6;p=openstack-build%2Fneutron-build.git

Drop SecurityGroupServerRpcApiMixin

The code base has now been migrated away from using this class, so it
can be removed.  This was a prerequisite to being able to put this rpc
api into a messaging namespace.

Part of blueprint rpc-docs-and-namespaces.

Change-Id: I967339c4579d42c5ca9cea7f1ef3ba2233a6ff9d
---

diff --git a/neutron/agent/securitygroups_rpc.py b/neutron/agent/securitygroups_rpc.py
index aa5a2d92c..2b7168214 100644
--- a/neutron/agent/securitygroups_rpc.py
+++ b/neutron/agent/securitygroups_rpc.py
@@ -84,8 +84,19 @@ def disable_security_group_extension_by_config(aliases):
         _disable_extension('allowed-address-pairs', aliases)
 
 
-class SecurityGroupServerRpcApiMixin(object):
-    """A mix-in that enable SecurityGroup support in plugin rpc."""
+class SecurityGroupServerRpcApi(object):
+    """RPC client for security group methods in the plugin.
+
+    This class implements the client side of an rpc interface.  This interface
+    is used by agents to call security group related methods implemented on the
+    plugin side.  The other side of this interface can be found in
+    neutron.api.rpc.handlers.SecurityGroupServerRpcCallback.  For more
+    information about changing rpc interfaces, see
+    doc/source/devref/rpc_api.rst.
+    """
+    def __init__(self, topic):
+        target = messaging.Target(topic=topic, version='1.0')
+        self.client = n_rpc.get_client(target)
 
     def security_group_rules_for_devices(self, context, devices):
         LOG.debug("Get security group rules "
@@ -102,28 +113,6 @@ class SecurityGroupServerRpcApiMixin(object):
                           devices=devices)
 
 
-# NOTE(russellb) This class currently serves as a transition point as the code
-# base is migrated away from using the Mixin class.  Once the mixin usage is
-# removed, the body of the mixin will be folded into this class.  This class
-# must become standalone before we can move this API into a messaging
-# namespace.  For more info on why this should be put in a namespace, see
-# http://specs.openstack.org/openstack/neutron-specs/
-#           specs/kilo/rpc-docs-and-namespaces.html
-class SecurityGroupServerRpcApi(SecurityGroupServerRpcApiMixin):
-    """RPC client for security group methods in the plugin.
-
-    This class implements the client side of an rpc interface.  This interface
-    is used by agents to call security group related methods implemented on the
-    plugin side.  The other side of this interface can be found in
-    neutron.api.rpc.handlers.SecurityGroupServerRpcCallback.  For more
-    information about changing rpc interfaces, see
-    doc/source/devref/rpc_api.rst.
-    """
-    def __init__(self, topic):
-        target = messaging.Target(topic=topic, version='1.0')
-        self.client = n_rpc.get_client(target)
-
-
 class SecurityGroupAgentRpcCallbackMixin(object):
     """A mix-in that enable SecurityGroup agent
     support in agent implementations.