From: Russell Bryant <rbryant@redhat.com>
Date: Wed, 12 Nov 2014 18:33:45 +0000 (+0000)
Subject: Drop RpcCallback usage from DhcpRpcCallback
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=982500b48a99faeef23eb45d52521ebad45f6c30;p=openstack-build%2Fneutron-build.git

Drop RpcCallback usage from DhcpRpcCallback

Drop the usage of the RpcCallback compatibility class from
DhcpRpcCallback.

Part of blueprint drop-rpc-compat.

Change-Id: I7c4654455c15c4a545c8b19bfcbf617e6d6593d6
---

diff --git a/neutron/api/rpc/handlers/dhcp_rpc.py b/neutron/api/rpc/handlers/dhcp_rpc.py
index 58317eac4..85efe1777 100644
--- a/neutron/api/rpc/handlers/dhcp_rpc.py
+++ b/neutron/api/rpc/handlers/dhcp_rpc.py
@@ -15,11 +15,11 @@
 
 from oslo.config import cfg
 from oslo.db import exception as db_exc
+from oslo import messaging
 
 from neutron.api.v2 import attributes
 from neutron.common import constants
 from neutron.common import exceptions as n_exc
-from neutron.common import rpc as n_rpc
 from neutron.common import utils
 from neutron.extensions import portbindings
 from neutron import manager
@@ -30,14 +30,14 @@ from neutron.openstack.common import log as logging
 LOG = logging.getLogger(__name__)
 
 
-class DhcpRpcCallback(n_rpc.RpcCallback):
+class DhcpRpcCallback(object):
     """DHCP agent RPC callback in plugin implementations."""
 
     # API version history:
     #     1.0 - Initial version.
     #     1.1 - Added get_active_networks_info, create_dhcp_port,
     #           and update_dhcp_port methods.
-    RPC_API_VERSION = '1.1'
+    target = messaging.Target(version='1.1')
 
     def _get_active_networks(self, context, **kwargs):
         """Retrieve and return a list of the active networks."""