openstack/cinder
Code Issues Proposed changes

Merge "Implementing the use of _L’x’/i18n markers"

Browse Source
This commit is contained in:
Jenkins 2014-12-01 14:59:39 +00:00 committed by Gerrit Code Review
commit 7e3ddf8d0d
17 changed files with 102 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/db/sqlalchemy/api.py
View File

@ -42,7 +42,7 @@ from sqlalchemy.sql import func
from cinder.common import sqlalchemyutils from cinder.common import sqlalchemyutils
from cinder.db.sqlalchemy import models from cinder.db.sqlalchemy import models
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LW
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common import uuidutils from cinder.openstack.common import uuidutils
@ -889,7 +889,7 @@ def quota_reserve(context, resources, quotas, deltas, expire,
usages[resource].reserved += delta usages[resource].reserved += delta
if unders: if unders:
LOG.warning(_("Change will make usage less than 0 for the following " LOG.warning(_LW("Change will make usage less than 0 for the following "
"resources: %s") % unders) "resources: %s") % unders)
if overs: if overs:
usages = dict((k, dict(in_use=v['in_use'], reserved=v['reserved'])) usages = dict((k, dict(in_use=v['in_use'], reserved=v['reserved']))

4
cinder/image/glance.py
View File

@ -33,7 +33,7 @@ from oslo.utils import timeutils
import six.moves.urllib.parse as urlparse import six.moves.urllib.parse as urlparse
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LW
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
@ -130,7 +130,7 @@ class GlanceClientWrapper(object):
self.version = version self.version = version
if CONF.glance_num_retries < 0: if CONF.glance_num_retries < 0:
LOG.warning(_( LOG.warning(_LW(
"glance_num_retries shouldn't be a negative value. " "glance_num_retries shouldn't be a negative value. "
"The number of retries will be set to 0 until this is" "The number of retries will be set to 0 until this is"
"corrected in the cinder.conf.")) "corrected in the cinder.conf."))

4
cinder/scheduler/filter_scheduler.py
View File

@ -23,7 +23,7 @@ Weighing Functions.
from oslo.config import cfg from oslo.config import cfg
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LW
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.scheduler import driver from cinder.scheduler import driver
from cinder.scheduler import scheduler_options from cinder.scheduler import scheduler_options
@ -397,7 +397,7 @@ class FilterScheduler(driver.Scheduler):
weighed_hosts = self._get_weighted_candidates(context, request_spec, weighed_hosts = self._get_weighted_candidates(context, request_spec,
filter_properties) filter_properties)
if not weighed_hosts: if not weighed_hosts:
LOG.warning(_('No weighed hosts found for volume ' LOG.warning(_LW('No weighed hosts found for volume '
'with properties: %s'), 'with properties: %s'),
filter_properties['request_spec']['volume_type']) filter_properties['request_spec']['volume_type'])
return None return None

6
cinder/scheduler/filters/capacity_filter.py
View File

@ -18,7 +18,7 @@
import math import math
from cinder.i18n import _ from cinder.i18n import _LE, _LW
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common.scheduler import filters from cinder.openstack.common.scheduler import filters
@ -41,7 +41,7 @@ class CapacityFilter(filters.BaseHostFilter):
if host_state.free_capacity_gb is None: if host_state.free_capacity_gb is None:
# Fail Safe # Fail Safe
LOG.error(_("Free capacity not set: " LOG.error(_LE("Free capacity not set: "
"volume node info collection broken.")) "volume node info collection broken."))
return False return False
@ -59,7 +59,7 @@ class CapacityFilter(filters.BaseHostFilter):
"requested": volume_size, "requested": volume_size,
"available": free} "available": free}
if free < volume_size: if free < volume_size:
LOG.warning(_("Insufficient free space for volume creation " LOG.warning(_LW("Insufficient free space for volume creation "
"on host %(host)s (requested / avail): " "on host %(host)s (requested / avail): "
"%(requested)s/%(available)s") % msg_args) "%(requested)s/%(available)s") % msg_args)
else: else:

6
cinder/scheduler/flows/create_volume.py
View File

@ -16,7 +16,7 @@ from taskflow.patterns import linear_flow
from cinder import exception from cinder import exception
from cinder import flow_utils from cinder import flow_utils
from cinder.i18n import _ from cinder.i18n import _, _LE
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder import rpc from cinder import rpc
from cinder import utils from cinder import utils
@ -100,7 +100,7 @@ class ScheduleCreateVolumeTask(flow_utils.CinderTask):
try: try:
self._notify_failure(context, request_spec, cause) self._notify_failure(context, request_spec, cause)
finally: finally:
LOG.error(_("Failed to run task %(name)s: %(cause)s") % LOG.error(_LE("Failed to run task %(name)s: %(cause)s") %
{'cause': cause, 'name': self.name}) {'cause': cause, 'name': self.name})
def _notify_failure(self, context, request_spec, cause): def _notify_failure(self, context, request_spec, cause):
@ -117,7 +117,7 @@ class ScheduleCreateVolumeTask(flow_utils.CinderTask):
rpc.get_notifier('scheduler').error(context, self.FAILURE_TOPIC, rpc.get_notifier('scheduler').error(context, self.FAILURE_TOPIC,
payload) payload)
except exception.CinderException: except exception.CinderException:
LOG.exception(_("Failed notifying on %(topic)s " LOG.exception(_LE("Failed notifying on %(topic)s "
"payload %(payload)s") % "payload %(payload)s") %
{'topic': self.FAILURE_TOPIC, 'payload': payload}) {'topic': self.FAILURE_TOPIC, 'payload': payload})

4
cinder/scheduler/host_manager.py
View File

@ -24,7 +24,7 @@ from oslo.utils import timeutils
from cinder import db from cinder import db
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LI
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.openstack.common.scheduler import filters from cinder.openstack.common.scheduler import filters
from cinder.openstack.common.scheduler import weights from cinder.openstack.common.scheduler import weights
@ -471,7 +471,7 @@ class HostManager(object):
# remove non-active hosts from host_state_map # remove non-active hosts from host_state_map
nonactive_hosts = set(self.host_state_map.keys()) - active_hosts nonactive_hosts = set(self.host_state_map.keys()) - active_hosts
for host in nonactive_hosts: for host in nonactive_hosts:
LOG.info(_("Removing non-active host: %(host)s from " LOG.info(_LI("Removing non-active host: %(host)s from "
"scheduler cache.") % {'host': host}) "scheduler cache.") % {'host': host})
del self.host_state_map[host] del self.host_state_map[host]

7
cinder/scheduler/manager.py
View File

@ -28,7 +28,7 @@ from cinder import context
from cinder import db from cinder import db
from cinder import exception from cinder import exception
from cinder import flow_utils from cinder import flow_utils
from cinder.i18n import _ from cinder.i18n import _, _LE
from cinder import manager from cinder import manager
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder import quota from cinder import quota
@ -105,7 +105,7 @@ class SchedulerManager(manager.Manager):
{'status': 'error'}) {'status': 'error'})
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.exception(_("Failed to create consistency group " LOG.exception(_LE("Failed to create consistency group "
"%(group_id)s."), "%(group_id)s."),
{'group_id': group_id}) {'group_id': group_id})
db.consistencygroup_update(context, group_id, db.consistencygroup_update(context, group_id,
@ -124,7 +124,8 @@ class SchedulerManager(manager.Manager):
snapshot_id, snapshot_id,
image_id) image_id)
except Exception: except Exception:
LOG.exception(_("Failed to create scheduler manager volume flow")) LOG.exception(_LE("Failed to create scheduler "
"manager volume flow"))
raise exception.CinderException( raise exception.CinderException(
_("Failed to create scheduler manager volume flow")) _("Failed to create scheduler manager volume flow"))

