openstack
/
karbor
Code Issues Proposed changes

Merge "Trivial fix typos"

This commit is contained in:
Jenkins 2017-06-02 02:02:31 +00:00 committed by Gerrit Code Review
parent ab83b52c7a b8c6a56459
commit 542cca8815
11 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-ref/source/v1/karbor-v1-scheduled-operations.inc
View File

@ -19,7 +19,7 @@ List scheduled operations
.. rest_method:: GET /v1/{tenant_id}/scheduled_operations
List all the scheduled operations based on tigger and plan, or part of the
List all the scheduled operations based on trigger and plan, or part of the
scheduled operations limited by ``?limit={limit_num}`` by ``GET`` method.
Response Codes

2
api-ref/source/v1/karbor-v1-triggers.inc
View File

@ -167,7 +167,7 @@ Update trigger
.. rest_method:: PUT /v1/{tenant_id}/triggers/{trigger_id}
Updates the name or properties of a specific trigger alonely or at the same
Updates the name or properties of a specific trigger alone or at the same
time.
Response Codes

2
doc/source/specs/checkpoint-metadata.rst
View File

@ -44,7 +44,7 @@ will be in the format of ``karbor-<key-name>`` for example
Anything that is not officially defined *should* use the
prefix: ``x-<application>--<key-name>``.
For example, ``x-trigger-master--tigger-id``
For example, ``x-trigger-master--trigger-id``
Alternatives
------------

2
karbor/db/api.py
View File

@ -197,7 +197,7 @@ def scheduled_operation_get(context, id, columns_to_join=[]):
:param context: The security context
:param id: ID of the scheduled operation
:columns_to_join: columns which will be joined
:param columns_to_join: columns which will be joined
:returns: Dictionary-like object containing properties of the scheduled
operation

2
karbor/services/operationengine/engine/executors/base.py
View File

@ -33,7 +33,7 @@ class BaseExecutor(object):
:param operation_id: ID of operation
:param triggered_time: time when the operation is triggered
:param expect_start_time: expect time when to run the operation
:param window_time: time how long to wait to runn the operation after
:param window_time: time how long to wait to run the operation after
expect_start_time
"""
pass

2
karbor/services/protection/clients/eisoo.py
View File

@ -29,7 +29,7 @@ eisoo_client_opts = [
help='App id for eisoo authentication.'),
cfg.StrOpt(SERVICE + '_app_secret',
secret=True,
help='App secret for eisoo authenticaiton.'),
help='App secret for eisoo authentication.'),
]
CONF = cfg.CONF

2
karbor/services/protection/protection_plugins/utils.py
View File

@ -17,7 +17,7 @@ from oslo_service import loopingcall
LOG = logging.getLogger(__name__)
def udpate_resource_restore_result(restore_record, resource_type, resource_id,
def update_resource_restore_result(restore_record, resource_type, resource_id,
status, reason=''):
try:
restore_record.update_resource_status(resource_type, resource_id,

4
karbor/services/protection/protection_plugins/volume/cinder_protection_plugin.py
View File

@ -191,7 +191,7 @@ class ProtectOperation(protection_plugin.Operation):
bank_section.update_object('status',
constants.RESOURCE_STATUS_ERROR)
raise exception.CreateBackupFailed(
reason='Volume is in errorneous state',
reason='Volume is in erroneous state',
resource_id=volume_id,
resource_type=constants.VOLUME_RESOURCE_TYPE,
)
@ -279,7 +279,7 @@ class RestoreOperation(protection_plugin.Operation):
# check and update status
update_method = partial(
utils.udpate_resource_restore_result,
utils.update_resource_restore_result,
kwargs.get('restore'), resource.type, volume_id)
update_method(constants.RESOURCE_STATUS_RESTORING)

2
karbor/services/protection/provider.py
View File

@ -180,7 +180,7 @@ class ProviderRegistry(object):
{'provider': provider_config.provider.name,
'reason': e})
else:
LOG.info('Loaded provider: %s successully.',
LOG.info('Loaded provider: %s successfully.',
provider_config.provider.name)
self.providers[provider.id] = provider

4
karbor/tests/unit/protection/test_cinder_protection_plugin.py
View File

@ -334,7 +334,7 @@ class CinderProtectionPluginTest(base.TestCase):
@mock.patch('karbor.services.protection.clients.cinder.create')
@mock.patch('karbor.services.protection.protection_plugins.utils.'
'udpate_resource_restore_result')
'update_resource_restore_result')
def test_restore_succeed(self, mock_update_restore, mock_cinder_create):
resource = Resource(
id="123",
@ -399,7 +399,7 @@ class CinderProtectionPluginTest(base.TestCase):
@mock.patch('karbor.services.protection.clients.cinder.create')
@mock.patch('karbor.services.protection.protection_plugins.utils.'
'udpate_resource_restore_result')
'update_resource_restore_result')
def test_restore_fail_volume_1(self, mock_update_restore,
mock_cinder_create):
resource = Resource(

2
karbor/tests/unit/protection/test_graph.py
View File

@ -198,7 +198,7 @@ class GraphBuilderTest(base.TestCase):
class _TestGraphWalkerListener(graph.GraphWalkerListener):
def __init__(self, expected_event_stream, test):
super(_TestGraphWalkerListener, self).__init__()
# Because the testing famework is badly designed
# Because the testing framework is badly designed
# I need to have a reference to the test to raise assertions
self._test = test
self._expected_expected_event_stream = list(expected_event_stream)