From bc4d1054c3d5125103e16cf85ef02f97987994fd Mon Sep 17 00:00:00 2001 From: armando-migliaccio Date: Tue, 14 Oct 2014 23:25:58 -0700 Subject: [PATCH] Remove redundant initialization and check from DVR RPC mixin The initialization, as well as the recurrent checks on whether the agent is able to handle DVR requests, are not necessary; this is because the dvr_agent is going to be set at the time the L2 agent starts receiving RPC messages. Change-Id: I9caad965d0ff507e2ed93d6432997ad86139ac04 --- neutron/api/rpc/handlers/dvr_rpc.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/neutron/api/rpc/handlers/dvr_rpc.py b/neutron/api/rpc/handlers/dvr_rpc.py index f4d0233a5..e9028cf64 100644 --- a/neutron/api/rpc/handlers/dvr_rpc.py +++ b/neutron/api/rpc/handlers/dvr_rpc.py @@ -115,8 +115,6 @@ class DVRAgentRpcApiMixin(object): class DVRAgentRpcCallbackMixin(object): """Agent-side RPC (implementation) for plugin-to-agent interaction.""" - dvr_agent = None - def dvr_mac_address_update(self, context, **kwargs): """Callback for dvr_mac_addresses update. @@ -124,7 +122,4 @@ class DVRAgentRpcCallbackMixin(object): """ dvr_macs = kwargs.get('dvr_macs', []) LOG.debug("dvr_macs updated on remote: %s", dvr_macs) - if not self.dvr_agent: - LOG.warn(_("DVR agent binding currently not set.")) - return self.dvr_agent.dvr_mac_address_update(dvr_macs) -- 2.45.2