From ef42f7c3f982092be6b5199bd9c2ade69e0446f3 Mon Sep 17 00:00:00 2001 From: Yong Sheng Gong Date: Tue, 10 Dec 2013 14:38:35 +0800 Subject: [PATCH] change variable name from plugin into agent Variable for agent instance should be named as 'agent' instead of plugin. Change-Id: I9bb2245049c6d6084284c2311a4c6aa2ad880bc1 Closes-Bug: #1259431 --- .../linuxbridge/agent/linuxbridge_neutron_agent.py | 8 ++++---- neutron/plugins/openvswitch/agent/ovs_neutron_agent.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py index cd63c64f8..1eac636e2 100755 --- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -991,11 +991,11 @@ def main(): polling_interval = cfg.CONF.AGENT.polling_interval root_helper = cfg.CONF.AGENT.root_helper - plugin = LinuxBridgeNeutronAgentRPC(interface_mappings, - polling_interval, - root_helper) + agent = LinuxBridgeNeutronAgentRPC(interface_mappings, + polling_interval, + root_helper) LOG.info(_("Agent initialized successfully, now running... ")) - plugin.daemon_loop() + agent.daemon_loop() sys.exit(0) diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py index b52bdb56a..cf2243e8a 100644 --- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py @@ -1285,11 +1285,11 @@ def main(): # commands target xen dom0 rather than domU. cfg.CONF.set_default('ip_lib_force_root', True) - plugin = OVSNeutronAgent(**agent_config) + agent = OVSNeutronAgent(**agent_config) # Start everything. LOG.info(_("Agent initialized successfully, now running... ")) - plugin.daemon_loop() + agent.daemon_loop() sys.exit(0) -- 2.45.2