6
cinder/scheduler/scheduler_options.py
View File

@ -27,7 +27,7 @@ import os
from oslo.config import cfg from oslo.config import cfg
from oslo.utils import timeutils from oslo.utils import timeutils
from cinder.i18n import _ from cinder.i18n import _LE
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
@ -66,7 +66,7 @@ class SchedulerOptions(object):
try: try:
return os.path.getmtime(filename) return os.path.getmtime(filename)
except os.error as e: except os.error as e:
LOG.exception(_("Could not stat scheduler options file " LOG.exception(_LE("Could not stat scheduler options file "
"%(filename)s: '%(e)s'"), "%(filename)s: '%(e)s'"),
{'filename': filename, 'e': e}) {'filename': filename, 'e': e})
raise raise
@ -76,7 +76,7 @@ class SchedulerOptions(object):
try: try:
return json.load(handle) return json.load(handle)
except ValueError as e: except ValueError as e:
LOG.exception(_("Could not decode scheduler options: '%s'") % e) LOG.exception(_LE("Could not decode scheduler options: '%s'") % e)
return {} return {}
def _get_time_now(self): def _get_time_now(self):

6
cinder/transfer/api.py
View File

@ -27,7 +27,7 @@ from oslo.utils import excutils
from cinder.db import base from cinder.db import base
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LE, _LI
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder import quota from cinder import quota
from cinder.volume import api as volume_api from cinder.volume import api as volume_api
@ -184,7 +184,7 @@ class API(base.Base):
gigabytes=-vol_ref['size']) gigabytes=-vol_ref['size'])
except Exception: except Exception:
donor_reservations = None donor_reservations = None
LOG.exception(_("Failed to update quota donating volume" LOG.exception(_LE("Failed to update quota donating volume"
" transfer id %s") % transfer_id) " transfer id %s") % transfer_id)
try: try:
@ -201,7 +201,7 @@ class API(base.Base):
QUOTAS.commit(context, reservations) QUOTAS.commit(context, reservations)
if donor_reservations: if donor_reservations:
QUOTAS.commit(context, donor_reservations, project_id=donor_id) QUOTAS.commit(context, donor_reservations, project_id=donor_id)
LOG.info(_("Volume %s has been transferred.") % volume_id) LOG.info(_LI("Volume %s has been transferred.") % volume_id)
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
QUOTAS.rollback(context, reservations) QUOTAS.rollback(context, reservations)

