3bb80a0333
Remove usage of the RpcProxy compatibility class from the ml2 AgentNotifierApi. The equivalent oslo.messaging APIs are now used instead. A couple of other mixin APIs had to be converted at the same time. Note that there is one very minor functional change here. The base rpc version is set to '1.0' now instead of '1.1'. The right pattern to use is to always set the base to be N.0. Any method that needs a newer version should specify it. Part of blueprint drop-rpc-compat. Change-Id: I640568e2d73c9eb7a9505db640dc1427a1ae2abe
117 lines
4.1 KiB
Python
117 lines
4.1 KiB
Python
# Copyright 2014, Hewlett-Packard Development Company, L.P.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from oslo import messaging
|
|
|
|
from neutron.common import log
|
|
from neutron.common import topics
|
|
from neutron import manager
|
|
from neutron.openstack.common import log as logging
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class DVRServerRpcApiMixin(object):
|
|
"""Agent-side RPC (stub) for agent-to-plugin interaction."""
|
|
|
|
DVR_RPC_VERSION = "1.0"
|
|
|
|
@log.log
|
|
def get_dvr_mac_address_by_host(self, context, host):
|
|
cctxt = self.client.prepare(version=self.DVR_RPC_VERSION)
|
|
return cctxt.call(context, 'get_dvr_mac_address_by_host', host=host)
|
|
|
|
@log.log
|
|
def get_dvr_mac_address_list(self, context):
|
|
cctxt = self.client.prepare(version=self.DVR_RPC_VERSION)
|
|
return cctxt.call(context, 'get_dvr_mac_address_list')
|
|
|
|
@log.log
|
|
def get_ports_on_host_by_subnet(self, context, host, subnet):
|
|
cctxt = self.client.prepare(version=self.DVR_RPC_VERSION)
|
|
return cctxt.call(context, 'get_ports_on_host_by_subnet',
|
|
host=host, subnet=subnet)
|
|
|
|
@log.log
|
|
def get_subnet_for_dvr(self, context, subnet):
|
|
cctxt = self.client.prepare(version=self.DVR_RPC_VERSION)
|
|
return cctxt.call(context, 'get_subnet_for_dvr', subnet=subnet)
|
|
|
|
|
|
class DVRServerRpcCallback(object):
|
|
"""Plugin-side RPC (implementation) for agent-to-plugin interaction."""
|
|
|
|
# History
|
|
# 1.0 Initial version
|
|
|
|
target = messaging.Target(version='1.0')
|
|
|
|
@property
|
|
def plugin(self):
|
|
if not getattr(self, '_plugin', None):
|
|
self._plugin = manager.NeutronManager.get_plugin()
|
|
return self._plugin
|
|
|
|
def get_dvr_mac_address_list(self, context):
|
|
return self.plugin.get_dvr_mac_address_list(context)
|
|
|
|
def get_dvr_mac_address_by_host(self, context, **kwargs):
|
|
host = kwargs.get('host')
|
|
LOG.debug("DVR Agent requests mac_address for host %s", host)
|
|
return self.plugin.get_dvr_mac_address_by_host(context, host)
|
|
|
|
def get_ports_on_host_by_subnet(self, context, **kwargs):
|
|
host = kwargs.get('host')
|
|
subnet = kwargs.get('subnet')
|
|
LOG.debug("DVR Agent requests list of VM ports on host %s", host)
|
|
return self.plugin.get_ports_on_host_by_subnet(context,
|
|
host, subnet)
|
|
|
|
def get_subnet_for_dvr(self, context, **kwargs):
|
|
subnet = kwargs.get('subnet')
|
|
return self.plugin.get_subnet_for_dvr(context, subnet)
|
|
|
|
|
|
class DVRAgentRpcApiMixin(object):
|
|
"""Plugin-side RPC (stub) for plugin-to-agent interaction."""
|
|
|
|
DVR_RPC_VERSION = "1.0"
|
|
|
|
def _get_dvr_update_topic(self):
|
|
return topics.get_topic_name(self.topic,
|
|
topics.DVR,
|
|
topics.UPDATE)
|
|
|
|
def dvr_mac_address_update(self, context, dvr_macs):
|
|
"""Notify dvr mac address updates."""
|
|
if not dvr_macs:
|
|
return
|
|
cctxt = self.client.prepare(topic=self._get_dvr_update_topic(),
|
|
version=self.DVR_RPC_VERSION, fanout=True)
|
|
cctxt.cast(context, 'dvr_mac_address_update', dvr_macs=dvr_macs)
|
|
|
|
|
|
class DVRAgentRpcCallbackMixin(object):
|
|
"""Agent-side RPC (implementation) for plugin-to-agent interaction."""
|
|
|
|
def dvr_mac_address_update(self, context, **kwargs):
|
|
"""Callback for dvr_mac_addresses update.
|
|
|
|
:param dvr_macs: list of updated dvr_macs
|
|
"""
|
|
dvr_macs = kwargs.get('dvr_macs', [])
|
|
LOG.debug("dvr_macs updated on remote: %s", dvr_macs)
|
|
self.dvr_agent.dvr_mac_address_update(dvr_macs)
|