From 162aaa75ee90c8d2f11a40f6d376a05056174c40 Mon Sep 17 00:00:00 2001 From: shangxiaobj Date: Thu, 31 Aug 2017 20:47:09 -0700 Subject: [PATCH] [Trivialfix]Fix typos in watcher Fix the typos in watcher. Change-Id: I3ab77e2a1f862d3790065de4a6ff6c3ef42f226d --- doc/source/contributor/environment.rst | 2 +- doc/source/contributor/plugin/base-setup.rst | 2 +- doc/source/strategies/workload-stabilization.rst | 2 +- watcher/applier/workflow_engine/base.py | 2 +- watcher/applier/workflow_engine/default.py | 2 +- watcher/common/nova_helper.py | 4 ++-- watcher/decision_engine/model/collector/nova.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/source/contributor/environment.rst b/doc/source/contributor/environment.rst index a2a23f141..4d6d0ce34 100644 --- a/doc/source/contributor/environment.rst +++ b/doc/source/contributor/environment.rst @@ -4,7 +4,7 @@ https://creativecommons.org/licenses/by/3.0/ -.. _watcher_developement_environment: +.. _watcher_development_environment: ========================================= Set up a development environment manually diff --git a/doc/source/contributor/plugin/base-setup.rst b/doc/source/contributor/plugin/base-setup.rst index 3d5cd2a40..9809663b2 100644 --- a/doc/source/contributor/plugin/base-setup.rst +++ b/doc/source/contributor/plugin/base-setup.rst @@ -22,7 +22,7 @@ Pre-requisites We assume that you have set up a working Watcher development environment. So if this not already the case, you can check out our documentation which explains how to set up a :ref:`development environment -`. +`. .. _development environment: diff --git a/doc/source/strategies/workload-stabilization.rst b/doc/source/strategies/workload-stabilization.rst index 567aa1da1..a228bfa67 100644 --- a/doc/source/strategies/workload-stabilization.rst +++ b/doc/source/strategies/workload-stabilization.rst @@ -100,7 +100,7 @@ parameter type default Value description into which the samples are grouped for aggregation. Watcher uses only the last - period of all recieved ones. + period of all received ones. ==================== ====== ===================== ============================= .. |metrics| replace:: ["cpu_util", "memory.resident"] diff --git a/watcher/applier/workflow_engine/base.py b/watcher/applier/workflow_engine/base.py index 389ca262f..b25208cb7 100644 --- a/watcher/applier/workflow_engine/base.py +++ b/watcher/applier/workflow_engine/base.py @@ -241,7 +241,7 @@ class BaseTaskFlowActionContainer(flow_task.Task): action_plan = objects.ActionPlan.get_by_id( self.engine.context, self._db_action.action_plan_id, eager=True) # NOTE: check if revert cause by cancel action plan or - # some other exception occured during action plan execution + # some other exception occurred during action plan execution # if due to some other exception keep the flow intact. if action_plan.state not in CANCEL_STATE: self.do_revert() diff --git a/watcher/applier/workflow_engine/default.py b/watcher/applier/workflow_engine/default.py index 8f2fbc74e..b79c24e5a 100644 --- a/watcher/applier/workflow_engine/default.py +++ b/watcher/applier/workflow_engine/default.py @@ -45,7 +45,7 @@ class DefaultWorkFlowEngine(base.BaseWorkFlowEngine): # (or whether the execution of v should be ignored, # and therefore not executed). It is expected to take as single # keyword argument history which will be the execution results of - # all u decideable links that have v as a target. It is expected + # all u decidable links that have v as a target. It is expected # to return a single boolean # (True to allow v execution or False to not). return True diff --git a/watcher/common/nova_helper.py b/watcher/common/nova_helper.py index 72dae4188..f83340656 100644 --- a/watcher/common/nova_helper.py +++ b/watcher/common/nova_helper.py @@ -528,10 +528,10 @@ class NovaHelper(object): instance_host = getattr(instance, 'OS-EXT-SRV-ATTR:host') instance_status = getattr(instance, 'status') - # Abort live migration successfull, action is cancelled + # Abort live migration successful, action is cancelled if instance_host == source and instance_status == 'ACTIVE': return True - # Nova Unable to abort live migration, action is succeded + # Nova Unable to abort live migration, action is succeeded elif instance_host == destination and instance_status == 'ACTIVE': return False diff --git a/watcher/decision_engine/model/collector/nova.py b/watcher/decision_engine/model/collector/nova.py index a5fe3bd80..462b040a1 100644 --- a/watcher/decision_engine/model/collector/nova.py +++ b/watcher/decision_engine/model/collector/nova.py @@ -117,7 +117,7 @@ class ModelBuilder(object): # cpu_id, cpu_node = self.build_cpu_compute_node(base_id, node) # self.add_node(cpu_id, cpu_node) - # # Connect the base compute node to the dependant nodes. + # # Connect the base compute node to the dependent nodes. # self.add_edges_from([(base_id, disk_id), (base_id, mem_id), # (base_id, cpu_id), (base_id, net_id)], # label="contains")