10
cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
View File

@ -22,7 +22,7 @@ from oslo.utils import excutils
import paramiko import paramiko
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LE
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder import utils from cinder import utils
from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as fabric_opts from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as fabric_opts
@ -140,8 +140,8 @@ class BrcdFCSanLookupService(FCSanLookupService):
nsinfo = self.get_nameserver_info() nsinfo = self.get_nameserver_info()
except exception.FCSanLookupServiceException: except exception.FCSanLookupServiceException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Failed collecting name server info from " LOG.error(_LE("Failed collecting name server info from"
"fabric %s") % fabric_ip) " fabric %s") % fabric_ip)
except Exception as e: except Exception as e:
msg = _("SSH connection failed " msg = _("SSH connection failed "
"for %(fabric)s with error: %(err)s" "for %(fabric)s with error: %(err)s"
@ -199,14 +199,14 @@ class BrcdFCSanLookupService(FCSanLookupService):
cli_output = self._get_switch_data(ZoneConstant.NS_SHOW) cli_output = self._get_switch_data(ZoneConstant.NS_SHOW)
except exception.FCSanLookupServiceException: except exception.FCSanLookupServiceException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Failed collecting nsshow info for fabric")) LOG.error(_LE("Failed collecting nsshow info for fabric"))
if cli_output: if cli_output:
nsinfo_list = self._parse_ns_output(cli_output) nsinfo_list = self._parse_ns_output(cli_output)
try: try:
cli_output = self._get_switch_data(ZoneConstant.NS_CAM_SHOW) cli_output = self._get_switch_data(ZoneConstant.NS_CAM_SHOW)
except exception.FCSanLookupServiceException: except exception.FCSanLookupServiceException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Failed collecting nscamshow")) LOG.error(_LE("Failed collecting nscamshow"))
if cli_output: if cli_output:
nsinfo_list.extend(self._parse_ns_output(cli_output)) nsinfo_list.extend(self._parse_ns_output(cli_output))
LOG.debug("Connector returning nsinfo-%s", nsinfo_list) LOG.debug("Connector returning nsinfo-%s", nsinfo_list)

14
cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py
View File

@ -29,7 +29,7 @@ from oslo.concurrency import processutils
from oslo.utils import excutils from oslo.utils import excutils
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LE
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder import ssh_utils from cinder import ssh_utils
from cinder import utils from cinder import utils
@ -79,7 +79,7 @@ class BrcdFCZoneClientCLI(object):
[ZoneConstant.GET_ACTIVE_ZONE_CFG]) [ZoneConstant.GET_ACTIVE_ZONE_CFG])
except exception.BrocadeZoningCliException: except exception.BrocadeZoningCliException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Failed getting active zone set " LOG.error(_LE("Failed getting active zone set "
"from fabric %s"), self.switch_ip) "from fabric %s"), self.switch_ip)
try: try:
for line in switch_data: for line in switch_data:
@ -148,7 +148,7 @@ class BrcdFCZoneClientCLI(object):
self.delete_zones(zone, activate, active_zone_set) self.delete_zones(zone, activate, active_zone_set)
except exception.BrocadeZoningCliException: except exception.BrocadeZoningCliException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Deleting zone failed %s"), zone) LOG.error(_LE("Deleting zone failed %s"), zone)
LOG.debug("Deleted Zone before insert : %s", zone) LOG.debug("Deleted Zone before insert : %s", zone)
zone_members_with_sep = ';'.join(str(member) for zone_members_with_sep = ';'.join(str(member) for
member in zones[zone]) member in zones[zone])
@ -257,7 +257,7 @@ class BrcdFCZoneClientCLI(object):
cli_output = self._get_switch_info([cmd]) cli_output = self._get_switch_info([cmd])
except exception.BrocadeZoningCliException: except exception.BrocadeZoningCliException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Failed collecting nsshow " LOG.error(_LE("Failed collecting nsshow "
"info for fabric %s"), self.switch_ip) "info for fabric %s"), self.switch_ip)
if (cli_output): if (cli_output):
return_list = self._parse_ns_output(cli_output) return_list = self._parse_ns_output(cli_output)
@ -329,7 +329,7 @@ class BrcdFCZoneClientCLI(object):
firmware = int(ver[0] + ver[1]) firmware = int(ver[0] + ver[1])
return firmware > 63 return firmware > 63
else: else:
LOG.error(_("No CLI output for firmware version check")) LOG.error(_LE("No CLI output for firmware version check"))
return False return False
except processutils.ProcessExecutionError as e: except processutils.ProcessExecutionError as e:
msg = _("Error while getting data via ssh: (command=%(cmd)s " msg = _("Error while getting data via ssh: (command=%(cmd)s "
@ -414,7 +414,7 @@ class BrcdFCZoneClientCLI(object):
cmd=command) cmd=command)
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Error running SSH command: %s") % command) LOG.error(_LE("Error running SSH command: %s") % command)
def _ssh_execute(self, cmd_list, check_exit_code=True, attempts=1): def _ssh_execute(self, cmd_list, check_exit_code=True, attempts=1):
"""Execute cli with status update. """Execute cli with status update.
@ -479,7 +479,7 @@ class BrcdFCZoneClientCLI(object):
cmd=command) cmd=command)
except Exception as e: except Exception as e:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Error executing command via ssh: %s"), e) LOG.error(_LE("Error executing command via ssh: %s"), e)
finally: finally:
if stdin: if stdin:
stdin.flush() stdin.flush()

