Merge "Fix missing import for i18n"

tacker/api/common/_filters.py

@@ -21,6 +21,7 @@ from oslo_utils import strutils
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 
+from tacker._i18n import _
 from tacker.common import exceptions as exception
 
 

tacker/api/v1/resource.py

@@ -20,6 +20,7 @@ Utility methods for working with WSGI servers redux
 from oslo_log import log as logging
 import webob.dec
 
+from tacker._i18n import _
 from tacker.api import api_common
 from tacker import wsgi
 

tacker/api/validation/__init__.py

@@ -21,6 +21,7 @@ Request Body validating middleware.
 import functools
 import webob
 
+from tacker._i18n import _
 from tacker.api.validation import validators
 from tacker.common import exceptions
 

tacker/api/validation/validators.py

@@ -25,6 +25,7 @@ from oslo_utils import uuidutils
 import rfc3986
 import webob
 
+from tacker._i18n import _
 from tacker.common import exceptions as exception
 
 

tacker/conductor/conductor_server.py

@@ -40,6 +40,7 @@ from oslo_utils import timeutils
 from oslo_utils import uuidutils
 from sqlalchemy import exc as sqlexc
 
+from tacker._i18n import _
 from tacker import auth
 from tacker.common import coordination
 from tacker.common import csar_utils

tacker/conf/conductor.py

@@ -15,6 +15,8 @@
 
 from oslo_config import cfg
 
+from tacker._i18n import _
+
 
 CONF = cfg.CONF
 

tacker/conf/policy.py

@@ -15,6 +15,7 @@
 
 from oslo_config import cfg
 
+from tacker._i18n import _
 
 CONF = cfg.CONF
 

tacker/conf/vnf_package.py

@@ -15,6 +15,7 @@
 
 from oslo_config import cfg
 
+from tacker._i18n import _
 
 CONF = cfg.CONF
 

tacker/db/db_sqlalchemy/api.py

@@ -15,6 +15,7 @@
 
 from oslo_db.sqlalchemy import utils as sqlalchemyutils
 
+from tacker._i18n import _
 import tacker.context
 
 

tacker/objects/vnf_deployment_flavour.py

@@ -19,6 +19,7 @@ from oslo_utils import uuidutils
 from oslo_versionedobjects import base as ovoo_base
 from sqlalchemy.orm import joinedload
 
+from tacker._i18n import _
 from tacker.common import exceptions
 from tacker.db import api as db_api
 from tacker.db.db_sqlalchemy import api

tacker/objects/vnf_package_vnfd.py

@@ -16,6 +16,7 @@ from oslo_db import exception as db_exc
 from oslo_log import log as logging
 from oslo_utils import uuidutils
 
+from tacker._i18n import _
 from tacker.common import exceptions
 import tacker.context
 from tacker.db import api as db_api

tacker/objects/vnf_software_image.py

@@ -17,6 +17,7 @@ from oslo_utils import uuidutils
 from oslo_versionedobjects import base as ovoo_base
 from sqlalchemy.orm import joinedload
 
+from tacker._i18n import _
 from tacker.common import exceptions
 from tacker.common import utils
 from tacker.db import api as db_api

tacker/plugins/fenix.py

@@ -17,6 +17,7 @@ import yaml
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 
+from tacker._i18n import _
 from tacker.common import clients
 from tacker.common import log
 from tacker.extensions import vnfm

tacker/tests/etc/samples/etsi/nfv/user_data_sample_userdata_invalid_script/UserData/lcm_user_data_invalid_script.py

@@ -11,6 +11,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from tacker._i18n import _
 from tacker.extensions import vnfm
 from tacker.vnfm.lcm_user_data.abstract_user_data import AbstractUserData
 

tacker/tests/unit/sol_refactored/infra_drivers/kubernetes/fakes.py

@@ -18,6 +18,7 @@ import datetime
 from kubernetes import client
 from oslo_utils import uuidutils
 
