From d7208283e60d6a79e4bcddcf34332d5f2f1e3be9 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Thu, 24 Dec 2015 06:40:59 +0900 Subject: [PATCH] Consume _ from local _1i8n OpenStack discourages using _ from the python builtins namespace. Instead it is encourage to consume _ provided by per-repo _i18n. Change-Id: I9db859ed6d595a621f2b4d09992d2312453a0b75 --- neutron_vpnaas/db/vpn/vpn_validator.py | 1 + neutron_vpnaas/extensions/vpnaas.py | 2 ++ neutron_vpnaas/services/vpn/agent.py | 1 + neutron_vpnaas/services/vpn/common/netns_wrapper.py | 2 +- neutron_vpnaas/services/vpn/device_drivers/cisco_ipsec.py | 2 +- neutron_vpnaas/services/vpn/device_drivers/ipsec.py | 2 +- neutron_vpnaas/services/vpn/device_drivers/strongswan_ipsec.py | 2 ++ neutron_vpnaas/services/vpn/device_drivers/vyatta_ipsec.py | 2 +- neutron_vpnaas/services/vpn/service_drivers/cisco_csr_db.py | 2 +- neutron_vpnaas/services/vpn/service_drivers/cisco_validator.py | 1 + neutron_vpnaas/services/vpn/service_drivers/ipsec_validator.py | 1 + neutron_vpnaas/services/vpn/vyatta_agent.py | 1 + 12 files changed, 14 insertions(+), 5 deletions(-) diff --git a/neutron_vpnaas/db/vpn/vpn_validator.py b/neutron_vpnaas/db/vpn/vpn_validator.py index c8d630a85..c9d9fa0e8 100644 --- a/neutron_vpnaas/db/vpn/vpn_validator.py +++ b/neutron_vpnaas/db/vpn/vpn_validator.py @@ -22,6 +22,7 @@ from neutron.db import models_v2 from neutron import manager from neutron.plugins.common import constants as nconstants +from neutron_vpnaas._i18n import _ from neutron_vpnaas.extensions import vpnaas from neutron_vpnaas.services.vpn.common import constants diff --git a/neutron_vpnaas/extensions/vpnaas.py b/neutron_vpnaas/extensions/vpnaas.py index 59d2b43e6..49b562a7e 100644 --- a/neutron_vpnaas/extensions/vpnaas.py +++ b/neutron_vpnaas/extensions/vpnaas.py @@ -24,6 +24,8 @@ from neutron.common import exceptions as nexception from neutron.plugins.common import constants as nconstants from neutron.services import service_base +from neutron_vpnaas._i18n import _ + class VPNServiceNotFound(nexception.NotFound): message = _("VPNService %(vpnservice_id)s could not be found") diff --git a/neutron_vpnaas/services/vpn/agent.py b/neutron_vpnaas/services/vpn/agent.py index 8f3ed0355..e14537464 100644 --- a/neutron_vpnaas/services/vpn/agent.py +++ b/neutron_vpnaas/services/vpn/agent.py @@ -18,6 +18,7 @@ from neutron.agent.l3 import agent as l3_agent from neutron.agent import l3_agent as entry from oslo_config import cfg +from neutron_vpnaas._i18n import _ from neutron_vpnaas.services.vpn import vpn_service vpn_agent_opts = [ diff --git a/neutron_vpnaas/services/vpn/common/netns_wrapper.py b/neutron_vpnaas/services/vpn/common/netns_wrapper.py index 67de8b761..dcbbb7aa9 100644 --- a/neutron_vpnaas/services/vpn/common/netns_wrapper.py +++ b/neutron_vpnaas/services/vpn/common/netns_wrapper.py @@ -25,7 +25,7 @@ from oslo_log import log as logging from oslo_rootwrap import wrapper import six -from neutron_vpnaas._i18n import _LE, _LI +from neutron_vpnaas._i18n import _, _LE, _LI if six.PY3: import configparser as ConfigParser diff --git a/neutron_vpnaas/services/vpn/device_drivers/cisco_ipsec.py b/neutron_vpnaas/services/vpn/device_drivers/cisco_ipsec.py index 2da00ab85..6adff9a8c 100644 --- a/neutron_vpnaas/services/vpn/device_drivers/cisco_ipsec.py +++ b/neutron_vpnaas/services/vpn/device_drivers/cisco_ipsec.py @@ -26,7 +26,7 @@ from oslo_log import log as logging import oslo_messaging from oslo_service import loopingcall -from neutron_vpnaas._i18n import _LE, _LI, _LW +from neutron_vpnaas._i18n import _, _LE, _LI, _LW from neutron_vpnaas.services.vpn.common import topics from neutron_vpnaas.services.vpn import device_drivers from neutron_vpnaas.services.vpn.device_drivers import ( diff --git a/neutron_vpnaas/services/vpn/device_drivers/ipsec.py b/neutron_vpnaas/services/vpn/device_drivers/ipsec.py index d2624b3e0..138247d59 100644 --- a/neutron_vpnaas/services/vpn/device_drivers/ipsec.py +++ b/neutron_vpnaas/services/vpn/device_drivers/ipsec.py @@ -36,7 +36,7 @@ from oslo_log import log as logging import oslo_messaging from oslo_service import loopingcall -from neutron_vpnaas._i18n import _LE, _LI, _LW +from neutron_vpnaas._i18n import _, _LE, _LI, _LW from neutron_vpnaas.extensions import vpnaas from neutron_vpnaas.services.vpn.common import topics from neutron_vpnaas.services.vpn import device_drivers diff --git a/neutron_vpnaas/services/vpn/device_drivers/strongswan_ipsec.py b/neutron_vpnaas/services/vpn/device_drivers/strongswan_ipsec.py index 4b79ac368..77ac8e1a1 100644 --- a/neutron_vpnaas/services/vpn/device_drivers/strongswan_ipsec.py +++ b/neutron_vpnaas/services/vpn/device_drivers/strongswan_ipsec.py @@ -20,6 +20,8 @@ from oslo_config import cfg from neutron.agent.linux import ip_lib from neutron.plugins.common import constants + +from neutron_vpnaas._i18n import _ from neutron_vpnaas.services.vpn.device_drivers import ipsec TEMPLATE_PATH = os.path.dirname(os.path.abspath(__file__)) diff --git a/neutron_vpnaas/services/vpn/device_drivers/vyatta_ipsec.py b/neutron_vpnaas/services/vpn/device_drivers/vyatta_ipsec.py index b04e6b6b7..ea9ac96d2 100644 --- a/neutron_vpnaas/services/vpn/device_drivers/vyatta_ipsec.py +++ b/neutron_vpnaas/services/vpn/device_drivers/vyatta_ipsec.py @@ -28,7 +28,7 @@ from oslo_service import loopingcall from oslo_service import periodic_task import six -from neutron_vpnaas._i18n import _LE, _LW +from neutron_vpnaas._i18n import _, _LE, _LW from neutron_vpnaas.services.vpn.common import topics from neutron_vpnaas.services.vpn import device_drivers diff --git a/neutron_vpnaas/services/vpn/service_drivers/cisco_csr_db.py b/neutron_vpnaas/services/vpn/service_drivers/cisco_csr_db.py index 080b09bac..22833569e 100644 --- a/neutron_vpnaas/services/vpn/service_drivers/cisco_csr_db.py +++ b/neutron_vpnaas/services/vpn/service_drivers/cisco_csr_db.py @@ -19,7 +19,7 @@ from oslo_log import log as logging import sqlalchemy as sa from sqlalchemy.orm import exc as sql_exc -from neutron_vpnaas._i18n import _LI +from neutron_vpnaas._i18n import _, _LI from neutron_vpnaas.db.vpn import vpn_models LOG = logging.getLogger(__name__) diff --git a/neutron_vpnaas/services/vpn/service_drivers/cisco_validator.py b/neutron_vpnaas/services/vpn/service_drivers/cisco_validator.py index 9072ba3c3..32a108f2b 100644 --- a/neutron_vpnaas/services/vpn/service_drivers/cisco_validator.py +++ b/neutron_vpnaas/services/vpn/service_drivers/cisco_validator.py @@ -17,6 +17,7 @@ from netaddr import core as net_exc from neutron.common import exceptions from oslo_log import log as logging +from neutron_vpnaas._i18n import _ from neutron_vpnaas.db.vpn import vpn_validator diff --git a/neutron_vpnaas/services/vpn/service_drivers/ipsec_validator.py b/neutron_vpnaas/services/vpn/service_drivers/ipsec_validator.py index 978dad499..263465429 100644 --- a/neutron_vpnaas/services/vpn/service_drivers/ipsec_validator.py +++ b/neutron_vpnaas/services/vpn/service_drivers/ipsec_validator.py @@ -14,6 +14,7 @@ from neutron.common import exceptions +from neutron_vpnaas._i18n import _ from neutron_vpnaas.db.vpn import vpn_validator diff --git a/neutron_vpnaas/services/vpn/vyatta_agent.py b/neutron_vpnaas/services/vpn/vyatta_agent.py index efc2ad580..c713fe867 100644 --- a/neutron_vpnaas/services/vpn/vyatta_agent.py +++ b/neutron_vpnaas/services/vpn/vyatta_agent.py @@ -18,6 +18,7 @@ from networking_brocade.vyatta.common import l3_agent as vyatta_l3 from neutron.agent import l3_agent as entry from oslo_config import cfg +from neutron_vpnaas._i18n import _ from neutron_vpnaas.services.vpn import vyatta_vpn_service