20
cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py
View File

@ -36,7 +36,7 @@ from oslo.utils import excutils
from oslo.utils import importutils from oslo.utils import importutils
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LE, _LI
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as fabric_opts from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as fabric_opts
from cinder.zonemanager.drivers.fc_zone_driver import FCZoneDriver from cinder.zonemanager.drivers.fc_zone_driver import FCZoneDriver
@ -134,7 +134,7 @@ class BrcdFCZoneDriver(FCZoneDriver):
:param initiator_target_map: Mapping of initiator to list of targets :param initiator_target_map: Mapping of initiator to list of targets
""" """
LOG.debug("Add connection for Fabric:%s", fabric) LOG.debug("Add connection for Fabric:%s", fabric)
LOG.info(_("BrcdFCZoneDriver - Add connection " LOG.info(_LI("BrcdFCZoneDriver - Add connection "
"for I-T map: %s"), initiator_target_map) "for I-T map: %s"), initiator_target_map)
zoning_policy = self.configuration.zoning_policy zoning_policy = self.configuration.zoning_policy
zoning_policy_fab = self.fabric_configs[fabric].safe_get( zoning_policy_fab = self.fabric_configs[fabric].safe_get(
@ -142,7 +142,7 @@ class BrcdFCZoneDriver(FCZoneDriver):
if zoning_policy_fab: if zoning_policy_fab:
zoning_policy = zoning_policy_fab zoning_policy = zoning_policy_fab
LOG.info(_("Zoning policy for Fabric %s"), zoning_policy) LOG.info(_LI("Zoning policy for Fabric %s"), zoning_policy)
cli_client = self._get_cli_client(fabric) cli_client = self._get_cli_client(fabric)
cfgmap_from_fabric = self._get_active_zone_set(cli_client) cfgmap_from_fabric = self._get_active_zone_set(cli_client)
@ -169,7 +169,7 @@ class BrcdFCZoneDriver(FCZoneDriver):
zone_map[zone_name] = zone_members zone_map[zone_name] = zone_members
else: else:
# This is I-T zoning, skip if zone already exists. # This is I-T zoning, skip if zone already exists.
LOG.info(_("Zone exists in I-T mode. " LOG.info(_LI("Zone exists in I-T mode. "
"Skipping zone creation %s"), zone_name) "Skipping zone creation %s"), zone_name)
elif zoning_policy == 'initiator': elif zoning_policy == 'initiator':
zone_members = [self.get_formatted_wwn(initiator)] zone_members = [self.get_formatted_wwn(initiator)]
@ -192,7 +192,7 @@ class BrcdFCZoneDriver(FCZoneDriver):
LOG.error(msg) LOG.error(msg)
raise exception.FCZoneDriverException(msg) raise exception.FCZoneDriverException(msg)
LOG.info(_("Zone map to add: %s"), zone_map) LOG.info(_LI("Zone map to add: %s"), zone_map)
if len(zone_map) > 0: if len(zone_map) > 0:
try: try:
@ -220,7 +220,7 @@ class BrcdFCZoneDriver(FCZoneDriver):
:param initiator_target_map: Mapping of initiator to list of targets :param initiator_target_map: Mapping of initiator to list of targets
""" """
LOG.debug("Delete connection for fabric:%s", fabric) LOG.debug("Delete connection for fabric:%s", fabric)
LOG.info(_("BrcdFCZoneDriver - Delete connection for I-T map: %s"), LOG.info(_LI("BrcdFCZoneDriver - Delete connection for I-T map: %s"),
initiator_target_map) initiator_target_map)
zoning_policy = self.configuration.zoning_policy zoning_policy = self.configuration.zoning_policy
zoning_policy_fab = self.fabric_configs[fabric].safe_get( zoning_policy_fab = self.fabric_configs[fabric].safe_get(
@ -228,7 +228,7 @@ class BrcdFCZoneDriver(FCZoneDriver):
if zoning_policy_fab: if zoning_policy_fab:
zoning_policy = zoning_policy_fab zoning_policy = zoning_policy_fab
LOG.info(_("Zoning policy for fabric %s"), zoning_policy) LOG.info(_LI("Zoning policy for fabric %s"), zoning_policy)
conn = self._get_cli_client(fabric) conn = self._get_cli_client(fabric)
cfgmap_from_fabric = self._get_active_zone_set(conn) cfgmap_from_fabric = self._get_active_zone_set(conn)
@ -292,7 +292,7 @@ class BrcdFCZoneDriver(FCZoneDriver):
else: else:
zones_to_delete.append(zone_name) zones_to_delete.append(zone_name)
else: else:
LOG.info(_("Zoning Policy: %s, not " LOG.info(_LI("Zoning Policy: %s, not "
"recognized"), zoning_policy) "recognized"), zoning_policy)
LOG.debug("Final Zone map to update: %s", zone_map) LOG.debug("Final Zone map to update: %s", zone_map)
LOG.debug("Final Zone list to delete: %s", zones_to_delete) LOG.debug("Final Zone list to delete: %s", zones_to_delete)
@ -360,7 +360,7 @@ class BrcdFCZoneDriver(FCZoneDriver):
LOG.error(msg) LOG.error(msg)
raise exception.FCZoneDriverException(msg) raise exception.FCZoneDriverException(msg)
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Error getting name server " LOG.error(_LE("Error getting name server "
"info: %s"), ex) "info: %s"), ex)
except Exception as e: except Exception as e:
msg = (_("Failed to get name server info:%s") % e) msg = (_("Failed to get name server info:%s") % e)
@ -371,7 +371,7 @@ class BrcdFCZoneDriver(FCZoneDriver):
nsinfo) nsinfo)
if visible_targets: if visible_targets:
LOG.info(_("Filtered targets for SAN is: %s"), LOG.info(_LI("Filtered targets for SAN is: %s"),
{fabric_name: visible_targets}) {fabric_name: visible_targets})
# getting rid of the ':' before returning # getting rid of the ':' before returning
for idx, elem in enumerate(visible_targets): for idx, elem in enumerate(visible_targets):

