Merge "Add checking audit state" into stable/ocata

Add checking audit state
This patch adds checking audit state when updating an existing audit in accordance with audit state machine. Closes-Bug: #1662406 Change-Id: I20610c83169b77f141974a5cebe33818a4bf0728 (cherry picked from commit 0d83354c57)
2017-02-16 13:53:58 +00:00 · 2017-02-16 13:16:06 +00:00 · 2017-02-16 13:15:48 +00:00 · 2017-02-14 10:27:17 +00:00 · 2017-02-08 15:37:01 +00:00 · 2017-02-08 00:05:44 +00:00
539 changed files with 6586 additions and 28905 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,8 @@
 *.so

 # Packages
-*.egg*
+*.egg
+*.egg-info
 dist
 build
 eggs
@@ -23,7 +24,8 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage*
 .tox
-.stestr/
+nosetests.xml
+.testrepository
 .venv
 .idea

@@ -41,11 +43,9 @@ output/*/index.html

 # Sphinx
 doc/build
-doc/source/api/*
+doc/source/api
 doc/source/samples
-doc/source/_static/*.sample
-!doc/source/api/index.rst
-!doc/source/api/v1.rst
+doc/source/watcher.conf.sample

 # pbr generates these
 AUTHORS
@@ -71,6 +71,3 @@ releasenotes/build

 # Desktop Service Store
 *.DS_Store
-
-# Autogenerated sample config file
-etc/watcher/watcher.conf.sample
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/watcher.git
+defaultbranch=stable/ocata
--- a/.stestr.conf
+++ b/.stestr.conf
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_path=./watcher/tests
-top_dir=./
-
--- a/.testr.conf
+++ b/.testr.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \
+             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./watcher/tests} $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,136 +0,0 @@
- project:
-    check:
-      jobs:
-        - watcher-tempest-functional:
-            voting: false
-        - watcher-tempest-dummy_optim
-        - watcher-tempest-actuator
-        - watcher-tempest-basic_optim
-        - watcher-tempest-workload_balancing
-        - watcherclient-tempest-functional:
-            voting: false
-        - openstack-tox-lower-constraints
-    gate:
-      jobs:
-        # - watcher-tempest-functional
-        - openstack-tox-lower-constraints
-
- job:
-    name: watcher-tempest-dummy_optim
-    parent: watcher-tempest-multinode
-    voting: false
-    vars:
-      tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_dummy_optim'
-
- job:
-    name: watcher-tempest-actuator
-    parent: watcher-tempest-multinode
-    voting: false
-    vars:
-      tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_actuator'
-
- job:
-    name: watcher-tempest-basic_optim
-    parent: watcher-tempest-multinode
-    voting: false
-    vars:
-      tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_basic_optim'
-
- job:
-    name: watcher-tempest-workload_balancing
-    parent: watcher-tempest-multinode
-    voting: false
-    vars:
-      tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_workload_balancing'
-
- job:
-    name: watcher-tempest-multinode
-    parent: watcher-tempest-functional
-    nodeset: openstack-two-node
-    pre-run: playbooks/pre.yaml
-    run: playbooks/orchestrate-tempest.yaml
-    roles:
-      - zuul: openstack/tempest
-    group-vars:
-      subnode:
-        devstack_local_conf:
-          post-config:
-            $NOVA_CONF:
-              libvirt:
-                live_migration_uri: 'qemu+ssh://root@%s/system'
-        devstack_services:
-          watcher-api: false
-          watcher-decision-engine: true
-          watcher-applier: false
-          # We need to add TLS support for watcher plugin
-          tls-proxy: false
-          ceilometer: false
-          ceilometer-acompute: false
-          ceilometer-acentral: false
-          ceilometer-anotification: false
-          watcher: false
-          gnocchi-api: false
-          gnocchi-metricd: false
-          rabbit: false
-          mysql: false
-    vars:
-      devstack_local_conf:
-        post-config:
-          $NOVA_CONF:
-            libvirt:
-              live_migration_uri: 'qemu+ssh://root@%s/system'
-        test-config:
-          $TEMPEST_CONFIG:
-            compute:
-              min_compute_nodes: 2
-            compute-feature-enabled:
-              live_migration: true
-              block_migration_for_live_migration: true
-      devstack_plugins:
-        ceilometer: https://git.openstack.org/openstack/ceilometer
-
- job:
-    name: watcher-tempest-functional
-    parent: devstack-tempest
-    timeout: 7200
-    required-projects:
-      - openstack/ceilometer
-      - openstack-infra/devstack-gate
-      - openstack/python-openstackclient
-      - openstack/python-watcherclient
-      - openstack/watcher
-      - openstack/watcher-tempest-plugin
-      - openstack/tempest
-    vars:
-      devstack_plugins:
-        watcher: https://git.openstack.org/openstack/watcher
-      devstack_services:
-        tls-proxy: false
-        watcher-api: true
-        watcher-decision-engine: true
-        watcher-applier: true
-        tempest: true
-        s-account: false
-        s-container: false
-        s-object: false
-        s-proxy: false
-      devstack_localrc:
-        TEMPEST_PLUGINS: '/opt/stack/watcher-tempest-plugin'
-      tempest_test_regex: 'watcher_tempest_plugin.tests.api'
-      tox_envlist: all
-      tox_environment:
-        # Do we really need to set this? It's cargo culted
-        PYTHONUNBUFFERED: 'true'
-      zuul_copy_output:
-        /etc/hosts: logs
-
- job:
-    # This job is used in python-watcherclient repo
-    name: watcherclient-tempest-functional
-    parent: watcher-tempest-functional
-    timeout: 4200
-    vars:
-      tempest_concurrency: 1
-      devstack_localrc:
-        TEMPEST_PLUGINS: '/opt/stack/python-watcherclient'
-      tempest_test_regex: 'watcherclient.tests.functional'
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,13 +1,13 @@
 If you would like to contribute to the development of OpenStack,
 you must follow the steps in this page:

-   https://docs.openstack.org/infra/manual/developers.html
+   http://docs.openstack.org/infra/manual/developers.html

 Once those steps have been completed, changes to OpenStack
 should be submitted for review via the Gerrit tool, following
 the workflow documented at:

-   https://docs.openstack.org/infra/manual/developers.html#development-workflow
+   http://docs.openstack.org/infra/manual/developers.html#development-workflow

 Pull requests submitted through GitHub will be ignored.

--- a/HACKING.rst
+++ b/HACKING.rst
@@ -8,4 +8,4 @@
 watcher Style Commandments
 ==========================

-Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
+Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
 Team and repository tags
 ========================

-.. image:: https://governance.openstack.org/tc/badges/watcher.svg
-    :target: https://governance.openstack.org/tc/reference/tags/index.html
+.. image:: http://governance.openstack.org/badges/watcher.svg
+    :target: http://governance.openstack.org/reference/tags/index.html

 .. Change things from this point on

@@ -22,11 +22,10 @@ service for multi-tenant OpenStack-based clouds.
 Watcher 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: https://wiki.openstack.org/wiki/Watcher
-* Source: https://github.com/openstack/watcher
-* Bugs: https://bugs.launchpad.net/watcher
-* Documentation: https://docs.openstack.org/watcher/latest/
-* Release notes: https://docs.openstack.org/releasenotes/watcher/
+* Wiki: http://wiki.openstack.org/wiki/Watcher
+* Source:  https://github.com/openstack/watcher
+* Bugs: http://bugs.launchpad.net/watcher
+* Documentation: http://docs.openstack.org/developer/watcher/
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -1,90 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# nova documentation build configuration file, created by
-# sphinx-quickstart on Sat May  1 15:17:47 2010.
-#
-# This file is execfile()d with the current directory set to
-# its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-from watcher import version as watcher_version
-
-
-extensions = [
-    'openstackdocstheme',
-    'os_api_ref',
-]
-
-# -- General configuration ----------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'Infrastructure Optimization API Reference'
-copyright = u'2010-present, OpenStack Foundation'
-
-# openstackdocstheme options
-repository_name = 'openstack/watcher'
-bug_project = 'watcher'
-bug_tag = ''
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The full version, including alpha/beta/rc tags.
-release = watcher_version.version_info.release_string()
-# The short X.Y version.
-version = watcher_version.version_string
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# -- Options for HTML output --------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  Major themes that come with
-# Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'openstackdocs'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-html_theme_options = {
-    "sidebar_mode": "toc",
-}
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
-# -- Options for LaTeX output -------------------------------------------------
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass
-# [howto/manual]).
-latex_documents = [
-    ('index', 'Watcher.tex', u'Infrastructure Optimization API Reference',
-     u'OpenStack Foundation', 'manual'),
-]
--- a/api-ref/source/index.rst
+++ b/api-ref/source/index.rst
@@ -1,16 +0,0 @@
-:tocdepth: 2
-
-===========
-Watcher API
-===========
-
-.. rest_expand_all::
-
-.. include:: watcher-api-v1-audittemplates.inc
-.. include:: watcher-api-v1-audits.inc
-.. include:: watcher-api-v1-actionplans.inc
-.. include:: watcher-api-v1-actions.inc
-.. include:: watcher-api-v1-goals.inc
-.. include:: watcher-api-v1-strategies.inc
-.. include:: watcher-api-v1-services.inc
-.. include:: watcher-api-v1-scoring_engines.inc
--- a/api-ref/source/parameters.yaml
+++ b/api-ref/source/parameters.yaml
@@ -1,433 +0,0 @@
-# Path
-action_ident:
-  description: |
-    The UUID of the Action.
-  in: path
-  required: true
-  type: string
-actionplan_ident:
-  description: |
-    The UUID of the Action Plan.
-  in: path
-  required: true
-  type: string
-audit_ident:
-  description: |
-    The UUID or name of the Audit.
-  in: path
-  required: true
-  type: string
-audittemplate_ident:
-  description: |
-    The UUID or name of the Audit Template.
-  in: path
-  required: true
-  type: string
-goal_ident:
-  description: |
-    The UUID or name of the Goal.
-  in: path
-  required: true
-  type: string
-scoring_engine_ident:
-  description: |
-    The UUID or name of the Scoring Engine.
-  in: path
-  required: true
-  type: string
-service_ident:
-  description: |
-    The ID or name of the Service.
-  in: path
-  required: true
-  type: string
-strategy_ident:
-  description: |
-    The UUID or name of the Strategy.
-  in: path
-  required: true
-  type: string
-
-# Query body
-limit:
-  description: |
-    Requests a page size of items. Returns a number of items up to a ``limit``
-    value. Use the limit parameter to make an initial limited request and use
-    the ID of the last-seen item from the response as the ``marker`` parameter
-    value in a subsequent limited request.
-  in: query
-  required: false
-  type: integer
-marker:
-  description: |
-    The ID of the last-seen item. Use the ``limit`` parameter to make an
-    initial limited request and use the ID of the last-seen item from the
-    response as the ``marker`` parameter value in a subsequent limited request.
-  in: query
-  required: false
-  type: string
-r_action_plan:
-  description: |
-    UUID of the action plan used for filtering.
-  in: query
-  required: false
-  type: string
-r_audit:
-  description: |
-    Optional UUID of an audit, to get only actions for that audit.
-  in: query
-  required: false
-  type: string
-r_goal:
-  description: |
-    The UUID or name of the Goal.
-  in: query
-  required: false
-  type: string
-r_strategy:
-  description: |
-    The UUID or name of the Strategy.
-  in: query
-  required: false
-  type: string
-sort_dir:
-  description: |
-    Sorts the response by the requested sort direction.
-    A valid value is ``asc`` (ascending) or ``desc`` (descending).
-    Default is ``asc``.
-  in: query
-  required: false
-  type: string
-sort_key:
-  description: |
-    Sorts the response by the this attribute value. Default is ``id``.
-  in: query
-  required: false
-  type: string
-
-# variables in the API response body
-
-# Action
-action_action_plan_uuid:
-  description: |
-    The action plan this action belongs to.
-  in: body
-  required: true
-  type: string
-action_description:
-  description: |
-    Action description.
-  in: body
-  required: true
-  type: string
-action_input_parameters:
-  description: |
-    Input parameters which are used by appropriate action type. For example,
-    ``migration`` action takes into account such parameters as
-    ``migration_type``, ``destination_node``, ``resource_id`` and
-    ``source_node``. To see a list of supported action types and their input
-    parameters visit `Action plugins page <https://docs.openstack.org/watcher/latest/contributor/plugin/plugins.html#actions>`_.
-  in: body
-  required: true
-  type: JSON
-action_parents:
-  description: |
-    UUIDs of parent actions.
-  in: body
-  required: true
-  type: array
-action_state:
-  description: |
-    State of Action.
-  in: body
-  required: true
-  type: string
-action_type:
-  description: |
-    Action type based on specific API action. Actions in Watcher are
-    pluggable, to see a list of supported action types visit
-    `Action plugins page <https://docs.openstack.org/watcher/latest/contributor/plugin/plugins.html#actions>`_.
-  in: body
-  required: true
-  type: string
-
-# Action Plan
-actionplan_audit_uuid:
-  description: |
-    The UUID of the audit this acton plan belongs to.
-  in: body
-  required: false
-  type: string
-actionplan_efficacy_indicators:
-  description: |
-    The list of efficacy indicators associated to this action plan.
-  in: body
-  required: false
-  type: array
-actionplan_global_efficacy:
-  description: |
-    The global efficacy of this action plan.
-  in: body
-  required: false
-  type: array
-actionplan_state:
-  description: |
-    State of this action plan. To get more information about states and
-    action plan's lifecycle, visit `Action Plan State Machine page <https://docs.openstack.org/watcher/latest/architecture.html#action-plan-state-machine>`_.
-  in: body
-  required: false
-  type: string
-
-# Audit
-audit_autotrigger:
-  description: |
-    Autoexecute action plan once audit is succeeded.
-  in: body
-  required: false
-  type: boolean
-audit_goal:
-  description: |
-    The UUID or name of the Goal.
-  in: body
-  required: false
-  type: string
-audit_interval:
-  description: |
-    Time interval between audit's execution.
-    Can be set either in seconds or cron syntax.
-    Should be defined only for CONTINUOUS audits.
-  in: body
-  required: false
-  type: string
-audit_name:
-  description: |
-    Name of this audit.
-  in: body
-  required: false
-  type: string
-audit_next_run_time:
-  description: |
-    The next time audit launch. Defined only for CONTINUOUS audits.
-  in: body
-  required: false
-  type: string
-audit_parameters:
-  description: |
-    The strategy parameters for this audit.
-  in: body
-  required: false
-  type: JSON
-audit_state:
-  description: |
-    State of this audit. To get more information about states and
-    audit's lifecycle, visit `Audit State Machine page <https://docs.openstack.org/watcher/latest/architecture.html#audit-state-machine>`_.
-  in: body
-  required: true
-  type: string
-audit_strategy:
-  description: |
-    The UUID or name of the Strategy.
-  in: body
-  required: false
-  type: string
-audit_type:
-  description: |
-    Type of this audit. Can be either ONESHOT or CONTINUOUS.
-  in: body
-  required: true
-  type: string
-
-# Audit Template
-audittemplate_description:
-  description: |
-    Short description of the Audit Template.
-  in: body
-  required: false
-  type: string
-audittemplate_goal:
-  description: |
-    The UUID or name of the Goal.
-  in: body
-  required: true
-  type: string
-audittemplate_name:
-  description: |
-    The name of the Audit template.
-  in: body
-  required: true
-  type: string
-audittemplate_scope:
-  description: |
-    Audit Scope.
-  in: body
-  required: false
-  type: JSON
-audittemplate_strategy:
-  description: |
-    The UUID or name of the Strategy.
-  in: body
-  required: false
-  type: string
-
-created_at:
-  description: |
-    The date and time when the resource was created. The date and time
-    stamp format is `ISO 8601 <https://en.wikipedia.org/wiki/ISO_8601>`_
-  in: body
-  required: true
-  type: string
-deleted_at:
-  description: |
-    The date and time when the resource was deleted. The date and time
-    stamp format is `ISO 8601 <https://en.wikipedia.org/wiki/ISO_8601>`_
-  in: body
-  required: true
-  type: string
-
-# Goal
-goal_display_name:
-  description: |
-    Localized name of the goal.
-  in: body
-  required: true
-  type: string
-goal_efficacy_specification:
-  description: |
-    Efficacy specifications as result of stategy's execution.
-  in: body
-  required: true
-  type: array
-goal_name:
-  description: |
-    Name of the goal.
-  in: body
-  required: true
-  type: string
-goal_uuid:
-  description: |
-    Unique UUID for this goal.
-  in: body
-  required: true
-  type: string
-
-links:
-  description: |
-    A list of relative links. Includes the self and bookmark links.
-  in: body
-  required: true
-  type: array
-
-# Scoring Engine
-scoring_engine_description:
-  description: |
-    A human readable description of the Scoring Engine.
-  in: body
-  required: true
-  type: string
-scoring_engine_metainfo:
-  description: |
-    A metadata associated with the scoring engine
-  in: body
-  required: true
-  type: string
-scoring_engine_name:
-  description: |
-    The name of the scoring engine.
-  in: body
-  required: true
-  type: string
-# Service
-service_host:
-  description: |
-    Name of host where service is placed on.
-  in: body
-  required: true
-  type: string
-service_id:
-  description: |
-    ID of service.
-  in: body
-  required: true
-  type: integer
-service_last_seen_up:
-  description: |
-    Time when Watcher service sent latest heartbeat.
-  in: body
-  required: true
-  type: string
-service_name:
-  description: |
-    Name of service like ``watcher-applier``.
-  in: body
-  required: true
-  type: string
-service_status:
-  description: |
-    State of service. It can be either in ACTIVE or FAILED state.
-  in: body
-  required: true
-  type: string
-
-# Strategy
-strategy_check_comment:
-  description: |
-    Requirement comment.
-  in: body
-  required: true
-  type: string
-strategy_check_mandatory:
-  description: |
-    Whether this requirement mandatory or not.
-  in: body
-  required: true
-  type: boolean
-strategy_check_state:
-  description: |
-    State of requirement for Strategy.
-  in: body
-  required: true
-  type: string or JSON
-strategy_check_type:
-  description: |
-    Type of requirement for Strategy.
-  in: body
-  required: true
-  type: string
-strategy_display_name:
-  description: |
-    Localized name of the strategy.
-  in: body
-  required: true
-  type: string
-strategy_name:
-  description: |
-    Name of the strategy.
-  in: body
-  required: true
-  type: string
-strategy_parameters_spec:
-  description: |
-    Parameters specifications for this strategy.
-  in: body
-  required: true
-  type: JSON
-strategy_uuid:
-  description: |
-    Unique UUID for this strategy.
-  in: body
-  required: true
-  type: string
-
-updated_at:
-  description: |
-    The date and time when the resource was updated. The date and time
-    stamp format is `ISO 8601 <https://en.wikipedia.org/wiki/ISO_8601>`_
-  in: body
-  required: true
-  type: string
-uuid:
-  description: |
-    The UUID for the resource.
-  in: body
-  required: true
-  type: string
--- a/api-ref/source/samples/actionplan-cancel-request-cancelling.json
+++ b/api-ref/source/samples/actionplan-cancel-request-cancelling.json
@@ -1,7 +0,0 @@
-[
-    {
-        "op": "replace",
-        "value": "CANCELLING",
-        "path": "/state"
-    }
-]
--- a/api-ref/source/samples/actionplan-cancel-request-pending.json
+++ b/api-ref/source/samples/actionplan-cancel-request-pending.json
@@ -1,7 +0,0 @@
-[
-    {
-        "op": "replace",
-        "value": "CANCELLED",
-        "path": "/state"
-    }
-]
--- a/api-ref/source/samples/actionplan-list-detailed-response.json
+++ b/api-ref/source/samples/actionplan-list-detailed-response.json
@@ -1,26 +0,0 @@
-{
-    "action_plans": [
-        {
-            "state": "ONGOING",
-            "efficacy_indicators": [],
-            "strategy_uuid": "7dae0eea-9df7-42b8-bb3e-313958ff2242",
-            "global_efficacy": [],
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/action_plans/4cbc4ede-0d25-481b-b86e-998dbbd4f8bf"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/action_plans/4cbc4ede-0d25-481b-b86e-998dbbd4f8bf"
-                }
-            ],
-            "updated_at": "2018-04-10T11:59:52.640067+00:00",
-            "strategy_name": "dummy_with_resize",
-            "deleted_at": null,
-            "uuid": "4cbc4ede-0d25-481b-b86e-998dbbd4f8bf",
-            "audit_uuid": "7d100b05-0a86-491f-98a7-f93da19b272a",
-            "created_at": "2018-04-10T11:59:52.640067+00:00"
-        }
-    ]
-}
--- a/api-ref/source/samples/actionplan-list-response.json
+++ b/api-ref/source/samples/actionplan-list-response.json
@@ -1,24 +0,0 @@
-{
-    "action_plans": [
-        {
-            "state": "ONGOING",
-            "efficacy_indicators": [],
-            "strategy_uuid": "7dae0eea-9df7-42b8-bb3e-313958ff2242",
-            "global_efficacy": [],
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/action_plans/4cbc4ede-0d25-481b-b86e-998dbbd4f8bf"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/action_plans/4cbc4ede-0d25-481b-b86e-998dbbd4f8bf"
-                }
-            ],
-            "updated_at": "2018-04-10T11:59:52.640067+00:00",
-            "strategy_name": "dummy_with_resize",
-            "uuid": "4cbc4ede-0d25-481b-b86e-998dbbd4f8bf",
-            "audit_uuid": "7d100b05-0a86-491f-98a7-f93da19b272a"
-        }
-    ]
-}
--- a/api-ref/source/samples/actionplan-show-response.json
+++ b/api-ref/source/samples/actionplan-show-response.json
@@ -1,20 +0,0 @@
-{
-    "state": "ONGOING",
-    "efficacy_indicators": [],
-    "strategy_uuid": "7dae0eea-9df7-42b8-bb3e-313958ff2242",
-    "global_efficacy": [],
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/action_plans/4cbc4ede-0d25-481b-b86e-998dbbd4f8bf"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/action_plans/4cbc4ede-0d25-481b-b86e-998dbbd4f8bf"
-        }
-    ],
-    "updated_at": "2018-04-10T11:59:52.640067+00:00",
-    "strategy_name": "dummy_with_resize",
-    "uuid": "4cbc4ede-0d25-481b-b86e-998dbbd4f8bf",
-    "audit_uuid": "7d100b05-0a86-491f-98a7-f93da19b272a"
-}
--- a/api-ref/source/samples/actionplan-start-response.json
+++ b/api-ref/source/samples/actionplan-start-response.json
@@ -1,22 +0,0 @@
-{
-    "state": "PENDING",
-    "efficacy_indicators": [],
-    "strategy_uuid": "7dae0eea-9df7-42b8-bb3e-313958ff2242",
-    "global_efficacy": [],
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/action_plans/4cbc4ede-0d25-481b-b86e-998dbbd4f8bf"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/action_plans/4cbc4ede-0d25-481b-b86e-998dbbd4f8bf"
-        }
-    ],
-    "updated_at": "2018-04-10T11:59:41.602430+00:00",
-    "strategy_name": "dummy_with_resize",
-    "uuid": "4cbc4ede-0d25-481b-b86e-998dbbd4f8bf",
-    "audit_uuid": "7d100b05-0a86-491f-98a7-f93da19b272a",
-    "created_at": "2018-04-10T11:59:12.592729+00:00",
-    "deleted_at": null
-}
--- a/api-ref/source/samples/actions-list-detailed-response.json
+++ b/api-ref/source/samples/actions-list-detailed-response.json
@@ -1,30 +0,0 @@
-{
-    "actions": [
-        {
-            "state": "PENDING",
-            "description": "Wait for a given interval in seconds.",
-            "parents": [
-                "8119d16e-b419-4729-b015-fc04c4e45783"
-            ],
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/actions/7182a988-e6c4-4152-a0d6-067119475c83"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/actions/7182a988-e6c4-4152-a0d6-067119475c83"
-                }
-            ],
-            "action_plan_uuid": "c6bba9ed-a7eb-4370-9993-d873e5e22cba",
-            "uuid": "7182a988-e6c4-4152-a0d6-067119475c83",
-            "deleted_at": null,
-            "updated_at": null,
-            "input_parameters": {
-                "duration": 3.2
-            },
-            "action_type": "sleep",
-            "created_at": "2018-03-26T11:56:08.235226+00:00"
-        }
-    ]
-}
--- a/api-ref/source/samples/actions-list-response.json
+++ b/api-ref/source/samples/actions-list-response.json
@@ -1,23 +0,0 @@
-{
-    "actions": [
-        {
-            "state": "PENDING",
-            "parents": [
-                "8119d16e-b419-4729-b015-fc04c4e45783"
-            ],
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/actions/7182a988-e6c4-4152-a0d6-067119475c83"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/actions/7182a988-e6c4-4152-a0d6-067119475c83"
-                }
-            ],
-            "action_plan_uuid": "c6bba9ed-a7eb-4370-9993-d873e5e22cba",
-            "uuid": "7182a988-e6c4-4152-a0d6-067119475c83",
-            "action_type": "sleep"
-        }
-    ]
-}
--- a/api-ref/source/samples/actions-show-response.json
+++ b/api-ref/source/samples/actions-show-response.json
@@ -1,26 +0,0 @@
-{
-    "state": "SUCCEEDED",
-    "description": "Logging a NOP message",
-    "parents": [
-        "b4529294-1de6-4302-b57a-9b5d5dc363c6"
-    ],
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/actions/54acc7a0-91b0-46ea-a5f7-4ae2b9df0b0a"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/actions/54acc7a0-91b0-46ea-a5f7-4ae2b9df0b0a"
-        }
-    ],
-    "action_plan_uuid": "4cbc4ede-0d25-481b-b86e-998dbbd4f8bf",
-    "uuid": "54acc7a0-91b0-46ea-a5f7-4ae2b9df0b0a",
-    "deleted_at": null,
-    "updated_at": "2018-04-10T11:59:44.026973+00:00",
-    "input_parameters": {
-        "message": "Welcome"
-    },
-    "action_type": "nop",
-    "created_at": "2018-04-10T11:59:12.725147+00:00"
-}
--- a/api-ref/source/samples/audit-cancel-request.json
+++ b/api-ref/source/samples/audit-cancel-request.json
@@ -1,7 +0,0 @@
-[
-    {
-        "op": "replace",
-        "value": "CANCELLED",
-        "path": "/state"
-    }
-]
--- a/api-ref/source/samples/audit-cancel-response.json
+++ b/api-ref/source/samples/audit-cancel-response.json
@@ -1,51 +0,0 @@
-{
-    "interval": "*/2 * * * *",
-    "strategy_uuid": "6b3b3902-8508-4cb0-bb85-67f32866b086",
-    "goal_uuid": "e1a5a45b-f251-47cf-9c5f-fa1e66e1286a",
-    "name": "audit1",
-    "parameters": {
-        "host_choice": "retry",
-        "instance_metrics": {
-            "cpu_util": "compute.node.cpu.percent",
-            "memory.resident": "hardware.memory.used"
-        },
-        "granularity": 300,
-        "weights": {
-            "cpu_util_weight": 1.0,
-            "memory.resident_weight": 1.0
-        },
-        "retry_count": 1,
-        "metrics": [
-            "cpu_util"
-        ],
-        "periods": {
-            "instance": 720,
-            "node": 600
-        },
-        "thresholds": {
-            "cpu_util": 0.2,
-            "memory.resident": 0.2
-        }
-    },
-    "auto_trigger": false,
-    "uuid": "65a5da84-5819-4aea-8278-a28d2b489028",
-    "goal_name": "workload_balancing",
-    "scope": [],
-    "created_at": "2018-04-06T07:27:27.820460+00:00",
-    "deleted_at": null,
-    "state": "CANCELLED",
-    "audit_type": "CONTINUOUS",
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/audits/65a5da84-5819-4aea-8278-a28d2b489028"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/audits/65a5da84-5819-4aea-8278-a28d2b489028"
-        }
-    ],
-    "strategy_name": "workload_stabilization",
-    "next_run_time": "2018-04-06T11:56:00",
-    "updated_at": "2018-04-06T11:54:01.266447+00:00"
-}
--- a/api-ref/source/samples/audit-create-request-continuous.json
+++ b/api-ref/source/samples/audit-create-request-continuous.json
@@ -1,12 +0,0 @@
-{
-    "auto_trigger": false,
-    "audit_template_uuid": "76fddfee-a9c4-40b0-8da0-c19ad6904f09",
-    "name": "test_audit",
-    "parameters": {
-        "metrics": [
-            "cpu_util"
-        ]
-    },
-    "audit_type": "CONTINUOUS",
-    "interval": "*/2 * * * *"
-}
--- a/api-ref/source/samples/audit-create-request-oneshot.json
+++ b/api-ref/source/samples/audit-create-request-oneshot.json
@@ -1,5 +0,0 @@
-{
-    "audit_type": "ONESHOT",
-    "auto_trigger": false,
-    "audit_template_uuid": "5e70a156-ced7-4012-b1c6-88fcb02ee0c1"
-}
--- a/api-ref/source/samples/audit-create-response.json
+++ b/api-ref/source/samples/audit-create-response.json
@@ -1,51 +0,0 @@
-{
-    "interval": "*/2 * * * *",
-    "strategy_uuid": "6b3b3902-8508-4cb0-bb85-67f32866b086",
-    "goal_uuid": "e1a5a45b-f251-47cf-9c5f-fa1e66e1286a",
-    "name": "test_audit",
-    "parameters": {
-        "host_choice": "retry",
-        "granularity": 300,
-        "thresholds": {
-            "cpu_util": 0.2,
-            "memory.resident": 0.2
-        },
-        "periods": {
-            "node": 600,
-            "instance": 720
-        },
-        "retry_count": 1,
-        "metrics": [
-            "cpu_util"
-        ],
-        "weights": {
-            "cpu_util_weight": 1.0,
-            "memory.resident_weight": 1.0
-        },
-        "instance_metrics": {
-            "cpu_util": "compute.node.cpu.percent",
-            "memory.resident": "hardware.memory.used"
-        }
-    },
-    "auto_trigger": false,
-    "uuid": "65a5da84-5819-4aea-8278-a28d2b489028",
-    "goal_name": "workload_balancing",
-    "scope": [],
-    "created_at": "2018-04-06T07:27:27.820460+00:00",
-    "deleted_at": null,
-    "state": "PENDING",
-    "audit_type": "CONTINUOUS",
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/audits/65a5da84-5819-4aea-8278-a28d2b489028"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/audits/65a5da84-5819-4aea-8278-a28d2b489028"
-        }
-    ],
-    "strategy_name": "workload_stabilization",
-    "next_run_time": null,
-    "updated_at": null
-}
--- a/api-ref/source/samples/audit-list-detailed-response.json
+++ b/api-ref/source/samples/audit-list-detailed-response.json
@@ -1,55 +0,0 @@
-{
-    "audits": [
-        {
-            "interval": "*/2 * * * *",
-            "strategy_uuid": "6b3b3902-8508-4cb0-bb85-67f32866b086",
-            "goal_uuid": "e1a5a45b-f251-47cf-9c5f-fa1e66e1286a",
-            "name": "test_audit",
-            "parameters": {
-                "host_choice": "retry",
-                "instance_metrics": {
-                    "cpu_util": "compute.node.cpu.percent",
-                    "memory.resident": "hardware.memory.used"
-                },
-                "granularity": 300,
-                "weights": {
-                    "cpu_util_weight": 1.0,
-                    "memory.resident_weight": 1.0
-                },
-                "retry_count": 1,
-                "metrics": [
-                    "cpu_util"
-                ],
-                "periods": {
-                    "instance": 720,
-                    "node": 600
-                },
-                "thresholds": {
-                    "cpu_util": 0.2,
-                    "memory.resident": 0.2
-                }
-            },
-            "auto_trigger": false,
-            "uuid": "65a5da84-5819-4aea-8278-a28d2b489028",
-            "goal_name": "workload_balancing",
-            "scope": [],
-            "created_at": "2018-04-06T07:27:27.820460+00:00",
-            "deleted_at": null,
-            "state": "ONGOING",
-            "audit_type": "CONTINUOUS",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/audits/65a5da84-5819-4aea-8278-a28d2b489028"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/audits/65a5da84-5819-4aea-8278-a28d2b489028"
-                }
-            ],
-            "strategy_name": "workload_stabilization",
-            "next_run_time": "2018-04-06T09:46:00",
-            "updated_at": "2018-04-06T09:44:01.604146+00:00"
-        }
-    ]
-}
--- a/api-ref/source/samples/audit-list-response.json
+++ b/api-ref/source/samples/audit-list-response.json
@@ -1,28 +0,0 @@
-{
-    "audits": [
-        {
-            "interval": null,
-            "strategy_uuid": "e311727b-b9b3-43ef-a5f7-8bd7ea80df25",
-            "goal_uuid": "4690f8ba-18ff-45c1-99e9-159556d23810",
-            "name": "dummy-2018-03-26T11:56:07.950400",
-            "auto_trigger": false,
-            "uuid": "ccc69a5f-114e-46f4-b15e-a77eaa337b01",
-            "goal_name": "dummy",
-            "scope": [],
-            "state": "SUCCEEDED",
-            "audit_type": "ONESHOT",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/audits/ccc69a5f-114e-46f4-b15e-a77eaa337b01"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/audits/ccc69a5f-114e-46f4-b15e-a77eaa337b01"
-                }
-            ],
-            "strategy_name": "dummy",
-            "next_run_time": null
-        }
-    ]
-}
--- a/api-ref/source/samples/audit-show-response.json
+++ b/api-ref/source/samples/audit-show-response.json
@@ -1,51 +0,0 @@
-{
-    "interval": "*/2 * * * *",
-    "strategy_uuid": "6b3b3902-8508-4cb0-bb85-67f32866b086",
-    "goal_uuid": "e1a5a45b-f251-47cf-9c5f-fa1e66e1286a",
-    "name": "test_audit",
-    "parameters": {
-        "host_choice": "retry",
-        "instance_metrics": {
-            "cpu_util": "compute.node.cpu.percent",
-            "memory.resident": "hardware.memory.used"
-        },
-        "granularity": 300,
-        "weights": {
-            "cpu_util_weight": 1.0,
-            "memory.resident_weight": 1.0
-        },
-        "retry_count": 1,
-        "metrics": [
-            "cpu_util"
-        ],
-        "periods": {
-            "instance": 720,
-            "node": 600
-        },
-        "thresholds": {
-            "cpu_util": 0.2,
-            "memory.resident": 0.2
-        }
-    },
-    "auto_trigger": false,
-    "uuid": "65a5da84-5819-4aea-8278-a28d2b489028",
-    "goal_name": "workload_balancing",
-    "scope": [],
-    "created_at": "2018-04-06T07:27:27.820460+00:00",
-    "deleted_at": null,
-    "state": "ONGOING",
-    "audit_type": "CONTINUOUS",
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/audits/65a5da84-5819-4aea-8278-a28d2b489028"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/audits/65a5da84-5819-4aea-8278-a28d2b489028"
-        }
-    ],
-    "strategy_name": "workload_stabilization",
-    "next_run_time": "2018-04-06T11:56:00",
-    "updated_at": "2018-04-06T11:54:01.266447+00:00"
-}
--- a/api-ref/source/samples/audit-update-request.json
+++ b/api-ref/source/samples/audit-update-request.json
@@ -1,12 +0,0 @@
-[
-    {
-        "value": "CANCELLED",
-        "path": "/state",
-        "op": "replace"
-    },
-    {
-        "value": "audit1",
-        "path": "/name",
-        "op": "replace"
-    }
-]
--- a/api-ref/source/samples/audit-update-response.json
+++ b/api-ref/source/samples/audit-update-response.json
@@ -1,51 +0,0 @@
-{
-    "interval": "*/2 * * * *",
-    "strategy_uuid": "6b3b3902-8508-4cb0-bb85-67f32866b086",
-    "goal_uuid": "e1a5a45b-f251-47cf-9c5f-fa1e66e1286a",
-    "name": "audit1",
-    "parameters": {
-        "host_choice": "retry",
-        "instance_metrics": {
-            "cpu_util": "compute.node.cpu.percent",
-            "memory.resident": "hardware.memory.used"
-        },
-        "granularity": 300,
-        "weights": {
-            "cpu_util_weight": 1.0,
-            "memory.resident_weight": 1.0
-        },
-        "retry_count": 1,
-        "metrics": [
-            "cpu_util"
-        ],
-        "periods": {
-            "instance": 720,
-            "node": 600
-        },
-        "thresholds": {
-            "cpu_util": 0.2,
-            "memory.resident": 0.2
-        }
-    },
-    "auto_trigger": false,
-    "uuid": "65a5da84-5819-4aea-8278-a28d2b489028",
-    "goal_name": "workload_balancing",
-    "scope": [],
-    "created_at": "2018-04-06T07:27:27.820460+00:00",
-    "deleted_at": null,
-    "state": "CANCELLED",
-    "audit_type": "CONTINUOUS",
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/audits/65a5da84-5819-4aea-8278-a28d2b489028"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/audits/65a5da84-5819-4aea-8278-a28d2b489028"
-        }
-    ],
-    "strategy_name": "workload_stabilization",
-    "next_run_time": "2018-04-06T11:56:00",
-    "updated_at": "2018-04-06T11:54:01.266447+00:00"
-}
--- a/api-ref/source/samples/audittemplate-create-request-full.json
+++ b/api-ref/source/samples/audittemplate-create-request-full.json
@@ -1,7 +0,0 @@
-{
-    "name": "at2",
-    "goal": "dummy",
-    "strategy": "dummy",
-    "description": "the second audit template",
-    "scope": []
-}
--- a/api-ref/source/samples/audittemplate-create-request-minimal.json
+++ b/api-ref/source/samples/audittemplate-create-request-minimal.json
@@ -1,4 +0,0 @@
-{
-    "name": "at2",
-    "goal": "dummy"
-}
--- a/api-ref/source/samples/audittemplate-create-response.json
+++ b/api-ref/source/samples/audittemplate-create-response.json
@@ -1,23 +0,0 @@
-{
-    "description": null,
-    "strategy_uuid": null,
-    "goal_uuid": "4690f8ba-18ff-45c1-99e9-159556d23810",
-    "name": "at3",
-    "uuid": "b4041d8c-85d7-4224-851d-649fe48b7196",
-    "goal_name": "dummy",
-    "scope": [],
-    "created_at": "2018-04-04T08:38:33.110432+00:00",
-    "deleted_at": null,
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/audit_templates/b4041d8c-85d7-4224-851d-649fe48b7196"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/audit_templates/b4041d8c-85d7-4224-851d-649fe48b7196"
-        }
-    ],
-    "strategy_name": null,
-    "updated_at": null
-}
--- a/api-ref/source/samples/audittemplate-list-detailed-response.json
+++ b/api-ref/source/samples/audittemplate-list-detailed-response.json
@@ -1,23 +0,0 @@
-{
-    "audit_templates":[
-        {
-            "strategy_uuid": null,
-            "goal_uuid": "4690f8ba-18ff-45c1-99e9-159556d23810",
-            "name": "at3",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/audit_templates/b4041d8c-85d7-4224-851d-649fe48b7196"
-                },
-                {
-                    "rel": "bookmark", "href":
-                    "http://controller:9322/audit_templates/b4041d8c-85d7-4224-851d-649fe48b7196"
-                }
-            ],
-            "strategy_name": null,
-            "uuid": "b4041d8c-85d7-4224-851d-649fe48b7196",
-            "goal_name": "dummy", "scope": [],
-            "description": null
-        }
-    ]
-}
--- a/api-ref/source/samples/audittemplate-list-response.json
+++ b/api-ref/source/samples/audittemplate-list-response.json
@@ -1,22 +0,0 @@
-{
-    "audit_templates":[
-        {
-            "strategy_uuid": null,
-            "goal_uuid": "4690f8ba-18ff-45c1-99e9-159556d23810",
-            "name": "at3",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/audit_templates/b4041d8c-85d7-4224-851d-649fe48b7196"
-                },
-                {
-                    "rel": "bookmark", "href":
-                    "http://controller:9322/audit_templates/b4041d8c-85d7-4224-851d-649fe48b7196"
-                }
-            ],
-            "strategy_name": null,
-            "uuid": "b4041d8c-85d7-4224-851d-649fe48b7196",
-            "goal_name": "dummy", "scope": []
-        }
-    ]
-}
--- a/api-ref/source/samples/audittemplate-show-response.json
+++ b/api-ref/source/samples/audittemplate-show-response.json
@@ -1,23 +0,0 @@
-{
-    "description": "test 1",
-    "strategy_uuid": null,
-    "goal_uuid": "4690f8ba-18ff-45c1-99e9-159556d23810",
-    "name": "at1",
-    "uuid": "0d100c27-14af-4962-86fb-f6079287c9c6",
-    "goal_name": "dummy",
-    "scope": [],
-    "created_at": "2018-04-04T07:48:36.175472+00:00",
-    "deleted_at": null,
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/audit_templates/0d100c27-14af-4962-86fb-f6079287c9c6"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/audit_templates/0d100c27-14af-4962-86fb-f6079287c9c6"
-        }
-    ],
-    "strategy_name": null,
-    "updated_at": "2018-04-05T07:57:55.803650+00:00"
-}
--- a/api-ref/source/samples/audittemplate-update-request.json
+++ b/api-ref/source/samples/audittemplate-update-request.json
@@ -1,7 +0,0 @@
-[
-    {
-        "op": "replace",
-        "value": "PENDING",
-        "path": "/state"
-    }
-]
--- a/api-ref/source/samples/audittemplate-update-response.json
+++ b/api-ref/source/samples/audittemplate-update-response.json
@@ -1,23 +0,0 @@
-{
-    "description": "test 1",
-    "strategy_uuid": null,
-    "goal_uuid": "4690f8ba-18ff-45c1-99e9-159556d23810",
-    "name": "at11",
-    "uuid": "0d100c27-14af-4962-86fb-f6079287c9c6",
-    "goal_name": "dummy",
-    "scope": [],
-    "created_at": "2018-04-04T07:48:36.175472+00:00",
-    "deleted_at": null,
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/audit_templates/0d100c27-14af-4962-86fb-f6079287c9c6"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/audit_templates/0d100c27-14af-4962-86fb-f6079287c9c6"
-        }
-    ],
-    "strategy_name": null,
-    "updated_at": "2018-04-05T07:57:42.139127+00:00"
-}
--- a/api-ref/source/samples/goal-list-response.json
+++ b/api-ref/source/samples/goal-list-response.json
@@ -1,55 +0,0 @@
-{
-    "goals": [
-        {
-            "efficacy_specification": [],
-            "uuid": "e1a5a45b-f251-47cf-9c5f-fa1e66e1286a",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/goals/e1a5a45b-f251-47cf-9c5f-fa1e66e1286a"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/goals/e1a5a45b-f251-47cf-9c5f-fa1e66e1286a"
-                }
-            ],
-            "name": "workload_balancing",
-            "display_name": "Workload Balancing"
-        },
-        {
-            "efficacy_specification": [
-                {
-                    "description": "The total number of enabled compute nodes.",
-                    "schema": "Range(min=0, max=None, min_included=True, max_included=True, msg=None)",
-                    "name": "compute_nodes_count",
-                    "unit": null
-                },
-                {
-                    "description": "The number of compute nodes to be released.",
-                    "schema": "Range(min=0, max=None, min_included=True, max_included=True, msg=None)",
-                    "name": "released_compute_nodes_count",
-                    "unit": null
-                },
-                {
-                    "description": "The number of VM migrations to be performed.",
-                    "schema": "Range(min=0, max=None, min_included=True, max_included=True, msg=None)",
-                    "name": "instance_migrations_count",
-                    "unit": null
-                }
-            ],
-            "uuid": "cb9afa5e-aec7-4a8c-9261-c15c33f2262b",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/goals/cb9afa5e-aec7-4a8c-9261-c15c33f2262b"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/goals/cb9afa5e-aec7-4a8c-9261-c15c33f2262b"
-                }
-            ],
-            "name": "server_consolidation",
-            "display_name": "Server Consolidation"
-        }
-    ]
-}
--- a/api-ref/source/samples/goal-show-response.json
+++ b/api-ref/source/samples/goal-show-response.json
@@ -1,19 +0,0 @@
-{
-    "efficacy_specification": [],
-    "name": "saving_energy",
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/goals/6f52889a-9dd4-4dbb-8e70-39b56c4836cc"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/goals/6f52889a-9dd4-4dbb-8e70-39b56c4836cc"
-        }
-    ],
-    "uuid": "6f52889a-9dd4-4dbb-8e70-39b56c4836cc",
-    "updated_at": null,
-    "display_name": "Saving Energy",
-    "created_at": "2018-03-26T11:55:24.365584+00:00",
-    "deleted_at": null
-}
--- a/api-ref/source/samples/scoring_engine-list-detailed-response.json
+++ b/api-ref/source/samples/scoring_engine-list-detailed-response.json
@@ -1,20 +0,0 @@
-{
-    "scoring_engines": [
-        {
-            "description": "Dummy Scorer calculating the average value",
-            "uuid": "5a44f007-55b1-423c-809f-6a274a9bd93b",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/scoring_engines/5a44f007-55b1-423c-809f-6a274a9bd93b"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/scoring_engines/5a44f007-55b1-423c-809f-6a274a9bd93b"
-                }
-            ],
-            "name": "dummy_avg_scorer",
-            "metainfo": ""
-        }
-    ]
-}
--- a/api-ref/source/samples/scoring_engine-list-response.json
+++ b/api-ref/source/samples/scoring_engine-list-response.json
@@ -1,19 +0,0 @@
-{
-    "scoring_engines": [
-        {
-            "description": "Dummy Scorer calculating the average value",
-            "uuid": "5a44f007-55b1-423c-809f-6a274a9bd93b",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/scoring_engines/5a44f007-55b1-423c-809f-6a274a9bd93b"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/scoring_engines/5a44f007-55b1-423c-809f-6a274a9bd93b"
-                }
-            ],
-            "name": "dummy_avg_scorer"
-        }
-    ]
-}
--- a/api-ref/source/samples/scoring_engine-show-response.json
+++ b/api-ref/source/samples/scoring_engine-show-response.json
@@ -1,16 +0,0 @@
-{
-    "description": "Dummy Scorer calculating the maximum value",
-    "uuid": "1ac42282-4e77-473e-898b-62ea007f1deb",
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/scoring_engines/1ac42282-4e77-473e-898b-62ea007f1deb"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/scoring_engines/1ac42282-4e77-473e-898b-62ea007f1deb"
-        }
-    ],
-    "name": "dummy_max_scorer",
-    "metainfo": ""
-}
--- a/api-ref/source/samples/service-list-detailed-response.json
+++ b/api-ref/source/samples/service-list-detailed-response.json
@@ -1,24 +0,0 @@
-{
-    "services": [
-        {
-            "status": "ACTIVE",
-            "name": "watcher-applier",
-            "host": "controller",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/services/1"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/services/1"
-                }
-            ],
-            "id": 1,
-            "deleted_at": null,
-            "updated_at": "2018-04-26T08:52:37.652895+00:00",
-            "last_seen_up": "2018-04-26T08:52:37.648572",
-            "created_at": "2018-03-26T11:55:24.075093+00:00"
-        }
-    ]
-}
--- a/api-ref/source/samples/service-list-response.json
+++ b/api-ref/source/samples/service-list-response.json
@@ -1,36 +0,0 @@
-{
-    "services": [
-        {
-            "id": 1,
-            "status": "ACTIVE",
-            "name": "watcher-applier",
-            "host": "controller",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/services/1"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/services/1"
-                }
-            ]
-        },
-        {
-            "id": 2,
-            "status": "ACTIVE",
-            "name": "watcher-decision-engine",
-            "host": "controller",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/services/2"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/services/2"
-                }
-            ]
-        }
-    ]
-}
--- a/api-ref/source/samples/service-show-response.json
+++ b/api-ref/source/samples/service-show-response.json
@@ -1,20 +0,0 @@
-{
-    "status": "ACTIVE",
-    "name": "watcher-applier",
-    "host": "controller",
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/services/1"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/services/1"
-        }
-    ],
-    "id": 1,
-    "deleted_at": null,
-    "updated_at": "2018-04-26T09:45:37.653061+00:00",
-    "last_seen_up": "2018-04-26T09:45:37.649314",
-    "created_at": "2018-03-26T11:55:24.075093+00:00"
-}
--- a/api-ref/source/samples/strategy-list-detailed-response.json
+++ b/api-ref/source/samples/strategy-list-detailed-response.json
@@ -1,35 +0,0 @@
-{
-    "strategies": [
-        {
-            "goal_uuid": "cb9afa5e-aec7-4a8c-9261-c15c33f2262b",
-            "name": "vm_workload_consolidation",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/strategies/6382b2d7-259e-487d-88db-78c852ffea54"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/strategies/6382b2d7-259e-487d-88db-78c852ffea54"
-                }
-            ],
-            "parameters_spec": {
-                "properties": {
-                    "granularity": {
-                        "default": 300,
-                        "type": "number",
-                        "description": "The time between two measures in an aggregated timeseries of a metric."
-                    },
-                    "period": {
-                        "default": 3600,
-                        "type": "number",
-                        "description": "The time interval in seconds for getting statistic aggregation"
-                    }
-                }
-            },
-            "uuid": "6382b2d7-259e-487d-88db-78c852ffea54",
-            "goal_name": "server_consolidation",
-            "display_name": "VM Workload Consolidation Strategy"
-        }
-    ]
-}
--- a/api-ref/source/samples/strategy-list-response.json
+++ b/api-ref/source/samples/strategy-list-response.json
@@ -1,21 +0,0 @@
-{
-    "strategies": [
-        {
-            "goal_uuid": "4690f8ba-18ff-45c1-99e9-159556d23810",
-            "name": "dummy",
-            "links": [
-                {
-                    "rel": "self",
-                    "href": "http://controller:9322/v1/strategies/e311727b-b9b3-43ef-a5f7-8bd7ea80df25"
-                },
-                {
-                    "rel": "bookmark",
-                    "href": "http://controller:9322/strategies/e311727b-b9b3-43ef-a5f7-8bd7ea80df25"
-                }
-            ],
-            "uuid": "e311727b-b9b3-43ef-a5f7-8bd7ea80df25",
-            "goal_name": "dummy",
-            "display_name": "Dummy strategy"
-        }
-    ]
-}
--- a/api-ref/source/samples/strategy-show-response.json
+++ b/api-ref/source/samples/strategy-show-response.json
@@ -1,33 +0,0 @@
-{
-    "goal_uuid": "4690f8ba-18ff-45c1-99e9-159556d23810",
-    "name": "dummy",
-    "links": [
-        {
-            "rel": "self",
-            "href": "http://controller:9322/v1/strategies/e311727b-b9b3-43ef-a5f7-8bd7ea80df25"
-        },
-        {
-            "rel": "bookmark",
-            "href": "http://controller:9322/strategies/e311727b-b9b3-43ef-a5f7-8bd7ea80df25"
-        }
-    ],
-    "parameters_spec": {
-        "properties": {
-            "para2": {
-                "default": "hello",
-                "type": "string",
-                "description": "string parameter example"
-            },
-            "para1": {
-                "maximum": 10.2,
-                "type": "number",
-                "minimum": 1.0,
-                "description": "number parameter example",
-                "default": 3.2
-            }
-        }
-    },
-    "uuid": "e311727b-b9b3-43ef-a5f7-8bd7ea80df25",
-    "goal_name": "dummy",
-    "display_name": "Dummy strategy"
-}
--- a/api-ref/source/samples/strategy-state-response.json
+++ b/api-ref/source/samples/strategy-state-response.json
@@ -1,49 +0,0 @@
-[
-    {
-        "state": "gnocchi: available",
-        "comment": "",
-        "mandatory": true,
-        "type": "Datasource"
-    },
-    {
-        "state": [
-            {
-                "compute.node.cpu.percent": "available"
-            },
-            {
-                "cpu_util": "available"
-            },
-            {
-                "memory.resident": "available"
-            },
-            {
-                "hardware.memory.used": "available"
-            }
-        ],
-        "comment": "",
-        "mandatory": false,
-        "type": "Metrics"
-    },
-    {
-        "state": [
-            {
-                "compute_model": "available"
-            },
-            {
-                "storage_model": "not available"
-            },
-            {
-                "baremetal_model": "not available"
-            }
-        ],
-        "comment": "",
-        "mandatory": true,
-        "type": "CDM"
-    },
-    {
-        "state": "workload_stabilization",
-        "mandatory": "",
-        "comment": "",
-        "type": "Name"
-    }
-]
--- a/api-ref/source/watcher-api-v1-actionplans.inc
+++ b/api-ref/source/watcher-api-v1-actionplans.inc
@@ -1,254 +0,0 @@
-.. -*- rst -*-
-
-============
-Action Plans
-============
-
-An ``Action Plan`` specifies a flow of ``Actions`` that should be executed
-in order to satisfy a given ``Goal``. It also contains an estimated
-``global efficacy`` alongside a set of ``efficacy indicators``.
-
-An ``Action Plan`` is generated by Watcher when an ``Audit`` is successful
-which implies that the ``Strategy`` which was used has found a ``Solution``
-to achieve the ``Goal`` of this ``Audit``.
-
-In the default implementation of Watcher, an action plan is composed of
-a graph of linked ``Actions``. Each action may have parent actions, which
-should be executed prior to child action.
-
-Start Action Plan
-=================
-
-.. rest_method::  POST /v1/action_plans/{actionplan_ident}/start
-
-Starts a created Action Plan resource.
-
-Normal response codes: 200
-
-Error codes: 400,404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - actionplan_ident: actionplan_ident
-
-Response
--------
-
-The list and example below are representative of the response as of API
-version 1:
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - state: actionplan_state
-    - audit_uuid: actionplan_audit_uuid
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - efficacy_indicators: actionplan_efficacy_indicators
-    - global_efficacy: actionplan_global_efficacy
-    - links: links
-
-**Example JSON representation of an Action Plan:**
-
-.. literalinclude:: samples/actionplan-start-response.json
-   :language: javascript
-
-List Action Plan
-================
-
-.. rest_method::  GET /v1/action_plans
-
-Returns a list of Action Plan resources.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - audit_uuid: r_audit
-   - strategy: r_strategy
-   - limit: limit
-   - marker: marker
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - state: actionplan_state
-    - audit_uuid: actionplan_audit_uuid
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - efficacy_indicators: actionplan_efficacy_indicators
-    - global_efficacy: actionplan_global_efficacy
-    - links: links
-
-**Example JSON representation of an Action Plan:**
-
-.. literalinclude:: samples/actionplan-list-response.json
-   :language: javascript
-
-List Action Plan detailed
-=========================
-
-.. rest_method::  GET /v1/action_plans/detail
-
-Returns a list of Action Plan resources with complete details.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - audit_uuid: r_audit
-   - strategy: r_strategy
-   - limit: limit
-   - marker: marker
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - deleted_at: deleted_at
-    - updated_at: updated_at
-    - created_at: created_at
-    - uuid: uuid
-    - state: actionplan_state
-    - audit_uuid: actionplan_audit_uuid
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - efficacy_indicators: actionplan_efficacy_indicators
-    - global_efficacy: actionplan_global_efficacy
-    - links: links
-
-**Example JSON representation of an Action Plan:**
-
-.. literalinclude:: samples/actionplan-list-detailed-response.json
-   :language: javascript
-
-Show Action Plan
-================
-
-.. rest_method::  GET /v1/action_plans/{actionplan_ident}
-
-Shows details for an Action Plan.
-
-Normal response codes: 200
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - actionplan_ident: actionplan_ident
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - state: actionplan_state
-    - audit_uuid: actionplan_audit_uuid
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - efficacy_indicators: actionplan_efficacy_indicators
-    - global_efficacy: actionplan_global_efficacy
-    - links: links
-
-**Example JSON representation of an Audit:**
-
-.. literalinclude:: samples/actionplan-show-response.json
-   :language: javascript
-
-Cancel Action Plan
-==================
-
-.. rest_method::  PATCH /v1/action_plans/{actionplan_ident}
-
-Cancels a created Action Plan resource.
-
-.. note:
-    If Action Plan is in ONGOING state, then ``state`` attribute should be
-    replaced with ``CANCELLING`` value. Otherwise, ``CANCELLED`` is to be
-    used.
-
-Normal response codes: 200
-
-Error codes: 400,404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - actionplan_ident: actionplan_ident
-
-**Example Action Plan ONGOING cancelling request:**
-
-.. literalinclude:: samples/actionplan-cancel-request-cancelling.json
-   :language: javascript
-
-**Example Action Plan PENDING cancelling request:**
-
-.. literalinclude:: samples/actionplan-cancel-request-pending.json
-   :language: javascript
-
-Response
--------
-
-The list and example below are representative of the response as of API
-version 1:
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - state: actionplan_state
-    - audit_uuid: actionplan_audit_uuid
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - efficacy_indicators: actionplan_efficacy_indicators
-    - global_efficacy: actionplan_global_efficacy
-    - links: links
-
-**Example JSON representation of an Action Plan:**
-
-.. literalinclude:: samples/actionplan-start-response.json
-   :language: javascript
-
-Delete Action Plan
-==================
-
-.. rest_method::  DELETE /v1/action_plans/{actionplan_ident}
-
-Deletes an Action Plan. Action Plan can be deleted only from SUCCEEDED, RECOMMENDED, FAILED, SUPERSEDED, CANCELLED states.
-
-Normal response codes: 204
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - actionplan_ident: actionplan_ident
--- a/api-ref/source/watcher-api-v1-actions.inc
+++ b/api-ref/source/watcher-api-v1-actions.inc
@@ -1,155 +0,0 @@
-.. -*- rst -*-
-
-=======
-Actions
-=======
-
-An ``Action`` is what enables Watcher to transform the current state of a
-``Cluster`` after an ``Audit``.
-
-An ``Action`` is an atomic task which changes the current state of a target
-Managed resource of the OpenStack ``Cluster`` such as:
-
-  Live migration of an instance from one compute node to another compute
-   node with Nova
-  Changing the power level of a compute node (ACPI level, ...)
-  Changing the current state of a compute node (enable or disable) with Nova
-
-In most cases, an ``Action`` triggers some concrete commands on an existing
-OpenStack module (Nova, Neutron, Cinder, Ironic, etc.).
-
-An ``Action`` has a life-cycle and its current state may be one of the
-following:
-
-  **PENDING** : the ``Action`` has not been executed yet by the
-   ``Watcher Applier``.
-  **ONGOING** : the ``Action`` is currently being processed by the
-   ``Watcher Applier``.
-  **SUCCEEDED** : the ``Action`` has been executed successfully
-  **FAILED** : an error occurred while trying to execute the ``Action``.
-  **DELETED** : the ``Action`` is still stored in the ``Watcher database``
-   but is not returned any more through the Watcher APIs.
-  **CANCELLED** : the ``Action`` was in **PENDING** or **ONGOING** state and
-   was cancelled by the ``Administrator``
-
-``Actions`` are created by ``Watcher Planner`` as result of Audit's execution.
-``Action`` can't be created, modified or deleted by user.
-
-List Action
-===========
-
-.. rest_method::  GET /v1/actions
-
-Returns a list of Action resources.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - action_plan_uuid: r_action_plan
-   - audit_uuid: r_audit
-   - limit: limit
-   - marker: marker
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - action_type: action_type
-    - state: action_state
-    - action_plan_uuid: action_action_plan_uuid
-    - parents: action_parents
-    - links: links
-
-**Example JSON representation of an Action:**
-
-.. literalinclude:: samples/actions-list-response.json
-   :language: javascript
-
-List Action Detailed
-====================
-
-.. rest_method::  GET /v1/actions/detail
-
-Returns a list of Action resources with complete details.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - action_plan_uuid: r_action_plan
-   - audit_uuid: r_audit
-   - limit: limit
-   - marker: marker
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - action_type: action_type
-    - state: action_state
-    - action_plan_uuid: action_action_plan_uuid
-    - parents: action_parents
-    - description: action_description
-    - input_parameters: action_input_parameters
-    - links: links
-
-**Example JSON representation of an Action:**
-
-.. literalinclude:: samples/actions-list-detailed-response.json
-   :language: javascript
-
-Show Action
-===========
-
-.. rest_method::  GET /v1/actions/{action_ident}
-
-Shows details for an Action.
-
-Normal response codes: 200
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - action_ident: action_ident
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - action_type: action_type
-    - state: action_state
-    - action_plan_uuid: action_action_plan_uuid
-    - parents: action_parents
-    - description: action_description
-    - input_parameters: action_input_parameters
-    - links: links
-
-**Example JSON representation of an Action:**
-
-.. literalinclude:: samples/actions-show-response.json
-   :language: javascript
--- a/api-ref/source/watcher-api-v1-audits.inc
+++ b/api-ref/source/watcher-api-v1-audits.inc
@@ -1,349 +0,0 @@
-.. -*- rst -*-
-
-======
-Audits
-======
-
-There are creating, listing, updating and deleting methods of Watcher Audit
-resources which are implemented via the ``/v1/audits`` resource.
-
-In the Watcher system, an ``Audit`` is a request for optimizing a ``Cluster``.
-
-The optimization is done in order to satisfy one ``Goal`` on a given
-``Cluster``.
-
-For each ``Audit``, the Watcher system generates an ``Action Plan``.
-
-Create Audit
-============
-
-.. rest_method::  POST /v1/audits
-
-Creates a new Audit resource.
-
-Mandatory attribute to be supplied: ``audit_type``.
-
-``Audit`` can be created either based on existed ``Audit Template`` or by
-itself. In the first case, there also should be supplied
-``audit_template_uuid``. If ``Audit`` is created without ``Audit Template``,
-``goal`` should be provided.
-
-.. warning::
-    **Only ``audit_template_uuid`` can be used to create audit so far.**
-    It should be fixed during the ``Rocky`` cycle.
-
-Normal response codes: 201
-
-Error codes: 400,404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - audit_template_uuid: audittemplate_name
-   - audit_type: audit_type
-   - name: audit_name
-   - goal: audit_goal
-   - strategy: audit_strategy
-   - parameters: audit_parameters
-   - interval: audit_interval
-   - scope: audittemplate_scope
-   - auto_trigger: audit_autotrigger
-
-**Example ONESHOT Audit creation request:**
-
-.. literalinclude:: samples/audit-create-request-oneshot.json
-   :language: javascript
-
-**Example CONTINUOUS Audit creation request with a specified strategy:**
-
-.. literalinclude:: samples/audit-create-request-continuous.json
-   :language: javascript
-
-Response
--------
-
-The list and example below are representative of the response as of API
-version 1:
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audit_name
-    - audit_type: audit_type
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - interval: audit_interval
-    - next_run_time: audit_next_run_time
-    - parameters: audit_parameters
-    - auto_trigger: audit_autotrigger
-    - state: audit_state
-    - scope: audittemplate_scope
-    - links: links
-
-**Example JSON representation of an Audit:**
-
-.. literalinclude:: samples/audit-create-response.json
-   :language: javascript
-
-List Audit
-==========
-
-.. rest_method::  GET /v1/audits
-
-Returns a list of Audit resources.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - goal: r_goal
-   - strategy: r_strategy
-   - limit: limit
-   - marker: marker
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audit_name
-    - audit_type: audit_type
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - interval: audit_interval
-    - next_run_time: audit_next_run_time
-    - auto_trigger: audit_autotrigger
-    - state: audit_state
-    - scope: audittemplate_scope
-    - links: links
-
-**Example JSON representation of an Audit:**
-
-.. literalinclude:: samples/audit-list-response.json
-   :language: javascript
-
-List Audit Detailed
-===================
-
-.. rest_method::  GET /v1/audits/detail
-
-Returns a list of Audit resources with complete details.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - goal: r_goal
-   - strategy: r_strategy
-   - limit: limit
-   - marker: marker
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audit_name
-    - audit_type: audit_type
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - interval: audit_interval
-    - next_run_time: audit_next_run_time
-    - parameters: audit_parameters
-    - auto_trigger: audit_autotrigger
-    - state: audit_state
-    - scope: audittemplate_scope
-    - links: links
-
-**Example JSON representation of an Audit:**
-
-.. literalinclude:: samples/audit-list-detailed-response.json
-   :language: javascript
-
-Show Audit
-==========
-
-.. rest_method::  GET /v1/audits/{audit_ident}
-
-Shows details for an Audit.
-
-Normal response codes: 200
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - audit_ident: audit_ident
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audit_name
-    - audit_type: audit_type
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - interval: audit_interval
-    - next_run_time: audit_next_run_time
-    - parameters: audit_parameters
-    - auto_trigger: audit_autotrigger
-    - state: audit_state
-    - scope: audittemplate_scope
-    - links: links
-
-**Example JSON representation of an Audit:**
-
-.. literalinclude:: samples/audit-show-response.json
-   :language: javascript
-
-Cancel Audit
-============
-
-.. rest_method::  PATCH /v1/audits/{audit_ident}
-
-Cancels an ONGOING Audit resource.
-
-Normal response codes: 200
-
-Error codes: 400,404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - audit_ident: audit_ident
-
-**Example Audit cancelling request:**
-
-.. literalinclude:: samples/audit-cancel-request.json
-   :language: javascript
-
-Response
--------
-
-The list and example below are representative of the response as of API
-version 1:
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audit_name
-    - audit_type: audit_type
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - interval: audit_interval
-    - next_run_time: audit_next_run_time
-    - parameters: audit_parameters
-    - auto_trigger: audit_autotrigger
-    - state: audit_state
-    - scope: audittemplate_scope
-    - links: links
-
-**Example JSON representation of an Audit:**
-
-.. literalinclude:: samples/audit-cancel-response.json
-   :language: javascript
-
-Update Audit
-============
-
-.. rest_method::  PATCH /v1/audits/{audit_ident}
-
-Updates an Audit with the given information.
-
-.. note:
-    ``audit_type`` shouldn't be changed by PATCH method.
-
-Normal response codes: 200
-
-Error codes: 400,404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - audit_ident: audit_ident
-
-**Example PATCH document updating Audit:**
-
-.. literalinclude:: samples/audit-update-request.json
-   :language: javascript
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audit_name
-    - audit_type: audit_type
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - interval: audit_interval
-    - next_run_time: audit_next_run_time
-    - parameters: audit_parameters
-    - auto_trigger: audit_autotrigger
-    - state: audit_state
-    - scope: audittemplate_scope
-    - links: links
-
-**Example JSON representation of an Audit:**
-
-.. literalinclude:: samples/audit-update-response.json
-   :language: javascript
-
-Delete Audit
-============
-
-.. rest_method::  DELETE /v1/audits/{audit_ident}
-
-Deletes an Audit. Audit can be deleted only from FAILED, SUCCEEDED, CANCELLED,
-SUSPENDED states.
-
-Normal response codes: 204
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - audit_ident: audit_ident
--- a/api-ref/source/watcher-api-v1-audittemplates.inc
+++ b/api-ref/source/watcher-api-v1-audittemplates.inc
@@ -1,257 +0,0 @@
-.. -*- rst -*-
-
-===============
-Audit Templates
-===============
-
-There are creating, listing, updating and deleting methods of Watcher Audit
-Template resources which are implemented via the ``/v1/audit_templates``
-resource.
-
-An Audit may be launched several times with the same settings
-(Goal, thresholds, ...). Therefore it makes sense to save those settings in
-some sort of Audit preset object, which is known as an Audit Template.
-
-An Audit Template contains at least the Goal of the Audit.
-
-Create Audit Template
-=====================
-
-.. rest_method::  POST /v1/audit_templates
-
-Creates a new Audit Template resource.
-
-It requires ``name`` and ``goal`` attributes to be supplied in the request
-body.
-
-Normal response codes: 201
-
-Error codes: 400,404,409
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - name: audittemplate_name
-   - goal: audittemplate_goal
-   - strategy: audittemplate_strategy
-   - description: audittemplate_description
-   - scope: audittemplate_scope
-
-**Example Audit Template creation request without a specified strategy:**
-
-.. literalinclude:: samples/audittemplate-create-request-minimal.json
-   :language: javascript
-
-**Example Audit Template creation request with a specified strategy:**
-
-.. literalinclude:: samples/audittemplate-create-request-full.json
-   :language: javascript
-
-Response
--------
-
-The list and example below are representative of the response as of API
-version 1:
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audittemplate_name
-    - description: audittemplate_description
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - scope: audittemplate_scope
-    - links: links
-
-**Example JSON representation of an Audit Template:**
-
-.. literalinclude:: samples/audittemplate-create-response.json
-   :language: javascript
-
-List Audit Template
-===================
-
-.. rest_method::  GET /v1/audit_templates
-
-Returns a list of Audit Template resources.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - goal: r_goal
-   - strategy: r_strategy
-   - limit: limit
-   - marker: marker
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audittemplate_name
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - scope: audittemplate_scope
-    - links: links
-
-**Example JSON representation of an Audit Template:**
-
-.. literalinclude:: samples/audittemplate-list-response.json
-   :language: javascript
-
-List Audit Template Detailed
-============================
-
-.. rest_method::  GET /v1/audit_templates/detail
-
-Returns a list of Audit Template resources with complete details.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - goal: r_goal
-   - strategy: r_strategy
-   - limit: limit
-   - marker: marker
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audittemplate_name
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - scope: audittemplate_scope
-    - links: links
-    - description: audittemplate_description
-
-**Example JSON representation of an Audit Template:**
-
-.. literalinclude:: samples/audittemplate-list-detailed-response.json
-   :language: javascript
-
-Show Audit Template
-===================
-
-.. rest_method::  GET /v1/audit_templates/{audittemplate_ident}
-
-Shows details for an Audit Template.
-
-Normal response codes: 200
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - audittemplate_ident: audittemplate_ident
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audittemplate_name
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - scope: audittemplate_scope
-    - links: links
-    - description: audittemplate_description
-
-**Example JSON representation of an Audit Template:**
-
-.. literalinclude:: samples/audittemplate-show-response.json
-   :language: javascript
-
-Update Audit Template
-=====================
-
-.. rest_method::  PATCH /v1/audit_templates/{audittemplate_ident}
-
-Updates an Audit Template with the given information.
-
-Normal response codes: 200
-
-Error codes: 400,404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - audittemplate_ident: audittemplate_ident
-
-**Example PATCH document updating Audit Template:**
-
-.. literalinclude:: samples/audittemplate-update-request.json
-   :language: javascript
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: audittemplate_name
-    - strategy_uuid: strategy_uuid
-    - strategy_name: strategy_name
-    - goal_uuid: goal_uuid
-    - goal_name: goal_name
-    - scope: audittemplate_scope
-    - links: links
-    - description: audittemplate_description
-
-**Example JSON representation of an Audit Template:**
-
-.. literalinclude:: samples/audittemplate-update-response.json
-   :language: javascript
-
-Delete Audit Template
-=====================
-
-.. rest_method::  DELETE /v1/audit_templates/{audittemplate_ident}
-
-Deletes an Audit Template.
-
-Normal response codes: 204
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - audittemplate_ident: audittemplate_ident
--- a/api-ref/source/watcher-api-v1-goals.inc
+++ b/api-ref/source/watcher-api-v1-goals.inc
@@ -1,126 +0,0 @@
-.. -*- rst -*-
-
-=====
-Goals
-=====
-
-A ``Goal`` is a human readable, observable and measurable end result having
-one objective to be achieved.
-
-Here are some examples of ``Goals``:
-
-  minimize the energy consumption
-  minimize the number of compute nodes (consolidation)
-  balance the workload among compute nodes
-  minimize the license cost (some softwares have a licensing model which is
-   based on the number of sockets or cores where the software is deployed)
-  find the most appropriate moment for a planned maintenance on a
-   given group of host (which may be an entire availability zone):
-   power supply replacement, cooling system replacement, hardware
-   modification, ...
-
-List Goal
-=========
-
-.. rest_method::  GET /v1/goals
-
-Returns a list of Goal resources.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - limit: limit
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - efficacy_specification: goal_efficacy_specification
-    - name: goal_name
-    - display_name: goal_display_name
-    - links: links
-
-**Example JSON representation of a Goal:**
-
-.. literalinclude:: samples/goal-list-response.json
-   :language: javascript
-
-List Goal Detailed
-==================
-
-.. rest_method::  GET /v1/goals/detail
-
-Returns a list of Goal resources with complete details.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - limit: limit
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - efficacy_specification: goal_efficacy_specification
-    - name: goal_name
-    - display_name: goal_display_name
-    - links: links
-
-**Example JSON representation of a Goal:**
-
-.. literalinclude:: samples/goal-list-response.json
-   :language: javascript
-
-Show Goal
-=========
-
-.. rest_method::  GET /v1/goals/{goal_ident}
-
-Shows details for an Goal.
-
-Normal response codes: 200
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - goal_ident: goal_ident
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - efficacy_specification: goal_efficacy_specification
-    - name: goal_name
-    - display_name: goal_display_name
-    - links: links
-
-**Example JSON representation of a Goal:**
-
-.. literalinclude:: samples/goal-show-response.json
-   :language: javascript
--- a/api-ref/source/watcher-api-v1-scoring_engines.inc
+++ b/api-ref/source/watcher-api-v1-scoring_engines.inc
@@ -1,120 +0,0 @@
-.. -*- rst -*-
-
-===============
-Scoring Engines
-===============
-
-A ``Scoring Engine`` is an executable that has a well-defined input, a
-well-defined output, and performs a purely mathematical task. That is,
-the calculation does not depend on the environment in which it is running - it
-would produce the same result anywhere.
-
-Because there might be multiple algorithms used to build a particular data
-model (and therefore a scoring engine), the usage of scoring engine might
-vary. A metainfo field is supposed to contain any information which might
-be needed by the user of a given scoring engine.
-
-List Scoring Engine
-===================
-
-.. rest_method::  GET /v1/scoring_engines
-
-Returns a list of Scoring Engine resources.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - limit: limit
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: scoring_engine_name
-    - description: scoring_engine_description
-    - links: links
-
-**Example JSON representation of a Scoring Engine:**
-
-.. literalinclude:: samples/scoring_engine-list-response.json
-   :language: javascript
-
-List Scoring Engine Detailed
-============================
-
-.. rest_method::  GET /v1/scoring_engines/detail
-
-Returns a list of Scoring Engine resources with complete details.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - limit: limit
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: scoring_engine_name
-    - description: scoring_engine_description
-    - metainfo: scoring_engine_metainfo
-    - links: links
-
-**Example JSON representation of a Scoring Engine:**
-
-.. literalinclude:: samples/scoring_engine-list-detailed-response.json
-   :language: javascript
-
-Show Scoring Engine
-===================
-
-.. rest_method::  GET /v1/scoring_engines/{scoring_engine_ident}
-
-Shows details for a Scoring Engine resource.
-
-Normal response codes: 200
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - scoring_engine_ident: scoring_engine_ident
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: scoring_engine_name
-    - description: scoring_engine_description
-    - metainfo: scoring_engine_metainfo
-    - links: links
-
-**Example JSON representation of a Scoring Engine:**
-
-.. literalinclude:: samples/scoring_engine-show-response.json
-   :language: javascript
--- a/api-ref/source/watcher-api-v1-services.inc
+++ b/api-ref/source/watcher-api-v1-services.inc
@@ -1,116 +0,0 @@
-.. -*- rst -*-
-
-========
-Services
-========
-
-This resource represents Watcher services, their states and hosts they are
-placed on.
-
-List Service
-============
-
-.. rest_method::  GET /v1/services
-
-Returns a list of Service resources.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - limit: limit
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - id: service_id
-    - name: service_name
-    - host: service_host
-    - status: service_status
-    - links: links
-
-**Example JSON representation of a Service:**
-
-.. literalinclude:: samples/service-list-response.json
-   :language: javascript
-
-List Service Detailed
-=====================
-
-.. rest_method::  GET /v1/services/detail
-
-Returns a list of Service resources with complete details.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - limit: limit
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - id: service_id
-    - name: service_name
-    - host: service_host
-    - status: service_status
-    - last_seen_up: service_last_seen_up
-    - links: links
-
-**Example JSON representation of a Service:**
-
-.. literalinclude:: samples/service-list-detailed-response.json
-   :language: javascript
-
-Show Service
-============
-
-.. rest_method::  GET /v1/services/{service_ident}
-
-Shows details for a Service resource.
-
-Normal response codes: 200
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - service_ident: service_ident
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - id: service_id
-    - name: service_name
-    - host: service_host
-    - status: service_status
-    - last_seen_up: service_last_seen_up
-    - links: links
-
-**Example JSON representation of a Service:**
-
-.. literalinclude:: samples/service-show-response.json
-   :language: javascript
--- a/api-ref/source/watcher-api-v1-strategies.inc
+++ b/api-ref/source/watcher-api-v1-strategies.inc
@@ -1,164 +0,0 @@
-.. -*- rst -*-
-
-==========
-Strategies
-==========
-
-A ``Strategy`` is an algorithm implementation which is able to find a
-``Solution`` for a given ``Goal``. To get more information about strategies
-that are shipped along with Watcher, visit `strategies page`_.
-
-There may be several potential strategies which are able to achieve the same
-``Goal``. This is why it is possible to configure which specific ``Strategy``
-should be used for each goal.
-
-Some strategies may provide better optimization results but may take more time
-to find an optimal ``Solution``.
-
-.. _`strategies page`: https://docs.openstack.org/watcher/latest/strategies/index.html
-
-List Strategy
-=============
-
-.. rest_method::  GET /v1/strategies
-
-Returns a list of Strategy resources.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - goal: r_goal
-   - limit: limit
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: strategy_name
-    - display_name: strategy_display_name
-    - goal_name: goal_name
-    - goal_uuid: goal_uuid
-    - links: links
-
-**Example JSON representation of a Strategy:**
-
-.. literalinclude:: samples/strategy-list-response.json
-   :language: javascript
-
-List Strategy Detailed
-======================
-
-.. rest_method::  GET /v1/strategies/detail
-
-Returns a list of Strategy resources with complete details.
-
-Normal response codes: 200
-
-Error codes: 400,401
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - goal: r_goal
-   - limit: limit
-   - sort_dir: sort_dir
-   - sort_key: sort_key
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: strategy_name
-    - display_name: strategy_display_name
-    - parameters_spec: strategy_parameters_spec
-    - goal_name: goal_name
-    - goal_uuid: goal_uuid
-    - links: links
-
-**Example JSON representation of a Strategy:**
-
-.. literalinclude:: samples/strategy-list-detailed-response.json
-   :language: javascript
-
-Show Strategy
-=============
-
-.. rest_method::  GET /v1/strategies/{strategy_ident}
-
-Shows details for a Strategy resource.
-
-Normal response codes: 200
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - strategy_ident: strategy_ident
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - uuid: uuid
-    - name: strategy_name
-    - display_name: strategy_display_name
-    - parameters_spec: strategy_parameters_spec
-    - goal_name: goal_name
-    - goal_uuid: goal_uuid
-    - links: links
-
-**Example JSON representation of a Strategy:**
-
-.. literalinclude:: samples/strategy-show-response.json
-   :language: javascript
-
-Show Strategy State
-===================
-
-.. rest_method::  GET /v1/strategies/{strategy_ident}/state
-
-Retrieve an information about strategy requirements.
-
-Normal response codes: 200
-
-Error codes: 404
-
-Request
-------
-
-.. rest_parameters:: parameters.yaml
-
-   - strategy_ident: strategy_ident
-
-Response
--------
-
-.. rest_parameters:: parameters.yaml
-
-    - state: strategy_check_state
-    - comment: strategy_check_comment
-    - mandatory: strategy_check_mandatory
-    - type: strategy_check_type
-
-**Example JSON representation of a Strategy:**
-
-.. literalinclude:: samples/strategy-state-response.json
-   :language: javascript
--- a/devstack/files/apache-watcher-api.template
+++ b/devstack/files/apache-watcher-api.template
@@ -1,42 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# This is an example Apache2 configuration file for using the
-# Watcher API through mod_wsgi.  This version assumes you are
-# running devstack to configure the software.
-
-Listen %WATCHER_SERVICE_PORT%
-
-<VirtualHost *:%WATCHER_SERVICE_PORT%>
-    WSGIDaemonProcess watcher-api user=%USER% processes=%APIWORKERS% threads=1 display-name=%{GROUP}
-    WSGIScriptAlias / %WATCHER_WSGI_DIR%/app.wsgi
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIProcessGroup watcher-api
-    WSGIPassAuthorization On
-
-    ErrorLogFormat "%M"
-    ErrorLog /var/log/%APACHE_NAME%/watcher-api.log
-    CustomLog /var/log/%APACHE_NAME%/watcher-api-access.log combined
-
-
-    <Directory %WATCHER_WSGI_DIR%>
-        WSGIProcessGroup watcher-api
-        WSGIApplicationGroup %{GLOBAL}
-        <IfVersion >= 2.4>
-            Require all granted
-        </IfVersion>
-        <IfVersion < 2.4>
-            Order allow,deny
-            Allow from all
-        </IfVersion>
-    </Directory>
-</VirtualHost>
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -42,10 +42,7 @@ WATCHER_AUTH_CACHE_DIR=${WATCHER_AUTH_CACHE_DIR:-/var/cache/watcher}

 WATCHER_CONF_DIR=/etc/watcher
 WATCHER_CONF=$WATCHER_CONF_DIR/watcher.conf
