From ffcb30c4fbee334f9903d2719418bc6aa9d7721c Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Thu, 16 Oct 2014 15:31:03 +0900 Subject: [PATCH] l3_agent: avoid name conflict with context module name, context, conflicts with argument name in many place in l3_agent. In order to avoid such conflict, import context as n_context following Neutron practice. Change-Id: Ic3754818f84064d2c8da04914826fc912437b2f0 Closes-Bug: #1381900 --- neutron/agent/l3_agent.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/agent/l3_agent.py b/neutron/agent/l3_agent.py index e23b600fb..112bf77ad 100644 --- a/neutron/agent/l3_agent.py +++ b/neutron/agent/l3_agent.py @@ -40,7 +40,7 @@ from neutron.common import ipv6_utils from neutron.common import rpc as n_rpc from neutron.common import topics from neutron.common import utils as common_utils -from neutron import context +from neutron import context as n_context from neutron import manager from neutron.openstack.common import excutils from neutron.openstack.common.gettextutils import _LE, _LW @@ -521,7 +521,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, LOG.error(msg) raise SystemExit(1) - self.context = context.get_admin_context_without_session() + self.context = n_context.get_admin_context_without_session() self.plugin_rpc = L3PluginApi(topics.L3PLUGIN, host) self.fullsync = True self.sync_progress = False -- 2.45.2