6
cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py
View File

@ -23,7 +23,7 @@ from oslo.utils import excutils
import six import six
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LE
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder import ssh_utils from cinder import ssh_utils
from cinder import utils from cinder import utils
@ -181,7 +181,7 @@ class CiscoFCSanLookupService(FCSanLookupService):
cli_output = self._get_switch_info(cmd) cli_output = self._get_switch_info(cmd)
except exception.FCSanLookupServiceException: except exception.FCSanLookupServiceException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Failed collecting show fcns database for" LOG.error(_LE("Failed collecting show fcns database for"
" fabric")) " fabric"))
if cli_output: if cli_output:
nsinfo_list = self._parse_ns_output(cli_output) nsinfo_list = self._parse_ns_output(cli_output)
@ -266,7 +266,7 @@ class CiscoFCSanLookupService(FCSanLookupService):
cmd=command) cmd=command)
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Error running SSH command: %s") % command) LOG.error(_LE("Error running SSH command: %s") % command)
def _ssh_execute(self, cmd_list, check_exit_code=True, attempts=1): def _ssh_execute(self, cmd_list, check_exit_code=True, attempts=1):
"""Execute cli with status update. """Execute cli with status update.

14
cinder/zonemanager/drivers/cisco/cisco_fc_zone_client_cli.py
View File

@ -27,7 +27,7 @@ from oslo.utils import excutils
import six import six
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LE, _LI
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder import ssh_utils from cinder import ssh_utils
from cinder import utils from cinder import utils
@ -87,7 +87,7 @@ class CiscoFCZoneClientCLI(object):
' | no-more']) ' | no-more'])
except exception.CiscoZoningCliException: except exception.CiscoZoningCliException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Failed getting active zone set " LOG.error(_LE("Failed getting active zone set "
"from fabric %s"), self.switch_ip) "from fabric %s"), self.switch_ip)
try: try:
for line in switch_data: for line in switch_data:
@ -173,7 +173,7 @@ class CiscoFCZoneClientCLI(object):
active_zone_set, zone_status) active_zone_set, zone_status)
except exception.CiscoZoningCliException: except exception.CiscoZoningCliException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Deleting zone failed %s"), zone) LOG.error(_LE("Deleting zone failed %s"), zone)
LOG.debug("Deleted Zone before insert : %s", zone) LOG.debug("Deleted Zone before insert : %s", zone)
zone_cmds.append(['zone', 'name', zone]) zone_cmds.append(['zone', 'name', zone])
@ -222,7 +222,7 @@ class CiscoFCZoneClientCLI(object):
[ZoneConstant.GET_ZONE_STATUS, self.fabric_vsan]) [ZoneConstant.GET_ZONE_STATUS, self.fabric_vsan])
except exception.CiscoZoningCliException: except exception.CiscoZoningCliException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Failed getting zone status " LOG.error(_LE("Failed getting zone status "
"from fabric %s"), self.switch_ip) "from fabric %s"), self.switch_ip)
try: try:
for line in switch_data: for line in switch_data:
@ -303,13 +303,13 @@ class CiscoFCZoneClientCLI(object):
self.fabric_vsan]) self.fabric_vsan])
except exception.CiscoZoningCliException: except exception.CiscoZoningCliException:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Failed collecting fcns database " LOG.error(_LE("Failed collecting fcns database "
"info for fabric %s"), self.switch_ip) "info for fabric %s"), self.switch_ip)
if (cli_output): if (cli_output):
return_list = self._parse_ns_output(cli_output) return_list = self._parse_ns_output(cli_output)
LOG.info(_("Connector returning fcnsinfo-%s"), return_list) LOG.info(_LI("Connector returning fcnsinfo-%s"), return_list)
return return_list return return_list
@ -394,7 +394,7 @@ class CiscoFCZoneClientCLI(object):
cmd=command) cmd=command)
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Error running SSH command: %s") % command) LOG.error(_LE("Error running SSH command: %s") % command)
def _ssh_execute(self, cmd_list, check_exit_code=True, attempts=1): def _ssh_execute(self, cmd_list, check_exit_code=True, attempts=1):
"""Execute cli with status update. """Execute cli with status update.

20
cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py
View File

