Move queue declaration to project level

This moves the watcher queue declaration from the pipeline level (where it is no longer valid) to the project level. https: //lists.openstack.org/pipermail/openstack-discuss/2022-May/028603.html Change-Id: I06923abb00f7eecd59587f44cd1f6a069e88a9fc (cherry picked from commit 6003322711)
Update TOX_CONSTRAINTS_FILE for stable/victoria
2023-08-19 07:30:34 +00:00 · 2020-09-30 01:54:48 +00:00 · 2020-09-30 01:40:38 +00:00 · 2020-09-29 09:02:47 +00:00 · 2020-08-29 16:12:52 +00:00 · 2020-08-18 07:55:59 +00:00
195 changed files with 1204 additions and 536 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/watcher.git
-defaultbranch=stable/ussuri
+defaultbranch=stable/victoria
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,9 +1,10 @@
 - project:
+    queue: watcher
    templates:
      - check-requirements
      - openstack-cover-jobs
      - openstack-lower-constraints-jobs
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-victoria-jobs
      - publish-openstack-docs-pti
      - release-notes-jobs-python3
    check:
@@ -16,7 +17,6 @@
        - watcher-tls-test
        - watcher-tempest-functional-ipv6-only
    gate:
-      queue: watcher
      jobs:
        - watcher-tempest-functional
        - watcher-tempest-functional-ipv6-only
@@ -102,7 +102,7 @@
 - job:
    name: watcher-tempest-multinode
    parent: watcher-tempest-functional
-    nodeset: openstack-two-node-bionic
+    nodeset: openstack-two-node-focal
    roles:
      - zuul: openstack/tempest
    group-vars:
@@ -160,7 +160,6 @@
    timeout: 7200
    required-projects: &base_required_projects
      - openstack/ceilometer
-      - openstack/devstack-gate
      - openstack/python-openstackclient
      - openstack/python-watcherclient
      - openstack/watcher
@@ -179,14 +178,10 @@
        s-container: false
        s-object: false
        s-proxy: false
-      devstack_localrc:
-        TEMPEST_PLUGINS: /opt/stack/watcher-tempest-plugin
-        USE_PYTHON3: true
+      tempest_plugins:
+        - 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

@@ -200,10 +195,12 @@

 - job:
    name: watcher-grenade
-    parent: legacy-dsvm-base
-    timeout: 10800
-    run: playbooks/legacy/grenade-devstack-watcher/run.yaml
-    post-run: playbooks/legacy/grenade-devstack-watcher/post.yaml
+    parent: grenade
+    required-projects:
+      - openstack/watcher
+      - openstack/python-watcherclient
+      - openstack/watcher-tempest-plugin
+    vars: *base_vars
    irrelevant-files:
      - ^(test-|)requirements.txt$
      - ^.*\.rst$
@@ -215,12 +212,6 @@
      - ^setup.cfg$
      - ^tools/.*$
      - ^tox.ini$
-    required-projects:
-      - openstack/grenade
-      - openstack/devstack-gate
-      - openstack/watcher
-      - openstack/python-watcherclient
-      - openstack/watcher-tempest-plugin

 - job:
    # This job is used in python-watcherclient repo
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -22,9 +22,6 @@
 # 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',
@@ -46,21 +43,13 @@ 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
+openstackdocs_repo_name = 'openstack/watcher'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'watcher'
+openstackdocs_bug_tag = ''

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'

 # -- Options for HTML output --------------------------------------------------

