openstack
/
neutron
Code Issues Proposed changes

Merge "ovs-agent: Trace remote methods only"

This commit is contained in:
Zuul 2019-07-15 12:15:40 +00:00 committed by Gerrit Code Review
parent ccd627c3b3 0299746c72
commit 597b8f62a1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -96,7 +96,6 @@ def has_zero_prefixlen_address(ip_addresses):
return any(netaddr.IPNetwork(ip).prefixlen == 0 for ip in ip_addresses)
@profiler.trace_cls("rpc")
class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
dvr_rpc.DVRAgentRpcCallbackMixin):
'''Implements OVS-based tunneling, VLANs and flat networks.
@ -479,6 +478,7 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
consumers,
start_listening=False)
@profiler.trace("rpc")
def port_update(self, context, **kwargs):
port = kwargs.get('port')
agent_restarted = kwargs.pop("agent_restarted", False)
@ -568,11 +568,13 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
'iface_id': port_data['id'],
'vif_type': port_binding['vif_type']})
@profiler.trace("rpc")
def port_delete(self, context, **kwargs):
port_id = kwargs.get('port_id')
self.deleted_ports.add(port_id)
self.updated_ports.discard(port_id)
@profiler.trace("rpc")
def network_update(self, context, **kwargs):
network_id = kwargs['network']['id']
network = self.plugin_rpc.get_network_details(
@ -588,12 +590,14 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
{'network_id': network_id,
'ports': self.network_ports[network_id]})
@profiler.trace("rpc")
def binding_deactivate(self, context, **kwargs):
if kwargs.get('host') != self.conf.host:
return
port_id = kwargs.get('port_id')
self.deactivated_bindings.add(port_id)
@profiler.trace("rpc")
def binding_activate(self, context, **kwargs):
if kwargs.get('host') != self.conf.host:
return
@ -661,6 +665,7 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
# ...and treat them as just added
port_info['added'] |= activated_bindings_copy
@profiler.trace("rpc")
def tunnel_update(self, context, **kwargs):
LOG.debug("tunnel_update received")
if not self.enable_tunneling:
@ -684,6 +689,7 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
tunnel_type)
self._setup_tunnel_flood_flow(self.tun_br, tunnel_type)
@profiler.trace("rpc")
def tunnel_delete(self, context, **kwargs):
LOG.debug("tunnel_delete received")
if not self.enable_tunneling: