Skip to content

Commit

Permalink
Drop RpcProxy usage from cisco apic ml2 plugin
Browse files Browse the repository at this point in the history
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
  • Loading branch information
russellb committed Nov 26, 2014
1 parent 05b5671 commit f4b3ba3
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions neutron/plugins/ml2/drivers/cisco/apic/apic_topology.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
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
Expand Down Expand Up @@ -138,30 +139,21 @@ def update_link(self, context,
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):
Expand Down

0 comments on commit f4b3ba3

Please sign in to comment.