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)

.gitreview

@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/watcher.git
+defaultbranch=stable/victoria

.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

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

babel.cfg

@@ -1,2 +0,0 @@
-[python: **.py]
-

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

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
 

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

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'),
 ]
 

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

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

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 }}'

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 --------------------------------------------------
 

releasenotes/source/index.rst

@@ -21,6 +21,7 @@ Contents:
    :maxdepth: 1
 
    unreleased
+   ussuri
    train
    stein
    rocky

releasenotes/source/ussuri.rst

@@ -0,0 +1,6 @@
+===========================
+Ussuri Series Release Notes
+===========================
+
+.. release-notes::
+   :branch: stable/ussuri

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

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

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

tox.ini

@@ -13,7 +13,7 @@ install_command = pip install {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -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:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -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
 
 

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
 

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(

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
 

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:

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.

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()

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

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

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)

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

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()

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
 
 

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

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?

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

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

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):

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

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

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):

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))
 
 

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)]

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

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

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__()

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

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)

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()

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

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
 
 

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):

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)
 

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 = {

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)

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)

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'
 

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'

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'
 

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'
 

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)

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__()

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']
         ]

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
 

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):

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

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

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
 

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()

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()

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

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):

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'
 

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

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 _

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)

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):

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``")

watcher/locale/de/LC_MESSAGES/watcher.po

@@ -1,14 +1,15 @@
 # Frank Kloeker <eumel@arcor.de>, 2018. #zanata
+# Andreas Jaeger <jaegerandi@gmail.com>, 2020. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: watcher VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2019-03-22 02:21+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"
-"PO-Revision-Date: 2018-03-06 07:56+0000\n"
-"Last-Translator: Frank Kloeker <eumel@arcor.de>\n"
+"PO-Revision-Date: 2020-04-25 11:45+0000\n"
+"Last-Translator: Andreas Jaeger <jaegerandi@gmail.com>\n"
 "Language-Team: German\n"
 "Language: de\n"
 "X-Generator: Zanata 4.3.3\n"
@@ -62,10 +63,6 @@ msgstr "Der Argumenttyp 'obj' ist nicht gültig"
 msgid "'obj' argument type is not valid: %s"
 msgstr "Der Argumenttyp 'obj' ist nicht gültig: %s"
 
-#, python-format
-msgid "A datetime.datetime is required here. Got %s"
-msgstr "Eine datetime.datetime ist hier erforderlich. Bekam %s"
-
 #, python-format
 msgid "A goal with UUID %(uuid)s already exists"
 msgstr "Ein Ziel mit UUID %(uuid)s ist bereits vorhanden"
@@ -169,10 +166,6 @@ msgstr ""
 msgid "An indicator value should be a number"
 msgstr "Ein Indikatorwert sollte eine Zahl sein"
 
-#, python-format
-msgid "An object of class %s is required here"
-msgstr "Ein Objekt der Klasse %s ist hier erforderlich"
-
 msgid "An unknown exception occurred"
 msgstr "Eine unbekannte Ausnahme ist aufgetreten"
 
@@ -203,20 +196,21 @@ msgstr "Prüfungsvorlagen"
 msgid "Audit parameter %(parameter)s are not allowed"
 msgstr "Prüfparameter %(parameter)s sind nicht erlaubt"
 
+#, python-format
+msgid "Audit state %(state)s is disallowed."
+msgstr "Auditstatus %(state)s ist ungültig."
+
 #, python-format
 msgid "Audit type %(audit_type)s could not be found"
 msgstr "Audit-Typ %(audit_type)s konnte nicht gefunden werden"
 
 #, python-format
-msgid "AuditTemplate %(audit_template)s could not be found"
-msgstr "AuditTemplate %(audit_template)s konnte nicht gefunden werden"
+msgid "Audit type %(audit_type)s is disallowed."
+msgstr "Audit-Typ %(audit_type)s nicht erlaubt."
 
 #, python-format
-msgid ""
-"AuditTemplate %(audit_template)s is referenced by one or multiple audits"
-msgstr ""
-"AuditTemplate %(audit_template)s wird von einem oder mehreren Audits "
-"referenziert"
+msgid "AuditTemplate %(audit_template)s could not be found"
+msgstr "AuditTemplate %(audit_template)s konnte nicht gefunden werden"
 
 msgid "Audits"
 msgstr "Audits"
@@ -293,6 +287,10 @@ msgstr "Patch '%(patch)s' konnte nicht angewendet werden. Grund:%(reason)s"
 msgid "Couldn't delete when state is '%(state)s'."
 msgstr "Konnte nicht gelöscht werden, wenn der Status '%(state)s' ist."
 
+#, python-format
+msgid "Couldn't start when state is '%(state)s'."
+msgstr "Konnte nicht gestartet werden, wenn der Status '%(state)s' ist."
+
 #, python-format
 msgid "Datasource %(datasource)s is not available."
 msgstr "Datenquelle %(datasource)s ist nicht verfügbar."
@@ -435,6 +433,10 @@ msgstr "Ungültige Abfrage: %(start_time)s > %(end_time)s"
 msgid "Invalid sort direction: %s. Acceptable values are 'asc' or 'desc'"
 msgstr "Ungültige Sortierrichtung: %s. Akzeptable Werte sind 'asc' oder 'desc'"
 
+#, python-format
+msgid "Invalid sort key: %s"
+msgstr "Ungültiger Sortierschlüssel: %s"
+
 msgid "Invalid state for swapping volume"
 msgstr "Ungültiger Status für das Auslagern des Datenträgers"
 
@@ -445,9 +447,6 @@ msgstr "Ungültiger Status: %(state)s"
 msgid "JSON list expected in feature argument"
 msgstr "JSON-Liste in Feature-Argument erwartet"
 
-msgid "Keystone API endpoint is missing"
-msgstr "Der Keystone-API-Endpunkt fehlt"
-
 msgid "Limit must be positive"
 msgstr "Limit muss positiv sein"
 
@@ -457,30 +456,27 @@ msgstr "Limit sollte positiv sein"
 msgid "Maximum time since last check-in for up service."
 msgstr "Maximale Zeit seit dem letzten Check-in für den Up-Service."
 
+#, python-format
+msgid "Metric: %(metric)s not available"
+msgstr "Metrik: %(metric)s nicht verfügbar"
+
 #, python-format
 msgid "Migration of type '%(migration_type)s' is not supported."
 msgstr "Die Migration vom Typ '%(migration_type)s' wird nicht unterstützt."
 
+msgid "Minimum Nova API Version"
+msgstr "Minimale Nova API Version"
+
 #, python-format
 msgid "No %(metric)s metric for %(host)s found."
 msgstr "Keine %(metric)s Metrik für %(host)s gefunden."
 
-msgid "No rows were returned"
-msgstr "Es wurden keine Zeilen zurückgegeben"
-
 #, python-format
 msgid "No strategy could be found to achieve the '%(goal)s' goal."
 msgstr ""
 "Es konnte keine Strategie gefunden werden, um das Ziel '%(goal)s' zu "
 "erreichen."
 
-msgid "No such metric"
-msgstr "Keine solche Metrik"
-
-#, python-format
-msgid "No values returned by %(resource_id)s for %(metric_name)s."
-msgstr "Keine Werte von %(resource_id)s für %(metric_name)s zurückgegeben."
-
 msgid "Noisy Neighbor"
 msgstr "Lauter Nachbar"
 
@@ -559,6 +555,9 @@ msgstr ""
 "Verhältnis der freigegebenen Compute-Knoten geteilt durch die Gesamtzahl der "
 "aktivierten Compute-Knoten."
 
+msgid "Request not acceptable."
+msgstr "Anforderung nicht zulässig."
+
 #, python-format
 msgid "Role name seems ambiguous: %s"
 msgstr "Der Rollenname scheint mehrdeutig: %s"
@@ -648,10 +647,6 @@ msgstr "Die UUID oder der Name der Überprüfungsvorlage ist ungültig"
 msgid "The baremetal resource '%(name)s' could not be found"
 msgstr "Die Barmetal-Ressource '%(name)s' konnte nicht gefunden werden"
 
-#, python-format
-msgid "The capacity %(capacity)s is not defined for '%(resource)s'"
-msgstr "Die Kapazität %(capacity)s ist nicht definiert für '%(resource)s'"
-
 #, python-format
 msgid "The cluster data model '%(cdm)s' could not be built"
 msgstr "Das Clusterdatenmodell '%(cdm)s' konnte nicht erstellt werden"
@@ -690,9 +685,6 @@ msgstr "Die Instanz '%(name)s' konnte nicht gefunden werden"
 msgid "The ironic node %(uuid)s could not be found"
 msgstr "Der Ironic Knoten %(uuid)s konnte nicht gefunden werden"
 