-WATCHER_POLICY_YAML=$WATCHER_CONF_DIR/policy.yaml.sample
-
-WATCHER_DEVSTACK_DIR=$WATCHER_DIR/devstack
-WATCHER_DEVSTACK_FILES_DIR=$WATCHER_DEVSTACK_DIR/files
+WATCHER_POLICY_JSON=$WATCHER_CONF_DIR/policy.json

 NOVA_CONF_DIR=/etc/nova
 NOVA_CONF=$NOVA_CONF_DIR/nova.conf
@@ -54,13 +51,6 @@ if is_ssl_enabled_service "watcher" || is_service_enabled tls-proxy; then
    WATCHER_SERVICE_PROTOCOL="https"
 fi

-WATCHER_USE_MOD_WSGI=$(trueorfalse True WATCHER_USE_MOD_WSGI)
-
-if is_suse; then
-    WATCHER_WSGI_DIR=${WATCHER_WSGI_DIR:-/srv/www/htdocs/watcher}
-else
-    WATCHER_WSGI_DIR=${WATCHER_WSGI_DIR:-/var/www/watcher}
-fi
 # Public facing bits
 WATCHER_SERVICE_HOST=${WATCHER_SERVICE_HOST:-$HOST_IP}
 WATCHER_SERVICE_PORT=${WATCHER_SERVICE_PORT:-9322}
