fix various typos in different messages

due the hard string freeze fixed only in master branch

Change-Id: If5ef3e0290e081cca56903882ffc86d9b11d7806
This commit is contained in:
Frank Kloeker 2018-02-10 17:39:40 +01:00
parent 1df345f8dc
commit 666490bc78
15 changed files with 32 additions and 32 deletions

View File

@ -26,9 +26,9 @@ OPTS = [
cfg.StrOpt('username', default='admin',
help=_('User name for alarm monitoring')),
cfg.StrOpt('password', default='devstack',
help=_('password for alarm monitoring')),
help=_('Password for alarm monitoring')),
cfg.StrOpt('project_name', default='admin',
help=_('project name for alarm monitoring')),
help=_('Project name for alarm monitoring')),
]
cfg.CONF.register_opts(OPTS, 'alarm_auth')

View File

@ -134,7 +134,7 @@ class InfraDriverUnreachable(exceptions.ServiceUnavailable):
class VNFInactive(exceptions.InvalidInput):
message = _("VNF %(vnf_id)s is not in Active state %(message)s")
message = _("VNF %(vnf_id)s is not in Active state: %(message)s")
class MetadataNotMatched(exceptions.InvalidInput):
@ -170,11 +170,11 @@ class InvalidKubernetesInputParameter(exceptions.InvalidInput):
def _validate_service_type_list(data, valid_values=None):
if not isinstance(data, list):
msg = _("invalid data format for service list: '%s'") % data
msg = _("Invalid data format for service list: '%s'") % data
LOG.debug(msg)
return msg
if not data:
msg = _("empty list is not allowed for service list. '%s'") % data
msg = _("Empty list is not allowed for service list. '%s'") % data
LOG.debug(msg)
return msg
key_specs = {

View File

@ -53,11 +53,11 @@ OPTS = [cfg.StrOpt('openstack', default='/etc/tacker/vim/fernet_keys',
# same params as we used in ping monitor driver
OPENSTACK_OPTS = [
cfg.StrOpt('count', default='1',
help=_('number of ICMP packets to send')),
help=_('Number of ICMP packets to send')),
cfg.StrOpt('timeout', default='1',
help=_('number of seconds to wait for a response')),
help=_('Number of seconds to wait for a response')),
cfg.StrOpt('interval', default='1',
help=_('number of seconds to wait between packets'))
help=_('Number of seconds to wait between packets'))
]
cfg.CONF.register_opts(OPTS, 'vim_keys')
cfg.CONF.register_opts(OPENSTACK_OPTS, 'vim_monitor')

View File

@ -265,7 +265,7 @@ class OpenStack(abstract_driver.DeviceAbstractDriver,
raise vnfm.VNFDeleteWaitFailed(reason=error_reason)
if stack_retries != 0 and status != 'DELETE_COMPLETE':
error_reason = _("vnf {vnf_id} deletion is not completed. "
error_reason = _("VNF {vnf_id} deletion is not completed. "
"{stack_status}").format(vnf_id=vnf_id,
stack_status=status)
LOG.warning(error_reason)
@ -347,7 +347,7 @@ class OpenStack(abstract_driver.DeviceAbstractDriver,
if stack_retries == 0:
metadata = heatclient.resource_metadata(stack_id, policy_name)
if not metadata['scaling_in_progress']:
error_reason = _('when signal occurred within cool down '
error_reason = _('When signal occurred within cool down '
'window, no events generated from heat, '
'so ignore it')
LOG.warning(error_reason)

View File

@ -28,8 +28,8 @@ from tacker.vnfm.mgmt_drivers import constants as mgmt_constants
LOG = logging.getLogger(__name__)
OPTS = [
cfg.StrOpt('user', default='root', help=_('user name to login openwrt')),
cfg.StrOpt('password', default='', help=_('password to login openwrt')),
cfg.StrOpt('user', default='root', help=_('User name to login openwrt')),
cfg.StrOpt('password', default='', help=_('Password to login openwrt')),
]
cfg.CONF.register_opts(OPTS, 'openwrt')

View File

@ -24,9 +24,9 @@ from tacker.vnfm.monitor_drivers import abstract_driver
LOG = logging.getLogger(__name__)
OPTS = [
cfg.IntOpt('retry', default=5,
help=_('number of times to retry')),
help=_('Number of times to retry')),
cfg.IntOpt('timeout', default=1,
help=_('number of seconds to wait for a response')),
help=_('Number of seconds to wait for a response')),
cfg.IntOpt('port', default=80,
help=_('HTTP port number to send request'))
]

View File

@ -23,11 +23,11 @@ from tacker.vnfm.monitor_drivers import abstract_driver
LOG = logging.getLogger(__name__)
OPTS = [
cfg.StrOpt('count', default='1',
help=_('number of ICMP packets to send')),
help=_('Number of ICMP packets to send')),
cfg.StrOpt('timeout', default='1',
help=_('number of seconds to wait for a response')),
help=_('Number of seconds to wait for a response')),
cfg.StrOpt('interval', default='1',
help=_('number of seconds to wait between packets'))
help=_('Number of seconds to wait between packets'))
]
cfg.CONF.register_opts(OPTS, 'monitor_ping')

View File

@ -831,8 +831,8 @@ class VNFMPlugin(vnfm_db.VNFMPluginDb, VNFMMgmtMixin):
if bckend_policy_type == constants.POLICY_SCALING:
if vnf_dict['status'] != constants.ACTIVE:
LOG.info(_("Scaling Policy action "
"skipped due to status:"
"%(status)s for vnf: %(vnfid)s"),
"skipped due to status "
"%(status)s for vnf %(vnfid)s"),
{"status": vnf_dict['status'],
"vnfid": vnf_dict['id']})
return