-msgid "The metrics resource collector is not defined"
-msgstr "Der Metrikressourcen-Collector ist nicht definiert"
-
 msgid "The number of VM migrations to be performed."
 msgstr "Die Anzahl der VM-Migrationen, die ausgeführt werden sollen."
 

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: 2019-03-22 02:21+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"
@@ -63,10 +63,6 @@ msgstr "'obj' argument type is not valid"
 msgid "'obj' argument type is not valid: %s"
 msgstr "'obj' argument type is not valid: %s"
 
-#, python-format
-msgid "A datetime.datetime is required here. Got %s"
-msgstr "A datetime.datetime is required here. Got %s"
-
 #, python-format
 msgid "A goal with UUID %(uuid)s already exists"
 msgstr "A goal with UUID %(uuid)s already exists"
@@ -162,10 +158,6 @@ msgstr "An audit_template with UUID or name %(audit_template)s already exists"
 msgid "An indicator value should be a number"
 msgstr "An indicator value should be a number"
 
-#, python-format
-msgid "An object of class %s is required here"
-msgstr "An object of class %s is required here"
-
 msgid "An unknown exception occurred"
 msgstr "An unknown exception occurred"
 
@@ -203,12 +195,6 @@ msgstr "Audit type %(audit_type)s could not be found"
 msgid "AuditTemplate %(audit_template)s could not be found"
 msgstr "AuditTemplate %(audit_template)s could not be found"
 
-#, python-format
-msgid ""
-"AuditTemplate %(audit_template)s is referenced by one or multiple audits"
-msgstr ""
-"AuditTemplate %(audit_template)s is referenced by one or multiple audits"
-
 msgid "Audits"
 msgstr "Audits"
 
@@ -439,9 +425,6 @@ msgstr "Invalid state: %(state)s"
 msgid "JSON list expected in feature argument"
 msgstr "JSON list expected in feature argument"
 
-msgid "Keystone API endpoint is missing"
-msgstr "Keystone API endpoint is missing"
-
 msgid "Limit must be positive"
 msgstr "Limit must be positive"
 
@@ -468,20 +451,10 @@ msgstr ""
 msgid "No %(metric)s metric for %(host)s found."
 msgstr "No %(metric)s metric for %(host)s found."
 
-msgid "No rows were returned"
-msgstr "No rows were returned"
-
 #, python-format
 msgid "No strategy could be found to achieve the '%(goal)s' goal."
 msgstr "No strategy could be found to achieve the '%(goal)s' goal."
 
-msgid "No such metric"
-msgstr "No such metric"
-
-#, python-format
-msgid "No values returned by %(resource_id)s for %(metric_name)s."
-msgstr "No values returned by %(resource_id)s for %(metric_name)s."
-
 msgid "Noisy Neighbor"
 msgstr "Noisy Neighbour"
 
@@ -575,9 +548,6 @@ msgstr "Role name seems ambiguous: %s"
 msgid "Role not Found: %s"
 msgstr "Role not Found: %s"
 
-msgid "Sample Check"
-msgstr "Sample Check"
-
 msgid "Saving Energy"
 msgstr "Saving Energy"
 
@@ -667,10 +637,6 @@ msgstr "The audit template UUID or name specified is invalid"
 msgid "The baremetal resource '%(name)s' could not be found"
 msgstr "The baremetal resource '%(name)s' could not be found"
 
-#, python-format
-msgid "The capacity %(capacity)s is not defined for '%(resource)s'"
-msgstr "The capacity %(capacity)s is not defined for '%(resource)s'"
-
 #, python-format
 msgid "The cluster data model '%(cdm)s' could not be built"
 msgstr "The cluster data model '%(cdm)s' could not be built"
@@ -709,9 +675,6 @@ msgstr "The instance '%(name)s' could not be found"
 msgid "The ironic node %(uuid)s could not be found"
 msgstr "The Ironic node %(uuid)s could not be found"
 
-msgid "The metrics resource collector is not defined"
-msgstr "The metrics resource collector is not defined"
-
 msgid "The number of VM migrations to be performed."
 msgstr "The number of VM migrations to be performed."
 

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

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

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'])

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

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

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
 

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

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

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):
 

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

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
 

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

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

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

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

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

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

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

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

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

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"

watcher/tests/applier/actions/test_resize.py

@@ -13,9 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import unicode_literals
 import jsonschema
-import mock
+from unittest import mock
 
 from watcher.applier.actions import base as baction
 from watcher.applier.actions import resize

watcher/tests/applier/actions/test_sleep.py

@@ -15,7 +15,7 @@
 
 
 import jsonschema
-import mock
+from unittest import mock
 
 from watcher.applier.actions import sleep
 from watcher.tests import base