@ -34,7 +34,7 @@ from oslo.utils import importutils
import six import six
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LE, _LI
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.zonemanager.drivers.cisco import cisco_fabric_opts as fabric_opts from cinder.zonemanager.drivers.cisco import cisco_fabric_opts as fabric_opts
from cinder.zonemanager.drivers.fc_zone_driver import FCZoneDriver from cinder.zonemanager.drivers.fc_zone_driver import FCZoneDriver
@ -123,7 +123,7 @@ class CiscoFCZoneDriver(FCZoneDriver):
""" """
LOG.debug("Add connection for Fabric:%s", fabric) LOG.debug("Add connection for Fabric:%s", fabric)
LOG.info(_("CiscoFCZoneDriver - Add connection " LOG.info(_LI("CiscoFCZoneDriver - Add connection "
"for I-T map: %s"), initiator_target_map) "for I-T map: %s"), initiator_target_map)
fabric_ip = self.fabric_configs[fabric].safe_get( fabric_ip = self.fabric_configs[fabric].safe_get(
'cisco_fc_fabric_address') 'cisco_fc_fabric_address')
@ -141,7 +141,7 @@ class CiscoFCZoneDriver(FCZoneDriver):
zoning_vsan = self.fabric_configs[fabric].safe_get('cisco_zoning_vsan') zoning_vsan = self.fabric_configs[fabric].safe_get('cisco_zoning_vsan')
LOG.info(_("Zoning policy for Fabric %s"), zoning_policy) LOG.info(_LI("Zoning policy for Fabric %s"), zoning_policy)
statusmap_from_fabric = self.get_zoning_status( statusmap_from_fabric = self.get_zoning_status(
fabric_ip, fabric_user, fabric_pwd, fabric_port, zoning_vsan) fabric_ip, fabric_user, fabric_pwd, fabric_port, zoning_vsan)
@ -173,7 +173,7 @@ class CiscoFCZoneDriver(FCZoneDriver):
zone_map[zone_name] = zone_members zone_map[zone_name] = zone_members
else: else:
# This is I-T zoning, skip if zone exists. # This is I-T zoning, skip if zone exists.
LOG.info(_("Zone exists in I-T mode. " LOG.info(_LI("Zone exists in I-T mode. "
"Skipping zone creation %s"), "Skipping zone creation %s"),
zone_name) zone_name)
elif zoning_policy == 'initiator': elif zoning_policy == 'initiator':
@ -196,7 +196,7 @@ class CiscoFCZoneDriver(FCZoneDriver):
LOG.error(msg) LOG.error(msg)
raise exception.FCZoneDriverException(msg) raise exception.FCZoneDriverException(msg)
LOG.info(_("Zone map to add: %s"), zone_map) LOG.info(_LI("Zone map to add: %s"), zone_map)
if len(zone_map) > 0: if len(zone_map) > 0:
conn = None conn = None
@ -237,7 +237,7 @@ class CiscoFCZoneDriver(FCZoneDriver):
:param initiator_target_map: Mapping of initiator to list of targets :param initiator_target_map: Mapping of initiator to list of targets
""" """
LOG.debug("Delete connection for fabric:%s", fabric) LOG.debug("Delete connection for fabric:%s", fabric)
LOG.info(_("CiscoFCZoneDriver - Delete connection for I-T map: %s"), LOG.info(_LI("CiscoFCZoneDriver - Delete connection for I-T map: %s"),
initiator_target_map) initiator_target_map)
fabric_ip = self.fabric_configs[fabric].safe_get( fabric_ip = self.fabric_configs[fabric].safe_get(
'cisco_fc_fabric_address') 'cisco_fc_fabric_address')
@ -256,7 +256,7 @@ class CiscoFCZoneDriver(FCZoneDriver):
zoning_vsan = self.fabric_configs[fabric].safe_get('cisco_zoning_vsan') zoning_vsan = self.fabric_configs[fabric].safe_get('cisco_zoning_vsan')
LOG.info(_("Zoning policy for fabric %s"), zoning_policy) LOG.info(_LI("Zoning policy for fabric %s"), zoning_policy)
statusmap_from_fabric = self.get_zoning_status( statusmap_from_fabric = self.get_zoning_status(
fabric_ip, fabric_user, fabric_pwd, fabric_port, zoning_vsan) fabric_ip, fabric_user, fabric_pwd, fabric_port, zoning_vsan)
@ -327,7 +327,7 @@ class CiscoFCZoneDriver(FCZoneDriver):
else: else:
zones_to_delete.append(zone_name) zones_to_delete.append(zone_name)
else: else:
LOG.info(_("Zoning Policy: %s, not recognized"), LOG.info(_LI("Zoning Policy: %s, not recognized"),
zoning_policy) zoning_policy)
LOG.debug("Final Zone map to update: %s", zone_map) LOG.debug("Final Zone map to update: %s", zone_map)
LOG.debug("Final Zone list to delete: %s", zones_to_delete) LOG.debug("Final Zone list to delete: %s", zones_to_delete)
@ -418,7 +418,7 @@ class CiscoFCZoneDriver(FCZoneDriver):
conn.cleanup() conn.cleanup()
except exception.CiscoZoningCliException as ex: except exception.CiscoZoningCliException as ex:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error(_("Error getting show fcns database " LOG.error(_LE("Error getting show fcns database "
"info: %s"), six.text_type(ex)) "info: %s"), six.text_type(ex))
except Exception as e: except Exception as e:
msg = (_("Failed to get show fcns database info:%s") % msg = (_("Failed to get show fcns database info:%s") %
@ -429,7 +429,7 @@ class CiscoFCZoneDriver(FCZoneDriver):
lambda x: x in formatted_target_list, nsinfo) lambda x: x in formatted_target_list, nsinfo)
if visible_targets: if visible_targets:
LOG.info(_("Filtered targets for SAN is: %s"), LOG.info(_LI("Filtered targets for SAN is: %s"),
{fabric_name: visible_targets}) {fabric_name: visible_targets})
# getting rid of the ':' before returning # getting rid of the ':' before returning
for idx, elem in enumerate(visible_targets): for idx, elem in enumerate(visible_targets):

12
cinder/zonemanager/fc_zone_manager.py
View File

