x
/
group-based-policy
Code Issues Proposed changes

Fix oslo_i18n usage 

The use of log translations were removed in upstream
neutron in this patch:

https://review.opendev.org/c/openstack/neutron/+/453355

The same was applied to GBP. However, some files we missing
imports of the oslo_i18n translator, as this is still needed
for other printing (e.g. exceptions, configuration file options, etc.).

Change-Id: Ie8d3d312dcb1b811e76879ec8df2a0cd892ce6d3
(cherry picked from commit 832ba2760c)
This commit is contained in:
pulkit vajpyee 2022-02-09 14:44:42 +05:30 committed by Thomas Bachman
parent 3566dbaf1c
commit bd020b02ae
13 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gbpservice/contrib/nfp/configurator/drivers/loadbalancer/v2/haproxy/config.py
View File

@ -19,6 +19,9 @@ Routines for configuring Octavia Haproxy driver
from oslo_config import cfg
from gbpservice._i18n import _
haproxy_amphora_opts = [
cfg.StrOpt('base_path',
default='/var/lib/octavia',

1
gbpservice/contrib/nfp/service_plugins/firewall/nfp_fwaas_plugin.py
View File

@ -13,6 +13,7 @@
from keystoneclient import exceptions as k_exceptions
from keystoneclient.v2_0 import client as keyclient
from gbpservice._i18n import _
from gbpservice.common import utils
from gbpservice.contrib.nfp.config_orchestrator.common import topics
from gbpservice.nfp.core import log as nfp_logging

4
gbpservice/contrib/nfp/service_plugins/vpn/drivers/nfp_vpnaas_driver.py
View File

@ -27,6 +27,10 @@ from neutron_vpnaas.services.vpn.service_drivers import base_ipsec
import oslo_messaging
from gbpservice._i18n import _
from gbpservice.contrib.nfp.config_orchestrator.common import topics
from gbpservice.nfp.core import log as nfp_logging
LOG = nfp_logging.getLogger(__name__)
BASE_VPN_VERSION = '1.0'
AGENT_TYPE_VPN = 'NFP Vpn agent'

2
gbpservice/contrib/nfp_service/reference_configurator/controllers/controller.py
View File

@ -21,6 +21,8 @@ import pecan
from pecan import rest
import yaml
from gbpservice._i18n import _
LOG = logging.getLogger(__name__)
SUCCESS = 'SUCCESS'
FAILED = 'FAILED'

1
gbpservice/neutron/db/servicechain_db.py
View File

@ -26,6 +26,7 @@ from sqlalchemy.ext.orderinglist import ordering_list
from sqlalchemy import orm
from sqlalchemy.orm import exc
from gbpservice._i18n import _
from gbpservice.neutron.db import api as db_api
from gbpservice.neutron.extensions import servicechain as schain
from gbpservice.neutron.services.servicechain.common import exceptions as s_exc

16
gbpservice/neutron/extensions/cisco_apic.py
View File

@ -26,6 +26,8 @@ from neutron_lib.api import validators as valid
from oslo_log import log as logging
import six
from gbpservice._i18n import _
ALIAS = 'cisco-apic'
DIST_NAMES = 'apic:distinguished_names'
@ -84,11 +86,11 @@ def _validate_apic_vlan(data, key_specs=None):
val = int(data)
if val >= APIC_MIN_VLAN and val <= APIC_MAX_VLAN:
return
msg = _("Invalid value for VLAN: '%s'") % data
msg = ("Invalid value for VLAN: '%s'") % data
LOG.debug(msg)
return msg
except (ValueError, TypeError):
msg = _("Invalid data format for VLAN: '%s'") % data
msg = ("Invalid data format for VLAN: '%s'") % data
LOG.debug(msg)
return msg
@ -106,7 +108,7 @@ def _validate_apic_vlan_range(data, key_specs=None):
if msg:
return msg
if int(data[VLAN_RANGE_START]) > int(data[VLAN_RANGE_END]):
msg = _("Invalid start, end for VLAN range %s") % data
msg = ("Invalid start, end for VLAN range %s") % data
return msg
@ -115,9 +117,9 @@ def _validate_erspan_flow_id(data, key_specs=None):
return
msg = valid.validate_non_negative(data)
if int(data) > 1023:
msg = _("ERSPAN flow ID must be less than 1023 (was %s)") % data
msg = ("ERSPAN flow ID must be less than 1023 (was %s)") % data
elif int(data) == 0:
msg = _("ERSPAN flow ID must be greater than 0 (was %s)") % data
msg = ("ERSPAN flow ID must be greater than 0 (was %s)") % data
return msg
@ -132,7 +134,7 @@ def _validate_erspan_configs(data, valid_values=None):
otherwise a human readable message indicating why validation failed.
"""
if not isinstance(data, list):
msg = _("Invalid data format for ERSPAN config: '%s'") % data
msg = ("Invalid data format for ERSPAN config: '%s'") % data
LOG.debug(msg)
return msg
@ -149,7 +151,7 @@ def _validate_erspan_configs(data, valid_values=None):
if msg:
return msg
if erspan_config in erspan_configs:
msg = _("Duplicate ERSPAN config '%s'") % erspan_config
msg = ("Duplicate ERSPAN config '%s'") % erspan_config
LOG.debug(msg)
return msg
erspan_configs.append(erspan_config)

30
gbpservice/neutron/extensions/group_policy.py
View File

@ -287,18 +287,18 @@ def _validate_gbp_port_range(data, key_specs=None):
try:
val = int(p)
if val <= 0 or val > 65535:
msg = _("Invalid port '%s', valid range 0 < port < 65536") % p
msg = ("Invalid port '%s', valid range 0 < port < 65536") % p
LOG.debug(msg)
return msg
if val <= lower_range:
msg_dict = dict(p1=lower_range, p2=val)
msg = _("Invalid port range: %(p1)s:%(p2)s, "
"valid range 0 < port1 < port2") % msg_dict
msg = ("Invalid port range: %(p1)s:%(p2)s, "
"valid range 0 < port1 < port2") % msg_dict
LOG.debug(msg)
return msg
lower_range = val
except (ValueError, TypeError):
msg = _("Port value '%s' is not a valid number") % p
msg = ("Port value '%s' is not a valid number") % p
LOG.debug(msg)
return msg
@ -316,21 +316,21 @@ def _validate_network_svc_params(data, key_specs=None):
# The supported values are defined in gp_network_service_param_values,
# but the values are not validated when the tpye is 'string'.
if not isinstance(data, list):
msg = _("'%s' is not a list") % data
msg = ("'%s' is not a list") % data
LOG.debug(msg)
return msg
for d in data:
if not isinstance(d, dict):
msg = _("'%s' is not a dictionary") % d
msg = ("'%s' is not a dictionary") % d
LOG.debug(msg)
return msg
if set(d) != set(gp_network_service_param_keys):
s = ", ".join(set(d) - set(gp_network_service_param_keys))
msg = _("Unknown key(s) '%s' in network service params") % s
msg = ("Unknown key(s) '%s' in network service params") % s
LOG.debug(msg)
return msg
if d['type'] not in gp_network_service_param_types:
msg = _("Network service param type(s) '%s' not supported") % (
msg = ("Network service param type(s) '%s' not supported") % (
d['type'])
LOG.debug(msg)
return msg
@ -338,8 +338,8 @@ def _validate_network_svc_params(data, key_specs=None):
gp_constants.GP_NETWORK_SVC_PARAM_TYPE_QOS_MAX,
gp_constants.GP_NETWORK_SVC_PARAM_TYPE_QOS_BURST):
if d['value'] not in gp_network_service_param_values:
msg = _("Network service param value '%s' is not "
"supported") % d['value']
msg = ("Network service param value '%s' is not "
"supported") % d['value']
LOG.debug(msg)
return msg
@ -348,16 +348,16 @@ def _validate_external_dict(data, key_specs=None):
if data is None:
return
if not isinstance(data, dict):
msg = _("'%s' is not a dictionary") % data
msg = ("'%s' is not a dictionary") % data
LOG.debug(msg)
return msg
for d in data:
if not uuidutils.is_uuid_like(d):
msg = _("'%s' is not a valid UUID") % d
msg = ("'%s' is not a valid UUID") % d
LOG.debug(msg)
return msg
if not isinstance(data[d], list):
msg = _("'%s' is not a list") % data[d]
msg = ("'%s' is not a list") % data[d]
LOG.debug(msg)
return msg
@ -365,7 +365,7 @@ def _validate_external_dict(data, key_specs=None):
def _validate_gbproutes(data, valid_values=None):
# Shamelessly copied from Neutron, will pass even if nexthop is valid
if not isinstance(data, list):
msg = _("Invalid data format for hostroute: '%s'") % data
msg = ("Invalid data format for hostroute: '%s'") % data
LOG.debug(msg)
return msg
@ -386,7 +386,7 @@ def _validate_gbproutes(data, valid_values=None):
LOG.debug(msg)
return msg
if hostroute in hostroutes:
msg = _("Duplicate hostroute '%s'") % hostroute
msg = ("Duplicate hostroute '%s'") % hostroute
LOG.debug(msg)
return msg
hostroutes.append(hostroute)

1
gbpservice/neutron/extensions/patch.py
View File

@ -27,6 +27,7 @@ from neutron_lib.plugins import directory
from oslo_log import log
from oslo_utils import excutils
from gbpservice._i18n import _
from gbpservice.common import utils as gbp_utils
from gbpservice.neutron.db import api as db_api

4
gbpservice/neutron/extensions/servicechain.py
View File

@ -84,7 +84,7 @@ class PortNotFound(nexc.NotFound):
def _validate_str_list(data, valid_values=None):
if not isinstance(data, list):
msg = _("'%s' is not a list") % data
msg = ("'%s' is not a list") % data
LOG.debug(msg)
return msg
@ -95,7 +95,7 @@ def _validate_str_list(data, valid_values=None):
return msg
if len(set(data)) != len(data):
msg = _("Duplicate items in the list: '%s'") % ', '.join(data)
msg = ("Duplicate items in the list: '%s'") % ', '.join(data)
LOG.debug(msg)
return msg

1
gbpservice/neutron/services/servicechain/plugins/ncp/node_plumbers/admin_owned_resources_apic_tscp.py
View File

@ -16,6 +16,7 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import excutils
from gbpservice._i18n import _
from gbpservice.common import utils
from gbpservice.neutron.services.servicechain.plugins.ncp.node_plumbers \
import traffic_stitching_plumber as tscp

1
gbpservice/nfp/orchestrator/config_drivers/heat_driver.py
View File

@ -20,6 +20,7 @@ from oslo_config import cfg
from oslo_serialization import jsonutils
import yaml
from gbpservice._i18n import _
from gbpservice.neutron.db import api as db_api
from gbpservice.neutron.services.grouppolicy.common import constants as gconst
from gbpservice.neutron.services.servicechain.plugins.ncp import plumber_base

10
gbpservice/nfp/orchestrator/drivers/orchestration_driver.py
View File

@ -478,19 +478,19 @@ class OrchestrationDriver(object):
interfaces = device_data.pop('interfaces', None)
if not interfaces:
LOG.exception('Failed to get interfaces for device creation.')
return None, _, _
return None, None, None
image_id = image_id_result.get('result', None)
if not image_id:
LOG.error('Failed to get image id for device creation.')
self._delete_interfaces(device_data, interfaces,
network_handler=network_handler)
return None, _, _
return None, None, None
if server_grp_id_result and not server_grp_id_result.get('result'):
LOG.error('Validation failed for Nova anti-affinity '
'server group.')
return None, _, _
return None, None, None
provider_metadata = provider_metadata_result.get('result', None)
if not provider_metadata:
@ -562,7 +562,7 @@ class OrchestrationDriver(object):
{'data': device_data})
self._delete_interfaces(device_data, interfaces,
network_handler=network_handler)
return None, _
return None, None
mgmt_neutron_port_info = port_details_result.get('result', None)
@ -575,7 +575,7 @@ class OrchestrationDriver(object):
instance_id)
self._delete_interfaces(device_data, interfaces,
network_handler=network_handler)
return None, _
return None, None
return instance_id, mgmt_neutron_port_info
@_set_network_handler

1
gbpservice/tools/validate/cli.py
View File

@ -21,6 +21,7 @@ from neutron.common import config
from neutron import manager
from neutron_lib.plugins import directory
from gbpservice._i18n import _
from gbpservice.neutron.services.grouppolicy import (
group_policy_driver_api as api)