openstack
/
neutron
Code Issues Proposed changes

Merge "ml2/rpc: provide a small helper to avoid redundancy"

This commit is contained in:
Zuul 2018-11-21 12:10:36 +00:00 committed by Gerrit Code Review
parent 7d6057739b e6dbef39d3
commit 595e88f022
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
neutron/plugins/ml2/rpc.py
View File

@ -66,11 +66,16 @@ class RpcCallbacks(type_tunnel.TunnelRpcCallbackMixin):
if port['status'] != new_status:
return new_status
@staticmethod
def _get_request_details(kwargs):
return (kwargs.get('agent_id'),
kwargs.get('host'),
kwargs.get('device'))
def get_device_details(self, rpc_context, **kwargs):
"""Agent requests device details."""
agent_id = kwargs.get('agent_id')
device = kwargs.get('device')
host = kwargs.get('host')
agent_id, host, device = self._get_request_details(kwargs)
# cached networks used for reducing number of network db calls
# for server internal usage only
cached_networks = kwargs.get('cached_networks')
@ -216,9 +221,7 @@ class RpcCallbacks(type_tunnel.TunnelRpcCallbackMixin):
def update_device_down(self, rpc_context, **kwargs):
"""Device no longer exists on agent."""
# TODO(garyk) - live migration and port status
agent_id = kwargs.get('agent_id')
device = kwargs.get('device')
host = kwargs.get('host')
agent_id, host, device = self._get_request_details(kwargs)
LOG.debug("Device %(device)s no longer exists at agent "
"%(agent_id)s",
{'device': device, 'agent_id': agent_id})
@ -248,9 +251,7 @@ class RpcCallbacks(type_tunnel.TunnelRpcCallbackMixin):
def update_device_up(self, rpc_context, **kwargs):
"""Device is up on agent."""
agent_id = kwargs.get('agent_id')
device = kwargs.get('device')
host = kwargs.get('host')
agent_id, host, device = self._get_request_details(kwargs)
LOG.debug("Device %(device)s up at agent %(agent_id)s",
{'device': device, 'agent_id': agent_id})
plugin = directory.get_plugin()