+from tacker._i18n import _
 from tacker.sol_refactored import objects
 
 

tacker/tests/unit/vnflcm/test_controller.py

@@ -29,6 +29,7 @@ from oslo_config import cfg
 from oslo_policy import policy as oslo_policy
 from oslo_serialization import jsonutils
 
+from tacker._i18n import _
 from tacker.api.views import vnf_subscriptions as vnf_subscription_view
 from tacker.api.vnflcm.v1 import controller
 from tacker.api.vnflcm.v1 import sync_resource

tacker/tests/unit/vnflcm/test_vnflcm_driver.py

@@ -25,6 +25,7 @@ from oslo_serialization import jsonutils
 from oslo_utils import uuidutils
 
 from heatclient.v1 import resources
+from tacker._i18n import _
 from tacker.common import driver_manager
 from tacker.common import exceptions
 from tacker.common import utils

tacker/tests/unit/vnfm/infra_drivers/kubernetes/fakes.py

@@ -18,6 +18,7 @@ import datetime
 from kubernetes import client
 from oslo_serialization import jsonutils
 from oslo_utils import uuidutils
+from tacker._i18n import _
 from tacker.db.db_sqlalchemy import models
 from tacker import objects
 from tacker.objects import vim_connection

tacker/tests/unit/vnfm/infra_drivers/kubernetes/test_kubernetes_driver.py

@@ -20,6 +20,7 @@ import os
 from kubernetes import client
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
+from tacker._i18n import _
 from tacker.common.container import kubernetes_utils
 from tacker.common import exceptions
 from tacker import context

tacker/tests/unit/vnfm/infra_drivers/kubernetes/test_kubernetes_driver_helm.py

@@ -18,6 +18,7 @@ import paramiko
 from ddt import ddt
 from kubernetes import client
 from oslo_serialization import jsonutils
+from tacker._i18n import _
 from tacker.common import exceptions
 from tacker import context
 from tacker.db.db_sqlalchemy import models

tacker/tests/unit/vnfm/mgmt_drivers/fakes.py

@@ -17,6 +17,7 @@ import datetime
 from kubernetes import client
 import os
 
+from tacker._i18n import _
 from tacker import objects
 from tacker.objects import fields
 from tacker.tests import uuidsentinel

tacker/tests/unit/vnfpkgm/test_controller.py

@@ -27,6 +27,7 @@ from oslo_config import cfg
 from oslo_policy import policy as oslo_policy
 from oslo_serialization import jsonutils
 
+from tacker._i18n import _
 from tacker.api.vnfpkgm.v1 import controller
 from tacker.common import csar_utils
 from tacker.common import exceptions as tacker_exc

tacker/vnflcm/vnflcm_driver.py

@@ -31,6 +31,7 @@ from oslo_utils import excutils
 from oslo_utils import timeutils
 from toscaparser import tosca_template
 
+from tacker._i18n import _
 from tacker.common import driver_manager
 from tacker.common import exceptions
 from tacker.common import log
@@ -355,7 +356,7 @@ class VnfLcmDriver(abstract_driver.VnfInstanceAbstractDriver):
             vnf_package_path=vnf_package_path)
 
         # save the vnf resources in the db
-        for _, resources in vnf_resources.items():
+        for _i, resources in vnf_resources.items():
             for vnf_resource in resources:
                 vnf_resource.create()
 
@@ -1488,7 +1489,7 @@ class VnfLcmDriver(abstract_driver.VnfInstanceAbstractDriver):
                 region_name=vim_connection_info.access_info.get('region_name')
             )
         else:
-            for _ in range(scale_vnf_request.number_of_steps):
+            for _i in range(scale_vnf_request.number_of_steps):
                 last_event_id = self._vnf_manager.invoke(
                     vim_connection_info.vim_type,
                     'scale',

tacker/vnfm/lcm_user_data/abstract_user_data.py

@@ -13,6 +13,7 @@
 
 import abc
 
+from tacker._i18n import _
 from tacker.extensions import vnfm