- del_arp_entry
Needed by the L3 service when dealing with DVR
"""
- RPC_API_VERSION = '1.2'
+ target = messaging.Target(version='1.2')
OPTS = [
cfg.StrOpt('agent_mode', default='legacy',
# License for the specific language governing permissions and limitations
# under the License.
+from oslo import messaging
+
from neutron.common import constants as consts
from neutron.common import utils
from neutron.i18n import _LE
class MeteringRpcCallbacks(object):
- RPC_API_VERSION = '1.0'
+ target = messaging.Target(version='1.0')
def __init__(self, meter_plugin):
self.meter_plugin = meter_plugin
import weakref
from oslo.config import cfg
+from oslo import messaging
from oslo.utils import importutils
-from neutron.common import rpc as n_rpc
from neutron.common import utils
from neutron.openstack.common import log as logging
from neutron.openstack.common import periodic_task
LOG = logging.getLogger(__name__)
-class Manager(n_rpc.RpcCallback, periodic_task.PeriodicTasks):
+class Manager(periodic_task.PeriodicTasks):
# Set RPC API version to 1.0 by default.
- RPC_API_VERSION = '1.0'
+ target = messaging.Target(version='1.0')
def __init__(self, host=None):
if not host:
eventlet.monkey_patch()
from oslo.config import cfg
+from oslo import messaging
from oslo.utils import excutils
from neutron.agent.linux import ovs_lib
from neutron.agent import rpc as agent_rpc
from neutron.agent import securitygroups_rpc as sg_rpc
from neutron.common import config
-from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron import context as q_context
from neutron.extensions import securitygroup as ext_sg
self.init_firewall()
-class RestProxyAgent(n_rpc.RpcCallback,
- sg_rpc.SecurityGroupAgentRpcCallbackMixin):
+class RestProxyAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin):
- RPC_API_VERSION = '1.1'
+ target = messaging.Target(version='1.1')
def __init__(self, integ_br, polling_interval, root_helper, vs='ovs'):
super(RestProxyAgent, self).__init__()
The main entry points in this class are the `process_services()` and
`_backlog_task()` .
"""
- RPC_API_VERSION = '1.1'
+ target = messaging.Target(version='1.1')
OPTS = [
cfg.IntOpt('rpc_loop_interval', default=10,
# License for the specific language governing permissions and limitations
# under the License.
+from oslo import messaging
+
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.db import agents_db
from neutron.plugins.common import constants
-class CiscoRouterPluginRpcCallbacks(n_rpc.RpcCallback,
- l3_router_rpc.L3RouterCfgRpcCallbackMixin,
+class CiscoRouterPluginRpcCallbacks(l3_router_rpc.L3RouterCfgRpcCallbackMixin,
devices_rpc.DeviceCfgRpcCallbackMixin):
- RPC_API_VERSION = '1.1'
+
+ target = messaging.Target(version='1.1')
def __init__(self, l3plugin):
super(CiscoRouterPluginRpcCallbacks, self).__init__()
from neutron.agent import securitygroups_rpc as sg_rpc
from neutron.common import config as common_config
from neutron.common import constants as n_const
-from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron import context
from neutron.i18n import _LE, _LI
config.register_agent_state_opts_helper(cfg.CONF)
-class HyperVSecurityAgent(n_rpc.RpcCallback,
- sg_rpc.SecurityGroupAgentRpcMixin):
- # Set RPC API version to 1.1 by default.
- RPC_API_VERSION = '1.1'
+class HyperVSecurityAgent(sg_rpc.SecurityGroupAgentRpcMixin):
+
+ target = messaging.Target(version='1.1')
def __init__(self, context, plugin_rpc):
super(HyperVSecurityAgent, self).__init__()
consumers)
-class HyperVSecurityCallbackMixin(n_rpc.RpcCallback,
- sg_rpc.SecurityGroupAgentRpcCallbackMixin):
- # Set RPC API version to 1.1 by default.
- RPC_API_VERSION = '1.1'
+class HyperVSecurityCallbackMixin(sg_rpc.SecurityGroupAgentRpcCallbackMixin):
+
+ target = messaging.Target(version='1.1')
def __init__(self, sg_agent):
super(HyperVSecurityCallbackMixin, self).__init__()
eventlet.monkey_patch()
from oslo.config import cfg
+from oslo import messaging
from six import moves
from neutron.agent import l2population_rpc as l2pop_rpc
from neutron.common import config as common_config
from neutron.common import constants
from neutron.common import exceptions
-from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils as q_utils
from neutron import context
self.remove_fdb_bridge_entry(mac, agent_ip, interface)
-class LinuxBridgeRpcCallbacks(n_rpc.RpcCallback,
- sg_rpc.SecurityGroupAgentRpcCallbackMixin,
+class LinuxBridgeRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
l2pop_rpc.L2populationRpcCallBackMixin):
# Set RPC API version to 1.0 by default.
# history
# 1.1 Support Security Group RPC
- RPC_API_VERSION = '1.1'
+ target = messaging.Target(version='1.1')
def __init__(self, context, agent):
super(LinuxBridgeRpcCallbacks, self).__init__()
class ApicTopologyService(manager.Manager):
- RPC_API_VERSION = '1.1'
+ target = messaging.Target(version='1.1')
def __init__(self, host=None):
if host is None:
LOG = log.getLogger(__name__)
-class RpcCallbacks(n_rpc.RpcCallback,
- type_tunnel.TunnelRpcCallbackMixin):
+class RpcCallbacks(type_tunnel.TunnelRpcCallbackMixin):
- RPC_API_VERSION = '1.3'
# history
# 1.0 Initial version (from openvswitch/linuxbridge)
# 1.1 Support Security Group RPC
# 1.3 get_device_details rpc signature upgrade to obtain 'host' and
# return value to include fixed_ips and device_owner for
# the device port
+ target = messaging.Target(version='1.3')
def __init__(self, notifier, type_manager):
self.setup_tunnel_callback_mixin(notifier, type_manager)
eventlet.monkey_patch()
from oslo.config import cfg
+from oslo import messaging
from neutron.agent import rpc as agent_rpc
from neutron.agent import securitygroups_rpc as sg_rpc
from neutron.common import config as common_config
from neutron.common import constants as q_constants
-from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils as q_utils
from neutron import context
self.network_map[network_id] = data
-class MlnxEswitchRpcCallbacks(n_rpc.RpcCallback,
- sg_rpc.SecurityGroupAgentRpcCallbackMixin):
+class MlnxEswitchRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin):
# Set RPC API version to 1.0 by default.
# history
# 1.1 Support Security Group RPC
- RPC_API_VERSION = '1.1'
+ target = messaging.Target(version='1.1')
def __init__(self, context, agent):
super(MlnxEswitchRpcCallbacks, self).__init__()
class MlnxEswitchNeutronAgent(sg_rpc.SecurityGroupAgentRpcMixin):
- # Set RPC API version to 1.0 by default.
- #RPC_API_VERSION = '1.0'
def __init__(self, interface_mapping):
self._polling_interval = cfg.CONF.AGENT.polling_interval
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
from oslo.config import cfg
+from oslo import messaging
from neutron.common import constants as q_const
-from neutron.common import rpc as n_rpc
from neutron.db import api as db_api
from neutron import manager
from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
-class MlnxRpcCallbacks(n_rpc.RpcCallback):
+class MlnxRpcCallbacks(object):
# History
# 1.1 Support Security Group RPC
# 1.2 Support get_devices_details_list
- RPC_API_VERSION = '1.2'
+ target = messaging.Target(version='1.2')
def get_device_details(self, rpc_context, **kwargs):
"""Agent requests device details."""
port_removed=port_removed)
-class NECAgentRpcCallback(n_rpc.RpcCallback):
+class NECAgentRpcCallback(object):
- RPC_API_VERSION = '1.0'
+ target = messaging.Target(version='1.0')
def __init__(self, context, agent, sg_agent):
super(NECAgentRpcCallback, self).__init__()
self.client = n_rpc.get_client(target)
-class SecurityGroupAgentRpcCallback(
- n_rpc.RpcCallback,
- sg_rpc.SecurityGroupAgentRpcCallbackMixin):
+class SecurityGroupAgentRpcCallback(sg_rpc.SecurityGroupAgentRpcCallbackMixin):
- RPC_API_VERSION = sg_rpc.SG_RPC_VERSION
+ target = messaging.Target(version=sg_rpc.SG_RPC_VERSION)
def __init__(self, context, sg_agent):
super(SecurityGroupAgentRpcCallback, self).__init__()
cctxt.cast(context, 'port_update', port=port)
-class NECPluginV2RPCCallbacks(n_rpc.RpcCallback):
+class NECPluginV2RPCCallbacks(object):
- RPC_API_VERSION = '1.0'
+ target = messaging.Target(version='1.0')
def __init__(self, plugin):
super(NECPluginV2RPCCallbacks, self).__init__()
import netaddr
from oslo.config import cfg
+from oslo import messaging
from ryu.app.ofctl import api as ryu_api
from ryu.base import app_manager
from ryu.controller import handler
from neutron.agent import securitygroups_rpc as sg_rpc
from neutron.common import constants as n_const
from neutron.common import log
-from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils as n_utils
from neutron import context
self.arplib.del_arp_table_entry(network, ip)
-class OFANeutronAgent(n_rpc.RpcCallback,
- sg_rpc.SecurityGroupAgentRpcCallbackMixin,
+class OFANeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
l2population_rpc.L2populationRpcCallBackTunnelMixin):
"""A agent for OpenFlow Agent ML2 mechanism driver.
# history
# 1.0 Initial version
# 1.1 Support Security Group RPC
- RPC_API_VERSION = '1.1'
+ target = messaging.Target(version='1.1')
def __init__(self, ryuapp, integ_br, local_ip,
bridge_mappings, interface_mappings, root_helper,
LOG = logging.getLogger(__name__)
-class NVSDAgentRpcCallback(n_rpc.RpcCallback):
+class NVSDAgentRpcCallback(object):
- RPC_API_VERSION = '1.0'
+ target = messaging.Target(version='1.0')
def __init__(self, context, agent, sg_agent):
super(NVSDAgentRpcCallback, self).__init__()
self.client = n_rpc.get_client(target)
-class SecurityGroupAgentRpcCallback(
- n_rpc.RpcCallback,
- sg_rpc.SecurityGroupAgentRpcCallbackMixin):
+class SecurityGroupAgentRpcCallback(sg_rpc.SecurityGroupAgentRpcCallbackMixin):
- RPC_API_VERSION = sg_rpc.SG_RPC_VERSION
+ target = messaging.Target(version=sg_rpc.SG_RPC_VERSION)
def __init__(self, context, sg_agent):
super(SecurityGroupAgentRpcCallback, self).__init__()
self.init_firewall()
-class NVSDNeutronAgent(n_rpc.RpcCallback):
+class NVSDNeutronAgent(object):
# history
# 1.0 Initial version
# 1.1 Support Security Group RPC
- RPC_API_VERSION = '1.1'
+ target = messaging.Target(version='1.1')
def __init__(self, integ_br, root_helper, polling_interval):
super(NVSDNeutronAgent, self).__init__()
import netaddr
from neutron.plugins.openvswitch.agent import ovs_dvr_neutron_agent
from oslo.config import cfg
+from oslo import messaging
from six import moves
from neutron.agent import l2population_rpc
from neutron.common import config as common_config
from neutron.common import constants as q_const
from neutron.common import exceptions
-from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils as q_utils
from neutron import context
self.init_firewall(defer_refresh_firewall=True)
-class OVSNeutronAgent(n_rpc.RpcCallback,
- sg_rpc.SecurityGroupAgentRpcCallbackMixin,
+class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
l2population_rpc.L2populationRpcCallBackTunnelMixin,
dvr_rpc.DVRAgentRpcCallbackMixin):
'''Implements OVS-based tunneling, VLANs and flat networks.
# 1.0 Initial version
# 1.1 Support Security Group RPC
# 1.2 Support DVR (Distributed Virtual Router) RPC
- RPC_API_VERSION = '1.2'
+ target = messaging.Target(version='1.2')
def __init__(self, integ_br, tun_br, local_ip,
bridge_mappings, root_helper,
eventlet.monkey_patch()
from oslo.config import cfg
+from oslo import messaging
from neutron.agent import rpc as agent_rpc
from neutron.agent import securitygroups_rpc as sg_rpc
from neutron.common import config as common_config
from neutron.common import constants as q_constants
-from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils as q_utils
from neutron import context
LOG = logging.getLogger(__name__)
-class SriovNicSwitchRpcCallbacks(n_rpc.RpcCallback,
- sg_rpc.SecurityGroupAgentRpcCallbackMixin):
+class SriovNicSwitchRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin):
# Set RPC API version to 1.0 by default.
# history
# 1.1 Support Security Group RPC
- RPC_API_VERSION = '1.1'
+ target = messaging.Target(version='1.1')
def __init__(self, context, agent):
super(SriovNicSwitchRpcCallbacks, self).__init__()
# under the License.
from oslo.config import cfg
+from oslo import messaging
from oslo.utils import importutils
from neutron.agent import rpc as agent_rpc
from neutron.common import constants as n_const
from neutron.common import exceptions as n_exc
-from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron import context
from neutron.i18n import _LE, _LI
msg = _('Unknown device with pool_id %(pool_id)s')
-class LbaasAgentManager(n_rpc.RpcCallback, periodic_task.PeriodicTasks):
+class LbaasAgentManager(periodic_task.PeriodicTasks):
- RPC_API_VERSION = '2.0'
# history
# 1.0 Initial version
# 1.1 Support agent_updated call
# - modify/reload/destroy_pool methods were removed;
# - added methods to handle create/update/delete for every lbaas
# object individually;
+ target = messaging.Target(version='2.0')
def __init__(self, conf):
super(LbaasAgentManager, self).__init__()
"in plugin driver.")
-class LoadBalancerCallbacks(n_rpc.RpcCallback):
+class LoadBalancerCallbacks(object):
- RPC_API_VERSION = '2.0'
# history
# 1.0 Initial version
# 2.0 Generic API for agent based drivers
# - get_logical_device() handling changed;
# - pool_deployed() and update_status() methods added;
+ target = messaging.Target(version='2.0')
def __init__(self, plugin):
super(LoadBalancerCallbacks, self).__init__()
# history
# 1.0 Initial version
- RPC_API_VERSION = '1.0'
-
- # TODO(ihrachys): we can't use RpcCallback here due to inheritance
- # issues
- target = messaging.Target(version=RPC_API_VERSION)
+ target = messaging.Target(version='1.0')
def __init__(self, agent, host):
self.host = host
# history
# 1.0 Initial version
-
- RPC_API_VERSION = '1.0'
-
- # TODO(ihrachys): we can't use RpcCallback here due to inheritance
- # issues
- target = messaging.Target(version=RPC_API_VERSION)
+ target = messaging.Target(version='1.0')
def __init__(self, agent, host):
self.agent = agent
"""
admin_context = context if context.is_admin else context.elevated()
if not version:
- version = self.RPC_API_VERSION
+ version = self.target.version
l3_agents = self.driver.l3_plugin.get_l3_agents_hosting_routers(
admin_context, [router_id],
admin_state_up=True,
# License for the specific language governing permissions and limitations
# under the License.
+from oslo import messaging
+
from neutron.common import rpc as n_rpc
from neutron.db.vpn import vpn_db
from neutron.openstack.common import log as logging
VRF_SUFFIX_LEN = 6
-class CiscoCsrIPsecVpnDriverCallBack(n_rpc.RpcCallback):
+class CiscoCsrIPsecVpnDriverCallBack(object):
"""Handler for agent to plugin RPC messaging."""
# history
# 1.0 Initial version
- RPC_API_VERSION = BASE_IPSEC_VERSION
+ target = messaging.Target(version=BASE_IPSEC_VERSION)
def __init__(self, driver):
super(CiscoCsrIPsecVpnDriverCallBack, self).__init__()
plugin.update_status_by_agent(context, status)
-class CiscoCsrIPsecVpnAgentApi(service_drivers.BaseIPsecVpnAgentApi,
- n_rpc.RpcCallback):
+class CiscoCsrIPsecVpnAgentApi(service_drivers.BaseIPsecVpnAgentApi):
"""API and handler for Cisco IPSec plugin to agent RPC messaging."""
- RPC_API_VERSION = BASE_IPSEC_VERSION
+ target = messaging.Target(version=BASE_IPSEC_VERSION)
def __init__(self, topic, default_version, driver):
super(CiscoCsrIPsecVpnAgentApi, self).__init__(
"""
admin_context = context if context.is_admin else context.elevated()
if not version:
- version = self.RPC_API_VERSION
+ version = self.target.version
host = self.driver.l3_plugin.get_host_for_router(admin_context,
router_id)
LOG.debug('Notify agent at %(topic)s.%(host)s the message '
plugin.update_status_by_agent(context, status)
-class IPsecVpnAgentApi(service_drivers.BaseIPsecVpnAgentApi,
- n_rpc.RpcCallback):
+class IPsecVpnAgentApi(service_drivers.BaseIPsecVpnAgentApi):
"""Agent RPC API for IPsecVPNAgent."""
- RPC_API_VERSION = BASE_IPSEC_VERSION
+ target = messaging.Target(version=BASE_IPSEC_VERSION)
def __init__(self, topic, default_version, driver):
super(IPsecVpnAgentApi, self).__init__(
Code Review / openstack-build / neutron-build.git / commitdiff