diff --git a/README.rst b/README.rst index 42b6791..9e5beac 100644 --- a/README.rst +++ b/README.rst @@ -6,12 +6,12 @@ Client for resource optimization service for OpenStack. OpenStack Watcher provides a flexible and scalable resource optimization service for multi-tenant OpenStack-based clouds. -Watcher provides a complete optimization loop—including everything from a +Watcher provides a complete optimization loop-including everything from a metrics receiver, complex event processor and profiler, optimization processor and an action plan applier. This provides a robust framework to realize a wide range of cloud optimization goals, including the reduction of data center operating costs, increased system performance via intelligent virtual machine -migration, increased energy efficiency—and more! +migration, increased energy efficiency-and more! * Free software: Apache license * Wiki: http://wiki.openstack.org/wiki/Watcher diff --git a/watcherclient/tests/v1/test_action_plan.py b/watcherclient/tests/v1/test_action_plan.py index 22831d8..a7c7d3c 100644 --- a/watcherclient/tests/v1/test_action_plan.py +++ b/watcherclient/tests/v1/test_action_plan.py @@ -38,7 +38,7 @@ ACTION_PLAN2 = { } UPDATED_ACTION_PLAN = copy.deepcopy(ACTION_PLAN1) -NEW_STATE = 'TRIGGERED' +NEW_STATE = 'PENDING' UPDATED_ACTION_PLAN['state'] = NEW_STATE fake_responses = { diff --git a/watcherclient/tests/v1/test_action_plan_shell.py b/watcherclient/tests/v1/test_action_plan_shell.py index 75eb8ac..74536f0 100644 --- a/watcherclient/tests/v1/test_action_plan_shell.py +++ b/watcherclient/tests/v1/test_action_plan_shell.py @@ -137,7 +137,7 @@ class ActionPlanShellTest(utils.BaseTestCase): ap_shell.do_action_plan_start(client_mock, args) patch = commonutils.args_array_to_patch( - 'replace', ['state=TRIGGERED']) + 'replace', ['state=PENDING']) client_mock.action_plan.update.assert_called_once_with( 'a5199d0e-0702-4613-9234-5ae2af8dafea', patch) diff --git a/watcherclient/v1/action_plan_shell.py b/watcherclient/v1/action_plan_shell.py index e889adc..dc2658d 100644 --- a/watcherclient/v1/action_plan_shell.py +++ b/watcherclient/v1/action_plan_shell.py @@ -145,7 +145,7 @@ def do_action_plan_start(cc, args): action_plan_uuid = getattr(args, 'action-plan') if uuidutils.is_uuid_like(action_plan_uuid): args.op = 'replace' - args.attributes = [['state=TRIGGERED']] + args.attributes = [['state=PENDING']] patch = utils.args_array_to_patch( args.op,