From f4b3ba31e9548cdd4a8b97e6aa30c0a895b72e8a Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Mon, 24 Nov 2014 18:48:38 +0000
Subject: [PATCH] Drop RpcProxy usage from cisco apic ml2 plugin

Drop usage fo the RpcProxy compatibility class from the cisco apic ml2
plugin.  The equivalent oslo.messaging APIs are now used instead.

Part of blueprint drop-rpc-compat.

Change-Id: I415b65720a09652bae70fc1c1dada9f5727c4441
---
 .../ml2/drivers/cisco/apic/apic_topology.py   | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/neutron/plugins/ml2/drivers/cisco/apic/apic_topology.py b/neutron/plugins/ml2/drivers/cisco/apic/apic_topology.py
index 6be0b2a9f..b75c76cd6 100644
--- a/neutron/plugins/ml2/drivers/cisco/apic/apic_topology.py
+++ b/neutron/plugins/ml2/drivers/cisco/apic/apic_topology.py
@@ -21,6 +21,7 @@ import eventlet
 eventlet.monkey_patch()
 
 from oslo.config import cfg
+from oslo import messaging
 
 from neutron.agent.common import config
 from neutron.agent.linux import ip_lib
@@ -138,30 +139,21 @@ class ApicTopologyService(manager.Manager):
                 self.peers[(host, interface)] = nlink
 
 
-class ApicTopologyServiceNotifierApi(rpc.RpcProxy):
-
-    RPC_API_VERSION = '1.1'
+class ApicTopologyServiceNotifierApi(object):
 
     def __init__(self):
-        super(ApicTopologyServiceNotifierApi, self).__init__(
-            topic=TOPIC_APIC_SERVICE,
-            default_version=self.RPC_API_VERSION)
+        target = messaging.Target(topic=TOPIC_APIC_SERVICE, version='1.0')
+        self.client = rpc.get_client(target)
 
     def update_link(self, context, host, interface, mac, switch, module, port):
-        self.fanout_cast(
-            context, self.make_msg(
-                'update_link',
-                host=host, interface=interface, mac=mac,
-                switch=switch, module=module, port=port),
-            topic=TOPIC_APIC_SERVICE)
+        cctxt = self.client.prepare(version='1.1', fanout=True)
+        cctxt.cast(context, 'update_link', host=host, interface=interface,
+                   mac=mac, switch=switch, module=module, port=port)
 
     def delete_link(self, context, host, interface):
-        self.fanout_cast(
-            context, self.make_msg(
-                'delete_link',
-                host=host, interface=interface, mac=None,
-                switch=0, module=0, port=0),
-            topic=TOPIC_APIC_SERVICE)
+        cctxt = self.client.prepare(version='1.1', fanout=True)
+        cctxt.cast(context, 'delete_link', host=host, interface=interface,
+                   mac=None, switch=0, module=0, port=0)
 
 
 class ApicTopologyAgent(manager.Manager):
-- 
2.45.2