@ -35,7 +35,7 @@ from oslo.config import cfg
from oslo.utils import importutils from oslo.utils import importutils
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _, _LI
from cinder.openstack.common import log as logging from cinder.openstack.common import log as logging
from cinder.volume import configuration as config from cinder.volume import configuration as config
from cinder.zonemanager import fc_common from cinder.zonemanager import fc_common
@ -142,13 +142,13 @@ class ZoneManager(fc_common.FCCommon):
i_t_map = {initiator: t_list} i_t_map = {initiator: t_list}
valid_i_t_map = self.get_valid_initiator_target_map( valid_i_t_map = self.get_valid_initiator_target_map(
i_t_map, True) i_t_map, True)
LOG.info(_("Final filtered map for fabric: %s"), LOG.info(_LI("Final filtered map for fabric: %s"),
{fabric: valid_i_t_map}) {fabric: valid_i_t_map})
# Call driver to add connection control # Call driver to add connection control
self.driver.add_connection(fabric, valid_i_t_map) self.driver.add_connection(fabric, valid_i_t_map)
LOG.info(_("Add Connection: Finished iterating " LOG.info(_LI("Add Connection: Finished iterating "
"over all target list")) "over all target list"))
except Exception as e: except Exception as e:
msg = _("Failed adding connection for fabric=%(fabric)s: " msg = _("Failed adding connection for fabric=%(fabric)s: "
@ -172,7 +172,7 @@ class ZoneManager(fc_common.FCCommon):
try: try:
for initiator in initiator_target_map.keys(): for initiator in initiator_target_map.keys():
target_list = initiator_target_map[initiator] target_list = initiator_target_map[initiator]
LOG.info(_("Delete connection Target List:%s"), LOG.info(_LI("Delete connection Target List:%s"),
{initiator: target_list}) {initiator: target_list})
# get SAN context for the target list # get SAN context for the target list
@ -188,7 +188,7 @@ class ZoneManager(fc_common.FCCommon):
i_t_map = {initiator: t_list} i_t_map = {initiator: t_list}
valid_i_t_map = self.get_valid_initiator_target_map( valid_i_t_map = self.get_valid_initiator_target_map(
i_t_map, False) i_t_map, False)
LOG.info(_("Final filtered map for delete " LOG.info(_LI("Final filtered map for delete "
"connection: %s"), valid_i_t_map) "connection: %s"), valid_i_t_map)
# Call driver to delete connection control # Call driver to delete connection control
@ -239,6 +239,6 @@ class ZoneManager(fc_common.FCCommon):
if t_list: if t_list:
filtered_i_t_map[initiator] = t_list filtered_i_t_map[initiator] = t_list
else: else:
LOG.info(_("No targets to add or remove connection for " LOG.info(_LI("No targets to add or remove connection for "
"I: %s"), initiator) "I: %s"), initiator)
return filtered_i_t_map return filtered_i_t_map

6
cinder/zonemanager/utils.py
View File

@ -19,7 +19,7 @@ Utility functions related to the Zone Manager.
""" """
import logging import logging
from cinder.i18n import _ from cinder.i18n import _, _LI
from cinder.openstack.common import log from cinder.openstack.common import log
from cinder.volume.configuration import Configuration from cinder.volume.configuration import Configuration
from cinder.volume import manager from cinder.volume import manager
@ -37,7 +37,7 @@ def create_zone_manager():
if config.safe_get('zoning_mode') == 'fabric': if config.safe_get('zoning_mode') == 'fabric':
LOG.debug("FC Zone Manager enabled.") LOG.debug("FC Zone Manager enabled.")
zm = fc_zone_manager.ZoneManager(configuration=config) zm = fc_zone_manager.ZoneManager(configuration=config)
LOG.info(_("Using FC Zone Manager %(zm_version)s," LOG.info(_LI("Using FC Zone Manager %(zm_version)s,"
" Driver %(drv_name)s %(drv_version)s.") % " Driver %(drv_name)s %(drv_version)s.") %
{'zm_version': zm.get_version(), {'zm_version': zm.get_version(),
'drv_name': zm.driver.__class__.__name__, 'drv_name': zm.driver.__class__.__name__,
@ -54,7 +54,7 @@ def create_lookup_service():
if config.safe_get('zoning_mode') == 'fabric': if config.safe_get('zoning_mode') == 'fabric':
LOG.debug("FC Lookup Service enabled.") LOG.debug("FC Lookup Service enabled.")
lookup = fc_san_lookup_service.FCSanLookupService(configuration=config) lookup = fc_san_lookup_service.FCSanLookupService(configuration=config)
LOG.info(_("Using FC lookup service %s") % lookup.lookup_service) LOG.info(_LI("Using FC lookup service %s") % lookup.lookup_service)
return lookup return lookup
else: else:
LOG.debug("FC Lookup Service not enabled in cinder.conf.") LOG.debug("FC Lookup Service not enabled in cinder.conf.")