@@ -84,21 +74,10 @@ function is_watcher_enabled {
    return 1
 }

-#_cleanup_watcher_apache_wsgi - Remove wsgi files,
-#disable and remove apache vhost file
-function _cleanup_watcher_apache_wsgi {
-    sudo rm -rf $WATCHER_WSGI_DIR
-    sudo rm -f $(apache_site_config_for watcher-api)
-    restart_apache_server
-}
-
 # cleanup_watcher() - Remove residual data files, anything left over from previous
 # runs that a clean run would need to clean up
 function cleanup_watcher {
    sudo rm -rf $WATCHER_STATE_PATH $WATCHER_AUTH_CACHE_DIR
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        _cleanup_watcher_apache_wsgi
-    fi
 }

 # configure_watcher() - Set config files, create data dirs, etc
@@ -106,25 +85,7 @@ function configure_watcher {
    # Put config files in ``/etc/watcher`` for everyone to find
    sudo install -d -o $STACK_USER $WATCHER_CONF_DIR

-    local project=watcher
-    local project_uc
-    project_uc=$(echo watcher|tr a-z A-Z)
-    local conf_dir="${project_uc}_CONF_DIR"
-    # eval conf dir to get the variable
-    conf_dir="${!conf_dir}"
-    local project_dir="${project_uc}_DIR"
-    # eval project dir to get the variable
-    project_dir="${!project_dir}"
-    local sample_conf_dir="${project_dir}/etc/${project}"
-    local sample_policy_dir="${project_dir}/etc/${project}/policy.d"
-    local sample_policy_generator="${project_dir}/etc/${project}/oslo-policy-generator/watcher-policy-generator.conf"
-
-    # first generate policy.yaml
-    oslopolicy-sample-generator --config-file $sample_policy_generator
-    # then optionally copy over policy.d
-    if [[ -d $sample_policy_dir ]]; then
-        cp -r $sample_policy_dir $conf_dir/policy.d
-    fi
+    install_default_policy watcher

    # Rebuild the config file from scratch
    create_watcher_conf
@@ -147,28 +108,6 @@ function create_watcher_accounts {
        "$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST:$WATCHER_SERVICE_PORT"
 }

-# _config_watcher_apache_wsgi() - Set WSGI config files of watcher
-function _config_watcher_apache_wsgi {
-    local watcher_apache_conf
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        sudo mkdir -p $WATCHER_WSGI_DIR
-        sudo cp $WATCHER_DIR/watcher/api/app.wsgi $WATCHER_WSGI_DIR/app.wsgi
-        watcher_apache_conf=$(apache_site_config_for watcher-api)
-        sudo cp $WATCHER_DEVSTACK_FILES_DIR/apache-watcher-api.template $watcher_apache_conf
-        sudo sed -e "
-            s|%WATCHER_SERVICE_PORT%|$WATCHER_SERVICE_PORT|g;
-            s|%WATCHER_WSGI_DIR%|$WATCHER_WSGI_DIR|g;
-            s|%USER%|$STACK_USER|g;
-            s|%APIWORKERS%|$API_WORKERS|g;
-            s|%APACHE_NAME%|$APACHE_NAME|g;
-        " -i $watcher_apache_conf
-        enable_apache_site watcher-api
-        tail_log watcher-access /var/log/$APACHE_NAME/watcher-api-access.log
-        tail_log watcher-api /var/log/$APACHE_NAME/watcher-api.log
-   fi
-
-}
-
 # create_watcher_conf() - Create a new watcher.conf file
 function create_watcher_conf {
    # (Re)create ``watcher.conf``
@@ -177,21 +116,17 @@ function create_watcher_conf {
    iniset $WATCHER_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL"
    iniset $WATCHER_CONF DEFAULT control_exchange watcher

-    iniset_rpc_backend watcher $WATCHER_CONF
-
    iniset $WATCHER_CONF database connection $(database_connection_url watcher)
    iniset $WATCHER_CONF api host "$WATCHER_SERVICE_HOST"
+    iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT"

-    if is_service_enabled tls-proxy; then
-        iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT_INT"
-        # iniset $WATCHER_CONF api enable_ssl_api "True"
-    else
-        iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT"
-    fi
+    iniset $WATCHER_CONF oslo_policy policy_file $WATCHER_POLICY_JSON

-    iniset $WATCHER_CONF oslo_policy policy_file $WATCHER_POLICY_YAML
+    iniset $WATCHER_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
+    iniset $WATCHER_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
+    iniset $WATCHER_CONF oslo_messaging_rabbit rabbit_host $RABBIT_HOST

-    iniset $WATCHER_CONF oslo_messaging_notifications driver "messagingv2"
+    iniset $WATCHER_CONF oslo_messaging_notifications driver "messaging"

    iniset $NOVA_CONF oslo_messaging_notifications topics "notifications,watcher_notifications"
    iniset $NOVA_CONF notifications notify_on_state_change "vm_and_task_state"
@@ -219,13 +154,9 @@ function create_watcher_conf {
        setup_colorized_logging $WATCHER_CONF DEFAULT
    else
        # Show user_name and project_name instead of user_id and project_id
-        iniset $WATCHER_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(levelname)s %(name)s [%(request_id)s %(project_domain)s %(user_name)s %(project_name)s] %(instance)s%(message)s"
+        iniset $WATCHER_CONF DEFAULT logging_context_format_string "%(asctime)s.%(msecs)03d %(levelname)s %(name)s [%(request_id)s %(user_name)s %(project_name)s] %(instance)s%(message)s"
    fi

-    #config apache files
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        _config_watcher_apache_wsgi
-    fi
    # Register SSL certificates if provided
    if is_ssl_enabled_service watcher; then
        ensure_certificates WATCHER
@@ -257,7 +188,7 @@ function init_watcher {
        recreate_database watcher

        # Create watcher schema
-        $WATCHER_BIN_DIR/watcher-db-manage --config-file $WATCHER_CONF upgrade
+        $WATCHER_BIN_DIR/watcher-db-manage --config-file $WATCHER_CONF upgrade head
    fi
    create_watcher_cache_dir
 }
@@ -274,26 +205,19 @@ function install_watcherclient {
 function install_watcher {
    git_clone $WATCHER_REPO $WATCHER_DIR $WATCHER_BRANCH
    setup_develop $WATCHER_DIR
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        install_apache_wsgi
-    fi
 }

 # start_watcher_api() - Start the API process ahead of other things
 function start_watcher_api {
    # Get right service port for testing
-
    local service_port=$WATCHER_SERVICE_PORT
    local service_protocol=$WATCHER_SERVICE_PROTOCOL
    if is_service_enabled tls-proxy; then
        service_port=$WATCHER_SERVICE_PORT_INT
        service_protocol="http"
    fi
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        restart_apache_server
-    else
-        run_process watcher-api "$WATCHER_BIN_DIR/watcher-api --config-file $WATCHER_CONF"
-    fi
+
+    run_process watcher-api "$WATCHER_BIN_DIR/watcher-api --config-file $WATCHER_CONF"
    echo "Waiting for watcher-api to start..."
    if ! wait_for_service $SERVICE_TIMEOUT $service_protocol://$WATCHER_SERVICE_HOST:$service_port; then
        die $LINENO "watcher-api did not start"
@@ -301,7 +225,8 @@ function start_watcher_api {

    # Start proxies if enabled
    if is_service_enabled tls-proxy; then
-        start_tls_proxy watcher '*' $WATCHER_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT
+        start_tls_proxy '*' $WATCHER_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT &
+        start_tls_proxy '*' $EC2_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT &
    fi
 }

@@ -315,12 +240,7 @@ function start_watcher {

 # stop_watcher() - Stop running processes (non-screen)
 function stop_watcher {
-    if [[ "$WATCHER_USE_MOD_WSGI" == "True" ]]; then
-        disable_apache_site watcher-api
-    else
-        stop_process watcher-api
-    fi
-    for serv in watcher-decision-engine watcher-applier; do
+    for serv in watcher-api watcher-decision-engine watcher-applier; do
        stop_process $serv
    done
 }
--- a/devstack/local.conf.compute
+++ b/devstack/local.conf.compute
@@ -25,7 +25,7 @@ GLANCE_HOSTPORT=${SERVICE_HOST}:9292
 DATABASE_TYPE=mysql

 # Enable services (including neutron)
-ENABLED_SERVICES=n-cpu,n-api-meta,c-vol,q-agt,placement-client
+ENABLED_SERVICES=n-cpu,n-api-meta,c-vol,q-agt

 NOVA_VNC_ENABLED=True
 NOVNCPROXY_URL="http://$SERVICE_HOST:6080/vnc_auto.html"
--- a/devstack/local.conf.controller
+++ b/devstack/local.conf.controller
@@ -17,15 +17,18 @@ NETWORK_GATEWAY=10.254.1.1 # Change this for your network

 MULTI_HOST=1

-
-#Set this to FALSE if do not want to run watcher-api behind mod-wsgi
-#WATCHER_USE_MOD_WSGI=TRUE
-
 # This is the controller node, so disable nova-compute
 disable_service n-cpu

+# Disable nova-network and use neutron instead
+disable_service n-net
+ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-agt,q-l3,neutron
+
+# Enable remote console access
+enable_service n-cauth
+
 # Enable the Watcher Dashboard plugin
-enable_plugin watcher-dashboard git://git.openstack.org/openstack/watcher-dashboard
+# enable_plugin watcher-dashboard git://git.openstack.org/openstack/watcher-dashboard

 # Enable the Watcher plugin
 enable_plugin watcher git://git.openstack.org/openstack/watcher
@@ -36,12 +39,6 @@ enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
 # This is the controller node, so disable the ceilometer compute agent
 disable_service ceilometer-acompute

-# Enable the ceilometer api explicitly(bug:1667678)
-enable_service ceilometer-api
-
-# Enable the Gnocchi plugin
-enable_plugin gnocchi https://github.com/gnocchixyz/gnocchi
-
 LOGFILE=$DEST/logs/stack.sh.log
 LOGDAYS=2

--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -7,7 +7,7 @@ _XTRACE_WATCHER_PLUGIN=$(set +o | grep xtrace)
 set -o xtrace

 echo_summary "watcher's plugin.sh was called..."
-. $DEST/watcher/devstack/lib/watcher
+source $DEST/watcher/devstack/lib/watcher

 # Show all of defined environment variables
 (set -o posix; set)
--- a/devstack/settings
+++ b/devstack/settings
@@ -3,9 +3,6 @@
 # Make sure rabbit is enabled
 enable_service rabbit

-# Make sure mysql is enabled
-enable_service mysql
-
 # Enable Watcher services
 enable_service watcher-api
 enable_service watcher-decision-engine
--- a/doc/ext/term.py
+++ b/doc/ext/term.py
@@ -22,7 +22,7 @@ from docutils import nodes
 from docutils.parsers import rst
 from docutils import statemachine

-from watcher.version import version_string
+from watcher.version import version_info


 class BaseWatcherDirective(rst.Directive):
@@ -169,4 +169,4 @@ class WatcherFunc(BaseWatcherDirective):
 def setup(app):
    app.add_directive('watcher-term', WatcherTerm)
    app.add_directive('watcher-func', WatcherFunc)
-    return {'version': version_string}
+    return {'version': version_info.version_string()}
--- a/doc/ext/versioned_notifications.py
+++ b/doc/ext/versioned_notifications.py
@@ -20,7 +20,7 @@ It is used via a single directive in the .rst file

 """

-from docutils.parsers.rst import Directive
+from sphinx.util.compat import Directive
 from docutils import nodes

 from watcher.notifications import base as notification
--- a/doc/notification_samples/action-cancel-end.json
+++ b/doc/notification_samples/action-cancel-end.json
@@ -1,41 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionCancelPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": null,
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "CANCELLED",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "CANCELLING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.cancel.end",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-cancel-error.json
+++ b/doc/notification_samples/action-cancel-error.json
@@ -1,51 +0,0 @@
-{
-  "priority": "ERROR",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionCancelPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "ExceptionPayload",
-        "watcher_object.data": {
-          "module_name": "watcher.tests.notifications.test_action_notification",
-          "exception": "WatcherException",
-          "exception_message": "TEST",
-          "function_name": "test_send_action_cancel_with_error"
-        }
-      },
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "FAILED",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "CANCELLING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.cancel.error",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-cancel-start.json
+++ b/doc/notification_samples/action-cancel-start.json
@@ -1,41 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionCancelPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": null,
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "CANCELLING",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "CANCELLING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.cancel.start",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-create.json
+++ b/doc/notification_samples/action-create.json
@@ -1,40 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionCreatePayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "PENDING",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "event_type": "action.create",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-delete.json
+++ b/doc/notification_samples/action-delete.json
@@ -1,40 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionDeletePayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "DELETED",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "event_type": "action.delete",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-execution-end.json
+++ b/doc/notification_samples/action-execution-end.json
@@ -1,41 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionExecutionPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": null,
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "SUCCEEDED",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.execution.end",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-execution-error.json
+++ b/doc/notification_samples/action-execution-error.json
@@ -1,51 +0,0 @@
-{
-  "priority": "ERROR",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionExecutionPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "ExceptionPayload",
-        "watcher_object.data": {
-          "module_name": "watcher.tests.notifications.test_action_notification",
-          "exception": "WatcherException",
-          "exception_message": "TEST",
-          "function_name": "test_send_action_execution_with_error"
-        }
-      },
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "FAILED",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy":[],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.execution.error",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-execution-start.json
+++ b/doc/notification_samples/action-execution-start.json
@@ -1,41 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionExecutionPayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "fault": null,
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state": "ONGOING",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": [],
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.execution.start",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action-update.json
+++ b/doc/notification_samples/action-update.json
@@ -1,49 +0,0 @@
-{
-  "priority": "INFO",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.version": "1.0",
-    "watcher_object.name": "ActionUpdatePayload",
-    "watcher_object.data": {
-      "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "input_parameters": {
-        "param2": 2,
-        "param1": 1
-      },
-      "created_at": "2016-10-18T09:52:05Z",
-      "updated_at": null,
-      "state_update": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "ActionStateUpdatePayload",
-        "watcher_object.data": {
-          "old_state": "PENDING",
-          "state": "ONGOING"
-        }
-      },
-      "state": "ONGOING",
-      "action_plan": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.version": "1.0",
-        "watcher_object.name": "TerseActionPlanPayload",
-        "watcher_object.data": {
-          "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-          "global_efficacy": {},
-          "created_at": "2016-10-18T09:52:05Z",
-          "updated_at": null,
-          "state": "ONGOING",
-          "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "deleted_at": null
-        }
-      },
-      "parents": [],
-      "action_type": "nop",
-      "deleted_at": null
-    }
-  },
-  "event_type": "action.update",
-  "publisher_id": "infra-optim:node0",
-  "timestamp": "2017-01-01 00:00:00.000000",
-  "message_id": "530b409c-9b6b-459b-8f08-f93dbfeb4d41"
-}
--- a/doc/notification_samples/action_plan-cancel-end.json
+++ b/doc/notification_samples/action_plan-cancel-end.json
@@ -1,55 +0,0 @@
-{
-  "event_type": "action_plan.cancel.end",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.name": "ActionPlanCancelPayload",
-    "watcher_object.version": "1.0",
-    "watcher_object.data": {
-      "created_at": "2016-10-18T09:52:05Z",
-      "deleted_at": null,
-      "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "audit": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "TerseAuditPayload",
-        "watcher_object.version": "1.0",
-        "watcher_object.data": {
-          "created_at": "2016-10-18T09:52:05Z",
-          "deleted_at": null,
-          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
-          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
-          "scope": [],
-          "audit_type": "ONESHOT",
-          "state": "SUCCEEDED",
-          "parameters": {},
-          "interval": null,
-          "updated_at": null
-        }
-      },
-      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-      "fault": null,
-      "state": "CANCELLED",
-      "global_efficacy": [],
-      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-      "strategy": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "StrategyPayload",
-        "watcher_object.version": "1.0",
-        "watcher_object.data": {
-          "created_at": "2016-10-18T09:52:05Z",
-          "deleted_at": null,
-          "name": "TEST",
-          "uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "parameters_spec": {},
-          "display_name": "test strategy",
-          "updated_at": null
-        }
-      },
-      "updated_at": null
-    }
-  },
-  "priority": "INFO",
-  "message_id": "3984dc2b-8aef-462b-a220-8ae04237a56e",
-  "timestamp": "2016-10-18 09:52:05.219414",
-  "publisher_id": "infra-optim:node0"
-}
--- a/doc/notification_samples/action_plan-cancel-error.json
+++ b/doc/notification_samples/action_plan-cancel-error.json
@@ -1,65 +0,0 @@
-{
-  "event_type": "action_plan.cancel.error",
-  "publisher_id": "infra-optim:node0",
-  "priority": "ERROR",
-  "message_id": "9a45c5ae-0e21-4300-8fa0-5555d52a66d9",
-  "payload": {
-    "watcher_object.version": "1.0",
-    "watcher_object.namespace": "watcher",
-    "watcher_object.name": "ActionPlanCancelPayload",
-    "watcher_object.data": {
-      "fault": {
-        "watcher_object.version": "1.0",
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "ExceptionPayload",
-        "watcher_object.data": {
-          "exception_message": "TEST",
-          "module_name": "watcher.tests.notifications.test_action_plan_notification",
-          "function_name": "test_send_action_plan_cancel_with_error",
-          "exception": "WatcherException"
-        }
-      },
-      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-      "created_at": "2016-10-18T09:52:05Z",
-      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-      "strategy": {
-        "watcher_object.version": "1.0",
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "StrategyPayload",
-        "watcher_object.data": {
-          "uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "created_at": "2016-10-18T09:52:05Z",
-          "name": "TEST",
-          "updated_at": null,
-          "display_name": "test strategy",
-          "parameters_spec": {},
-          "deleted_at": null
-        }
-      },
-      "updated_at": null,
-      "deleted_at": null,
-      "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "audit": {
-        "watcher_object.version": "1.0",
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "TerseAuditPayload",
-        "watcher_object.data": {
-          "parameters": {},
-          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
-          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
-          "created_at": "2016-10-18T09:52:05Z",
-          "scope": [],
-          "updated_at": null,
-          "audit_type": "ONESHOT",
-          "interval": null,
-          "deleted_at": null,
-          "state": "SUCCEEDED"
-        }
-      },
-      "global_efficacy": [],
-      "state": "CANCELLING"
-    }
-  },
-  "timestamp": "2016-10-18 09:52:05.219414"
-}
--- a/doc/notification_samples/action_plan-cancel-start.json
+++ b/doc/notification_samples/action_plan-cancel-start.json
@@ -1,55 +0,0 @@
-{
-  "event_type": "action_plan.cancel.start",
-  "payload": {
-    "watcher_object.namespace": "watcher",
-    "watcher_object.name": "ActionPlanCancelPayload",
-    "watcher_object.version": "1.0",
-    "watcher_object.data": {
-      "created_at": "2016-10-18T09:52:05Z",
-      "deleted_at": null,
-      "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-      "audit": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "TerseAuditPayload",
-        "watcher_object.version": "1.0",
-        "watcher_object.data": {
-          "created_at": "2016-10-18T09:52:05Z",
-          "deleted_at": null,
-          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
-          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
-          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
-          "scope": [],
-          "audit_type": "ONESHOT",
-          "state": "SUCCEEDED",
-          "parameters": {},
-          "interval": null,
-          "updated_at": null
-        }
-      },
-      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
-      "fault": null,
-      "state": "CANCELLING",
-      "global_efficacy": [],
-      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-      "strategy": {
-        "watcher_object.namespace": "watcher",
-        "watcher_object.name": "StrategyPayload",
-        "watcher_object.version": "1.0",
-        "watcher_object.data": {
-          "created_at": "2016-10-18T09:52:05Z",
-          "deleted_at": null,
-          "name": "TEST",
-          "uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
-          "parameters_spec": {},
-          "display_name": "test strategy",
-          "updated_at": null
-        }
-      },
-      "updated_at": null
-    }
-  },
-  "priority": "INFO",
-  "message_id": "3984dc2b-8aef-462b-a220-8ae04237a56e",
-  "timestamp": "2016-10-18 09:52:05.219414",
-  "publisher_id": "infra-optim:node0"
-}
--- a/doc/notification_samples/action_plan-create.json
+++ b/doc/notification_samples/action_plan-create.json
@@ -23,7 +23,6 @@
      "audit": {
        "watcher_object.version": "1.0",
        "watcher_object.data": {
-          "name": "my_audit",
          "audit_type": "ONESHOT",
          "scope": [],
          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
--- a/doc/notification_samples/action_plan-delete.json
+++ b/doc/notification_samples/action_plan-delete.json
@@ -8,7 +8,6 @@
      "audit_uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
      "audit": {
        "watcher_object.data": {
-          "name": "my_audit",
          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
--- a/doc/notification_samples/action_plan-execution-end.json
+++ b/doc/notification_samples/action_plan-execution-end.json
@@ -15,7 +15,6 @@
        "watcher_object.data": {
          "created_at": "2016-10-18T09:52:05Z",
          "deleted_at": null,
-          "name": "my_audit",
          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
@@ -30,7 +29,7 @@
      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
      "fault": null,
      "state": "ONGOING",
-      "global_efficacy": [],
+      "global_efficacy": {},
      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
      "strategy": {
        "watcher_object.namespace": "watcher",
--- a/doc/notification_samples/action_plan-execution-error.json
+++ b/doc/notification_samples/action_plan-execution-error.json
@@ -45,7 +45,6 @@
        "watcher_object.name": "TerseAuditPayload",
        "watcher_object.data": {
          "parameters": {},
-          "name": "my_audit",
          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
@@ -58,7 +57,7 @@
          "state": "PENDING"
        }
      },
-      "global_efficacy": [],
+      "global_efficacy": {},
      "state": "ONGOING"
    }
  },
--- a/doc/notification_samples/action_plan-execution-start.json
+++ b/doc/notification_samples/action_plan-execution-start.json
@@ -15,7 +15,6 @@
        "watcher_object.data": {
          "created_at": "2016-10-18T09:52:05Z",
          "deleted_at": null,
-          "name": "my_audit",
          "uuid": "10a47dd1-4874-4298-91cf-eff046dbdb8d",
          "goal_uuid": "bc830f84-8ae3-4fc6-8bc6-e3dd15e8b49a",
          "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
@@ -30,7 +29,7 @@
      "uuid": "76be87bd-3422-43f9-93a0-e85a577e3061",
      "fault": null,
      "state": "ONGOING",
-      "global_efficacy": [],
+      "global_efficacy": {},
      "strategy_uuid": "cb3d0b58-4415-4d90-b75b-1e96878730e3",
      "strategy": {
        "watcher_object.namespace": "watcher",
--- a/doc/notification_samples/action_plan-update.json
+++ b/doc/notification_samples/action_plan-update.json
@@ -6,7 +6,6 @@
      "audit": {
        "watcher_object.version": "1.0",
        "watcher_object.data": {
-          "name": "my_audit",
          "audit_type": "ONESHOT",
          "scope": [],
          "created_at": "2016-10-18T09:52:05Z",
--- a/doc/notification_samples/audit-create.json
+++ b/doc/notification_samples/audit-create.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-delete.json
+++ b/doc/notification_samples/audit-delete.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-planner-end.json
+++ b/doc/notification_samples/audit-planner-end.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-planner-error.json
+++ b/doc/notification_samples/audit-planner-error.json
@@ -2,7 +2,6 @@
  "priority": "ERROR",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-planner-start.json
+++ b/doc/notification_samples/audit-planner-start.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-strategy-end.json
+++ b/doc/notification_samples/audit-strategy-end.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-strategy-error.json
+++ b/doc/notification_samples/audit-strategy-error.json
@@ -2,7 +2,6 @@
  "priority": "ERROR",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-strategy-start.json
+++ b/doc/notification_samples/audit-strategy-start.json
@@ -2,7 +2,6 @@
  "priority": "INFO",
  "payload": {
    "watcher_object.data": {
-      "name": "my_audit",
      "audit_type": "ONESHOT",
      "parameters": {
        "para2": "hello",
--- a/doc/notification_samples/audit-update.json
+++ b/doc/notification_samples/audit-update.json
@@ -4,7 +4,6 @@
  "payload": {
    "watcher_object.name": "AuditUpdatePayload",
    "watcher_object.data": {
-      "name": "my_audit",
      "strategy_uuid": "75234dfe-87e3-4f11-a0e0-3c3305d86a39",
      "strategy": {
        "watcher_object.name": "StrategyPayload",
--- a/doc/notification_samples/service-update.json
+++ b/doc/notification_samples/service-update.json
@@ -1,26 +0,0 @@
-{
-    "payload": {
-        "watcher_object.name": "ServiceUpdatePayload",
-        "watcher_object.namespace": "watcher",
-        "watcher_object.data": {
-            "status_update": {
-                "watcher_object.name": "ServiceStatusUpdatePayload",
-                "watcher_object.namespace": "watcher",
-                "watcher_object.data": {
-                    "old_state": "ACTIVE",
-                    "state": "FAILED"
-                },
-                "watcher_object.version": "1.0"
-            },
-            "last_seen_up": "2016-09-22T08:32:06Z",
-            "name": "watcher-service",
-            "sevice_host": "controller"
-        },
-        "watcher_object.version": "1.0"
-    },
-    "event_type": "service.update",
-    "priority": "INFO",
-    "message_id": "3984dc2b-8aef-462b-a220-8ae04237a56e",
-    "timestamp": "2016-10-18 09:52:05.219414",
-    "publisher_id": "infra-optim:node0"
-}
--- a/doc/source/admin/apache-mod-wsgi.rst
+++ b/doc/source/admin/apache-mod-wsgi.rst
@@ -1,49 +0,0 @@
-..
-      Except where otherwise noted, this document is licensed under Creative
-      Commons Attribution 3.0 License.  You can view the license at:
-
-          https://creativecommons.org/licenses/by/3.0/
-
-
-Installing API behind mod_wsgi
-==============================
-
-#. Install the Apache Service::
-
-    Fedora 21/RHEL7/CentOS7:
-      sudo yum install httpd
-
-    Fedora 22 (or higher):
-      sudo dnf install httpd
-
-    Debian/Ubuntu:
-      apt-get install apache2
-
-#. Copy ``etc/apache2/watcher.conf`` under the apache sites::
-
-    Fedora/RHEL7/CentOS7:
-      sudo cp etc/apache2/watcher /etc/httpd/conf.d/watcher.conf
-
-    Debian/Ubuntu:
-      sudo cp etc/apache2/watcher /etc/apache2/sites-available/watcher.conf
-
-#. Edit ``<apache-configuration-dir>/watcher.conf`` according to installation
-   and environment.
-
-   * Modify the ``WSGIDaemonProcess`` directive to set the ``user`` and
-     ``group`` values to appropriate user on your server.
-   * Modify the ``WSGIScriptAlias`` directive to point to the
-     watcher/api/app.wsgi script.
-   * Modify the ``Directory`` directive to set the path to the Watcher API
-     code.
-   * Modify the ``ErrorLog and CustomLog`` to redirect the logs to the right
-     directory.
-
-#. Enable the apache watcher site and reload::
-
-    Fedora/RHEL7/CentOS7:
-      sudo systemctl reload httpd
-
-   Debian/Ubuntu:
-    sudo a2ensite watcher
-    sudo service apache2 reload
--- a/doc/source/admin/index.rst
+++ b/doc/source/admin/index.rst
@@ -1,12 +0,0 @@
-===================
-Administrator Guide
-===================
-
-.. toctree::
-   :maxdepth: 2
-
-   apache-mod-wsgi
-   gmr
-   policy
-   ways-to-install
-   ../strategies/index
--- a/doc/source/api/index.rst
+++ b/doc/source/api/index.rst
@@ -1,8 +0,0 @@
-==================================================
-OpenStack Infrastructure Optimization Service APIs
-==================================================
-
-.. toctree::
-   :maxdepth: 1
-
-   v1
--- a/doc/source/architecture.rst
+++ b/doc/source/architecture.rst
@@ -119,7 +119,7 @@ The watcher command-line interface (CLI) can be used to interact with the
 Watcher system in order to control it or to know its current status.

 Please, read `the detailed documentation about Watcher CLI
-<https://docs.openstack.org/python-watcherclient/latest/cli/>`_.
+<https://factory.b-com.com/www/watcher/doc/python-watcherclient/>`_.

 .. _archi_watcher_dashboard_definition:

@@ -130,7 +130,7 @@ The Watcher Dashboard can be used to interact with the Watcher system through
 Horizon in order to control it or to know its current status.

 Please, read `the detailed documentation about Watcher Dashboard
-<https://docs.openstack.org/watcher-dashboard/latest>`_.
+<http://docs.openstack.org/developer/watcher-dashboard/>`_.

 .. _archi_watcher_database_definition:

@@ -170,7 +170,7 @@ Unless specified, it then selects the most appropriate :ref:`strategy
 goal.

 The :ref:`Strategy <strategy_definition>` is then dynamically loaded (via
-`stevedore <https://docs.openstack.org/stevedore/latest>`_). The
+`stevedore <http://docs.openstack.org/developer/stevedore/>`_). The
 :ref:`Watcher Decision Engine <watcher_decision_engine_definition>` executes
 the strategy.

@@ -407,9 +407,6 @@ be one of the following:
 -  **CANCELLED** : the :ref:`Audit <audit_definition>` was in **PENDING** or
   **ONGOING** state and was cancelled by the
   :ref:`Administrator <administrator_definition>`
-  **SUSPENDED** : the :ref:`Audit <audit_definition>` was in **ONGOING**
-   state and was suspended by the
-   :ref:`Administrator <administrator_definition>`

 The following diagram shows the different possible states of an
 :ref:`Audit <audit_definition>` and what event makes the state change to a new
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -31,7 +31,8 @@ sys.path.insert(0, os.path.abspath('./'))
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-    'oslo_config.sphinxext',
+    'oslo_config.sphinxconfiggen',
+    'oslosphinx',
    'sphinx.ext.autodoc',
    'sphinx.ext.viewcode',
    'sphinxcontrib.httpdomain',
@@ -40,15 +41,10 @@ extensions = [
    'wsmeext.sphinxext',
    'ext.term',
    'ext.versioned_notifications',
-    'oslo_config.sphinxconfiggen',
-    'openstackdocstheme',
-    'sphinx.ext.napoleon',
 ]

 wsme_protocols = ['restjson']
-config_generator_config_file = [(
-    '../../etc/watcher/oslo-config-generator/watcher.conf',
-    '_static/watcher')]
+config_generator_config_file = '../../etc/watcher/watcher-config-generator.conf'
 sample_config_basename = 'watcher'

 # autodoc generation is a bit aggressive and a nuisance when doing heavy
@@ -73,7 +69,7 @@ copyright = u'OpenStack Foundation'
 # The full version, including alpha/beta/rc tags.
 release = watcher_version.version_info.release_string()
 # The short X.Y version.
-version = watcher_version.version_string
+version = watcher_version.version_info.version_string()

 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['watcher.']
@@ -96,8 +92,6 @@ add_function_parentheses = True
 # unit titles (such as .. function::).
 add_module_names = True

-suppress_warnings = ['app.add_directive']
-
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'

@@ -123,20 +117,12 @@ man_pages = [
 # Sphinx are currently 'default' and 'sphinxdoc'.
 # html_theme_path = ["."]
 # html_theme = '_theme'
-html_theme = 'openstackdocs'
 # html_static_path = ['static']
-# html_theme_options = {}
+html_theme_options = {'incubating': True}

 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project

-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
-#openstackdocstheme options
-repository_name = 'openstack/watcher'
-bug_project = 'watcher'
-bug_tag = ''
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
--- a/doc/source/config-generator.conf
+++ b/doc/source/config-generator.conf
@@ -0,0 +1 @@
+../../etc/watcher/watcher-config-generator.conf
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jenkins	1caf89686c	Merge "Add checking audit state" into stable/ocata	2017-02-16 13:53:58 +00:00
Hidekazu Nakamura	ed3224835a	Add checking audit state This patch adds checking audit state when updating an existing audit in accordance with audit state machine. Closes-Bug: #1662406 Change-Id: I20610c83169b77f141974a5cebe33818a4bf0728 (cherry picked from commit `0d83354c57`)	2017-02-16 13:16:06 +00:00
ericxiett	8a7e316f73	Fix that remove 'strategy' attribute does not work. The 'strategy_id' attribute is the one that not exposes to API. But the 'PATCH' API always update this attribute. So this change does not work when choose 'remove' op. This patch sets value for 'strategy_id' attribute. Change-Id: I1597fb5d4985bb8271ad3cea7ea5f0adb7de65f4 Closes-Bug: #1662395 (cherry picked from commit `e55c73be0e`)	2017-02-16 13:15:48 +00:00
Jenkins	112ac3bbdf	Merge "Fix log level error to warning" into stable/ocata	2017-02-14 10:27:17 +00:00
licanwei	d1ab697612	Fix the mapping between the instance and the node The argument to the add_edge function should be instance.uuid and node.uuid, not instance and node Change-Id: Ida694f9158d3eb26e7f31062a18844472ea3c6fa Closes-Bug: #1662810	2017-02-08 15:37:01 +00:00
Hidekazu Nakamura	095ca0ffb2	Fix log level error to warning When action plan is currently running, new action plan is set as SUPERSEDED and error log reported. This patch changes log level from error to warning. Change-Id: I931218843d8f09340bd5363256164807d514446b Closes-Bug: #1662450 (cherry picked from commit `58711aaaec`)	2017-02-08 00:05:44 +00:00
OpenStack Release Bot	e1131a65d8	Update UPPER_CONSTRAINTS_FILE for stable/ocata Change-Id: Ie56e3186f2c9e42aff817fc7c71c4da93abb1c5f	2017-02-02 18:23:36 +00:00
OpenStack Release Bot	5e507e56f4	Update .gitreview for stable/ocata Change-Id: I5a431c04e85183baf05736de3920d6610d4add03	2017-02-02 18:23:36 +00:00
				`@@ -0,0 +1 @@`
				`../../etc/watcher/watcher-config-generator.conf`