@@ -75,10 +64,6 @@ 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
--- a/babel.cfg
+++ b/babel.cfg
@@ -1,2 +0,0 @@
-[python: **.py]
-
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -298,7 +298,7 @@ function start_watcher_api {
        service_protocol="http"
    fi
    if [[ "$WATCHER_USE_WSGI_MODE" == "uwsgi" ]]; then
-        run_process "watcher-api" "$WATCHER_BIN_DIR/uwsgi --procname-prefix watcher-api --ini $WATCHER_UWSGI_CONF"
+        run_process "watcher-api" "$(which uwsgi) --procname-prefix watcher-api --ini $WATCHER_UWSGI_CONF"
        watcher_url=$service_protocol://$SERVICE_HOST/infra-optim
    else
        watcher_url=$service_protocol://$SERVICE_HOST:$service_port
--- a/doc/ext/term.py
+++ b/doc/ext/term.py
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from __future__ import unicode_literals
-
 import importlib
 import inspect

--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,10 +1,10 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-openstackdocstheme>=1.20.0 # Apache-2.0
-sphinx>=1.8.0,!=2.1.0,!=3.0.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-pecanwsme>=0.8.0 # Apache-2.0
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
-reno>=2.7.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
 sphinxcontrib-apidoc>=0.2.0  # BSD
 os-api-ref>=1.4.0 # Apache-2.0
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -14,7 +14,6 @@
 import os
 import sys

-from watcher import version as watcher_version
 from watcher import objects

 objects.register_all()
@@ -60,16 +59,6 @@ master_doc = 'index'
 project = u'Watcher'
 copyright = u'OpenStack Foundation'

-# 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 short X.Y version.
-# 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
-
 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['watcher.']

@@ -94,7 +83,7 @@ add_module_names = True
 suppress_warnings = ['app.add_directive']

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'

 # -- Options for man page output --------------------------------------------

@@ -125,12 +114,13 @@ html_theme = 'openstackdocs'
 # 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 = ''
+openstackdocs_repo_name = 'openstack/watcher'
+openstackdocs_pdf_link = True
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'watcher'
+openstackdocs_bug_tag = ''

 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
@@ -138,7 +128,7 @@ bug_tag = ''
 latex_documents = [
    ('index',
     'doc-watcher.tex',
-     u'%s Documentation' % project,
+     u'Watcher Documentation',
     u'OpenStack Foundation', 'manual'),
 ]

--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -5,11 +5,10 @@ appdirs==1.4.3
 APScheduler==3.5.1
 asn1crypto==0.24.0
 automaton==1.14.0
-Babel==2.5.3
 beautifulsoup4==4.6.0
 cachetools==2.0.1
 certifi==2018.1.18
-cffi==1.11.5
+cffi==1.14.0
 chardet==3.0.4
 cliff==2.11.0
 cmd2==0.8.1
@@ -31,12 +30,11 @@ extras==1.0.0
 fasteners==0.14.1
 fixtures==3.0.0
 freezegun==0.3.10
-future==0.16.0
 futurist==1.8.0
 gitdb2==2.0.3
 GitPython==2.1.8
 gnocchiclient==7.0.1
-greenlet==0.4.13
+greenlet==0.4.15
 idna==2.6
 imagesize==1.0.0
 iso8601==0.1.12
@@ -44,26 +42,23 @@ Jinja2==2.10
 jmespath==0.9.3
 jsonpatch==1.21
 jsonpointer==2.0
-jsonschema==2.6.0
+jsonschema==3.2.0
 keystoneauth1==3.4.0
 keystonemiddleware==4.21.0
-kombu==4.1.0
+kombu==5.0.0
 linecache2==1.0.0
 logutils==0.3.5
-lxml==4.1.1
+lxml==4.5.1
 Mako==1.0.7
-MarkupSafe==1.0
+MarkupSafe==1.1.1
 mccabe==0.2.1
 microversion_parse==0.2.1
-mock==2.0.0
 monotonic==1.4
-mox3==0.25.0
 msgpack==0.5.6
 munch==2.2.0
 netaddr==0.7.19
 netifaces==0.10.6
-networkx==2.2
-openstackdocstheme==1.20.0
+networkx==2.4
 openstacksdk==0.12.0
 os-api-ref===1.4.0
 os-client-config==1.29.0
@@ -75,7 +70,7 @@ oslo.cache==1.29.0
 oslo.concurrency==3.26.0
 oslo.config==5.2.0
 oslo.context==2.21.0
-oslo.db==4.35.0
+oslo.db==4.44.0
 oslo.i18n==3.20.0
 oslo.log==3.37.0
 oslo.messaging==8.1.2
@@ -118,8 +113,7 @@ python-novaclient==14.1.0
 python-openstackclient==3.14.0
 python-subunit==1.2.0
 pytz==2018.3
-PyYAML==3.12
-reno==2.7.0
+PyYAML==3.13
 repoze.lru==0.7
 requests==2.18.4
 requestsexceptions==1.4.0
@@ -128,22 +122,17 @@ rfc3986==1.1.0
 Routes==2.4.1
 simplegeneric==0.8.1
 simplejson==3.13.2
-six==1.11.0
 smmap2==2.0.3
 snowballstemmer==1.2.1
-Sphinx==1.6.5
-sphinxcontrib-httpdomain==1.6.1
-sphinxcontrib-pecanwsme==0.8.0
-sphinxcontrib-websupport==1.0.1
 SQLAlchemy==1.2.5
 sqlalchemy-migrate==0.11.0
 sqlparse==0.2.4
 statsd==3.2.2
 stestr==2.0.0
 stevedore==1.28.0
-taskflow==3.7.1
+taskflow==3.8.0
 Tempita==0.5.2
-tenacity==4.9.0
+tenacity==4.12.0
 testresources==2.0.1
 testscenarios==0.5.0
 testtools==2.3.0
--- a/playbooks/legacy/grenade-devstack-watcher/post.yaml
+++ b/playbooks/legacy/grenade-devstack-watcher/post.yaml
@@ -1,15 +0,0 @@
- hosts: primary
-  tasks:
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
--- a/playbooks/legacy/grenade-devstack-watcher/run.yaml
+++ b/playbooks/legacy/grenade-devstack-watcher/run.yaml
@@ -1,60 +0,0 @@
- hosts: all
-  name: legacy-grenade-dsvm-watcher
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-
-          export PROJECTS="openstack/grenade $PROJECTS"
-          export PROJECTS="openstack/watcher $PROJECTS"
-          export PROJECTS="openstack/watcher-tempest-plugin $PROJECTS"
-          export PROJECTS="openstack/python-watcherclient $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT="python-watcherclient $DEVSTACK_PROJECT_FROM_GIT"
-
-          export GRENADE_PLUGINRC="enable_grenade_plugin watcher https://opendev.org/openstack/watcher"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/watcher-tempest-plugin'"
-
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_GRENADE=pullup
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          # Add configuration values for enabling security features in local.conf
-          function pre_test_hook {
-              if [ -f /opt/stack/old/watcher-tempest-plugin/tools/pre_test_hook.sh ] ; then
-                  . /opt/stack/old/watcher-tempest-plugin/tools/pre_test_hook.sh
-              fi
-          }
-          export -f pre_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -53,7 +53,6 @@ source_suffix = '.rst'
 master_doc = 'index'

 # General information about the project.
-project = u'watcher'
 copyright = u'2016, Watcher developers'

 # Release notes are version independent
@@ -91,11 +90,15 @@ exclude_patterns = ['_build']
 #show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'

 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []

+# openstackdocstheme options
+openstackdocs_repo_name = 'openstack/watcher'
+openstackdocs_bug_project = 'watcher'
+openstackdocs_bug_tag = ''

 # -- Options for HTML output --------------------------------------------------

--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -21,6 +21,7 @@ Contents:
   :maxdepth: 1

   unreleased
+   ussuri
   train
   stein
   rocky
--- a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
+++ b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
@@ -0,0 +1,651 @@
+# Andi Chandler <andi@gowling.com>, 2017. #zanata
+# Andi Chandler <andi@gowling.com>, 2018. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: python-watcher\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-11-08 01:22+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2018-11-07 06:15+0000\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>\n"
+"Language-Team: English (United Kingdom)\n"
+"Language: en_GB\n"
+"X-Generator: Zanata 4.3.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+msgid "0.29.0"
+msgstr "0.29.0"
+
+msgid "0.34.0"
+msgstr "0.34.0"
+
+msgid "1.0.0"
+msgstr "1.0.0"
+
+msgid "1.1.0"
+msgstr "1.1.0"
+
+msgid "1.10.0"
+msgstr "1.10.0"
+
+msgid "1.11.0"
+msgstr "1.11.0"
+
+msgid "1.3.0"
+msgstr "1.3.0"
+
+msgid "1.4.0"
+msgstr "1.4.0"
+
+msgid "1.4.1"
+msgstr "1.4.1"
+
+msgid "1.5.0"
+msgstr "1.5.0"
+
+msgid "1.6.0"
+msgstr "1.6.0"
+
+msgid "1.7.0"
+msgstr "1.7.0"
+
+msgid "1.9.0"
+msgstr "1.9.0"
+
+msgid "Add a service supervisor to watch Watcher deamons."
+msgstr "Add a service supervisor to watch Watcher daemons."
+
+msgid "Add action for compute node power on/off"
+msgstr "Add action for compute node power on/off"
+
+msgid ""
+"Add description property for dynamic action. Admin can see detail "
+"information of any specify action."
+msgstr ""
+"Add description property for dynamic action. Admin can see detail "
+"information of any specify action."
+
+msgid "Add notifications related to Action object."
+msgstr "Add notifications related to Action object."
+
+msgid "Add notifications related to Action plan object."
+msgstr "Add notifications related to Action plan object."
+
+msgid "Add notifications related to Audit object."
+msgstr "Add notifications related to Audit object."
+
+msgid "Add notifications related to Service object."
+msgstr "Add notifications related to Service object."
+
+msgid ""
+"Add start_time and end_time fields in audits table. User can set the start "
+"time and/or end time when creating CONTINUOUS audit."
+msgstr ""
+"Add start_time and end_time fields in audits table. User can set the start "
+"time and/or end time when creating CONTINUOUS audit."
+
+msgid ""
+"Add superseded state for an action plan if the cluster data model has "
+"changed after it has been created."
+msgstr ""
+"Add superseded state for an action plan if the cluster data model has "
+"changed after it has been created."
+
+msgid "Added SUSPENDED audit state"
+msgstr "Added SUSPENDED audit state"
+
+msgid ""
+"Added a generic scoring engine module, which will standarize interactions "
+"with scoring engines through the common API. It is possible to use the "
+"scoring engine by different Strategies, which improve the code and data "
+"model re-use."
+msgstr ""
+"Added a generic scoring engine module, which will standardise interactions "
+"with scoring engines through the common API. It is possible to use the "
+"scoring engine by different Strategies, which improve the code and data "
+"model re-use."
+
+msgid ""
+"Added a new strategy based on the airflow of servers. This strategy makes "
+"decisions to migrate VMs to make the airflow uniform."
+msgstr ""
+"Added a new strategy based on the airflow of servers. This strategy makes "
+"decisions to migrate VMs to make the airflow uniform."
+
+msgid ""
+"Added a standard way to both declare and fetch configuration options so that "
+"whenever the administrator generates the Watcher configuration sample file, "
+"it contains the configuration options of the plugins that are currently "
+"available."
+msgstr ""
+"Added a standard way to both declare and fetch configuration options so that "
+"whenever the administrator generates the Watcher configuration sample file, "
+"it contains the configuration options of the plugins that are currently "
+"available."
+
+msgid ""
+"Added a strategy based on the VM workloads of hypervisors. This strategy "
+"makes decisions to migrate workloads to make the total VM workloads of each "
+"hypervisor balanced, when the total VM workloads of hypervisor reaches "
+"threshold."
+msgstr ""
+"Added a strategy based on the VM workloads of hypervisors. This strategy "
+"makes decisions to migrate workloads to make the total VM workloads of each "
+"hypervisor balanced, when the total VM workloads of hypervisor reaches "
+"threshold."
+
+msgid ""
+"Added a strategy for one compute node maintenance, without having the user's "
+"application been interrupted. If given one backup node, the strategy will "
+"firstly migrate all instances from the maintenance node to the backup node. "
+"If the backup node is not provided, it will migrate all instances, relying "
+"on nova-scheduler."
+msgstr ""
+"Added a strategy for one compute node maintenance, without having the user's "
+"application been interrupted. If given one backup node, the strategy will "
+"firstly migrate all instances from the maintenance node to the backup node. "
+"If the backup node is not provided, it will migrate all instances, relying "
+"on nova-scheduler."
+
+msgid ""
+"Added a strategy that monitors if there is a higher load on some hosts "
+"compared to other hosts in the cluster and re-balances the work across hosts "
+"to minimize the standard deviation of the loads in the cluster."
+msgstr ""
+"Added a strategy that monitors if there is a higher load on some hosts "
+"compared to other hosts in the cluster and re-balances the work across hosts "
+"to minimise the standard deviation of the loads in the cluster."
+
+msgid ""
+"Added a way to add a new action without having to amend the source code of "
+"the default planner."
+msgstr ""
+"Added a way to add a new action without having to amend the source code of "
+"the default planner."
+
+msgid ""
+"Added a way to check state of strategy before audit's execution. "
+"Administrator can use \"watcher strategy state <strategy_name>\" command to "
+"get information about metrics' availability, datasource's availability and "
+"CDM's availability."
+msgstr ""
+"Added a way to check state of strategy before audit's execution. "
+"Administrator can use \"watcher strategy state <strategy_name>\" command to "
+"get information about metrics' availability, datasource's availability and "
+"CDM's availability."
+
+msgid ""
+"Added a way to compare the efficacy of different strategies for a give "
+"optimization goal."
+msgstr ""
+"Added a way to compare the efficacy of different strategies for a give "
+"optimisation goal."
+
+msgid ""
+"Added a way to create periodic audit to be able to optimize continuously the "
+"cloud infrastructure."
+msgstr ""
+"Added a way to create periodic audit to be able to continuously optimise the "
+"cloud infrastructure."
+
+msgid ""
+"Added a way to return the of available goals depending on which strategies "
+"have been deployed on the node where the decison engine is running."
+msgstr ""
+"Added a way to return the of available goals depending on which strategies "
+"have been deployed on the node where the decision engine is running."
+
+msgid ""
+"Added an in-memory cache of the cluster model built up and kept fresh via "
+"notifications from services of interest in addition to periodic syncing "
+"logic."
+msgstr ""
+"Added an in-memory cache of the cluster model built up and kept fresh via "
+"notifications from services of interest in addition to periodic syncing "
+"logic."
+
+msgid ""
+"Added binding between apscheduler job and Watcher decision engine service. "
+"It will allow to provide HA support in the future."
+msgstr ""
+"Added binding between apscheduler job and Watcher decision engine service. "
+"It will allow to provide HA support in the future."
+
+msgid "Added cinder cluster data model"
+msgstr "Added cinder cluster data model"
+
+msgid ""
+"Added gnocchi support as data source for metrics. Administrator can change "
+"data source for each strategy using config file."
+msgstr ""
+"Added Gnocchi support as data source for metrics. Administrator can change "
+"data source for each strategy using config file."
+
+msgid "Added new tool ``watcher-status upgrade check``."
+msgstr "Added new tool ``watcher-status upgrade check``."
+
+msgid ""
+"Added notifications about cancelling of action plan. Now event based plugins "
+"know when action plan cancel started and completed."
+msgstr ""
+"Added notifications about cancelling of action plan. Now event based plugins "
+"know when action plan cancel started and completed."
+
+msgid "Added policies to handle user rights to access Watcher API."
+msgstr "Added policies to handle user rights to access Watcher API."
+
+msgid "Added storage capacity balance strategy."
+msgstr "Added storage capacity balance strategy."
+
+msgid ""
+"Added strategy \"Zone migration\" and it's goal \"Hardware maintenance\". "
+"The strategy migrates many instances and volumes efficiently with minimum "
+"downtime automatically."
+msgstr ""
+"Added strategy \"Zone migration\" and it's goal \"Hardware maintenance\". "
+"The strategy migrates many instances and volumes efficiently with minimum "
+"downtime automatically."
+
+msgid ""
+"Added strategy to identify and migrate a Noisy Neighbor - a low priority VM "
+"that negatively affects peformance of a high priority VM by over utilizing "
+"Last Level Cache."
+msgstr ""
+"Added strategy to identify and migrate a Noisy Neighbour - a low priority VM "
+"that negatively affects performance of a high priority VM by over utilising "
+"Last Level Cache."
+
+msgid ""
+"Added the functionality to filter out instances which have metadata field "
+"'optimize' set to False. For now, this is only available for the "
+"basic_consolidation strategy (if \"check_optimize_metadata\" configuration "
+"option is enabled)."
+msgstr ""
+"Added the functionality to filter out instances which have metadata field "
+"'optimize' set to False. For now, this is only available for the "
+"basic_consolidation strategy (if \"check_optimize_metadata\" configuration "
+"option is enabled)."
+
+msgid "Added using of JSONSchema instead of voluptuous to validate Actions."
+msgstr "Added using of JSONSchema instead of voluptuous to validate Actions."
+
+msgid "Added volume migrate action"
+msgstr "Added volume migrate action"
+
+msgid ""
+"Adds audit scoper for storage data model, now watcher users can specify "
+"audit scope for storage CDM in the same manner as compute scope."
+msgstr ""
+"Adds audit scoper for storage data model, now watcher users can specify "
+"audit scope for storage CDM in the same manner as compute scope."
+
+msgid "Adds baremetal data model in Watcher"
+msgstr "Adds baremetal data model in Watcher"
+
+msgid ""
+"Allow decision engine to pass strategy parameters, like optimization "
+"threshold, to selected strategy, also strategy to provide parameters info to "
+"end user."
+msgstr ""
+"Allow decision engine to pass strategy parameters, like optimisation "
+"threshold, to selected strategy, also strategy to provide parameters info to "
+"end user."
+
+msgid ""
+"Audits have 'name' field now, that is more friendly to end users. Audit's "
+"name can't exceed 63 characters."
+msgstr ""
+"Audits have 'name' field now, that is more friendly to end users. Audit's "
+"name can't exceed 63 characters."
+
+msgid "Bug Fixes"
+msgstr "Bug Fixes"
+
+msgid "Centralize all configuration options for Watcher."
+msgstr "Centralise all configuration options for Watcher."
+
+msgid "Contents:"
+msgstr "Contents:"
+
+msgid ""
+"Copy all audit templates parameters into audit instead of having a reference "
+"to the audit template."
+msgstr ""
+"Copy all audit templates parameters into audit instead of having a reference "
+"to the audit template."
+
+msgid "Current Series Release Notes"
+msgstr "Current Series Release Notes"
+
+msgid "Deprecation Notes"
+msgstr "Deprecation Notes"
+
+msgid ""
+"Each CDM collector can have its own CDM scoper now. This changed Scope JSON "
+"schema definition for the audit template POST data. Please see audit "
+"template create help message in python-watcherclient."
+msgstr ""
+"Each CDM collector can have its own CDM scoper now. This changed Scope JSON "
+"schema definition for the audit template POST data. Please see audit "
+"template create help message in python-watcherclient."
+
+msgid ""
+"Enhancement of vm_workload_consolidation strategy by using 'memory.resident' "
+"metric in place of 'memory.usage', as memory.usage shows the memory usage "
+"inside guest-os and memory.resident represents volume of RAM used by "
+"instance on host machine."
+msgstr ""
+"Enhancement of vm_workload_consolidation strategy by using 'memory.resident' "
+"metric in place of 'memory.usage', as memory.usage shows the memory usage "
+"inside guest-os and memory.resident represents volume of RAM used by "
+"instance on host machine."
+
+msgid ""
+"Existing workload_balance strategy based on the VM workloads of CPU. This "
+"feature improves the strategy. By the input parameter \"metrics\", it makes "
+"decision to migrate a VM base on CPU or memory utilization."
+msgstr ""
+"Existing workload_balance strategy based on the VM workloads of CPU. This "
+"feature improves the strategy. By the input parameter \"metrics\", it makes "
+"decision to migrate a VM base on CPU or memory utilisation."
+
+msgid ""
+"Feature to exclude instances from audit scope based on project_id is added. "
+"Now instances from particular project in OpenStack can be excluded from "
+"audit defining scope in audit templates."
+msgstr ""
+"Feature to exclude instances from audit scope based on project_id is added. "
+"Now instances from particular project in OpenStack can be excluded from "
+"audit defining scope in audit templates."
+
+msgid ""
+"Instance cold migration logic is now replaced with using Nova migrate "
+"Server(migrate Action) API which has host option since v2.56."
+msgstr ""
+"Instance cold migration logic is now replaced with using Nova migrate "
+"Server(migrate Action) API which has host option since v2.56."
+
+msgid "New Features"
+msgstr "New Features"
+
+msgid ""
+"New framework for ``watcher-status upgrade check`` command is added. This "
+"framework allows adding various checks which can be run before a Watcher "
+"upgrade to ensure if the upgrade can be performed safely."
+msgstr ""
+"New framework for ``watcher-status upgrade check`` command is added. This "
+"framework allows adding various checks which can be run before a Watcher "
+"upgrade to ensure if the upgrade can be performed safely."
+
+msgid "Newton Series Release Notes"
+msgstr "Newton Series Release Notes"
+
+msgid ""
+"Nova API version is now set to 2.56 by default. This needs the migrate "
+"action of migration type cold with destination_node parameter to work."
+msgstr ""
+"Nova API version is now set to 2.56 by default. This needs the migrate "
+"action of migration type cold with destination_node parameter to work."
+
+msgid "Ocata Series Release Notes"
+msgstr "Ocata Series Release Notes"
+
+msgid ""
+"Operator can now use new CLI tool ``watcher-status upgrade check`` to check "
+"if Watcher deployment can be safely upgraded from N-1 to N release."
+msgstr ""
+"Operator can now use new CLI tool ``watcher-status upgrade check`` to check "
+"if Watcher deployment can be safely upgraded from N-1 to N release."
+
+msgid "Pike Series Release Notes"
+msgstr "Pike Series Release Notes"
+
+msgid "Prelude"
+msgstr "Prelude"
+
+msgid ""
+"Provide a notification mechanism into Watcher that supports versioning. "
+"Whenever a Watcher object is created, updated or deleted, a versioned "
+"notification will, if it's relevant, be automatically sent to notify in "
+"order to allow an event-driven style of architecture within Watcher. "
+"Moreover, it will also give other services and/or 3rd party softwares (e.g. "
+"monitoring solutions or rules engines) the ability to react to such events."
+msgstr ""
+"Provide a notification mechanism into Watcher that supports versioning. "
+"Whenever a Watcher object is created, updated or deleted, a versioned "
+"notification will, if it's relevant, be automatically sent to notify in "
+"order to allow an event-driven style of architecture within Watcher. "
+"Moreover, it will also give other services and/or 3rd party software (e.g. "
+"monitoring solutions or rules engines) the ability to react to such events."
+
+msgid ""
+"Provides a generic way to define the scope of an audit. The set of audited "
+"resources will be called \"Audit scope\" and will be defined in each audit "
+"template (which contains the audit settings)."
+msgstr ""
+"Provides a generic way to define the scope of an audit. The set of audited "
+"resources will be called \"Audit scope\" and will be defined in each audit "
+"template (which contains the audit settings)."
+
+msgid "Queens Series Release Notes"
+msgstr "Queens Series Release Notes"
+
+msgid "Rocky Series Release Notes"
+msgstr "Rocky Series Release Notes"
+
+msgid ""
+"The graph model describes how VMs are associated to compute hosts. This "
+"allows for seeing relationships upfront between the entities and hence can "
+"be used to identify hot/cold spots in the data center and influence a "
+"strategy decision."
+msgstr ""
+"The graph model describes how VMs are associated to compute hosts. This "
+"allows for seeing relationships upfront between the entities and hence can "
+"be used to identify hot/cold spots in the data centre and influence a "
+"strategy decision."
+
+msgid ""
+"The migrate action of migration type cold with destination_node parameter "
+"was fixed. Before fixing, it booted an instance in the service project as a "
+"migrated instance."
+msgstr ""
+"The migrate action of migration type cold with destination_node parameter "
+"was fixed. Before fixing, it booted an instance in the service project as a "
+"migrated instance."
+
+msgid ""
+"There is new ability to create Watcher continuous audits with cron interval. "
+"It means you may use, for example, optional argument '--interval \"\\*/5 \\* "
+"\\* \\* \\*\"' to launch audit every 5 minutes. These jobs are executed on a "
+"best effort basis and therefore, we recommend you to use a minimal cron "
+"interval of at least one minute."
+msgstr ""
+"There is new ability to create Watcher continuous audits with cron interval. "
+"It means you may use, for example, optional argument '--interval \"\\*/5 \\* "
+"\\* \\* \\*\"' to launch audit every 5 minutes. These jobs are executed on a "
+"best effort basis and therefore, we recommend you to use a minimal cron "
+"interval of at least one minute."
+
+msgid "Upgrade Notes"
+msgstr "Upgrade Notes"
+
+msgid ""
+"Watcher can continuously optimize the OpenStack cloud for a specific "
+"strategy or goal by triggering an audit periodically which generates an "
+"action plan and run it automatically."
+msgstr ""
+"Watcher can continuously optimise the OpenStack cloud for a specific "
+"strategy or goal by triggering an audit periodically which generates an "
+"action plan and run it automatically."
+
+msgid ""
+"Watcher can now run specific actions in parallel improving the performances "
+"dramatically when executing an action plan."
+msgstr ""
+"Watcher can now run specific actions in parallel improving the performance "
+"dramatically when executing an action plan."
+
+msgid ""
+"Watcher consumes Nova notifications to update its internal Compute "
+"CDM(Cluster Data Model). All the notifications as below"
+msgstr ""
+"Watcher consumes Nova notifications to update its internal Compute "
+"CDM(Cluster Data Model). All the notifications as below"
+
+msgid "Watcher database can now be upgraded thanks to Alembic."
+msgstr "Watcher database can now be upgraded thanks to Alembic."
+
+msgid ""
+"Watcher got an ability to calculate multiple global efficacy indicators "
+"during audit's execution. Now global efficacy can be calculated for many "
+"resource types (like volumes, instances, network) if strategy supports "
+"efficacy indicators."
+msgstr ""
+"Watcher got an ability to calculate multiple global efficacy indicators "
+"during audit's execution. Now global efficacy can be calculated for many "
+"resource types (like volumes, instances, network) if strategy supports "
+"efficacy indicators."
+
+msgid ""
+"Watcher has a whole scope of the cluster, when building compute CDM which "
+"includes all instances. It filters excluded instances when migration during "
+"the audit."
+msgstr ""
+"Watcher has a whole scope of the cluster, when building compute CDM which "
+"includes all instances. It filters excluded instances when migration during "
+"the audit."
+
+msgid ""
+"Watcher removes the support to Nova legacy notifications because of Nova "
+"will deprecate them."
+msgstr ""
+"Watcher removes the support to Nova legacy notifications because of Nova "
+"will deprecate them."
+
+msgid ""
+"Watcher services can be launched in HA mode. From now on Watcher Decision "
+"Engine and Watcher Applier services may be deployed on different nodes to "
+"run in active-active or active-passive mode. Any ONGOING Audits or Action "
+"Plans will be CANCELLED if service they are executed on is restarted."
+msgstr ""
+"Watcher services can be launched in HA mode. From now on Watcher Decision "
+"Engine and Watcher Applier services may be deployed on different nodes to "
+"run in active-active or active-passive mode. Any ONGOING Audits or Action "
+"Plans will be CANCELLED if service they are executed on is restarted."
+
+msgid ""
+"Watcher starts to support API microversions since Stein cycle. From now "
+"onwards all API changes should be made with saving backward compatibility. "
+"To specify API version operator should use OpenStack-API-Version HTTP "
+"header. If operator wants to know the mininum and maximum supported versions "
+"by API, he/she can access /v1 resource and Watcher API will return "
+"appropriate headers in response."
+msgstr ""
+"Watcher starts to support API microversions since the Stein cycle. From now "
+"onwards all API changes should be made with saving backward compatibility. "
+"To specify API version operator should use OpenStack-API-Version HTTP "
+"header. If operator wants to know the minimum and maximum supported versions "
+"by API, he/she can access /v1 resource and Watcher API will return "
+"appropriate headers in response."
+
+msgid ""
+"Watcher supports multiple metrics backend and relies on Ceilometer and "
+"Monasca."
+msgstr ""
+"Watcher supports multiple metrics backend and relies on Ceilometer and "
+"Monasca."
+
+msgid "Welcome to watcher's Release Notes documentation!"
+msgstr "Welcome to watcher's Release Notes documentation!"
+
+msgid ""
+"all Watcher objects have been refactored to support OVO (oslo."
+"versionedobjects) which was a prerequisite step in order to implement "
+"versioned notifications."
+msgstr ""
+"all Watcher objects have been refactored to support OVO (oslo."
+"versionedobjects) which was a prerequisite step in order to implement "
+"versioned notifications."
+
+msgid "instance.create.end"
+msgstr "instance.create.end"
+
+msgid "instance.delete.end"
+msgstr "instance.delete.end"
+
+msgid "instance.live_migration_force_complete.end"
+msgstr "instance.live_migration_force_complete.end"
+
+msgid "instance.live_migration_post_dest.end"
+msgstr "instance.live_migration_post_dest.end"
+
+msgid "instance.lock"
+msgstr "instance.lock"
+
+msgid "instance.pause.end"
+msgstr "instance.pause.end"
+
+msgid "instance.power_off.end"
+msgstr "instance.power_off.end"
+
+msgid "instance.power_on.end"
+msgstr "instance.power_on.end"
+
+msgid "instance.rebuild.end"
+msgstr "instance.rebuild.end"
+
+msgid "instance.rescue.end"
+msgstr "instance.rescue.end"
+
+msgid "instance.resize_confirm.end"
+msgstr "instance.resize_confirm.end"
+
+msgid "instance.restore.end"
+msgstr "instance.restore.end"
+
+msgid "instance.resume.end"
+msgstr "instance.resume.end"
+
+msgid "instance.shelve.end"
+msgstr "instance.shelve.end"
+
+msgid "instance.shutdown.end"
+msgstr "instance.shutdown.end"
+
+msgid "instance.soft_delete.end"
+msgstr "instance.soft_delete.end"
+
+msgid "instance.suspend.end"
+msgstr "instance.suspend.end"
+
+msgid "instance.unlock"
+msgstr "instance.unlock"
+
+msgid "instance.unpause.end"
+msgstr "instance.unpause.end"
+
+msgid "instance.unrescue.end"
+msgstr "instance.unrescue.end"
+
+msgid "instance.unshelve.end"
+msgstr "instance.unshelve.end"
+
+msgid "instance.update"
+msgstr "instance.update"
+
+msgid "new:"
+msgstr "new:"
+
+msgid "pre-existing:"
+msgstr "pre-existing:"
+
+msgid "service.create"
+msgstr "service.create"
+
+msgid "service.delete"
+msgstr "service.delete"
+
+msgid "service.update"
+msgstr "service.update"
--- a/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po
+++ b/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po
@@ -0,0 +1,33 @@
+# Gérald LONLAS <g.lonlas@gmail.com>, 2016. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: python-watcher\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-03-22 02:21+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-10-22 06:44+0000\n"
+"Last-Translator: Gérald LONLAS <g.lonlas@gmail.com>\n"
+"Language-Team: French\n"
+"Language: fr\n"
+"X-Generator: Zanata 4.3.3\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+msgid "0.29.0"
+msgstr "0.29.0"
+
+msgid "Contents:"
+msgstr "Contenu :"
+
+msgid "Current Series Release Notes"
+msgstr "Note de la release actuelle"
+
+msgid "New Features"
+msgstr "Nouvelles fonctionnalités"
+
+msgid "Newton Series Release Notes"
+msgstr "Note de release pour Newton"
+
+msgid "Welcome to watcher's Release Notes documentation!"
+msgstr "Bienvenue dans la documentation de la note de Release de Watcher"
--- a/releasenotes/source/ussuri.rst
+++ b/releasenotes/source/ussuri.rst
@@ -0,0 +1,6 @@
+===========================
+Ussuri Series Release Notes
+===========================
+
+.. release-notes::
+   :branch: stable/ussuri
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,16 +5,16 @@
 apscheduler>=3.5.1 # MIT License
 jsonpatch>=1.21 # BSD
 keystoneauth1>=3.4.0 # Apache-2.0
-jsonschema>=2.6.0 # MIT
+jsonschema>=3.2.0 # MIT
 keystonemiddleware>=4.21.0 # Apache-2.0
-lxml>=4.1.1 # BSD
+lxml>=4.5.1 # BSD
 croniter>=0.3.20 # MIT License
 os-resource-classes>=0.4.0
 oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.cache>=1.29.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.context>=2.21.0 # Apache-2.0
-oslo.db>=4.35.0 # Apache-2.0
+oslo.db>=4.44.0 # Apache-2.0
 oslo.i18n>=3.20.0 # Apache-2.0
 oslo.log>=3.37.0 # Apache-2.0
 oslo.messaging>=8.1.2 # Apache-2.0
@@ -39,12 +39,11 @@ python-neutronclient>=6.7.0 # Apache-2.0
 python-novaclient>=14.1.0 # Apache-2.0
 python-openstackclient>=3.14.0 # Apache-2.0
 python-ironicclient>=2.5.0 # Apache-2.0
-six>=1.11.0 # MIT
 SQLAlchemy>=1.2.5 # MIT
 stevedore>=1.28.0 # Apache-2.0
-taskflow>=3.7.1 # Apache-2.0
+taskflow>=3.8.0 # Apache-2.0
 WebOb>=1.8.5 # MIT
 WSME>=0.9.2 # MIT
-networkx>=2.2;python_version>='3.4' # BSD
+networkx>=2.4 # BSD
 microversion_parse>=0.2.1 # Apache-2.0
 futurist>=1.8.0 # Apache-2.0
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,7 @@ classifier =
    Programming Language :: Python :: 3
    Programming Language :: Python :: 3.6
    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8

 [files]
 packages =
@@ -107,18 +108,3 @@ watcher_cluster_data_model_collectors =
    compute = watcher.decision_engine.model.collector.nova:NovaClusterDataModelCollector
    storage = watcher.decision_engine.model.collector.cinder:CinderClusterDataModelCollector
    baremetal = watcher.decision_engine.model.collector.ironic:BaremetalClusterDataModelCollector
-
-
-[compile_catalog]
-directory = watcher/locale
-domain = watcher
-
-[update_catalog]
-domain = watcher
-output_dir = watcher/locale
-input_file = watcher/locale/watcher.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext _LI _LW _LE _LC
-mapping_file = babel.cfg
-output_file = watcher/locale/watcher.pot
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,8 +5,7 @@
 coverage>=4.5.1 # Apache-2.0
 doc8>=0.8.0 # Apache-2.0
 freezegun>=0.3.10 # Apache-2.0
-hacking>=3.0,<3.1.0 # Apache-2.0
-mock>=2.0.0 # BSD
+hacking>=3.0.1,<3.1.0 # Apache-2.0
 oslotest>=3.3.0 # Apache-2.0
 os-testr>=1.0.0 # Apache-2.0
 testscenarios>=0.5.0 # Apache-2.0/BSD
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ install_command = pip install {opts} {packages}
 setenv =
   VIRTUAL_ENV={envdir}
 deps =
-    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
    -r{toxinidir}/test-requirements.txt
    -r{toxinidir}/requirements.txt
 commands =
@@ -26,12 +26,12 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 commands =
    doc8 doc/source/ CONTRIBUTING.rst HACKING.rst README.rst
    flake8
-    bandit -r watcher -x watcher/tests/* -n5 -ll -s B320
+    bandit -r watcher -x watcher/tests/* -n5 -ll -s B320,B322

 [testenv:venv]
 setenv = PYTHONHASHSEED=0
 deps =
-    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
    -r{toxinidir}/doc/requirements.txt
    -r{toxinidir}/test-requirements.txt
    -r{toxinidir}/requirements.txt
@@ -105,6 +105,7 @@ extension =
   N340 = checks:check_oslo_i18n_wrapper
   N341 = checks:check_builtins_gettext
   N342 = checks:no_redundant_import_alias
+   N366 = checks:import_stock_mock
 paths = ./watcher/hacking


--- a/watcher/api/config.py
+++ b/watcher/api/config.py
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from __future__ import unicode_literals
-
 from oslo_config import cfg
 from watcher.api import hooks

--- a/watcher/api/controllers/v1/audit_template.py
+++ b/watcher/api/controllers/v1/audit_template.py
@@ -138,6 +138,9 @@ class AuditTemplatePostType(wtypes.Base):
            raise exception.InvalidGoal(goal=audit_template.goal)

        if audit_template.scope:
+            keys = [list(s)[0] for s in audit_template.scope]
+            if keys[0] not in ('compute', 'storage'):
+                audit_template.scope = [dict(compute=audit_template.scope)]
            common_utils.Draft4Validator(
                AuditTemplatePostType._build_schema()
                ).validate(audit_template.scope)
@@ -158,18 +161,23 @@ class AuditTemplatePostType(wtypes.Base):
                        "included and excluded together"))

        if audit_template.strategy:
-            available_strategies = objects.Strategy.list(
-                AuditTemplatePostType._ctx)
-            available_strategies_map = {
-                s.uuid: s for s in available_strategies}
-            if audit_template.strategy not in available_strategies_map:
+            try:
+                if (common_utils.is_uuid_like(audit_template.strategy) or
+                        common_utils.is_int_like(audit_template.strategy)):
+                    strategy = objects.Strategy.get(
+                        AuditTemplatePostType._ctx, audit_template.strategy)
+                else:
+                    strategy = objects.Strategy.get_by_name(
+                        AuditTemplatePostType._ctx, audit_template.strategy)
+            except Exception:
                raise exception.InvalidStrategy(
                    strategy=audit_template.strategy)

-            strategy = available_strategies_map[audit_template.strategy]
            # Check that the strategy we indicate is actually related to the
            # specified goal
            if strategy.goal_id != goal.id:
+                available_strategies = objects.Strategy.list(
+                    AuditTemplatePostType._ctx)
                choices = ["'%s' (%s)" % (s.uuid, s.name)
                           for s in available_strategies]
                raise exception.InvalidStrategy(
--- a/watcher/api/hooks.py
+++ b/watcher/api/hooks.py
@@ -15,9 +15,9 @@
 # under the License.


+from http import client as http_client
 from oslo_config import cfg
 from pecan import hooks
-from six.moves import http_client

 from watcher.common import context

--- a/watcher/api/middleware/parsable_error.py
+++ b/watcher/api/middleware/parsable_error.py
@@ -24,7 +24,6 @@ from xml import etree as et

 from oslo_log import log
 from oslo_serialization import jsonutils
-import six
 import webob

 from watcher._i18n import _
@@ -84,12 +83,10 @@ class ParsableErrorMiddleware(object):
                            '</error_message>' % state['status_code']]
                state['headers'].append(('Content-Type', 'application/xml'))
            else:
-                if six.PY3:
-                    app_iter = [i.decode('utf-8') for i in app_iter]
+                app_iter = [i.decode('utf-8') for i in app_iter]
                body = [jsonutils.dumps(
                    {'error_message': '\n'.join(app_iter)})]
-                if six.PY3:
-                    body = [item.encode('utf-8') for item in body]
+                body = [item.encode('utf-8') for item in body]
                state['headers'].append(('Content-Type', 'application/json'))
            state['headers'].append(('Content-Length', str(len(body[0]))))
        else:
--- a/watcher/api/scheduling.py
+++ b/watcher/api/scheduling.py
@@ -20,7 +20,6 @@ import itertools
 from oslo_config import cfg
 from oslo_log import log
 from oslo_utils import timeutils
-import six

 from watcher.common import context as watcher_context
 from watcher.common import scheduling
@@ -83,7 +82,7 @@ class APISchedulingService(scheduling.BackgroundSchedulerService):
        service = objects.Service.get(context, service_id)
        last_heartbeat = (service.last_seen_up or service.updated_at or
                          service.created_at)
-        if isinstance(last_heartbeat, six.string_types):
+        if isinstance(last_heartbeat, str):
            # NOTE(russellb) If this service came in over rpc via
            # conductor, then the timestamp will be a string and needs to be
            # converted back to a datetime.
--- a/watcher/applier/action_plan/base.py
+++ b/watcher/applier/action_plan/base.py
@@ -18,11 +18,9 @@
 #

 import abc
-import six


-@six.add_metaclass(abc.ABCMeta)
-class BaseActionPlanHandler(object):
+class BaseActionPlanHandler(object, metaclass=abc.ABCMeta):
    @abc.abstractmethod
    def execute(self):
        raise NotImplementedError()
--- a/watcher/applier/actions/base.py
+++ b/watcher/applier/actions/base.py
@@ -19,14 +19,12 @@
 import abc

 import jsonschema
-import six

 from watcher.common import clients
 from watcher.common.loader import loadable


-@six.add_metaclass(abc.ABCMeta)
-class BaseAction(loadable.Loadable):
+class BaseAction(loadable.Loadable, metaclass=abc.ABCMeta):
    # NOTE(jed): by convention we decided
    # that the attribute "resource_id" is the unique id of
    # the resource to which the Action applies to allow us to use it in the
--- a/watcher/applier/actions/factory.py
+++ b/watcher/applier/actions/factory.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #

-from __future__ import unicode_literals
-
 from oslo_log import log

 from watcher.applier.loading import default
--- a/watcher/applier/actions/migration.py
+++ b/watcher/applier/actions/migration.py
@@ -186,7 +186,7 @@ class Migrate(base.BaseAction):
        return self.migrate(destination=self.destination_node)

    def revert(self):
-        LOG.info('Migrate action do not revert!')
+        return self.migrate(destination=self.source_node)

    def abort(self):
        nova = nova_helper.NovaHelper(osc=self.osc)
--- a/watcher/applier/actions/resize.py
+++ b/watcher/applier/actions/resize.py
@@ -95,7 +95,7 @@ class Resize(base.BaseAction):
        return self.resize()

    def revert(self):
-        return self.migrate(destination=self.source_node)
+        LOG.warning("revert not supported")

    def pre_condition(self):
        # TODO(jed): check if the instance exists / check if the instance is on
--- a/watcher/applier/base.py
+++ b/watcher/applier/base.py
@@ -26,11 +26,9 @@ See: :doc:`../architecture` for more details on this component.
 """

 import abc
-import six


-@six.add_metaclass(abc.ABCMeta)
-class BaseApplier(object):
+class BaseApplier(object, metaclass=abc.ABCMeta):
    @abc.abstractmethod
    def execute(self, action_plan_uuid):
        raise NotImplementedError()
--- a/watcher/applier/loading/default.py
+++ b/watcher/applier/loading/default.py
@@ -11,9 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from __future__ import unicode_literals
-
-
 from watcher.common.loader import default


--- a/watcher/applier/workflow_engine/base.py
+++ b/watcher/applier/workflow_engine/base.py
@@ -17,7 +17,6 @@
 #

 import abc
-import six
 import time

 import eventlet
@@ -40,8 +39,7 @@ CANCEL_STATE = [objects.action_plan.State.CANCELLING,
                objects.action_plan.State.CANCELLED]


-@six.add_metaclass(abc.ABCMeta)
-class BaseWorkFlowEngine(loadable.Loadable):
+class BaseWorkFlowEngine(loadable.Loadable, metaclass=abc.ABCMeta):

    def __init__(self, config, context=None, applier_manager=None):
        """Constructor
--- a/watcher/applier/workflow_engine/default.py
+++ b/watcher/applier/workflow_engine/default.py
@@ -25,8 +25,11 @@ from taskflow import task as flow_task

 from watcher.applier.workflow_engine import base
 from watcher.common import exception
+from watcher import conf
 from watcher import objects

+CONF = conf.CONF
+
 LOG = log.getLogger(__name__)


@@ -127,9 +130,11 @@ class DefaultWorkFlowEngine(base.BaseWorkFlowEngine):

 class TaskFlowActionContainer(base.BaseTaskFlowActionContainer):
    def __init__(self, db_action, engine):
-        name = "action_type:{0} uuid:{1}".format(db_action.action_type,
-                                                 db_action.uuid)
-        super(TaskFlowActionContainer, self).__init__(name, db_action, engine)
+        self.name = "action_type:{0} uuid:{1}".format(db_action.action_type,
+                                                      db_action.uuid)
+        super(TaskFlowActionContainer, self).__init__(self.name,
+                                                      db_action,
+                                                      engine)

    def do_pre_execute(self):
        db_action = self.engine.notify(self._db_action,
@@ -158,6 +163,12 @@ class TaskFlowActionContainer(base.BaseTaskFlowActionContainer):
        self.action.post_condition()

    def do_revert(self, *args, **kwargs):
+        # NOTE: Not rollback action plan
+        if not CONF.watcher_applier.rollback_when_actionplan_failed:
+            LOG.info("Failed actionplan rollback option is turned off, and "
+                     "the following action will be skipped: %s", self.name)
+            return
+
        LOG.warning("Revert action: %s", self.name)
        try:
            # TODO(jed): do we need to update the states in case of failure?
--- a/watcher/cmd/init.py
+++ b/watcher/cmd/init.py
@@ -18,3 +18,10 @@
 import eventlet

 eventlet.monkey_patch()
+
+# Monkey patch the original current_thread to use the up-to-date _active
+# global variable. See https://bugs.launchpad.net/bugs/1863021 and
+# https://github.com/eventlet/eventlet/issues/592
+import __original_module_threading as orig_threading  # noqa
+import threading  # noqa
+orig_threading.current_thread.__globals__['_active'] = threading._active
--- a/watcher/common/context.py
+++ b/watcher/common/context.py
@@ -13,7 +13,6 @@
 from oslo_context import context
 from oslo_log import log
 from oslo_utils import timeutils
-import six

 LOG = log.getLogger(__name__)

@@ -69,7 +68,7 @@ class RequestContext(context.RequestContext):
        self.project_id = project_id
        if not timestamp:
            timestamp = timeutils.utcnow()
-        if isinstance(timestamp, six.string_types):
+        if isinstance(timestamp, str):
            timestamp = timeutils.parse_isotime(timestamp)
        self.timestamp = timestamp
        self.user_name = user_name
--- a/watcher/common/loader/base.py
+++ b/watcher/common/loader/base.py
@@ -14,14 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from __future__ import unicode_literals
-
 import abc
-import six


-@six.add_metaclass(abc.ABCMeta)
-class BaseLoader(object):
+class BaseLoader(object, metaclass=abc.ABCMeta):

    @abc.abstractmethod
    def list_available(self):
--- a/watcher/common/loader/default.py
+++ b/watcher/common/loader/default.py
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from __future__ import unicode_literals
-
 from oslo_config import cfg
 from oslo_log import log
 from stevedore import driver as drivermanager
--- a/watcher/common/loader/loadable.py
+++ b/watcher/common/loader/loadable.py
@@ -16,13 +16,10 @@

 import abc

-import six
-
 from watcher.common import service


-@six.add_metaclass(abc.ABCMeta)
-class Loadable(object):
+class Loadable(object, metaclass=abc.ABCMeta):
    """Generic interface for dynamically loading a driver/entry point.

    This defines the contract in order to let the loader manager inject
@@ -48,8 +45,7 @@ LoadableSingletonMeta = type(
    "LoadableSingletonMeta", (abc.ABCMeta, service.Singleton), {})


-@six.add_metaclass(LoadableSingletonMeta)
-class LoadableSingleton(object):
+class LoadableSingleton(object, metaclass=LoadableSingletonMeta):
    """Generic interface for dynamically loading a driver as a singleton.

    This defines the contract in order to let the loader manager inject
--- a/watcher/common/service_manager.py
+++ b/watcher/common/service_manager.py
@@ -15,11 +15,9 @@
 # under the License.

 import abc
-import six


-@six.add_metaclass(abc.ABCMeta)
-class ServiceManager(object):
+class ServiceManager(object, metaclass=abc.ABCMeta):

    @abc.abstractproperty
    def service_name(self):
--- a/watcher/common/utils.py
+++ b/watcher/common/utils.py
@@ -28,7 +28,6 @@ from oslo_config import cfg
 from oslo_log import log
 from oslo_utils import strutils
 from oslo_utils import uuidutils
-import six

 from watcher.common import exception

@@ -82,7 +81,7 @@ def safe_rstrip(value, chars=None):
    :return: Stripped value.

    """
-    if not isinstance(value, six.string_types):
+    if not isinstance(value, str):
        LOG.warning(
            "Failed to remove trailing character. Returning original object."
            "Supplied object is not a string: %s,", value)
@@ -104,7 +103,7 @@ def is_hostname_safe(hostname):

    """
    m = r'^[a-z0-9]([a-z0-9\-]{0,61}[a-z0-9])?$'
-    return (isinstance(hostname, six.string_types) and
+    return (isinstance(hostname, str) and
            (re.match(m, hostname) is not None))


--- a/watcher/conf/applier.py
+++ b/watcher/conf/applier.py
@@ -43,11 +43,20 @@ APPLIER_MANAGER_OPTS = [
               help='Select the engine to use to execute the workflow'),
 ]

+APPLIER_OPTS = [
+    cfg.BoolOpt('rollback_when_actionplan_failed',
+                default=False,
+                help='If set True, the failed actionplan will rollback '
+                     'when executing. Defaule value is False.'),
+]
+

 def register_opts(conf):
    conf.register_group(watcher_applier)
    conf.register_opts(APPLIER_MANAGER_OPTS, group=watcher_applier)
+    conf.register_opts(APPLIER_OPTS, group=watcher_applier)


 def list_opts():
-    return [(watcher_applier, APPLIER_MANAGER_OPTS)]
+    return [(watcher_applier, APPLIER_MANAGER_OPTS),
+            (watcher_applier, APPLIER_OPTS)]
--- a/watcher/db/api.py
+++ b/watcher/db/api.py
@@ -18,7 +18,6 @@ Base classes for storage engines
 import abc
 from oslo_config import cfg
 from oslo_db import api as db_api
-import six

 _BACKEND_MAPPING = {'sqlalchemy': 'watcher.db.sqlalchemy.api'}
 IMPL = db_api.DBAPI.from_config(cfg.CONF, backend_mapping=_BACKEND_MAPPING,
@@ -30,8 +29,7 @@ def get_instance():
    return IMPL


-@six.add_metaclass(abc.ABCMeta)
-class BaseConnection(object):
+class BaseConnection(object, metaclass=abc.ABCMeta):
    """Base class for storage system connections."""

    @abc.abstractmethod
--- a/watcher/db/purge.py
+++ b/watcher/db/purge.py
@@ -15,8 +15,6 @@
 # limitations under the License.
 #

-from __future__ import print_function
-
 import collections
 import datetime
 import itertools
@@ -25,7 +23,6 @@ import sys
 from oslo_log import log
 from oslo_utils import strutils
 import prettytable as ptable
-from six.moves import input

 from watcher._i18n import _
 from watcher._i18n import lazy_translation_enabled
--- a/watcher/decision_engine/audit/base.py
+++ b/watcher/decision_engine/audit/base.py
@@ -18,7 +18,6 @@
 # limitations under the License.
 #
 import abc
-import six

 from oslo_config import cfg
 from oslo_log import log
@@ -36,9 +35,11 @@ CONF = cfg.CONF
 LOG = log.getLogger(__name__)


-@six.add_metaclass(abc.ABCMeta)
-@six.add_metaclass(service.Singleton)
-class BaseAuditHandler(object):
+class BaseMetaClass(service.Singleton, abc.ABCMeta):
+    pass
+
+
+class BaseAuditHandler(object, metaclass=BaseMetaClass):

    @abc.abstractmethod
    def execute(self, audit, request_context):
@@ -57,8 +58,7 @@ class BaseAuditHandler(object):
        raise NotImplementedError()


-@six.add_metaclass(abc.ABCMeta)
-class AuditHandler(BaseAuditHandler):
+class AuditHandler(BaseAuditHandler, metaclass=abc.ABCMeta):

    def __init__(self):
        super(AuditHandler, self).__init__()
--- a/watcher/decision_engine/datasources/grafana.py
+++ b/watcher/decision_engine/datasources/grafana.py
@@ -16,9 +16,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+from urllib import parse as urlparse
+
 from oslo_config import cfg
 from oslo_log import log
-import six.moves.urllib.parse as urlparse

 from watcher.common import clients
 from watcher.common import exception
--- a/watcher/decision_engine/goal/base.py
+++ b/watcher/decision_engine/goal/base.py
@@ -15,13 +15,11 @@
 # limitations under the License.

 import abc
-import six

 from watcher.common.loader import loadable


-@six.add_metaclass(abc.ABCMeta)
-class Goal(loadable.Loadable):
+class Goal(loadable.Loadable, metaclass=abc.ABCMeta):

    def __init__(self, config):
        super(Goal, self).__init__(config)
--- a/watcher/decision_engine/goal/efficacy/base.py
+++ b/watcher/decision_engine/goal/efficacy/base.py
@@ -27,11 +27,8 @@ import abc
 import jsonschema
 from oslo_serialization import jsonutils

-import six

-
-@six.add_metaclass(abc.ABCMeta)
-class EfficacySpecification(object):
+class EfficacySpecification(object, metaclass=abc.ABCMeta):

    def __init__(self):
        self._indicators_specs = self.get_indicators_specifications()
--- a/watcher/decision_engine/goal/efficacy/indicators.py
+++ b/watcher/decision_engine/goal/efficacy/indicators.py
@@ -18,7 +18,6 @@ import abc
 import jsonschema
 from jsonschema import SchemaError
 from jsonschema import ValidationError
-import six

 from oslo_log import log
 from oslo_serialization import jsonutils
@@ -29,8 +28,7 @@ from watcher.common import exception
 LOG = log.getLogger(__name__)


-@six.add_metaclass(abc.ABCMeta)
-class IndicatorSpecification(object):
+class IndicatorSpecification(object, metaclass=abc.ABCMeta):

    def __init__(self, name=None, description=None, unit=None, required=True):
        self.name = name
--- a/watcher/decision_engine/loading/default.py
+++ b/watcher/decision_engine/loading/default.py
@@ -19,9 +19,6 @@
 # limitations under the License.
 #

-from __future__ import unicode_literals
-
-
 from watcher.common.loader import default


--- a/watcher/decision_engine/model/base.py
+++ b/watcher/decision_engine/model/base.py
@@ -25,11 +25,9 @@ See: :doc:`../architecture` for more details on this component.
 """

 import abc
-import six


-@six.add_metaclass(abc.ABCMeta)
-class Model(object):
+class Model(object, metaclass=abc.ABCMeta):

    @abc.abstractmethod
    def to_string(self):
--- a/watcher/decision_engine/model/collector/base.py
+++ b/watcher/decision_engine/model/collector/base.py
@@ -110,7 +110,6 @@ import time

 from oslo_config import cfg
 from oslo_log import log
-import six

 from watcher.common import clients
 from watcher.common.loader import loadable
@@ -120,8 +119,8 @@ LOG = log.getLogger(__name__)
 CONF = cfg.CONF


-@six.add_metaclass(abc.ABCMeta)
-class BaseClusterDataModelCollector(loadable.LoadableSingleton):
+class BaseClusterDataModelCollector(loadable.LoadableSingleton,
+                                    metaclass=abc.ABCMeta):

    STALE_MODEL = model_root.ModelRoot(stale=True)

--- a/watcher/decision_engine/model/collector/cinder.py
+++ b/watcher/decision_engine/model/collector/cinder.py
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-import six
-
 from oslo_log import log

 from watcher.common import cinder_helper
@@ -152,6 +150,9 @@ class CinderClusterDataModelCollector(base.BaseClusterDataModelCollector):
        if self._audit_scope_handler is None:
            LOG.debug("No audit, Don't Build storage data model")
            return
+        if self._data_model_scope is None:
+            LOG.debug("No audit scope, Don't Build storage data model")
+            return

        builder = CinderModelBuilder(self.osc)
        return builder.execute(self._data_model_scope)
@@ -286,7 +287,7 @@ class CinderModelBuilder(base.BaseModelBuilder):
        :param instance: Cinder Volume object.
        :return: A volume node for the graph.
        """
-        attachments = [{k: v for k, v in six.iteritems(d) if k in (
+        attachments = [{k: v for k, v in iter(d.items()) if k in (
            'server_id', 'attachment_id')} for d in volume.attachments]

        volume_attributes = {
--- a/watcher/decision_engine/model/collector/ironic.py
+++ b/watcher/decision_engine/model/collector/ironic.py
@@ -63,6 +63,9 @@ class BaremetalClusterDataModelCollector(base.BaseClusterDataModelCollector):
        if self._audit_scope_handler is None:
            LOG.debug("No audit, Don't Build Baremetal data model")
            return
+        if self._data_model_scope is None:
+            LOG.debug("No audit scope, Don't Build Baremetal data model")
+            return

        builder = BareMetalModelBuilder(self.osc)
        return builder.execute(self._data_model_scope)
--- a/watcher/decision_engine/model/collector/nova.py
+++ b/watcher/decision_engine/model/collector/nova.py
@@ -184,6 +184,9 @@ class NovaClusterDataModelCollector(base.BaseClusterDataModelCollector):
        if self._audit_scope_handler is None:
            LOG.debug("No audit, Don't Build compute data model")
            return
+        if self._data_model_scope is None:
+            LOG.debug("No audit scope, Don't Build compute data model")
+            return

        builder = NovaModelBuilder(self.osc)
        return builder.execute(self._data_model_scope)
--- a/watcher/decision_engine/model/element/baremetal_resource.py
+++ b/watcher/decision_engine/model/element/baremetal_resource.py
@@ -16,14 +16,12 @@

 import abc

-import six

 from watcher.decision_engine.model.element import base
 from watcher.objects import fields as wfields


-@six.add_metaclass(abc.ABCMeta)
-class BaremetalResource(base.Element):
+class BaremetalResource(base.Element, metaclass=abc.ABCMeta):

    VERSION = '1.0'

--- a/watcher/decision_engine/model/element/base.py
+++ b/watcher/decision_engine/model/element/base.py
@@ -21,7 +21,6 @@ import collections

 from lxml import etree
 from oslo_log import log
-import six

 from watcher.objects import base
 from watcher.objects import fields as wfields
@@ -29,9 +28,8 @@ from watcher.objects import fields as wfields
 LOG = log.getLogger(__name__)


-@six.add_metaclass(abc.ABCMeta)
 class Element(base.WatcherObject, base.WatcherObjectDictCompat,
-              base.WatcherComparableObject):
+              base.WatcherComparableObject, metaclass=abc.ABCMeta):

    # Initial version
    VERSION = '1.0'
--- a/watcher/decision_engine/model/element/compute_resource.py
+++ b/watcher/decision_engine/model/element/compute_resource.py
@@ -16,14 +16,12 @@

 import abc

-import six

 from watcher.decision_engine.model.element import base
 from watcher.objects import fields as wfields


-@six.add_metaclass(abc.ABCMeta)
-class ComputeResource(base.Element):
+class ComputeResource(base.Element, metaclass=abc.ABCMeta):

    VERSION = '1.0'

--- a/watcher/decision_engine/model/element/storage_resource.py
+++ b/watcher/decision_engine/model/element/storage_resource.py
@@ -16,14 +16,12 @@

 import abc

-import six

 from watcher.decision_engine.model.element import base
 from watcher.objects import fields as wfields


-@six.add_metaclass(abc.ABCMeta)
-class StorageResource(base.Element):
+class StorageResource(base.Element, metaclass=abc.ABCMeta):

    VERSION = '1.0'

--- a/watcher/decision_engine/model/model_root.py
+++ b/watcher/decision_engine/model/model_root.py
@@ -21,7 +21,6 @@ from lxml import etree
 import networkx as nx
 from oslo_concurrency import lockutils
 from oslo_log import log
-import six

 from watcher._i18n import _
 from watcher.common import exception
@@ -93,9 +92,9 @@ class ModelRoot(nx.DiGraph, base.Model):
        :param node: :py:class:`~.node.ComputeNode` object or node UUID
        :type node: str or :py:class:`~.instance.Instance`
        """
-        if isinstance(instance, six.string_types):
+        if isinstance(instance, str):
            instance = self.get_instance_by_uuid(instance)
-        if isinstance(node, six.string_types):
+        if isinstance(node, str):
            node = self.get_node_by_uuid(node)
        self.assert_node(node)
        self.assert_instance(instance)
@@ -104,9 +103,9 @@ class ModelRoot(nx.DiGraph, base.Model):

    @lockutils.synchronized("model_root")
    def unmap_instance(self, instance, node):
-        if isinstance(instance, six.string_types):
+        if isinstance(instance, str):
            instance = self.get_instance_by_uuid(instance)
-        if isinstance(node, six.string_types):
+        if isinstance(node, str):
            node = self.get_node_by_uuid(node)

        self.remove_edge(instance.uuid, node.uuid)
@@ -367,9 +366,9 @@ class StorageModelRoot(nx.DiGraph, base.Model):
        :param pool: :py:class:`~.node.Pool` object or pool name
        :param node: :py:class:`~.node.StorageNode` object or node host
        """
-        if isinstance(pool, six.string_types):
+        if isinstance(pool, str):
            pool = self.get_pool_by_pool_name(pool)
-        if isinstance(node, six.string_types):
+        if isinstance(node, str):
            node = self.get_node_by_name(node)
        self.assert_node(node)
        self.assert_pool(pool)
@@ -383,9 +382,9 @@ class StorageModelRoot(nx.DiGraph, base.Model):
        :param pool: :py:class:`~.node.Pool` object or pool name
        :param node: :py:class:`~.node.StorageNode` object or node name
        """
-        if isinstance(pool, six.string_types):
+        if isinstance(pool, str):
            pool = self.get_pool_by_pool_name(pool)
-        if isinstance(node, six.string_types):
+        if isinstance(node, str):
            node = self.get_node_by_name(node)

        self.remove_edge(pool.name, node.host)
@@ -411,9 +410,9 @@ class StorageModelRoot(nx.DiGraph, base.Model):
        :param volume: :py:class:`~.volume.Volume` object or volume UUID
        :param pool: :py:class:`~.node.Pool` object or pool name
        """
-        if isinstance(volume, six.string_types):
+        if isinstance(volume, str):
            volume = self.get_volume_by_uuid(volume)
-        if isinstance(pool, six.string_types):
+        if isinstance(pool, str):
            pool = self.get_pool_by_pool_name(pool)
        self.assert_pool(pool)
        self.assert_volume(volume)
@@ -427,9 +426,9 @@ class StorageModelRoot(nx.DiGraph, base.Model):
        :param volume: :py:class:`~.volume.Volume` object or volume UUID
        :param pool: :py:class:`~.node.Pool` object or pool name
        """
-        if isinstance(volume, six.string_types):
+        if isinstance(volume, str):
            volume = self.get_volume_by_uuid(volume)
-        if isinstance(pool, six.string_types):
+        if isinstance(pool, str):
            pool = self.get_pool_by_pool_name(pool)

        self.remove_edge(volume.uuid, pool.name)
--- a/watcher/decision_engine/model/notification/base.py
+++ b/watcher/decision_engine/model/notification/base.py
@@ -17,11 +17,9 @@
 # limitations under the License.

 import abc
-import six


-@six.add_metaclass(abc.ABCMeta)
-class NotificationEndpoint(object):
+class NotificationEndpoint(object, metaclass=abc.ABCMeta):

    def __init__(self, collector):
        super(NotificationEndpoint, self).__init__()
--- a/watcher/decision_engine/model/notification/cinder.py
+++ b/watcher/decision_engine/model/notification/cinder.py
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-import six
-
 from oslo_log import log
 from watcher.common import cinder_helper
 from watcher.common import exception
@@ -161,7 +159,7 @@ class CinderNotification(base.NotificationEndpoint):
                return 'attachment_id'

        attachments = [
-            {_keyReplace(k): v for k, v in six.iteritems(d)
+            {_keyReplace(k): v for k, v in iter(d.items())
                if k in ('instance_uuid', 'id')}
            for d in data['volume_attachment']
        ]
--- a/watcher/decision_engine/model/notification/filtering.py
+++ b/watcher/decision_engine/model/notification/filtering.py
@@ -19,7 +19,6 @@
 import re

 import oslo_messaging as om
-import six


 class NotificationFilter(om.NotificationFilter):
@@ -81,7 +80,7 @@ class NotificationFilter(om.NotificationFilter):
        elif regex is not None and data is None:
            return True
        elif (regex is not None and
-              isinstance(data, six.string_types) and
+              isinstance(data, str) and
              not regex.match(data)):
            return True

--- a/watcher/decision_engine/planner/base.py
+++ b/watcher/decision_engine/planner/base.py
@@ -45,13 +45,11 @@ See :doc:`../architecture` for more details on this component.
 """

 import abc
-import six

 from watcher.common.loader import loadable


-@six.add_metaclass(abc.ABCMeta)
-class BasePlanner(loadable.Loadable):
+class BasePlanner(loadable.Loadable, metaclass=abc.ABCMeta):

    @classmethod
    def get_config_opts(cls):
--- a/watcher/decision_engine/scope/base.py
+++ b/watcher/decision_engine/scope/base.py
@@ -16,13 +16,11 @@
 #

 import abc
-import six

 from watcher.common import context


-@six.add_metaclass(abc.ABCMeta)
-class BaseScope(object):
+class BaseScope(object, metaclass=abc.ABCMeta):
    """A base class for Scope mechanism

    Child of this class is called when audit launches strategy. This strategy
--- a/watcher/decision_engine/scoring/base.py
+++ b/watcher/decision_engine/scoring/base.py
@@ -17,13 +17,11 @@
 # limitations under the License.

 import abc
-import six

 from watcher.common.loader import loadable


-@six.add_metaclass(abc.ABCMeta)
-class ScoringEngine(loadable.Loadable):
+class ScoringEngine(loadable.Loadable, metaclass=abc.ABCMeta):
    """A base class for all the Scoring Engines.

    A Scoring Engine is an instance of a data model, to which the learning
@@ -97,8 +95,7 @@ class ScoringEngine(loadable.Loadable):
        return []


-@six.add_metaclass(abc.ABCMeta)
-class ScoringEngineContainer(loadable.Loadable):
+class ScoringEngineContainer(loadable.Loadable, metaclass=abc.ABCMeta):
    """A base class for all the Scoring Engines Containers.

    A Scoring Engine Container is an abstraction which allows to plugin
--- a/watcher/decision_engine/solution/base.py
+++ b/watcher/decision_engine/solution/base.py
@@ -56,13 +56,11 @@ Two approaches to dealing with this can be envisaged:
 """

 import abc
-import six

 from watcher.decision_engine.solution import efficacy


-@six.add_metaclass(abc.ABCMeta)
-class BaseSolution(object):
+class BaseSolution(object, metaclass=abc.ABCMeta):
    def __init__(self, goal, strategy):
        """Base Solution constructor

--- a/watcher/decision_engine/solution/solution_comparator.py
+++ b/watcher/decision_engine/solution/solution_comparator.py
@@ -17,11 +17,9 @@
 # limitations under the License.
 #
 import abc
-import six


-@six.add_metaclass(abc.ABCMeta)
-class BaseSolutionComparator(object):
+class BaseSolutionComparator(object, metaclass=abc.ABCMeta):
    @abc.abstractmethod
    def compare(self, sol1, sol2):
        raise NotImplementedError()
--- a/watcher/decision_engine/solution/solution_evaluator.py
+++ b/watcher/decision_engine/solution/solution_evaluator.py
@@ -17,11 +17,9 @@
 # limitations under the License.
 #
 import abc
-import six


-@six.add_metaclass(abc.ABCMeta)
-class BaseSolutionEvaluator(object):
+class BaseSolutionEvaluator(object, metaclass=abc.ABCMeta):
    @abc.abstractmethod
    def evaluate(self, solution):
        raise NotImplementedError()
--- a/watcher/decision_engine/strategy/context/base.py
+++ b/watcher/decision_engine/strategy/context/base.py
@@ -18,14 +18,12 @@
 # limitations under the License.

 import abc
-import six

 from watcher import notifications
 from watcher.objects import fields


-@six.add_metaclass(abc.ABCMeta)
-class StrategyContext(object):
+class StrategyContext(object, metaclass=abc.ABCMeta):

    def execute_strategy(self, audit, request_context):
        """Execute the strategy for the given an audit
--- a/watcher/decision_engine/strategy/selection/base.py
+++ b/watcher/decision_engine/strategy/selection/base.py
@@ -17,11 +17,9 @@
 # limitations under the License.
 #
 import abc
-import six


-@six.add_metaclass(abc.ABCMeta)
-class BaseSelector(object):
+class BaseSelector(object, metaclass=abc.ABCMeta):

    @abc.abstractmethod
    def select(self):
--- a/watcher/decision_engine/strategy/strategies/base.py
+++ b/watcher/decision_engine/strategy/strategies/base.py
@@ -37,7 +37,6 @@ which are dynamically loaded by Watcher at launch time.
 """

 import abc
-import six

 from oslo_config import cfg
 from oslo_log import log
@@ -121,8 +120,7 @@ class StrategyEndpoint(object):
        return [available_datasource, available_metrics, available_cdm]


-@six.add_metaclass(abc.ABCMeta)
-class BaseStrategy(loadable.Loadable):
+class BaseStrategy(loadable.Loadable, metaclass=abc.ABCMeta):
    """A base class for all the strategies

    A Strategy is an algorithm implementation which is able to find a
@@ -471,8 +469,7 @@ class BaseStrategy(loadable.Loadable):
                                 input_parameters=parameters)


-@six.add_metaclass(abc.ABCMeta)
-class DummyBaseStrategy(BaseStrategy):
+class DummyBaseStrategy(BaseStrategy, metaclass=abc.ABCMeta):

    @classmethod
    def get_goal_name(cls):
@@ -485,8 +482,7 @@ class DummyBaseStrategy(BaseStrategy):
        return []


-@six.add_metaclass(abc.ABCMeta)
-class UnclassifiedStrategy(BaseStrategy):
+class UnclassifiedStrategy(BaseStrategy, metaclass=abc.ABCMeta):
    """This base class is used to ease the development of new strategies

    The goal defined within this strategy can be used to simplify the
@@ -500,8 +496,7 @@ class UnclassifiedStrategy(BaseStrategy):
        return "unclassified"


-@six.add_metaclass(abc.ABCMeta)
-class ServerConsolidationBaseStrategy(BaseStrategy):
+class ServerConsolidationBaseStrategy(BaseStrategy, metaclass=abc.ABCMeta):

    REASON_FOR_DISABLE = 'watcher_disabled'

@@ -510,16 +505,14 @@ class ServerConsolidationBaseStrategy(BaseStrategy):
        return "server_consolidation"


-@six.add_metaclass(abc.ABCMeta)
-class ThermalOptimizationBaseStrategy(BaseStrategy):
+class ThermalOptimizationBaseStrategy(BaseStrategy, metaclass=abc.ABCMeta):

    @classmethod
    def get_goal_name(cls):
        return "thermal_optimization"


-@six.add_metaclass(abc.ABCMeta)
-class WorkloadStabilizationBaseStrategy(BaseStrategy):
+class WorkloadStabilizationBaseStrategy(BaseStrategy, metaclass=abc.ABCMeta):

    def __init__(self, *args, **kwargs):
        super(WorkloadStabilizationBaseStrategy, self
@@ -531,16 +524,14 @@ class WorkloadStabilizationBaseStrategy(BaseStrategy):
        return "workload_balancing"


-@six.add_metaclass(abc.ABCMeta)
-class NoisyNeighborBaseStrategy(BaseStrategy):
+class NoisyNeighborBaseStrategy(BaseStrategy, metaclass=abc.ABCMeta):

    @classmethod
    def get_goal_name(cls):
        return "noisy_neighbor"


-@six.add_metaclass(abc.ABCMeta)
-class SavingEnergyBaseStrategy(BaseStrategy):
+class SavingEnergyBaseStrategy(BaseStrategy, metaclass=abc.ABCMeta):

    @classmethod
    def get_goal_name(cls):
@@ -553,8 +544,7 @@ class SavingEnergyBaseStrategy(BaseStrategy):
        return []


-@six.add_metaclass(abc.ABCMeta)
-class ZoneMigrationBaseStrategy(BaseStrategy):
+class ZoneMigrationBaseStrategy(BaseStrategy, metaclass=abc.ABCMeta):

    @classmethod
    def get_goal_name(cls):
@@ -567,8 +557,7 @@ class ZoneMigrationBaseStrategy(BaseStrategy):
        return []


-@six.add_metaclass(abc.ABCMeta)
-class HostMaintenanceBaseStrategy(BaseStrategy):
+class HostMaintenanceBaseStrategy(BaseStrategy, metaclass=abc.ABCMeta):

    REASON_FOR_MAINTAINING = 'watcher_maintaining'

--- a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
+++ b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
@@ -19,7 +19,6 @@
 #

 from oslo_log import log
-import six

 from watcher._i18n import _
 from watcher.common import exception
@@ -132,7 +131,7 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):

        :param instance:
        """
-        if isinstance(instance.state, six.string_types):
+        if isinstance(instance.state, str):
            return instance.state
        elif isinstance(instance.state, element.InstanceState):
            return instance.state.value
@@ -148,7 +147,7 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):

        :param node:
        """
-        if isinstance(node.status, six.string_types):
+        if isinstance(node.status, str):
            return node.status
        elif isinstance(node.status, element.ServiceState):
            return node.status.value
--- a/watcher/decision_engine/strategy/strategies/workload_balance.py
+++ b/watcher/decision_engine/strategy/strategies/workload_balance.py
@@ -17,8 +17,6 @@
 # limitations under the License.
 #

-from __future__ import division
-
 from oslo_log import log

 from watcher._i18n import _
--- a/watcher/decision_engine/strategy/strategies/zone_migration.py
+++ b/watcher/decision_engine/strategy/strategies/zone_migration.py
@@ -13,7 +13,6 @@
 #

 from dateutil.parser import parse
-import six

 from oslo_log import log

@@ -282,7 +281,7 @@ class ZoneMigration(base.ZoneMigrationBaseStrategy):
        action_counter = ActionCounter(total_limit,
                                       per_pool_limit, per_node_limit)

-        for k, targets in six.iteritems(filtered_targets):
+        for k, targets in iter(filtered_targets.items()):
            if k == VOLUME:
                self.volumes_migration(targets, action_counter)
            elif k == INSTANCE:
@@ -580,7 +579,7 @@ class ZoneMigration(base.ZoneMigrationBaseStrategy):
        filter_list = []
        priority_filter_map = self.get_priority_filter_map()

-        for k, v in six.iteritems(self.priority):
+        for k, v in iter(self.priority.items()):
            if k in priority_filter_map:
                filter_list.append(priority_filter_map[k](v))

@@ -710,7 +709,7 @@ class BaseFilter(object):
            return {}

        for cond in list(reversed(self.condition)):
-            for k, v in six.iteritems(targets):
+            for k, v in iter(targets.items()):
                if not self.is_allowed(k):
                    continue
                LOG.debug("filter:%s with the key: %s", cond, k)
--- a/watcher/decision_engine/threading.py
+++ b/watcher/decision_engine/threading.py
@@ -19,7 +19,6 @@
 import copy
 import futurist
 from futurist import waiters
-import six

 from oslo_config import cfg
 from oslo_log import log
@@ -29,8 +28,7 @@ CONF = cfg.CONF
 LOG = log.getLogger(__name__)


-@six.add_metaclass(service.Singleton)
-class DecisionEngineThreadPool(object):
+class DecisionEngineThreadPool(object, metaclass=service.Singleton):
    """Singleton threadpool to submit general tasks to"""

    def __init__(self):
--- a/watcher/hacking/checks.py
+++ b/watcher/hacking/checks.py
@@ -285,3 +285,31 @@ def no_redundant_import_alias(logical_line):
    """
    if re.match(re_redundant_import_alias, logical_line):
        yield(0, "N342: No redundant import alias.")
+
+
+@flake8ext
+def import_stock_mock(logical_line):
+    """Use python's mock, not the mock library.
+
+    Since we `dropped support for python 2`__, we no longer need to use the
+    mock library, which existed to backport py3 functionality into py2.
+    Which must be done by saying::
+
+        from unittest import mock
+
+    ...because if you say::
+
+        import mock
+
+    ...you definitely will not be getting the standard library mock. That will
+    always import the third party mock library. This check can be removed in
+    the future (and we can start saying ``import mock`` again) if we manage to
+    purge these transitive dependencies.
+
+    .. __: https://review.opendev.org/#/c/717540
+
+    N366
+    """
+    if logical_line == 'import mock':
+        yield (0, "N366: You must explicitly import python's mock: "
+                  "``from unittest import mock``")
--- a/watcher/locale/de/LC_MESSAGES/watcher.po
+++ b/watcher/locale/de/LC_MESSAGES/watcher.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: watcher VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2020-04-26 01:47+0000\n"
+"POT-Creation-Date: 2020-04-26 02:09+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/watcher/locale/en_GB/LC_MESSAGES/watcher.po
+++ b/watcher/locale/en_GB/LC_MESSAGES/watcher.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: watcher VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2020-04-26 01:47+0000\n"
+"POT-Creation-Date: 2020-04-26 02:09+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/watcher/objects/fields.py
+++ b/watcher/objects/fields.py
@@ -15,7 +15,6 @@
 """Utility methods for objects"""

 import ast
-import six

 from oslo_serialization import jsonutils
 from oslo_versionedobjects import fields
@@ -67,7 +66,7 @@ class ListOfUUIDsField(fields.AutoTypedField):
 class FlexibleDict(fields.FieldType):
    @staticmethod
    def coerce(obj, attr, value):
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
            value = ast.literal_eval(value)
        return dict(value)

@@ -87,7 +86,7 @@ class FlexibleDictField(fields.AutoTypedField):
 class FlexibleListOfDict(fields.FieldType):
    @staticmethod
    def coerce(obj, attr, value):
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
            value = ast.literal_eval(value)
        return list(value)

@@ -106,7 +105,7 @@ class FlexibleListOfDictField(fields.AutoTypedField):

 class Json(fields.FieldType):
    def coerce(self, obj, attr, value):
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
            loaded = jsonutils.loads(value)
            return loaded
        return value
--- a/watcher/tests/api/base.py
+++ b/watcher/tests/api/base.py
@@ -23,12 +23,12 @@
 # NOTE(deva): import auth_token so we can override a config option

 import copy
-import mock
+from unittest import mock
+from urllib import parse as urlparse

 from oslo_config import cfg
 import pecan
 import pecan.testing
-from six.moves.urllib import parse as urlparse

 from watcher.api import hooks
 from watcher.common import context as watcher_context
--- a/watcher/tests/api/test_config.py
+++ b/watcher/tests/api/test_config.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-import imp
+import importlib
 from oslo_config import cfg
 from watcher.api import config as api_config
 from watcher.tests.api import base
@@ -23,13 +23,13 @@ class TestRoot(base.FunctionalTest):
    def test_config_enable_webhooks_auth(self):
        acl_public_routes = ['/']
        cfg.CONF.set_override('enable_webhooks_auth', True, 'api')
-        imp.reload(api_config)
+        importlib.reload(api_config)
        self.assertEqual(acl_public_routes,
                         api_config.app['acl_public_routes'])

    def test_config_disable_webhooks_auth(self):
        acl_public_routes = ['/', '/v1/webhooks/.*']
        cfg.CONF.set_override('enable_webhooks_auth', False, 'api')
-        imp.reload(api_config)
+        importlib.reload(api_config)
        self.assertEqual(acl_public_routes,
                         api_config.app['acl_public_routes'])
--- a/watcher/tests/api/test_hooks.py
+++ b/watcher/tests/api/test_hooks.py
@@ -14,9 +14,8 @@

 """Tests for the Pecan API hooks."""

-from __future__ import unicode_literals
+from unittest import mock

-import mock
 from oslo_config import cfg
 import oslo_messaging as messaging
 from oslo_serialization import jsonutils
--- a/watcher/tests/api/test_scheduling.py
+++ b/watcher/tests/api/test_scheduling.py
@@ -15,7 +15,7 @@
 from apscheduler.schedulers import background
 import datetime
 import freezegun
-import mock
+from unittest import mock

 from watcher.api import scheduling
 from watcher.notifications import service
--- a/watcher/tests/api/test_utils.py
+++ b/watcher/tests/api/test_utils.py
@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from __future__ import unicode_literals
-
 from oslo_config import cfg
 import wsme

--- a/watcher/tests/api/v1/test_actions.py
+++ b/watcher/tests/api/v1/test_actions.py
@@ -12,7 +12,7 @@

 import datetime
 import itertools
-import mock
+from unittest import mock

 from oslo_config import cfg
 from oslo_serialization import jsonutils
--- a/watcher/tests/api/v1/test_actions_plans.py
+++ b/watcher/tests/api/v1/test_actions_plans.py
@@ -12,7 +12,7 @@

 import datetime
 import itertools
-import mock
+from unittest import mock

 from oslo_config import cfg
 from oslo_serialization import jsonutils
--- a/watcher/tests/api/v1/test_audit_templates.py
+++ b/watcher/tests/api/v1/test_audit_templates.py
@@ -12,13 +12,13 @@

 import datetime
 import itertools
-import mock
-from webtest.app import AppError
+from unittest import mock
+from urllib import parse as urlparse

 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
-from six.moves.urllib import parse as urlparse
+import webtest.app as webtest_app
 from wsme import types as wtypes

 from watcher.api.controllers.v1 import audit_template as api_audit_template
@@ -555,6 +555,35 @@ class TestPost(FunctionalTestWithSetup):
            response.json['created_at']).replace(tzinfo=None)
        self.assertEqual(test_time, return_created_at)

+    @mock.patch.object(timeutils, 'utcnow')
+    def test_create_audit_template_with_strategy_name(self, mock_utcnow):
+        audit_template_dict = post_get_test_audit_template(
+            goal=self.fake_goal1.uuid,
+            strategy=self.fake_strategy1.name)
+        test_time = datetime.datetime(2000, 1, 1, 0, 0)
+        mock_utcnow.return_value = test_time
+
+        response = self.post_json('/audit_templates', audit_template_dict)
+        self.assertEqual('application/json', response.content_type)
+        self.assertEqual(201, response.status_int)
+        # Check location header
+        self.assertIsNotNone(response.location)
+        expected_location = \
+            '/v1/audit_templates/%s' % response.json['uuid']
+        self.assertEqual(urlparse.urlparse(response.location).path,
+                         expected_location)
+        self.assertTrue(utils.is_uuid_like(response.json['uuid']))
+        self.assertNotIn('updated_at', response.json.keys)
+        self.assertNotIn('deleted_at', response.json.keys)
+        self.assertEqual(self.fake_goal1.uuid, response.json['goal_uuid'])
+        self.assertEqual(self.fake_strategy1.uuid,
+                         response.json['strategy_uuid'])
+        self.assertEqual(self.fake_strategy1.name,
+                         response.json['strategy_name'])
+        return_created_at = timeutils.parse_isotime(
+            response.json['created_at']).replace(tzinfo=None)
+        self.assertEqual(test_time, return_created_at)
+
    def test_create_audit_template_validation_with_aggregates(self):
        scope = [{'compute': [{'host_aggregates': [{'id': '*'}]},
                              {'availability_zones': [{'name': 'AZ1'},
@@ -574,7 +603,7 @@ class TestPost(FunctionalTestWithSetup):
        audit_template_dict = post_get_test_audit_template(
            goal=self.fake_goal1.uuid,
            strategy=self.fake_strategy1.uuid, scope=scope)
-        with self.assertRaisesRegex(AppError,
+        with self.assertRaisesRegex(webtest_app.AppError,
                                    "be included and excluded together"):
            self.post_json('/audit_templates', audit_template_dict)

@@ -663,6 +692,26 @@ class TestPost(FunctionalTestWithSetup):
        self.assertEqual(400, response.status_int)
        assert not cn_mock.called

+    def test_create_audit_template_with_old_scope(self):
+        scope = [{'host_aggregates': [{'id': '*'}]},
+                 {'availability_zones': [{'name': 'AZ1'},
+                                         {'name': 'AZ2'}]},
+                 {'exclude': [
+                     {'instances': [
+                         {'uuid': 'INSTANCE_1'},
+                         {'uuid': 'INSTANCE_2'}]},
+                     {'compute_nodes': [
+                         {'name': 'Node_1'},
+                         {'name': 'Node_2'}]},
+                 ]}
+                 ]
+        audit_template_dict = post_get_test_audit_template(
+            goal=self.fake_goal1.uuid,
+            strategy=self.fake_strategy1.uuid, scope=scope)
+        response = self.post_json('/audit_templates',
+                                  audit_template_dict)
+        self.assertEqual(201, response.status_int)
+

 class TestDelete(api_base.FunctionalTest):

--- a/watcher/tests/api/v1/test_audits.py
+++ b/watcher/tests/api/v1/test_audits.py
@@ -13,14 +13,14 @@
 import datetime
 from dateutil import tz
 import itertools
-import mock
+from unittest import mock
+from urllib import parse as urlparse

 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 from wsme import types as wtypes

-from six.moves.urllib import parse as urlparse
 from watcher.api.controllers.v1 import audit as api_audit
 from watcher.common import utils
 from watcher.db import api as db_api
--- a/watcher/tests/api/v1/test_data_model.py
+++ b/watcher/tests/api/v1/test_data_model.py
@@ -13,7 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.

-import mock
+from unittest import mock

 from oslo_serialization import jsonutils

--- a/watcher/tests/api/v1/test_goals.py
+++ b/watcher/tests/api/v1/test_goals.py
@@ -12,7 +12,7 @@

 from oslo_config import cfg
 from oslo_serialization import jsonutils
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse

 from watcher.common import utils
 from watcher.tests.api import base as api_base
--- a/watcher/tests/api/v1/test_services.py
+++ b/watcher/tests/api/v1/test_services.py
@@ -12,7 +12,7 @@

 from oslo_config import cfg
 from oslo_serialization import jsonutils
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse

 from watcher.tests.api import base as api_base
 from watcher.tests.objects import utils as obj_utils
--- a/watcher/tests/api/v1/test_strategies.py
+++ b/watcher/tests/api/v1/test_strategies.py
@@ -10,11 +10,11 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.

-import mock
+from unittest import mock
+from urllib import parse as urlparse

 from oslo_config import cfg
 from oslo_serialization import jsonutils
-from six.moves.urllib import parse as urlparse

 from watcher.common import utils
 from watcher.decision_engine import rpcapi as deapi
--- a/watcher/tests/api/v1/test_types.py
+++ b/watcher/tests/api/v1/test_types.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-import mock
+from unittest import mock
 import webtest
 import wsme
 from wsme import types as wtypes
--- a/watcher/tests/api/v1/test_webhooks.py
+++ b/watcher/tests/api/v1/test_webhooks.py
@@ -10,7 +10,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.

-import mock
+from unittest import mock

 from watcher.decision_engine import rpcapi as deapi
 from watcher import objects
--- a/watcher/tests/applier/action_plan/test_default_action_handler.py
+++ b/watcher/tests/applier/action_plan/test_default_action_handler.py
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-import mock
+from unittest import mock

 from watcher.applier.action_plan import default
 from watcher.applier import default as ap_applier
--- a/watcher/tests/applier/actions/loading/test_default_actions_loader.py
+++ b/watcher/tests/applier/actions/loading/test_default_actions_loader.py
@@ -12,7 +12,6 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import unicode_literals

 from watcher.applier.actions import base as abase
 from watcher.applier.loading import default
--- a/watcher/tests/applier/actions/test_change_node_power_state.py
+++ b/watcher/tests/applier/actions/test_change_node_power_state.py
@@ -13,10 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from __future__ import unicode_literals
+from unittest import mock

 import jsonschema
-import mock

 from watcher.applier.actions import base as baction
 from watcher.applier.actions import change_node_power_state
--- a/watcher/tests/applier/actions/test_change_nova_service_state.py
+++ b/watcher/tests/applier/actions/test_change_nova_service_state.py
@@ -13,10 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from __future__ import unicode_literals
+from unittest import mock

 import jsonschema
-import mock

 from watcher.applier.actions import base as baction
 from watcher.applier.actions import change_nova_service_state
--- a/watcher/tests/applier/actions/test_migration.py
+++ b/watcher/tests/applier/actions/test_migration.py
@@ -13,11 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from __future__ import unicode_literals
-
+from unittest import mock

 import jsonschema
-import mock

 from watcher.applier.actions import base as baction
 from watcher.applier.actions import migration
@@ -187,6 +185,29 @@ class TestMigration(base.TestCase):
                dest_hostname="compute2-hostname"
            )

+    def test_revert_live_migration(self):
+        self.m_helper.find_instance.return_value = self.INSTANCE_UUID
+
+        self.action.revert()
+
+        self.m_helper_cls.assert_called_once_with(osc=self.m_osc)
+        self.m_helper.live_migrate_instance.assert_called_once_with(
+            instance_id=self.INSTANCE_UUID,
+            dest_hostname="compute1-hostname"
+        )
+
+    def test_revert_cold_migration(self):
+        self.m_helper.find_instance.return_value = self.INSTANCE_UUID
+
+        self.action_cold.revert()
+
+        self.m_helper_cls.assert_called_once_with(osc=self.m_osc)
+        self.m_helper.watcher_non_live_migrate_instance.\
+            assert_called_once_with(
+                instance_id=self.INSTANCE_UUID,
+                dest_hostname="compute1-hostname"
+            )
+
    def test_abort_live_migrate(self):
        migration = mock.MagicMock()
        migration.id = "2"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thierry Carrez	ab64069e23	Move queue declaration to project level This moves the watcher queue declaration from the pipeline level (where it is no longer valid) to the project level. https: //lists.openstack.org/pipermail/openstack-discuss/2022-May/028603.html Change-Id: I06923abb00f7eecd59587f44cd1f6a069e88a9fc (cherry picked from commit `6003322711`)	2023-08-19 07:30:34 +00:00
OpenStack Release Bot	d8c7ad662f	Update TOX_CONSTRAINTS_FILE for stable/victoria Update the URL to the upper-constraints file to point to the redirect rule on releases.openstack.org so that anyone working on this branch will switch to the correct upper-constraints list automatically when the requirements repository branches. Until the requirements repository has as stable/victoria branch, tests will continue to use the upper-constraints list on master. Change-Id: Ieb0a95af10dd8e054254618a9021e69aca68191a	2020-09-30 01:54:48 +00:00
OpenStack Release Bot	9e3ce13f7b	Update .gitreview for stable/victoria Change-Id: I3314bd862a24fb5b114a562068168ef673b49397	2020-09-30 01:40:38 +00:00
Ghanshyam Mann	507765dc3e	[goal] Migrate testing to ubuntu focal As per victoria cycle testing runtime and community goal[1] we need to migrate upstream CI/CD to Ubuntu Focal(20.04). Fixing: - bug#1886298 Bump the lower constraints for required deps which added python3.8 support in their later version. - Move multinode jobs to focal nodeset Story: #2007865 Task: #40227 Closes-Bug: #1886298 [1] https://governance.openstack.org/tc/goals/selected/victoria/migrate-ci-cd-jobs-to-ubuntu-focal> Depends-On: https://review.opendev.org/#/c/752294/ Change-Id: Iec953f3294087cd0b628b701ad3d684cea61c057 (cherry picked from commit `e21e5f609e`)	2020-09-29 09:02:47 +00:00
zhoulinhui	583c946061	Use importlib to take place of im module The imp module is deprecated[1] since version 3.4, use importlib to instead 1: https://docs.python.org/3/library/imp.html#imp.reload Change-Id: Ic126bc8e0936e5d7a2c7a910b54b7348026fedcb	2020-08-29 16:12:52 +00:00
Zuul	25a0b184a1	Merge "option to rollback action_plan when it fails"	2020-08-18 07:55:59 +00:00
Luigi Toscano	ed59145354	Native Zuul v3 watcher-grenade job + some cleanup Create a native Zuul v3 grenade job. It matches the existing job, even though it doesn't call any local hook as the current legacy job does (because no local hook exists and it should be rewritten as zuul configuration if it did). The new job reuses the variable definition of the devstack watcher job, so clean up that job as well: - do not depend on devstack-gate, which is not needed and will be deprecated soon anyway; - use the new way (tempest_plugins) to define which tempest plugin should be installed; - remove the definition of USE_PYTHON3: true and simply inherit the value set by devstack; - remove the definition of PYTHONUNBUFFERED, not really set anywhere else and only useful back in the days in Jenkins. Change-Id: Ib0ed3c0f395e1b85b8f25f6e438c414165baab32	2020-07-29 09:45:17 +02:00
suzhengwei	19adfda3b9	option to rollback action_plan when it fails It has costs when rollback action_plan. So give users an option whether to rollback it when the action_plan fails. Change-Id: I20c0afded795eda7fb1b57ffdd2ae1ca36c45301	2020-07-10 10:31:26 +08:00
Zuul	fa56bc715e	Merge "resize action don't support revert"	2020-07-06 01:48:00 +00:00
Zuul	350ce66d3c	Merge "Watcher API supports strategy name when creating audit template"	2020-07-06 01:47:59 +00:00
licanwei	1667046f58	resize action don't support revert Change-Id: Ia2df0e0a4f242392915aa2a89d4fbae39b6c70e9	2020-07-02 14:48:55 +08:00
limin0801	3f7a508a2e	Watcher API supports strategy name when creating audit template when directly using the `curl` command to create audit template, strategy name can be accepted. Closes-Bug: #1884174 Change-Id: I7c0ca760a7fa414faca03c5293df34a84aad6fac	2020-07-01 01:46:44 +00:00
Zuul	f7f5659bca	Merge "Revert "Don't revert Migrate action""	2020-06-25 03:28:11 +00:00
suzhengwei	57f55190ff	Revert "Don't revert Migrate action" Whether to revert migrate action when the action_plan fails is determained by 'rollback_actionplan' option. This reverts commit `c522e881b1`. Change-Id: I5379018b7838dff4caf0ee0ce06cfa32e7b37b12	2020-06-22 09:26:46 +00:00
Zuul	237550ad57	Merge "remove mox3"	2020-06-19 07:24:56 +00:00
Zuul	cad67702d6	Merge "Use unittest.mock instead of mock"	2020-06-19 02:19:21 +00:00
licanwei	ae678dfaaa	remove mox3 Change-Id: Ia7a4dce8ccc8d9062d6fcca74b8184d85ee7fccb	2020-06-19 09:49:32 +08:00
Zuul	5ad3960286	Merge "voting watcher-grenade"	2020-06-18 08:09:19 +00:00
licanwei	dbd86be363	voting watcher-grenade Change-Id: I69ef17b545c62fe5b17e002b4c154e80e7fa5ffa	2020-06-18 10:14:01 +08:00
licanwei	9f0138e1cf	Check if scope is None if scope is None, don't create data model Change-Id: Icf611966c9b0a3882615d778ee6c72a8da73841d Closed-Bug: #1881920	2020-06-18 00:58:16 +00:00
zhurong	097ac06f0b	Use uwsgi binary from path and mark grenade non-voting Change-Id: Iaa6283e3f34166210cc2d0c918e610484bfd3ab9	2020-06-16 08:02:26 +00:00
Hervé Beraud	0869b1c75c	Use unittest.mock instead of mock The mock third party library was needed for mock support in py2 runtimes. Since we now only support py36 and later, we can use the standard lib unittest.mock module instead. Change-Id: I4ee01710d04d650a3ad5ae069015255d3f674c74	2020-06-09 12:20:06 +02:00
Zuul	527578a147	Merge "Compatible with old scope format"	2020-06-09 07:32:12 +00:00
Hervé Beraud	b0c411b22a	Cap jsonschema 3.2.0 as the minimal version Previous versions of jsonschema (<3.2.0) doesn't support python 3.8 [1]. Python 3.8 is part of the victoria supported runtimes [2] so we now force to use jsonschema version 3.2.0 to avoid issues, remove ambiguity and ensure that everything works with python 3 in general. [1] https://github.com/Julian/jsonschema/pull/627 [2] https://governance.openstack.org/tc/reference/runtimes/victoria.html#python-runtimes-for-victoria Change-Id: Id476227552c3fa91eecadbc6c4370c354f56a40d	2020-06-05 03:39:13 +00:00
licanwei	4a1915bec4	Compatible with old scope format Scope format changed from old to new after bp cdm-scoping. old format: - availability_zones: - name: nova - host_aggregates: - id: 1 - name: agg - exclude: - compute_nodes: - name: w012 new format: - compute: - availability_zones: - name: nova - host_aggregates: - id: 1 - name: agg - exclude: - compute_nodes: - name: w012 Change-Id: I2b5cd4d1cee19f5588e4d2185eb074343fff1187 Closed-Bug: #1882049	2020-06-04 17:24:41 +08:00
Sean McGinnis	751027858b	Use unittest.mock instead of third party mock Now that we no longer support py27, we can use the standard library unittest.mock module instead of the third party mock lib. Change-Id: I6cdd4c35a52a014ba3c4dfe4cc2bd4d670c96bc3 Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>	2020-05-29 13:48:06 -05:00
Zuul	12bd9c0590	Merge "Remove translation sections from setup.cfg"	2020-05-28 02:30:26 +00:00
Andreas Jaeger	1ff940598f	Switch to newer openstackdocstheme and reno versions Switch to openstackdocstheme 2.2.1 and reno 3.1.0 versions. Using these versions will allow especially: * Linking from HTML to PDF document * Allow parallel building of documents * Fix some rendering problems Update Sphinx version as well. Set openstackdocs_pdf_link to link to PDF file. Note that the link to the published document only works on docs.openstack.org where the PDF file is placed in the top-level html directory. The site-preview places the PDF in a pdf directory. Set openstackdocs_auto_name to False to use 'project' variable as name. Change pygments_style to 'native' since old theme version always used 'native' and the theme now respects the setting and using 'sphinx' can lead to some strange rendering. Remove docs requirements from lower-constraints, they are not needed during install or test but only for docs building. openstackdocstheme renames some variables, so follow the renames before the next release removes them. A couple of variables are also not needed anymore, remove them. See also http://lists.openstack.org/pipermail/openstack-discuss/2020-May/014971.html Change-Id: Ia9a3fb804fb59bb70edc150a3eb20c07a279170b	2020-05-21 15:15:16 +00:00
Andreas Jaeger	9d495618d2	Fix requirements check Remove python_version so that requirements-check passes again. Change-Id: I46c6118d9b29a17a3186b3fd5f47115236913a16	2020-05-21 12:35:46 +02:00
jacky06	c6d2690aa3	Remove translation sections from setup.cfg These translation sections are not needed anymore, Babel can generate translation files without them. Change-Id: I95bde8575638511449edaa1e546e3399bf0e6451	2020-05-15 00:56:16 +08:00
Zuul	623e44ecf9	Merge "Monkey patch original current_thread _active"	2020-05-14 03:54:43 +00:00
zhangbailin	5c34b6bc47	hacking: force explicit import of python's mock Since we dropped support for python 2 [1], we no longer need to use the mock library, which existed to backport py3 functionality into py2. Which must be done by saying:: from unittest import mock ...because if you say:: import mock ...you definitely will not be getting the standard library mock. That will always import the third party mock library. This commit adds hacking check N366 to enforce the former. This check can be removed in the future (and we can start saying ``import mock`` again) if we manage to purge these transitive dependencies. I'm not holding my breath. [1]https://review.opendev.org/#/c/717540 Change-Id: I8c8c99024e8de61d9151480d70543f809a100998	2020-05-13 15:42:42 +08:00
zhangbailin	8a36ad5f87	Use unittest.mock instead of third party mock Now that we no longer support py27, we can use the standard library unittest.mock module instead of the third party mock lib. The remainder was auto-generated with the following (hacky) script, with one or two manual tweaks after the fact: import glob for path in glob.glob('watcher/tests/*/.py', recursive=True): with open(path) as fh: lines = fh.readlines() if 'import mock\n' not in lines: continue import_group_found = False create_first_party_group = False for num, line in enumerate(lines): line = line.strip() if line.startswith('import ') or line.startswith('from '): tokens = line.split() for lib in ( 'ddt', 'six', 'webob', 'fixtures', 'testtools' 'neutron', 'cinder', 'ironic', 'keystone', 'oslo', ): if lib in tokens[1]: create_first_party_group = True break if create_first_party_group: break import_group_found = True if not import_group_found: continue if line.startswith('import ') or line.startswith('from '): tokens = line.split() if tokens[1] > 'unittest': break elif tokens[1] == 'unittest' and ( len(tokens) == 2 or tokens[4] > 'mock' ): break elif not line: break if create_first_party_group: lines.insert(num, 'from unittest import mock\n\n') else: lines.insert(num, 'from unittest import mock\n') del lines[lines.index('import mock\n')] with open(path, 'w+') as fh: fh.writelines(lines) Co-Authored-By: Sean McGinnis <sean.mcginnis@gmail.com> Change-Id: Icf35d3a6c10c529e07d1a4edaa36f504e5bf553a	2020-05-13 15:41:55 +08:00
Ghanshyam Mann	6ff95efaf6	Fix hacking min version to 3.0.1 flake8 new release 3.8.0 added new checks and gate pep8 job start failing. hacking 3.0.1 fix the pinning of flake8 to avoid bringing in a new version with new checks. Though it is fixed in latest hacking but 2.0 and 3.0 has cap for flake8 as <4.0.0 which mean flake8 new version 3.9.0 can also break the pep8 job if new check are added. To avoid similar gate break in future, we need to bump the hacking min version. - http://lists.openstack.org/pipermail/openstack-discuss/2020-May/014828.html Change-Id: I1fe394ebd1f161eb73f53bfa17d2ccc860b9f51b	2020-05-12 21:35:41 -05:00
Zuul	ba2f1804b0	Merge "Add py38 package metadata"	2020-05-07 09:27:32 +00:00
Zuul	44061326e9	Merge "Remove future imports"	2020-05-07 08:57:16 +00:00
Chris MacNaughton	0b4c4f1de6	Monkey patch original current_thread _active Monkey patch the original current_thread to use the up-to-date _active global variable. This solution is based on that documented at: https://github.com/eventlet/eventlet/issues/592 Change-Id: I194eedd505d45137963eb40d1b1d5da2309caeac Closes-Bug: #1863021	2020-05-06 10:21:32 +02:00
Sean McGinnis	9652571437	Add py38 package metadata Now that we are running the Victoria tests that include a voting py38, we can now add the Python 3.8 metadata to the package information to reflect that support. Change-Id: Icf85483ff64055d16d35f189755e5fb01fabf574 Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>	2020-05-02 07:48:18 -05:00
zhangbailin	f0f15f89c6	Remove future imports These particular imports are no longer needed in a Python 3-only world. Change-Id: I5e9e15556c04871c451f6363380f2a7ac026c968	2020-05-02 00:33:39 +00:00
qiufossen	075e374b3d	Remove Babel requirement Babel is not needed as requirement, remove it. See also http://lists.openstack.org/pipermail/openstack-discuss/2020-April/014227.html Change-Id: Id5c54668738e3de8ded900f389b646dcdef5d007	2020-04-29 15:38:43 +08:00
Zuul	eaa0dfea4b	Merge "Remove six[8] remove requirement&low-requirement"	2020-04-29 03:03:40 +00:00
Zuul	b7956de761	Merge "Remove six[7]"	2020-04-29 03:03:39 +00:00
OpenStack Proposal Bot	a30dbdd724	Imported Translations from Zanata For more information about this automatic import see: https://docs.openstack.org/i18n/latest/reviewing-translation-import.html Change-Id: I7cdff6bcc91edf445f60365a1cb921bb582c7c13	2020-04-26 09:05:59 +00:00
OpenStack Release Bot	60a829e982	Add Python3 victoria unit tests This is an automatically generated patch to ensure unit testing is in place for all the of the tested runtimes for victoria. See also the PTI in governance [1]. [1]: https://governance.openstack.org/tc/reference/project-testing-interface.html Change-Id: Ia59e92394115c4b672c86772840a1e188695079f	2020-04-23 09:48:55 +00:00
OpenStack Release Bot	74cfa0fc8c	Update master for stable/ussuri Add file to the reno documentation build to show release notes for stable/ussuri. Use pbr instruction to increment the minor version number automatically so that master versions are higher than the versions on stable/ussuri. Change-Id: I63fc3e49802f89ac2d967ee089a9dd9dffbe9c78 Sem-Ver: feature	2020-04-23 09:48:53 +00:00
chenker	5071c8f8fa	Remove six[8] remove requirement&low-requirement Change-Id: I84de517a08a87936f6a9015de350dcda2e24bcef	2020-04-22 16:04:00 +08:00
chenke	0ef0f165cb	Remove six[7] Since our code will only support py3. So remove six is necessary. Change-Id: I3738118b1898421ee41e9e2902c255ead73f3915	2020-04-22 15:59:15 +08:00