Fix compatibility with oslo.db 12.1.0

oslo.db 12.1.0 has changed the default value for the 'autocommit' parameter of 'LegacyEngineFacade' from 'True' to 'False'. This is a necessary step to ensure compatibility with SQLAlchemy 2.0. However, we are currently relying on the autocommit behavior and need changes to explicitly manage sessions. Until that happens, we need to override the default. This also moves the watcher queue declaration from the pipeline level (where it is no longer valid) to the project level. Co-Authored-By: Thierry Carrez <thierry@openstack.org> Co-Authored-By: Stephen Finucane <stephenfin@redhat.com> (cherry picked from commit 5d70c207cd) Change-Id: I7db39d958d087322bfa0aad70dfbd04de9228dd7
2022-09-26 14:16:27 +02:00
70 changed files with 757 additions and 1826 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,3 @@
 host=review.opendev.org
 port=29418
 project=openstack/watcher.git
-defaultbranch=stable/2024.1
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,7 +3,7 @@
    templates:
      - check-requirements
      - openstack-cover-jobs
-      - openstack-python3-jobs
+      - openstack-python3-zed-jobs
      - publish-openstack-docs-pti
      - release-notes-jobs-python3
    check:
@@ -85,12 +85,11 @@
    vars:
      tempest_concurrency: 1
      tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_strategies
-      tempest_exclude_regex: .*\[.*\breal_load\b.*\].*

 - job:
    name: watcher-tempest-multinode
    parent: watcher-tempest-functional
-    nodeset: openstack-two-node-jammy
+    nodeset: openstack-two-node-focal
    roles:
      - zuul: openstack/tempest
    group-vars:
@@ -108,7 +107,6 @@
          watcher-api: false
          watcher-decision-engine: true
          watcher-applier: false
-          c-bak: false
          ceilometer: false
          ceilometer-acompute: false
          ceilometer-acentral: false
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -338,19 +338,6 @@ function stop_watcher {
    done
 }

-# configure_tempest_for_watcher() - Configure Tempest for watcher
-function configure_tempest_for_watcher {
-    # Set default microversion for watcher-tempest-plugin
-    # Please make sure to update this when the microversion is updated, otherwise
-    # new tests may be skipped.
-    TEMPEST_WATCHER_MIN_MICROVERSION=${TEMPEST_WATCHER_MIN_MICROVERSION:-"1.0"}
-    TEMPEST_WATCHER_MAX_MICROVERSION=${TEMPEST_WATCHER_MAX_MICROVERSION:-"1.4"}
-
-    # Set microversion options in tempest.conf
-    iniset $TEMPEST_CONFIG optimize min_microversion $TEMPEST_WATCHER_MIN_MICROVERSION
-    iniset $TEMPEST_CONFIG optimize max_microversion $TEMPEST_WATCHER_MAX_MICROVERSION
-}
-
 # Restore xtrace
 $_XTRACE_WATCHER

--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -38,9 +38,6 @@ if is_service_enabled watcher-api watcher-decision-engine watcher-applier; then
        # Start the watcher components
        echo_summary "Starting watcher"
        start_watcher
-    elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
-        echo_summary "Configuring tempest for watcher"
-        configure_tempest_for_watcher
    fi

    if [[ "$1" == "unstack" ]]; then
--- a/doc/source/configuration/configuring.rst
+++ b/doc/source/configuration/configuring.rst
@@ -372,7 +372,7 @@ You can configure and install Ceilometer by following the documentation below :
 #. https://docs.openstack.org/ceilometer/latest

 The built-in strategy 'basic_consolidation' provided by watcher requires
-"**compute.node.cpu.percent**" and "**cpu**" measurements to be collected
+"**compute.node.cpu.percent**" and "**cpu_util**" measurements to be collected
 by Ceilometer.
 The measurements available depend on the hypervisors that OpenStack manages on
 the specific implementation.
--- a/doc/source/contributor/plugin/strategy-plugin.rst
+++ b/doc/source/contributor/plugin/strategy-plugin.rst
@@ -300,6 +300,6 @@ Using that you can now query the values for that specific metric:
 .. code-block:: py

    avg_meter = self.datasource_backend.statistic_aggregation(
-        instance.uuid, 'instance_cpu_usage', self.periods['instance'],
+        instance.uuid, 'cpu_util', self.periods['instance'],
        self.granularity,
        aggregation=self.aggregation_method['instance'])
--- a/doc/source/strategies/basic-server-consolidation.rst
+++ b/doc/source/strategies/basic-server-consolidation.rst
@@ -26,7 +26,8 @@ metric                       service name plugins comment
                                                  ``compute_monitors`` option
                                                  to ``cpu.virt_driver`` in
                                                  the nova.conf.
-``cpu``                      ceilometer_  none
+``cpu_util``                 ceilometer_  none    cpu_util has been removed
+                                                  since Stein.
 ============================ ============ ======= ===========================

 .. _ceilometer: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#openstack-compute
--- a/doc/source/strategies/saving_energy.rst
+++ b/doc/source/strategies/saving_energy.rst
@@ -89,9 +89,9 @@ step 2: Create audit to do optimization
 .. code-block:: shell

    $ openstack optimize audittemplate create \
-      saving_energy_template1 saving_energy --strategy saving_energy
+      at1 saving_energy --strategy saving_energy

-    $ openstack optimize audit create -a saving_energy_audit1 \
+    $ openstack optimize audit create -a at1 \
      -p free_used_percent=20.0

 External Links
--- a/doc/source/strategies/vm_workload_consolidation.rst
+++ b/doc/source/strategies/vm_workload_consolidation.rst
@@ -22,19 +22,14 @@ The *vm_workload_consolidation* strategy requires the following metrics:
 ============================ ============ ======= =========================
 metric                       service name plugins comment
 ============================ ============ ======= =========================
-``cpu``                      ceilometer_  none
+``cpu_util``                 ceilometer_  none    cpu_util has been removed
+                                                  since Stein.
 ``memory.resident``          ceilometer_  none
 ``memory``                   ceilometer_  none
 ``disk.root.size``           ceilometer_  none
-``compute.node.cpu.percent`` ceilometer_  none    (optional) need to set the
-                                                  ``compute_monitors`` option
-                                                  to ``cpu.virt_driver`` in the
-                                                  nova.conf.
-``hardware.memory.used``     ceilometer_  SNMP_   (optional)
 ============================ ============ ======= =========================

 .. _ceilometer: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#openstack-compute
-.. _SNMP: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#snmp-based-meters

 Cluster data model
 ******************
--- a/doc/source/strategies/workload-stabilization.rst
+++ b/doc/source/strategies/workload-stabilization.rst
@@ -27,8 +27,9 @@ metric                       service name plugins comment
                                                  to ``cpu.virt_driver`` in the
                                                  nova.conf.
 ``hardware.memory.used``     ceilometer_  SNMP_
-``cpu``                      ceilometer_  none
-``instance_ram_usage``       ceilometer_  none
+``cpu_util``                 ceilometer_  none    cpu_util has been removed
+                                                  since Stein.
+``memory.resident``          ceilometer_  none
 ============================ ============ ======= =============================

 .. _ceilometer: https://docs.openstack.org/ceilometer/latest/admin/telemetry-measurements.html#openstack-compute
@@ -106,10 +107,10 @@ parameter            type   default Value         description
                                                  period of all received ones.
 ==================== ====== ===================== =============================

-.. |metrics| replace:: ["instance_cpu_usage", "instance_ram_usage"]
-.. |thresholds| replace:: {"instance_cpu_usage": 0.2, "instance_ram_usage": 0.2}
-.. |weights| replace:: {"instance_cpu_usage_weight": 1.0, "instance_ram_usage_weight": 1.0}
-.. |instance_metrics| replace:: {"instance_cpu_usage": "compute.node.cpu.percent", "instance_ram_usage": "hardware.memory.used"}
+.. |metrics| replace:: ["cpu_util", "memory.resident"]
+.. |thresholds| replace:: {"cpu_util": 0.2, "memory.resident": 0.2}
+.. |weights| replace:: {"cpu_util_weight": 1.0, "memory.resident_weight": 1.0}
+.. |instance_metrics| replace:: {"cpu_util": "compute.node.cpu.percent", "memory.resident": "hardware.memory.used"}
 .. |periods| replace:: {"instance": 720, "node": 600}

 Efficacy Indicator
@@ -135,8 +136,8 @@ How to use it ?
      at1 workload_balancing --strategy workload_stabilization

    $ openstack optimize audit create -a at1 \
-      -p thresholds='{"instance_ram_usage": 0.05}' \
-      -p metrics='["instance_ram_usage"]'
+      -p thresholds='{"memory.resident": 0.05}' \
+      -p metrics='["memory.resident"]'

 External Links
 --------------
--- a/doc/source/strategies/workload_balance.rst
+++ b/doc/source/strategies/workload_balance.rst
@@ -24,7 +24,8 @@ The *workload_balance* strategy requires the following metrics:
 ======================= ============ ======= =========================
 metric                  service name plugins comment
 ======================= ============ ======= =========================
-``cpu``                 ceilometer_  none
+``cpu_util``            ceilometer_  none    cpu_util has been removed
+                                             since Stein.
 ``memory.resident``     ceilometer_  none
 ======================= ============ ======= =========================

@@ -64,16 +65,15 @@ Configuration

 Strategy parameters are:

-============== ====== ==================== ====================================
-parameter      type   default Value        description
-============== ====== ==================== ====================================
-``metrics``    String 'instance_cpu_usage' Workload balance base on cpu or ram
-                                           utilization. Choices:
-                                           ['instance_cpu_usage',
-                                           'instance_ram_usage']
-``threshold``  Number 25.0                 Workload threshold for migration
-``period``     Number 300                  Aggregate time period of ceilometer
-============== ====== ==================== ====================================
+============== ====== ============= ====================================
+parameter      type   default Value description
+============== ====== ============= ====================================
+``metrics``    String 'cpu_util'    Workload balance base on cpu or ram
+                                    utilization. choice: ['cpu_util',
+                                    'memory.resident']
+``threshold``  Number 25.0          Workload threshold for migration
+``period``     Number 300           Aggregate time period of ceilometer
+============== ====== ============= ====================================

 Efficacy Indicator
 ------------------
@@ -95,7 +95,7 @@ How to use it ?
      at1 workload_balancing --strategy workload_balance

    $ openstack optimize audit create -a at1 -p threshold=26.0 \
-            -p period=310 -p metrics=instance_cpu_usage
+            -p period=310 -p metrics=cpu_util

 External Links
 --------------
--- a/releasenotes/notes/bug-2112187-763bae283e0b736d.yaml
+++ b/releasenotes/notes/bug-2112187-763bae283e0b736d.yaml
@@ -1,47 +0,0 @@
---
-security:
-  - |
-    Watchers no longer forges requests on behalf of a tenant when
-    swapping volumes. Prior to this release watcher had 2 implementations
-    of moving a volume, it could use cinders volume migrate api or its own
-    internal implementation that directly calls nova volume attachment update
-    api. The former is safe and the recommend way to move volumes between
-    cinder storage backend the internal implementation was insecure, fragile
-    due to a lack of error handling and capable of deleting user data.
-
-    Insecure: the internal volume migration operation created a new keystone
-    user with a weak name and password and added it to the tenants project
-    with the admin role. It then used that user to forge request on behalf
-    of the tenant with admin right to swap the volume. if the applier was
-    restarted during the execution of this operation it would never be cleaned
-    up.
-
-    Fragile: the error handling was minimal, the swap volume api is async
-    so watcher has to poll for completion, there was no support to resume
-    that if interrupted of the time out was exceeded.
-
-    Data-loss: while the internal polling logic returned success or failure
-    watcher did not check the result, once the function returned it
-    unconditionally deleted the source volume. For larger volumes this
-    could result in irretrievable data loss.
-
-    Finally if a volume was swapped using the internal workflow it put
-    the nova instance in an out of sync state. If the VM was live migrated
-    after the swap volume completed successfully prior to a hard reboot
-    then the migration would fail or succeed and break tenant isolation.
-
-    see: https://bugs.launchpad.net/nova/+bug/2112187 for details.
-fixes:
-  - |
-    All code related to creating keystone user and granting roles has been
-    removed. The internal swap volume implementation has been removed and
-    replaced by cinders volume migrate api. Note as part of this change
-    Watcher will no longer attempt volume migrations or retypes if the
-    instance is in the `Verify Resize` task state. This resolves several
-    issues related to volume migration in the zone migration and
-    Storage capacity balance strategies. While efforts have been made
-    to maintain backward compatibility these changes are required to
-    address a security weakness in watcher's prior approach.
-
-    see: https://bugs.launchpad.net/nova/+bug/2112187 for more context.
-
--- a/releasenotes/source/2023.1.rst
+++ b/releasenotes/source/2023.1.rst
@@ -1,6 +0,0 @@
-===========================
-2023.1 Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: stable/2023.1
--- a/releasenotes/source/2023.2.rst
+++ b/releasenotes/source/2023.2.rst
@@ -1,6 +0,0 @@
-===========================
-2023.2 Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: stable/2023.2
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -21,9 +21,6 @@ Contents:
   :maxdepth: 1

   unreleased
-   2023.2
-   2023.1
-   zed
   yoga
   xena
   wallaby
--- a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
+++ b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
@@ -2,16 +2,15 @@
 # Andi Chandler <andi@gowling.com>, 2018. #zanata
 # Andi Chandler <andi@gowling.com>, 2020. #zanata
 # Andi Chandler <andi@gowling.com>, 2022. #zanata
-# Andi Chandler <andi@gowling.com>, 2023. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: python-watcher\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-14 03:05+0000\n"
+"POT-Creation-Date: 2022-08-29 03:02+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2023-06-21 07:54+0000\n"
+"PO-Revision-Date: 2022-05-31 08:39+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
 "Language-Team: English (United Kingdom)\n"
 "Language: en_GB\n"
@@ -60,9 +59,6 @@ msgstr "1.9.0"
 msgid "2.0.0"
 msgstr "2.0.0"

-msgid "2023.1 Series Release Notes"
-msgstr "2023.1 Series Release Notes"
-
 msgid "3.0.0"
 msgstr "3.0.0"

@@ -973,9 +969,6 @@ msgstr "Xena Series Release Notes"
 msgid "Yoga Series Release Notes"
 msgstr "Yoga Series Release Notes"

-msgid "Zed Series Release Notes"
-msgstr "Zed Series Release Notes"
-
 msgid "``[watcher_datasources] datasources = gnocchi,monasca,ceilometer``"
 msgstr "``[watcher_datasources] datasources = gnocchi,monasca,ceilometer``"

--- a/releasenotes/source/zed.rst
+++ b/releasenotes/source/zed.rst
@@ -1,6 +0,0 @@
-========================
-Zed Series Release Notes
-========================
-
-.. release-notes::
-   :branch: stable/zed
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ oslo.context>=2.21.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>=14.1.0 # Apache-2.0
+oslo.messaging>=8.1.2 # Apache-2.0
 oslo.policy>=3.6.0 # Apache-2.0
 oslo.reports>=1.27.0 # Apache-2.0
 oslo.serialization>=2.25.0 # Apache-2.0
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/watcher/latest/
-python_requires = >=3.8
+python_requires = >=3.6
 classifier =
    Environment :: OpenStack
    Intended Audience :: Information Technology
@@ -17,10 +17,9 @@ classifier =
    Programming Language :: Python :: Implementation :: CPython
    Programming Language :: Python :: 3 :: Only
    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11

 [files]
 packages =
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 minversion = 3.18.0
 envlist = py3,pep8
+skipsdist = True
 ignore_basepython_conflict = True

 [testenv]
@@ -8,30 +9,23 @@ basepython = python3
 usedevelop = True
 allowlist_externals = find
                      rm
-install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1} {opts} {packages}
+install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 setenv =
   VIRTUAL_ENV={envdir}
 deps =
    -r{toxinidir}/test-requirements.txt
    -r{toxinidir}/requirements.txt
-    python-libmaas>=0.6.8
 commands =
  rm -f .testrepository/times.dbm
  find . -type f -name "*.py[c|o]" -delete
  stestr run {posargs}
-passenv =
-  http_proxy
-  HTTP_PROXY
-  https_proxy
-  HTTPS_PROXY
-  no_proxy
-  NO_PROXY
+passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY

 [testenv:pep8]
 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

 [testenv:venv]
 setenv = PYTHONHASHSEED=0
--- a/watcher/applier/actions/change_node_power_state.py
+++ b/watcher/applier/actions/change_node_power_state.py
@@ -17,17 +17,17 @@
 # limitations under the License.
 #

+import enum
 import time

-from oslo_log import log
-
 from watcher._i18n import _
 from watcher.applier.actions import base
 from watcher.common import exception
-from watcher.common.metal_helper import constants as metal_constants
-from watcher.common.metal_helper import factory as metal_helper_factory

-LOG = log.getLogger(__name__)
+
+class NodeState(enum.Enum):
+    POWERON = 'on'
+    POWEROFF = 'off'


 class ChangeNodePowerState(base.BaseAction):
@@ -43,8 +43,8 @@ class ChangeNodePowerState(base.BaseAction):
         'state': str,
        })

-    The `resource_id` references a baremetal node id (list of available
-    ironic nodes is returned by this command: ``ironic node-list``).
+    The `resource_id` references a ironic node id (list of available
+    ironic node is returned by this command: ``ironic node-list``).
    The `state` value should either be `on` or `off`.
    """

@@ -59,14 +59,10 @@ class ChangeNodePowerState(base.BaseAction):
                    'type': 'string',
                    "minlength": 1
                },
-                'resource_name': {
-                    'type': 'string',
-                    "minlength": 1
-                },
                'state': {
                    'type': 'string',
-                    'enum': [metal_constants.PowerState.ON.value,
-                             metal_constants.PowerState.OFF.value]
+                    'enum': [NodeState.POWERON.value,
+                             NodeState.POWEROFF.value]
                }
            },
            'required': ['resource_id', 'state'],
@@ -86,10 +82,10 @@ class ChangeNodePowerState(base.BaseAction):
        return self._node_manage_power(target_state)

    def revert(self):
-        if self.state == metal_constants.PowerState.ON.value:
-            target_state = metal_constants.PowerState.OFF.value
-        elif self.state == metal_constants.PowerState.OFF.value:
-            target_state = metal_constants.PowerState.ON.value
+        if self.state == NodeState.POWERON.value:
+            target_state = NodeState.POWEROFF.value
+        elif self.state == NodeState.POWEROFF.value:
+            target_state = NodeState.POWERON.value
        return self._node_manage_power(target_state)

    def _node_manage_power(self, state, retry=60):
@@ -97,32 +93,30 @@ class ChangeNodePowerState(base.BaseAction):
            raise exception.IllegalArgumentException(
                message=_("The target state is not defined"))

-        metal_helper = metal_helper_factory.get_helper(self.osc)
-        node = metal_helper.get_node(self.node_uuid)
-        current_state = node.get_power_state()
-
-        if state == current_state.value:
+        ironic_client = self.osc.ironic()
+        nova_client = self.osc.nova()
+        current_state = ironic_client.node.get(self.node_uuid).power_state
+        # power state: 'power on' or 'power off', if current node state
+        # is the same as state, just return True
+        if state in current_state:
            return True

-        if state == metal_constants.PowerState.OFF.value:
-            compute_node = node.get_hypervisor_node().to_dict()
+        if state == NodeState.POWEROFF.value:
+            node_info = ironic_client.node.get(self.node_uuid).to_dict()
+            compute_node_id = node_info['extra']['compute_node_id']
+            compute_node = nova_client.hypervisors.get(compute_node_id)
+            compute_node = compute_node.to_dict()
            if (compute_node['running_vms'] == 0):
-                node.set_power_state(state)
-            else:
-                LOG.warning(
-                    "Compute node %s has %s running vms and will "
-                    "NOT be shut off.",
-                    compute_node["hypervisor_hostname"],
-                    compute_node['running_vms'])
-                return False
+                ironic_client.node.set_power_state(
+                    self.node_uuid, state)
        else:
-            node.set_power_state(state)
+            ironic_client.node.set_power_state(self.node_uuid, state)

-        node = metal_helper.get_node(self.node_uuid)
-        while node.get_power_state() == current_state and retry:
+        ironic_node = ironic_client.node.get(self.node_uuid)
+        while ironic_node.power_state == current_state and retry:
            time.sleep(10)
            retry -= 1
-            node = metal_helper.get_node(self.node_uuid)
+            ironic_node = ironic_client.node.get(self.node_uuid)
        if retry > 0:
            return True
        else:
@@ -136,4 +130,4 @@ class ChangeNodePowerState(base.BaseAction):

    def get_description(self):
        """Description of the action"""
-        return ("Compute node power on/off through Ironic or MaaS.")
+        return ("Compute node power on/off through ironic.")
--- a/watcher/applier/actions/volume_migration.py
+++ b/watcher/applier/actions/volume_migration.py
@@ -17,11 +17,14 @@ import jsonschema

 from oslo_log import log

+from cinderclient import client as cinder_client
 from watcher._i18n import _
 from watcher.applier.actions import base
 from watcher.common import cinder_helper
 from watcher.common import exception
+from watcher.common import keystone_helper
 from watcher.common import nova_helper
+from watcher.common import utils
 from watcher import conf

 CONF = conf.CONF
@@ -67,6 +70,8 @@ class VolumeMigrate(base.BaseAction):

    def __init__(self, config, osc=None):
        super(VolumeMigrate, self).__init__(config)
+        self.temp_username = utils.random_string(10)
+        self.temp_password = utils.random_string(10)
        self.cinder_util = cinder_helper.CinderHelper(osc=self.osc)
        self.nova_util = nova_helper.NovaHelper(osc=self.osc)

@@ -129,42 +134,83 @@ class VolumeMigrate(base.BaseAction):

    def _can_swap(self, volume):
        """Judge volume can be swapped"""
-        # TODO(sean-k-mooney): rename this to _can_migrate and update
-        # tests to reflect that.

-        # cinder volume migration can migrate volumes that are not
-        # attached to instances or nova can migrate the data for cinder
-        # if the volume is in-use. If the volume has no attachments
-        # allow cinder to decided if it can be migrated.
        if not volume.attachments:
-            LOG.debug(f"volume: {volume.id} has no attachments")
-            return True
-
-        # since it has attachments we need to validate nova's constraints
+            return False
        instance_id = volume.attachments[0]['server_id']
        instance_status = self.nova_util.find_instance(instance_id).status
-        LOG.debug(
-            f"volume: {volume.id} is attached to instance: {instance_id} "
-            f"in instance status: {instance_status}")
-        # NOTE(sean-k-mooney): This used to allow RESIZED which
-        # is the resize_verify task state, that is not an acceptable time
-        # to migrate volumes, if nova does not block this in the API
-        # today that is probably a bug. PAUSED is also questionable but
-        # it should generally be safe.
-        return (volume.status == 'in-use' and
-                instance_status in ('ACTIVE', 'PAUSED'))
+
+        if (volume.status == 'in-use' and
+                instance_status in ('ACTIVE', 'PAUSED', 'RESIZED')):
+            return True
+
+        return False
+
+    def _create_user(self, volume, user):
+        """Create user with volume attribute and user information"""
+        keystone_util = keystone_helper.KeystoneHelper(osc=self.osc)
+        project_id = getattr(volume, 'os-vol-tenant-attr:tenant_id')
+        user['project'] = project_id
+        user['domain'] = keystone_util.get_project(project_id).domain_id
+        user['roles'] = ['admin']
+        return keystone_util.create_user(user)
+
+    def _get_cinder_client(self, session):
+        """Get cinder client by session"""
+        return cinder_client.Client(
+            CONF.cinder_client.api_version,
+            session=session,
+            endpoint_type=CONF.cinder_client.endpoint_type)
+
+    def _swap_volume(self, volume, dest_type):
+        """Swap volume to dest_type
+
+           Limitation note: only for compute libvirt driver
+        """
+        if not dest_type:
+            raise exception.Invalid(
+                message=(_("destination type is required when "
+                           "migration type is swap")))
+
+        if not self._can_swap(volume):
+            raise exception.Invalid(
+                message=(_("Invalid state for swapping volume")))
+
+        user_info = {
+            'name': self.temp_username,
+            'password': self.temp_password}
+        user = self._create_user(volume, user_info)
+        keystone_util = keystone_helper.KeystoneHelper(osc=self.osc)
+        try:
+            session = keystone_util.create_session(
+                user.id, self.temp_password)
+            temp_cinder = self._get_cinder_client(session)
+
+            # swap volume
+            new_volume = self.cinder_util.create_volume(
+                temp_cinder, volume, dest_type)
+            self.nova_util.swap_volume(volume, new_volume)
+
+            # delete old volume
+            self.cinder_util.delete_volume(volume)
+
+        finally:
+            keystone_util.delete_user(user)
+
+        return True

    def _migrate(self, volume_id, dest_node, dest_type):
+
        try:
            volume = self.cinder_util.get_volume(volume_id)
-            # for backward compatibility map swap to migrate.
-            if self.migration_type in (self.SWAP, self.MIGRATE):
-                if not self._can_swap(volume):
-                    raise exception.Invalid(
-                        message=(_("Invalid state for swapping volume")))
-                return self.cinder_util.migrate(volume, dest_node)
+            if self.migration_type == self.SWAP:
+                if dest_node:
+                    LOG.warning("dest_node is ignored")
+                return self._swap_volume(volume, dest_type)
            elif self.migration_type == self.RETYPE:
                return self.cinder_util.retype(volume, dest_type)
+            elif self.migration_type == self.MIGRATE:
+                return self.cinder_util.migrate(volume, dest_node)
            else:
                raise exception.Invalid(
                    message=(_("Migration of type '%(migration_type)s' is not "
--- a/watcher/common/clients.py
+++ b/watcher/common/clients.py
@@ -25,7 +25,6 @@ from novaclient import api_versions as nova_api_versions
 from novaclient import client as nvclient

 from watcher.common import exception
-from watcher.common import utils

 try:
    from ceilometerclient import client as ceclient
@@ -33,12 +32,6 @@ try:
 except ImportError:
    HAS_CEILCLIENT = False

-try:
-    from maas import client as maas_client
-except ImportError:
-    maas_client = None
-
-
 CONF = cfg.CONF

 _CLIENTS_AUTH_GROUP = 'watcher_clients_auth'
@@ -81,7 +74,6 @@ class OpenStackClients(object):
        self._monasca = None
        self._neutron = None
        self._ironic = None
-        self._maas = None
        self._placement = None

    def _get_keystone_session(self):
@@ -273,23 +265,6 @@ class OpenStackClients(object):
                                           session=self.session)
        return self._ironic

-    def maas(self):
-        if self._maas:
-            return self._maas
-
-        if not maas_client:
-            raise exception.UnsupportedError(
-                "MAAS client unavailable. Please install python-libmaas.")
-
-        url = self._get_client_option('maas', 'url')
-        api_key = self._get_client_option('maas', 'api_key')
-        timeout = self._get_client_option('maas', 'timeout')
-        self._maas = utils.async_compat_call(
-            maas_client.connect,
-            url, apikey=api_key,
-            timeout=timeout)
-        return self._maas
-
    @exception.wrap_keystone_exception
    def placement(self):
        if self._placement:
--- a/watcher/common/context.py
+++ b/watcher/common/context.py
@@ -11,15 +11,12 @@
 # under the License.

 from oslo_context import context
-from oslo_db.sqlalchemy import enginefacade
 from oslo_log import log
 from oslo_utils import timeutils

-
 LOG = log.getLogger(__name__)


-@enginefacade.transaction_context_provider
 class RequestContext(context.RequestContext):
    """Extends security contexts from the OpenStack common library."""

--- a/watcher/common/keystone_helper.py
+++ b/watcher/common/keystone_helper.py
@@ -15,6 +15,8 @@
 from oslo_log import log

 from keystoneauth1.exceptions import http as ks_exceptions
+from keystoneauth1 import loading
+from keystoneauth1 import session
 from watcher._i18n import _
 from watcher.common import clients
 from watcher.common import exception
@@ -88,3 +90,35 @@ class KeystoneHelper(object):
                    message=(_("Domain name seems ambiguous: %s") %
                             name_or_id))
            return domains[0]
+
+    def create_session(self, user_id, password):
+        user = self.get_user(user_id)
+        loader = loading.get_plugin_loader('password')
+        auth = loader.load_from_options(
+            auth_url=CONF.watcher_clients_auth.auth_url,
+            password=password,
+            user_id=user_id,
+            project_id=user.default_project_id)
+        return session.Session(auth=auth)
+
+    def create_user(self, user):
+        project = self.get_project(user['project'])
+        domain = self.get_domain(user['domain'])
+        _user = self.keystone.users.create(
+            user['name'],
+            password=user['password'],
+            domain=domain,
+            project=project,
+        )
+        for role in user['roles']:
+            role = self.get_role(role)
+            self.keystone.roles.grant(
+                role.id, user=_user.id, project=project.id)
+        return _user
+
+    def delete_user(self, user):
+        try:
+            user = self.get_user(user)
+            self.keystone.users.delete(user)
+        except exception.Invalid:
+            pass
--- a/watcher/common/metal_helper/init.py
+++ b/watcher/common/metal_helper/init.py
--- a/watcher/common/metal_helper/base.py
+++ b/watcher/common/metal_helper/base.py
@@ -1,81 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import abc
-
-from watcher.common import exception
-from watcher.common.metal_helper import constants as metal_constants
-
-
-class BaseMetalNode(abc.ABC):
-    hv_up_when_powered_off = False
-
-    def __init__(self, nova_node=None):
-        self._nova_node = nova_node
-
-    def get_hypervisor_node(self):
-        if not self._nova_node:
-            raise exception.Invalid(message="No associated hypervisor.")
-        return self._nova_node
-
-    def get_hypervisor_hostname(self):
-        return self.get_hypervisor_node().hypervisor_hostname
-
-    @abc.abstractmethod
-    def get_power_state(self):
-        # TODO(lpetrut): document the following methods
-        pass
-
-    @abc.abstractmethod
-    def get_id(self):
-        """Return the node id provided by the bare metal service."""
-        pass
-
-    @abc.abstractmethod
-    def power_on(self):
-        pass
-
-    @abc.abstractmethod
-    def power_off(self):
-        pass
-
-    def set_power_state(self, state):
-        state = metal_constants.PowerState(state)
-        if state == metal_constants.PowerState.ON:
-            self.power_on()
-        elif state == metal_constants.PowerState.OFF:
-            self.power_off()
-        else:
-            raise exception.UnsupportedActionType(
-                "Cannot set power state: %s" % state)
-
-
-class BaseMetalHelper(abc.ABC):
-    def __init__(self, osc):
-        self._osc = osc
-
-    @property
-    def nova_client(self):
-        if not getattr(self, "_nova_client", None):
-            self._nova_client = self._osc.nova()
-        return self._nova_client
-
-    @abc.abstractmethod
-    def list_compute_nodes(self):
-        pass
-
-    @abc.abstractmethod
-    def get_node(self, node_id):
-        pass
--- a/watcher/common/metal_helper/constants.py
+++ b/watcher/common/metal_helper/constants.py
@@ -1,23 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import enum
-
-
-class PowerState(str, enum.Enum):
-    ON = "on"
-    OFF = "off"
-    UNKNOWN = "unknown"
-    ERROR = "error"
--- a/watcher/common/metal_helper/factory.py
+++ b/watcher/common/metal_helper/factory.py
@@ -1,33 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslo_config import cfg
-
-from watcher.common import clients
-from watcher.common.metal_helper import ironic
-from watcher.common.metal_helper import maas
-
-CONF = cfg.CONF
-
-
-def get_helper(osc=None):
-    # TODO(lpetrut): consider caching this client.
-    if not osc:
-        osc = clients.OpenStackClients()
-
-    if CONF.maas_client.url:
-        return maas.MaasHelper(osc)
-    else:
-        return ironic.IronicHelper(osc)
--- a/watcher/common/metal_helper/ironic.py
+++ b/watcher/common/metal_helper/ironic.py
@@ -1,94 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslo_log import log
-
-from watcher.common.metal_helper import base
-from watcher.common.metal_helper import constants as metal_constants
-
-LOG = log.getLogger(__name__)
-
-POWER_STATES_MAP = {
-    'power on': metal_constants.PowerState.ON,
-    'power off': metal_constants.PowerState.OFF,
-    # For now, we only use ON/OFF states
-    'rebooting': metal_constants.PowerState.ON,
-    'soft power off': metal_constants.PowerState.OFF,
-    'soft reboot': metal_constants.PowerState.ON,
-}
-
-
-class IronicNode(base.BaseMetalNode):
-    hv_up_when_powered_off = True
-
-    def __init__(self, ironic_node, nova_node, ironic_client):
-        super().__init__(nova_node)
-
-        self._ironic_client = ironic_client
-        self._ironic_node = ironic_node
-
-    def get_power_state(self):
-        return POWER_STATES_MAP.get(self._ironic_node.power_state,
-                                    metal_constants.PowerState.UNKNOWN)
-
-    def get_id(self):
-        return self._ironic_node.uuid
-
-    def power_on(self):
-        self._ironic_client.node.set_power_state(self.get_id(), "on")
-
-    def power_off(self):
-        self._ironic_client.node.set_power_state(self.get_id(), "off")
-
-
-class IronicHelper(base.BaseMetalHelper):
-    @property
-    def _client(self):
-        if not getattr(self, "_cached_client", None):
-            self._cached_client = self._osc.ironic()
-        return self._cached_client
-
-    def list_compute_nodes(self):
-        out_list = []
-        # TODO(lpetrut): consider using "detailed=True" instead of making
-        # an additional GET request per node
-        node_list = self._client.node.list()
-
-        for node in node_list:
-            node_info = self._client.node.get(node.uuid)
-            hypervisor_id = node_info.extra.get('compute_node_id', None)
-            if hypervisor_id is None:
-                LOG.warning('Cannot find compute_node_id in extra '
-                            'of ironic node %s', node.uuid)
-                continue
-
-            hypervisor_node = self.nova_client.hypervisors.get(hypervisor_id)
-            if hypervisor_node is None:
-                LOG.warning('Cannot find hypervisor %s', hypervisor_id)
-                continue
-
-            out_node = IronicNode(node, hypervisor_node, self._client)
-            out_list.append(out_node)
-
-        return out_list
-
-    def get_node(self, node_id):
-        ironic_node = self._client.node.get(node_id)
-        compute_node_id = ironic_node.extra.get('compute_node_id')
-        if compute_node_id:
-            compute_node = self.nova_client.hypervisors.get(compute_node_id)
-        else:
-            compute_node = None
-        return IronicNode(ironic_node, compute_node, self._client)
--- a/watcher/common/metal_helper/maas.py
+++ b/watcher/common/metal_helper/maas.py
@@ -1,125 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslo_config import cfg
-from oslo_log import log
-
-from watcher.common import exception
-from watcher.common.metal_helper import base
-from watcher.common.metal_helper import constants as metal_constants
-from watcher.common import utils
-
-CONF = cfg.CONF
-LOG = log.getLogger(__name__)
-
-try:
-    from maas.client import enum as maas_enum
-except ImportError:
-    maas_enum = None
-
-
-class MaasNode(base.BaseMetalNode):
-    hv_up_when_powered_off = False
-
-    def __init__(self, maas_node, nova_node, maas_client):
-        super().__init__(nova_node)
-
-        self._maas_client = maas_client
-        self._maas_node = maas_node
-
-    def get_power_state(self):
-        maas_state = utils.async_compat_call(
-            self._maas_node.query_power_state,
-            timeout=CONF.maas_client.timeout)
-
-        # python-libmaas may not be available, so we'll avoid a global
-        # variable.
-        power_states_map = {
-            maas_enum.PowerState.ON: metal_constants.PowerState.ON,
-            maas_enum.PowerState.OFF: metal_constants.PowerState.OFF,
-            maas_enum.PowerState.ERROR: metal_constants.PowerState.ERROR,
-            maas_enum.PowerState.UNKNOWN: metal_constants.PowerState.UNKNOWN,
-        }
-        return power_states_map.get(maas_state,
-                                    metal_constants.PowerState.UNKNOWN)
-
-    def get_id(self):
-        return self._maas_node.system_id
-
-    def power_on(self):
-        LOG.info("Powering on MAAS node: %s %s",
-                 self._maas_node.fqdn,
-                 self._maas_node.system_id)
-        utils.async_compat_call(
-            self._maas_node.power_on,
-            timeout=CONF.maas_client.timeout)
-
-    def power_off(self):
-        LOG.info("Powering off MAAS node: %s %s",
-                 self._maas_node.fqdn,
-                 self._maas_node.system_id)
-        utils.async_compat_call(
-            self._maas_node.power_off,
-            timeout=CONF.maas_client.timeout)
-
-
-class MaasHelper(base.BaseMetalHelper):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if not maas_enum:
-            raise exception.UnsupportedError(
-                "MAAS client unavailable. Please install python-libmaas.")
-
-    @property
-    def _client(self):
-        if not getattr(self, "_cached_client", None):
-            self._cached_client = self._osc.maas()
-        return self._cached_client
-
-    def list_compute_nodes(self):
-        out_list = []
-        node_list = utils.async_compat_call(
-            self._client.machines.list,
-            timeout=CONF.maas_client.timeout)
-
-        compute_nodes = self.nova_client.hypervisors.list()
-        compute_node_map = dict()
-        for compute_node in compute_nodes:
-            compute_node_map[compute_node.hypervisor_hostname] = compute_node
-
-        for node in node_list:
-            hypervisor_node = compute_node_map.get(node.fqdn)
-            if not hypervisor_node:
-                LOG.info('Cannot find hypervisor %s', node.fqdn)
-                continue
-
-            out_node = MaasNode(node, hypervisor_node, self._client)
-            out_list.append(out_node)
-
-        return out_list
-
-    def _get_compute_node_by_hostname(self, hostname):
-        compute_nodes = self.nova_client.hypervisors.search(
-            hostname, detailed=True)
-        for compute_node in compute_nodes:
-            if compute_node.hypervisor_hostname == hostname:
-                return compute_node
-
-    def get_node(self, node_id):
-        maas_node = utils.async_compat_call(
-            self._client.machines.get, node_id,
-            timeout=CONF.maas_client.timeout)
-        compute_node = self._get_compute_node_by_hostname(maas_node.fqdn)
-        return MaasNode(maas_node, compute_node, self._client)
--- a/watcher/common/rpc.py
+++ b/watcher/common/rpc.py
@@ -121,7 +121,7 @@ class RequestContextSerializer(messaging.Serializer):
 def get_client(target, version_cap=None, serializer=None):
    assert TRANSPORT is not None
    serializer = RequestContextSerializer(serializer)
-    return messaging.get_rpc_client(
+    return messaging.RPCClient(
        TRANSPORT,
        target,
        version_cap=version_cap,
--- a/watcher/common/utils.py
+++ b/watcher/common/utils.py
@@ -16,14 +16,12 @@

 """Utilities and helper functions."""

-import asyncio
 import datetime
-import inspect
+import random
 import re
+import string

 from croniter import croniter
-import eventlet
-from eventlet import tpool

 from jsonschema import validators
 from oslo_config import cfg
@@ -158,39 +156,9 @@ def extend_with_strict_schema(validator_class):
 StrictDefaultValidatingDraft4Validator = extend_with_default(
    extend_with_strict_schema(validators.Draft4Validator))

-
 Draft4Validator = validators.Draft4Validator


-# Some clients (e.g. MAAS) use asyncio, which isn't compatible with Eventlet.
-# As a workaround, we're delegating such calls to a native thread.
-def async_compat_call(f, *args, **kwargs):
-    timeout = kwargs.pop('timeout', None)
-
-    async def async_wrapper():
-        ret = f(*args, **kwargs)
-        if inspect.isawaitable(ret):
-            return await asyncio.wait_for(ret, timeout)
-        return ret
-
-    def tpool_wrapper():
-        # This will run in a separate native thread. Ideally, there should be
-        # a single thread permanently running an asyncio loop, but for
-        # convenience we'll use eventlet.tpool, which leverages a thread pool.
-        #
-        # That being considered, we're setting up a temporary asyncio loop to
-        # handle this call.
-        loop = asyncio.new_event_loop()
-        try:
-            asyncio.set_event_loop(loop)
-            return loop.run_until_complete(async_wrapper())
-        finally:
-            loop.close()
-
-    # We'll use eventlet timeouts as an extra precaution and asyncio timeouts
-    # to avoid lingering threads. For consistency, we'll convert eventlet
-    # timeout exceptions to asyncio timeout errors.
-    with eventlet.timeout.Timeout(
-            seconds=timeout,
-            exception=asyncio.TimeoutError("Timeout: %ss" % timeout)):
-        return tpool.execute(tpool_wrapper)
+def random_string(n):
+    return ''.join([random.choice(
+        string.ascii_letters + string.digits) for i in range(n)])
--- a/watcher/conf/init.py
+++ b/watcher/conf/init.py
@@ -35,7 +35,6 @@ from watcher.conf import grafana_client
 from watcher.conf import grafana_translators
 from watcher.conf import ironic_client
 from watcher.conf import keystone_client
-from watcher.conf import maas_client
 from watcher.conf import monasca_client
 from watcher.conf import neutron_client
 from watcher.conf import nova_client
@@ -55,7 +54,6 @@ db.register_opts(CONF)
 planner.register_opts(CONF)
 applier.register_opts(CONF)
 decision_engine.register_opts(CONF)
-maas_client.register_opts(CONF)
 monasca_client.register_opts(CONF)
 nova_client.register_opts(CONF)
 glance_client.register_opts(CONF)
--- a/watcher/conf/grafana_client.py
+++ b/watcher/conf/grafana_client.py
@@ -134,13 +134,7 @@ GRAFANA_CLIENT_OPTS = [
                     "InfluxDB this will be the retention period. "
                     "These queries will need to be constructed using tools "
                     "such as Postman. Example: SELECT cpu FROM {4}."
-                     "cpu_percent WHERE host == '{1}' AND time > now()-{2}s"),
-    cfg.IntOpt('http_timeout',
-               min=0,
-               default=60,
-               mutable=True,
-               help='Timeout for Grafana request')
-]
+                     "cpu_percent WHERE host == '{1}' AND time > now()-{2}s")]


 def register_opts(conf):
--- a/watcher/conf/maas_client.py
+++ b/watcher/conf/maas_client.py
@@ -1,38 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-
-from oslo_config import cfg
-
-maas_client = cfg.OptGroup(name='maas_client',
-                           title='Configuration Options for MaaS')
-
-MAAS_CLIENT_OPTS = [
-    cfg.StrOpt('url',
-               help='MaaS URL, example: http://1.2.3.4:5240/MAAS'),
-    cfg.StrOpt('api_key',
-               help='MaaS API authentication key.'),
-    cfg.IntOpt('timeout',
-               default=60,
-               help='MaaS client operation timeout in seconds.')]
-
-
-def register_opts(conf):
-    conf.register_group(maas_client)
-    conf.register_opts(MAAS_CLIENT_OPTS, group=maas_client)
-
-
-def list_opts():
-    return [(maas_client, MAAS_CLIENT_OPTS)]
--- a/watcher/db/sqlalchemy/alembic/env.py
+++ b/watcher/db/sqlalchemy/alembic/env.py
@@ -13,8 +13,8 @@
 from logging import config as log_config

 from alembic import context
-from oslo_db.sqlalchemy import enginefacade

+from watcher.db.sqlalchemy import api as sqla_api
 from watcher.db.sqlalchemy import models

 # this is the Alembic Config object, which provides
@@ -43,7 +43,7 @@ def run_migrations_online():
    and associate a connection with the context.

    """
-    engine = enginefacade.writer.get_engine()
+    engine = sqla_api.get_engine()
    with engine.connect() as connection:
        context.configure(connection=connection,
                          target_metadata=target_metadata)
--- a/watcher/db/sqlalchemy/api.py
+++ b/watcher/db/sqlalchemy/api.py
@@ -19,12 +19,10 @@
 import collections
 import datetime
 import operator
-import threading

 from oslo_config import cfg
-from oslo_db import api as oslo_db_api
 from oslo_db import exception as db_exc
-from oslo_db.sqlalchemy import enginefacade
+from oslo_db.sqlalchemy import session as db_session
 from oslo_db.sqlalchemy import utils as db_utils
 from oslo_utils import timeutils
 from sqlalchemy.inspection import inspect
@@ -40,7 +38,28 @@ from watcher import objects

 CONF = cfg.CONF

-_CONTEXT = threading.local()
+_FACADE = None
+
+
+def _create_facade_lazily():
+    global _FACADE
+    if _FACADE is None:
+        # FIXME(amoralej): Remove autocommit=True (and ideally use of
+        # LegacyEngineFacade) asap since it's not compatible with SQLAlchemy
+        # 2.0.
+        _FACADE = db_session.EngineFacade.from_config(CONF,
+                                                      autocommit=True)
+    return _FACADE
+
+
+def get_engine():
+    facade = _create_facade_lazily()
+    return facade.get_engine()
+
+
+def get_session(**kwargs):
+    facade = _create_facade_lazily()
+    return facade.get_session(**kwargs)


 def get_backend():
@@ -48,15 +67,14 @@ def get_backend():
    return Connection()


-def _session_for_read():
-    return enginefacade.reader.using(_CONTEXT)
+def model_query(model, *args, **kwargs):
+    """Query helper for simpler session usage.

-
-# NOTE(tylerchristie) Please add @oslo_db_api.retry_on_deadlock decorator to
-# any new methods using _session_for_write (as deadlocks happen on write), so
-# that oslo_db is able to retry in case of deadlocks.
-def _session_for_write():
-    return enginefacade.writer.using(_CONTEXT)
+    :param session: if present, the session to use
+    """
+    session = kwargs.get('session') or get_session()
+    query = session.query(model, *args)
+    return query


 def add_identity_filter(query, value):
@@ -79,6 +97,8 @@ def add_identity_filter(query, value):

 def _paginate_query(model, limit=None, marker=None, sort_key=None,
                    sort_dir=None, query=None):
+    if not query:
+        query = model_query(model)
    sort_keys = ['id']
    if sort_key and sort_key not in sort_keys:
        sort_keys.insert(0, sort_key)
@@ -231,39 +251,35 @@ class Connection(api.BaseConnection):
                query = query.options(joinedload(relationship.key))
        return query

-    @oslo_db_api.retry_on_deadlock
    def _create(self, model, values):
-        with _session_for_write() as session:
-            obj = model()
-            cleaned_values = {k: v for k, v in values.items()
-                              if k not in self._get_relationships(model)}
-            obj.update(cleaned_values)
-            session.add(obj)
-            session.flush()
-            return obj
+        obj = model()
+        cleaned_values = {k: v for k, v in values.items()
+                          if k not in self._get_relationships(model)}
+        obj.update(cleaned_values)
+        obj.save()
+        return obj

    def _get(self, context, model, fieldname, value, eager):
-        with _session_for_read() as session:
-            query = session.query(model)
-            if eager:
-                query = self._set_eager_options(model, query)
+        query = model_query(model)
+        if eager:
+            query = self._set_eager_options(model, query)

-            query = query.filter(getattr(model, fieldname) == value)
-            if not context.show_deleted:
-                query = query.filter(model.deleted_at.is_(None))
+        query = query.filter(getattr(model, fieldname) == value)
+        if not context.show_deleted:
+            query = query.filter(model.deleted_at.is_(None))

-            try:
-                obj = query.one()
-            except exc.NoResultFound:
-                raise exception.ResourceNotFound(name=model.__name__, id=value)
+        try:
+            obj = query.one()
+        except exc.NoResultFound:
+            raise exception.ResourceNotFound(name=model.__name__, id=value)

-            return obj
+        return obj

    @staticmethod
-    @oslo_db_api.retry_on_deadlock
    def _update(model, id_, values):
-        with _session_for_write() as session:
-            query = session.query(model)
+        session = get_session()
+        with session.begin():
+            query = model_query(model, session=session)
            query = add_identity_filter(query, id_)
            try:
                ref = query.with_for_update().one()
@@ -271,14 +287,13 @@ class Connection(api.BaseConnection):
                raise exception.ResourceNotFound(name=model.__name__, id=id_)

            ref.update(values)
-
-            return ref
+        return ref

    @staticmethod
-    @oslo_db_api.retry_on_deadlock
    def _soft_delete(model, id_):
-        with _session_for_write() as session:
-            query = session.query(model)
+        session = get_session()
+        with session.begin():
+            query = model_query(model, session=session)
            query = add_identity_filter(query, id_)
            try:
                row = query.one()
@@ -290,10 +305,10 @@ class Connection(api.BaseConnection):
            return row

    @staticmethod
-    @oslo_db_api.retry_on_deadlock
    def _destroy(model, id_):
-        with _session_for_write() as session:
-            query = session.query(model)
+        session = get_session()
+        with session.begin():
+            query = model_query(model, session=session)
            query = add_identity_filter(query, id_)

            try:
@@ -306,15 +321,14 @@ class Connection(api.BaseConnection):
    def _get_model_list(self, model, add_filters_func, context, filters=None,
                        limit=None, marker=None, sort_key=None, sort_dir=None,
                        eager=False):
-        with _session_for_read() as session:
-            query = session.query(model)
-            if eager:
-                query = self._set_eager_options(model, query)
-            query = add_filters_func(query, filters)
-            if not context.show_deleted:
-                query = query.filter(model.deleted_at.is_(None))
-            return _paginate_query(model, limit, marker,
-                                   sort_key, sort_dir, query)
+        query = model_query(model)
+        if eager:
+            query = self._set_eager_options(model, query)
+        query = add_filters_func(query, filters)
+        if not context.show_deleted:
+            query = query.filter(model.deleted_at.is_(None))
+        return _paginate_query(model, limit, marker,
+                               sort_key, sort_dir, query)

    # NOTE(erakli): _add_..._filters methods should be refactored to have same
    # content. join_fieldmap should be filled with JoinMap instead of dict
@@ -409,12 +423,11 @@ class Connection(api.BaseConnection):
            plain_fields=plain_fields, join_fieldmap=join_fieldmap)

        if 'audit_uuid' in filters:
-            with _session_for_read() as session:
-                stmt = session.query(models.ActionPlan).join(
-                    models.Audit,
-                    models.Audit.id == models.ActionPlan.audit_id)\
-                    .filter_by(uuid=filters['audit_uuid']).subquery()
-                query = query.filter_by(action_plan_id=stmt.c.id)
+            stmt = model_query(models.ActionPlan).join(
+                models.Audit,
+                models.Audit.id == models.ActionPlan.audit_id)\
+                .filter_by(uuid=filters['audit_uuid']).subquery()
+            query = query.filter_by(action_plan_id=stmt.c.id)

        return query

@@ -592,21 +605,20 @@ class Connection(api.BaseConnection):
        if not values.get('uuid'):
            values['uuid'] = utils.generate_uuid()

-        with _session_for_write() as session:
-            query = session.query(models.AuditTemplate)
-            query = query.filter_by(name=values.get('name'),
-                                    deleted_at=None)
+        query = model_query(models.AuditTemplate)
+        query = query.filter_by(name=values.get('name'),
+                                deleted_at=None)

-            if len(query.all()) > 0:
-                raise exception.AuditTemplateAlreadyExists(
-                    audit_template=values['name'])
+        if len(query.all()) > 0:
+            raise exception.AuditTemplateAlreadyExists(
+                audit_template=values['name'])

-            try:
-                audit_template = self._create(models.AuditTemplate, values)
-            except db_exc.DBDuplicateEntry:
-                raise exception.AuditTemplateAlreadyExists(
-                    audit_template=values['name'])
-            return audit_template
+        try:
+            audit_template = self._create(models.AuditTemplate, values)
+        except db_exc.DBDuplicateEntry:
+            raise exception.AuditTemplateAlreadyExists(
+                audit_template=values['name'])
+        return audit_template

    def _get_audit_template(self, context, fieldname, value, eager):
        try:
@@ -668,26 +680,25 @@ class Connection(api.BaseConnection):
        if not values.get('uuid'):
            values['uuid'] = utils.generate_uuid()

-        with _session_for_write() as session:
-            query = session.query(models.Audit)
-            query = query.filter_by(name=values.get('name'),
-                                    deleted_at=None)
+        query = model_query(models.Audit)
+        query = query.filter_by(name=values.get('name'),
+                                deleted_at=None)

-            if len(query.all()) > 0:
-                raise exception.AuditAlreadyExists(
-                    audit=values['name'])
+        if len(query.all()) > 0:
+            raise exception.AuditAlreadyExists(
+                audit=values['name'])

-            if values.get('state') is None:
-                values['state'] = objects.audit.State.PENDING
+        if values.get('state') is None:
+            values['state'] = objects.audit.State.PENDING

-            if not values.get('auto_trigger'):
-                values['auto_trigger'] = False
+        if not values.get('auto_trigger'):
+            values['auto_trigger'] = False

-            try:
-                audit = self._create(models.Audit, values)
-            except db_exc.DBDuplicateEntry:
-                raise exception.AuditAlreadyExists(audit=values['uuid'])
-            return audit
+        try:
+            audit = self._create(models.Audit, values)
+        except db_exc.DBDuplicateEntry:
+            raise exception.AuditAlreadyExists(audit=values['uuid'])
+        return audit

    def _get_audit(self, context, fieldname, value, eager):
        try:
@@ -711,13 +722,14 @@ class Connection(api.BaseConnection):
    def destroy_audit(self, audit_id):
        def is_audit_referenced(session, audit_id):
            """Checks whether the audit is referenced by action_plan(s)."""
-            query = session.query(models.ActionPlan)
+            query = model_query(models.ActionPlan, session=session)
            query = self._add_action_plans_filters(
                query, {'audit_id': audit_id})
            return query.count() != 0

-        with _session_for_write() as session:
-            query = session.query(models.Audit)
+        session = get_session()
+        with session.begin():
+            query = model_query(models.Audit, session=session)
            query = add_identity_filter(query, audit_id)

            try:
@@ -784,8 +796,9 @@ class Connection(api.BaseConnection):
            context, fieldname="uuid", value=action_uuid, eager=eager)

    def destroy_action(self, action_id):
-        with _session_for_write() as session:
-            query = session.query(models.Action)
+        session = get_session()
+        with session.begin():
+            query = model_query(models.Action, session=session)
            query = add_identity_filter(query, action_id)
            count = query.delete()
            if count != 1:
@@ -801,8 +814,9 @@ class Connection(api.BaseConnection):

    @staticmethod
    def _do_update_action(action_id, values):
-        with _session_for_write() as session:
-            query = session.query(models.Action)
+        session = get_session()
+        with session.begin():
+            query = model_query(models.Action, session=session)
            query = add_identity_filter(query, action_id)
            try:
                ref = query.with_for_update().one()
@@ -810,7 +824,7 @@ class Connection(api.BaseConnection):
                raise exception.ActionNotFound(action=action_id)

            ref.update(values)
-            return ref
+        return ref

    def soft_delete_action(self, action_id):
        try:
@@ -854,13 +868,14 @@ class Connection(api.BaseConnection):
    def destroy_action_plan(self, action_plan_id):
        def is_action_plan_referenced(session, action_plan_id):
            """Checks whether the action_plan is referenced by action(s)."""
-            query = session.query(models.Action)
+            query = model_query(models.Action, session=session)
            query = self._add_actions_filters(
                query, {'action_plan_id': action_plan_id})
            return query.count() != 0

-        with _session_for_write() as session:
-            query = session.query(models.ActionPlan)
+        session = get_session()
+        with session.begin():
+            query = model_query(models.ActionPlan, session=session)
            query = add_identity_filter(query, action_plan_id)

            try:
@@ -884,8 +899,9 @@ class Connection(api.BaseConnection):

    @staticmethod
    def _do_update_action_plan(action_plan_id, values):
-        with _session_for_write() as session:
-            query = session.query(models.ActionPlan)
+        session = get_session()
+        with session.begin():
+            query = model_query(models.ActionPlan, session=session)
            query = add_identity_filter(query, action_plan_id)
            try:
                ref = query.with_for_update().one()
@@ -893,7 +909,7 @@ class Connection(api.BaseConnection):
                raise exception.ActionPlanNotFound(action_plan=action_plan_id)

            ref.update(values)
-            return ref
+        return ref

    def soft_delete_action_plan(self, action_plan_id):
        try:
--- a/watcher/db/sqlalchemy/migration.py
+++ b/watcher/db/sqlalchemy/migration.py
@@ -20,9 +20,9 @@ import alembic
 from alembic import config as alembic_config
 import alembic.migration as alembic_migration
 from oslo_db import exception as db_exc
-from oslo_db.sqlalchemy import enginefacade

 from watcher._i18n import _
+from watcher.db.sqlalchemy import api as sqla_api
 from watcher.db.sqlalchemy import models


@@ -39,7 +39,7 @@ def version(engine=None):
    :rtype: string
    """
    if engine is None:
-        engine = enginefacade.reader.get_engine()
+        engine = sqla_api.get_engine()
    with engine.connect() as conn:
        context = alembic_migration.MigrationContext.configure(conn)
        return context.get_current_revision()
@@ -63,7 +63,7 @@ def create_schema(config=None, engine=None):
    Can be used for initial installation instead of upgrade('head').
    """
    if engine is None:
-        engine = enginefacade.writer.get_engine()
+        engine = sqla_api.get_engine()

    # NOTE(viktors): If we will use metadata.create_all() for non empty db
    #                schema, it will only add the new tables, but leave
--- a/watcher/db/sqlalchemy/models.py
+++ b/watcher/db/sqlalchemy/models.py
@@ -93,6 +93,14 @@ class WatcherBase(models.SoftDeleteMixin,
            d[c.name] = self[c.name]
        return d

+    def save(self, session=None):
+        import watcher.db.sqlalchemy.api as db_api
+
+        if session is None:
+            session = db_api.get_session()
+
+        super(WatcherBase, self).save(session)
+

 Base = declarative_base(cls=WatcherBase)

--- a/watcher/decision_engine/audit/continuous.py
+++ b/watcher/decision_engine/audit/continuous.py
@@ -52,7 +52,7 @@ class ContinuousAuditHandler(base.AuditHandler):
            self._audit_scheduler = scheduling.BackgroundSchedulerService(
                jobstores={
                    'default': job_store.WatcherJobStore(
-                        engine=sq_api.enginefacade.writer.get_engine()),
+                        engine=sq_api.get_engine()),
                }
            )
        return self._audit_scheduler
--- a/watcher/decision_engine/datasources/base.py
+++ b/watcher/decision_engine/datasources/base.py
@@ -63,7 +63,7 @@ class DataSourceBase(object):
            raise exception.MetricNotAvailable(metric=meter_name)
        return meter

-    def query_retry(self, f, *args, ignored_exc=None, **kwargs):
+    def query_retry(self, f, *args, **kwargs):
        """Attempts to retrieve metrics from the external service

        Attempts to access data from the external service and handles
@@ -71,23 +71,15 @@ class DataSourceBase(object):
        to the value of query_max_retries
        :param f: The method that performs the actual querying for metrics
        :param args: Array of arguments supplied to the method
-        :param ignored_exc: An exception or tuple of exceptions that shouldn't
-                            be retried, for example "NotFound" exceptions.
        :param kwargs: The amount of arguments supplied to the method
        :return: The value as retrieved from the external service
        """

        num_retries = CONF.watcher_datasources.query_max_retries
        timeout = CONF.watcher_datasources.query_timeout
-        ignored_exc = ignored_exc or tuple()
-
        for i in range(num_retries):
            try:
                return f(*args, **kwargs)
-            except ignored_exc as e:
-                LOG.debug("Got an ignored exception (%s) while calling: %s ",
-                          e, f)
-                return
            except Exception as e:
                LOG.exception(e)
                self.query_retry_reset(e)
--- a/watcher/decision_engine/datasources/gnocchi.py
+++ b/watcher/decision_engine/datasources/gnocchi.py
@@ -19,7 +19,6 @@
 from datetime import datetime
 from datetime import timedelta

-from gnocchiclient import exceptions as gnc_exc
 from oslo_config import cfg
 from oslo_log import log

@@ -39,7 +38,7 @@ class GnocchiHelper(base.DataSourceBase):
                      host_inlet_temp='hardware.ipmi.node.temperature',
                      host_airflow='hardware.ipmi.node.airflow',
                      host_power='hardware.ipmi.node.power',
-                      instance_cpu_usage='cpu',
+                      instance_cpu_usage='cpu_util',
                      instance_ram_usage='memory.resident',
                      instance_ram_allocated='memory',
                      instance_l3_cache_usage='cpu_l3_cache',
@@ -85,9 +84,7 @@ class GnocchiHelper(base.DataSourceBase):
            kwargs = dict(query={"=": {"original_resource_id": resource_id}},
                          limit=1)
            resources = self.query_retry(
-                f=self.gnocchi.resource.search,
-                ignored_exc=gnc_exc.NotFound,
-                **kwargs)
+                f=self.gnocchi.resource.search, **kwargs)

            if not resources:
                LOG.warning("The {0} resource {1} could not be "
@@ -96,25 +93,6 @@ class GnocchiHelper(base.DataSourceBase):

            resource_id = resources[0]['id']

-        if meter_name == "instance_cpu_usage":
-            if resource_type != "instance":
-                LOG.warning("Unsupported resource type for metric "
-                            "'instance_cpu_usage': ", resource_type)
-                return
-
-            # The "cpu_util" gauge (percentage) metric has been removed.
-            # We're going to obtain the same result by using the rate of change
-            # aggregate operation.
-            if aggregate not in ("mean", "rate:mean"):
-                LOG.warning("Unsupported aggregate for instance_cpu_usage "
-                            "metric: %s. "
-                            "Supported aggregates: mean, rate:mean ",
-                            aggregate)
-                return
-
-            # TODO(lpetrut): consider supporting other aggregates.
-            aggregate = "rate:mean"
-
        raw_kwargs = dict(
            metric=meter,
            start=start_time,
@@ -127,9 +105,7 @@ class GnocchiHelper(base.DataSourceBase):
        kwargs = {k: v for k, v in raw_kwargs.items() if k and v}

        statistics = self.query_retry(
-            f=self.gnocchi.metric.get_measures,
-            ignored_exc=gnc_exc.NotFound,
-            **kwargs)
+            f=self.gnocchi.metric.get_measures, **kwargs)

        return_value = None
        if statistics:
@@ -141,17 +117,6 @@ class GnocchiHelper(base.DataSourceBase):
                # Airflow from hardware.ipmi.node.airflow is reported as
                # 1/10 th of actual CFM
                return_value *= 10
-            if meter_name == "instance_cpu_usage":
-                # "rate:mean" can return negative values for migrated vms.
-                return_value = max(0, return_value)
-
-                # We're converting the cumulative cpu time (ns) to cpu usage
-                # percentage.
-                vcpus = resource.vcpus
-                if not vcpus:
-                    LOG.warning("instance vcpu count not set, assuming 1")
-                    vcpus = 1
-                return_value *= 100 / (granularity * 10e+8) / vcpus

        return return_value

@@ -167,9 +132,7 @@ class GnocchiHelper(base.DataSourceBase):
            kwargs = dict(query={"=": {"original_resource_id": resource_id}},
                          limit=1)
            resources = self.query_retry(
-                f=self.gnocchi.resource.search,
-                ignored_exc=gnc_exc.NotFound,
-                **kwargs)
+                f=self.gnocchi.resource.search, **kwargs)

            if not resources:
                LOG.warning("The {0} resource {1} could not be "
@@ -189,9 +152,7 @@ class GnocchiHelper(base.DataSourceBase):
        kwargs = {k: v for k, v in raw_kwargs.items() if k and v}

        statistics = self.query_retry(
-            f=self.gnocchi.metric.get_measures,
-            ignored_exc=gnc_exc.NotFound,
-            **kwargs)
+            f=self.gnocchi.metric.get_measures, **kwargs)

        return_value = None
        if statistics:
--- a/watcher/decision_engine/datasources/grafana.py
+++ b/watcher/decision_engine/datasources/grafana.py
@@ -138,8 +138,7 @@ class GrafanaHelper(base.DataSourceBase):
            raise exception.DataSourceNotAvailable(self.NAME)

        resp = requests.get(self._base_url + str(project_id) + '/query',
-                            params=params, headers=self._headers,
-                            timeout=CONF.grafana_client.http_timeout)
+                            params=params, headers=self._headers)
        if resp.status_code == HTTPStatus.OK:
            return resp
        elif resp.status_code == HTTPStatus.BAD_REQUEST:
--- a/watcher/decision_engine/model/collector/ironic.py
+++ b/watcher/decision_engine/model/collector/ironic.py
@@ -81,7 +81,6 @@ class BareMetalModelBuilder(base.BaseModelBuilder):
    def __init__(self, osc):
        self.osc = osc
        self.model = model_root.BaremetalModelRoot()
-        # TODO(lpetrut): add MAAS support
        self.ironic_helper = ironic_helper.IronicHelper(osc=self.osc)

    def add_ironic_node(self, node):
--- a/watcher/decision_engine/model/collector/nova.py
+++ b/watcher/decision_engine/model/collector/nova.py
@@ -48,7 +48,7 @@ class NovaClusterDataModelCollector(base.BaseClusterDataModelCollector):
                    "type": "array",
                    "items": {
                        "anyOf": [
-                            {"$ref": HOST_AGGREGATES + "host_aggr_id"},
+                            {"$ref": HOST_AGGREGATES + "id"},
                            {"$ref": HOST_AGGREGATES + "name"},
                        ]
                    }
@@ -98,8 +98,7 @@ class NovaClusterDataModelCollector(base.BaseClusterDataModelCollector):
                                "type": "array",
                                "items": {
                                    "anyOf": [
-                                        {"$ref":
-                                            HOST_AGGREGATES + "host_aggr_id"},
+                                        {"$ref": HOST_AGGREGATES + "id"},
                                        {"$ref": HOST_AGGREGATES + "name"},
                                    ]
                                }
@@ -130,7 +129,7 @@ class NovaClusterDataModelCollector(base.BaseClusterDataModelCollector):
            "additionalProperties": False
        },
        "host_aggregates": {
-            "host_aggr_id": {
+            "id": {
                "properties": {
                    "id": {
                        "oneOf": [
--- a/watcher/decision_engine/model/model_root.py
+++ b/watcher/decision_engine/model/model_root.py
@@ -157,7 +157,7 @@ class ModelRoot(nx.DiGraph, base.Model):
            if node_list:
                return node_list[0]
            else:
-                raise exception.ComputeNodeNotFound(name=name)
+                raise exception.ComputeResourceNotFound
        except exception.ComputeResourceNotFound:
            raise exception.ComputeNodeNotFound(name=name)

--- a/watcher/decision_engine/strategy/strategies/base.py
+++ b/watcher/decision_engine/strategy/strategies/base.py
@@ -252,6 +252,9 @@ class BaseStrategy(loadable.Loadable, metaclass=abc.ABCMeta):
        if not self.compute_model:
            raise exception.ClusterStateNotDefined()

+        if self.compute_model.stale:
+            raise exception.ClusterStateStale()
+
        LOG.debug(self.compute_model.to_string())

    def execute(self, audit=None):
--- a/watcher/decision_engine/strategy/strategies/saving_energy.py
+++ b/watcher/decision_engine/strategy/strategies/saving_energy.py
@@ -23,8 +23,6 @@ from oslo_log import log

 from watcher._i18n import _
 from watcher.common import exception
-from watcher.common.metal_helper import constants as metal_constants
-from watcher.common.metal_helper import factory as metal_helper_factory
 from watcher.decision_engine.strategy.strategies import base

 LOG = log.getLogger(__name__)
@@ -83,7 +81,7 @@ class SavingEnergy(base.SavingEnergyBaseStrategy):
    def __init__(self, config, osc=None):

        super(SavingEnergy, self).__init__(config, osc)
-        self._metal_helper = None
+        self._ironic_client = None
        self._nova_client = None

        self.with_vms_node_pool = []
@@ -93,10 +91,10 @@ class SavingEnergy(base.SavingEnergyBaseStrategy):
        self.min_free_hosts_num = 1

    @property
-    def metal_helper(self):
-        if not self._metal_helper:
-            self._metal_helper = metal_helper_factory.get_helper(self.osc)
-        return self._metal_helper
+    def ironic_client(self):
+        if not self._ironic_client:
+            self._ironic_client = self.osc.ironic()
+        return self._ironic_client

    @property
    def nova_client(self):
@@ -151,10 +149,10 @@ class SavingEnergy(base.SavingEnergyBaseStrategy):
        :return: None
        """
        params = {'state': state,
-                  'resource_name': node.get_hypervisor_hostname()}
+                  'resource_name': node.hostname}
        self.solution.add_action(
            action_type='change_node_power_state',
-            resource_id=node.get_id(),
+            resource_id=node.uuid,
            input_parameters=params)

    def get_hosts_pool(self):
@@ -164,36 +162,36 @@ class SavingEnergy(base.SavingEnergyBaseStrategy):

        """

-        node_list = self.metal_helper.list_compute_nodes()
+        node_list = self.ironic_client.node.list()
        for node in node_list:
-            hypervisor_node = node.get_hypervisor_node().to_dict()
-
+            node_info = self.ironic_client.node.get(node.uuid)
+            hypervisor_id = node_info.extra.get('compute_node_id', None)
+            if hypervisor_id is None:
+                LOG.warning(('Cannot find compute_node_id in extra '
+                             'of ironic node %s'), node.uuid)
+                continue
+            hypervisor_node = self.nova_client.hypervisors.get(hypervisor_id)
+            if hypervisor_node is None:
+                LOG.warning(('Cannot find hypervisor %s'), hypervisor_id)
+                continue
+            node.hostname = hypervisor_node.hypervisor_hostname
+            hypervisor_node = hypervisor_node.to_dict()
            compute_service = hypervisor_node.get('service', None)
            host_name = compute_service.get('host')
-            LOG.debug("Found hypervisor: %s", hypervisor_node)
            try:
                self.compute_model.get_node_by_name(host_name)
            except exception.ComputeNodeNotFound:
-                LOG.info("The compute model does not contain the host: %s",
-                         host_name)
                continue

-            if (node.hv_up_when_powered_off and
-                    hypervisor_node.get('state') != 'up'):
-                # filter nodes that are not in 'up' state
-                LOG.info("Ignoring node that isn't in 'up' state: %s",
-                         host_name)
+            if not (hypervisor_node.get('state') == 'up'):
+                """filter nodes that are not in 'up' state"""
                continue
            else:
                if (hypervisor_node['running_vms'] == 0):
-                    power_state = node.get_power_state()
-                    if power_state == metal_constants.PowerState.ON:
+                    if (node_info.power_state == 'power on'):
                        self.free_poweron_node_pool.append(node)
-                    elif power_state == metal_constants.PowerState.OFF:
+                    elif (node_info.power_state == 'power off'):
                        self.free_poweroff_node_pool.append(node)
-                    else:
-                        LOG.info("Ignoring node %s, unknown state: %s",
-                                 node, power_state)
                else:
                    self.with_vms_node_pool.append(node)

@@ -204,21 +202,17 @@ class SavingEnergy(base.SavingEnergyBaseStrategy):
                self.min_free_hosts_num)))
        len_poweron = len(self.free_poweron_node_pool)
        len_poweroff = len(self.free_poweroff_node_pool)
-        LOG.debug("need_poweron: %s, len_poweron: %s, len_poweroff: %s",
-                  need_poweron, len_poweron, len_poweroff)
        if len_poweron > need_poweron:
            for node in random.sample(self.free_poweron_node_pool,
                                      (len_poweron - need_poweron)):
-                self.add_action_poweronoff_node(node,
-                                                metal_constants.PowerState.OFF)
-                LOG.info("power off %s", node.get_id())
+                self.add_action_poweronoff_node(node, 'off')
+                LOG.debug("power off %s", node.uuid)
        elif len_poweron < need_poweron:
            diff = need_poweron - len_poweron
            for node in random.sample(self.free_poweroff_node_pool,
                                      min(len_poweroff, diff)):
-                self.add_action_poweronoff_node(node,
-                                                metal_constants.PowerState.ON)
-                LOG.info("power on %s", node.get_id())
+                self.add_action_poweronoff_node(node, 'on')
+                LOG.debug("power on %s", node.uuid)

    def pre_execute(self):
        self._pre_execute()
--- a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
+++ b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py
@@ -18,13 +18,9 @@
 # limitations under the License.
 #

-import collections
-
 from oslo_log import log
-import oslo_utils

 from watcher._i18n import _
-from watcher.applier.actions import migration
 from watcher.common import exception
 from watcher.decision_engine.model import element
 from watcher.decision_engine.strategy.strategies import base
@@ -70,8 +66,7 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):

    AGGREGATE = 'mean'
    DATASOURCE_METRICS = ['instance_ram_allocated', 'instance_cpu_usage',
-                          'instance_ram_usage', 'instance_root_disk_size',
-                          'host_cpu_usage', 'host_ram_usage']
+                          'instance_ram_usage', 'instance_root_disk_size']

    MIGRATION = "migrate"
    CHANGE_NOVA_SERVICE_STATE = "change_nova_service_state"
@@ -81,11 +76,6 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
        self.number_of_migrations = 0
        self.number_of_released_nodes = 0
        self.datasource_instance_data_cache = dict()
-        self.datasource_node_data_cache = dict()
-        # Host metric adjustments that take into account planned
-        # migrations.
-        self.host_metric_delta = collections.defaultdict(
-            lambda: collections.defaultdict(int))

    @classmethod
    def get_name(cls):
@@ -206,12 +196,12 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
        :return: None
        """
        instance_state_str = self.get_instance_state_str(instance)
-        if instance_state_str in (element.InstanceState.ACTIVE.value,
-                                  element.InstanceState.PAUSED.value):
-            migration_type = migration.Migrate.LIVE_MIGRATION
-        elif instance_state_str == element.InstanceState.STOPPED.value:
-            migration_type = migration.Migrate.COLD_MIGRATION
-        else:
+        if instance_state_str not in (element.InstanceState.ACTIVE.value,
+                                      element.InstanceState.PAUSED.value):
+            # Watcher currently only supports live VM migration and block live
+            # VM migration which both requires migrated VM to be active.
+            # When supported, the cold migration may be used as a fallback
+            # migration mechanism to move non active VMs.
            LOG.error(
                'Cannot live migrate: instance_uuid=%(instance_uuid)s, '
                'state=%(instance_state)s.', dict(
@@ -219,6 +209,8 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
                    instance_state=instance_state_str))
            return

+        migration_type = 'live'
+
        # Here will makes repeated actions to enable the same compute node,
        # when migrating VMs to the destination node which is disabled.
        # Whether should we remove the same actions in the solution???
@@ -236,18 +228,6 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
                destination_node)
            self.number_of_migrations += 1

-            instance_util = self.get_instance_utilization(instance)
-            self.host_metric_delta[source_node.hostname]['cpu'] -= (
-                instance_util['cpu'])
-            # We'll deduce the vm allocated memory.
-            self.host_metric_delta[source_node.hostname]['ram'] -= (
-                instance.memory)
-
-            self.host_metric_delta[destination_node.hostname]['cpu'] += (
-                instance_util['cpu'])
-            self.host_metric_delta[destination_node.hostname]['ram'] += (
-                instance.memory)
-
    def disable_unused_nodes(self):
        """Generate actions for disabling unused nodes.

@@ -310,21 +290,6 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
            disk=instance_disk_util)
        return self.datasource_instance_data_cache.get(instance.uuid)

-    def _get_node_total_utilization(self, node):
-        if node.hostname in self.datasource_node_data_cache:
-            return self.datasource_node_data_cache[node.hostname]
-
-        cpu = self.datasource_backend.get_host_cpu_usage(
-            node, self.period, self.AGGREGATE,
-            self.granularity)
-        ram = self.datasource_backend.get_host_ram_usage(
-            node, self.period, self.AGGREGATE,
-            self.granularity)
-
-        self.datasource_node_data_cache[node.hostname] = dict(
-            cpu=cpu, ram=ram)
-        return self.datasource_node_data_cache[node.hostname]
-
    def get_node_utilization(self, node):
        """Collect cpu, ram and disk utilization statistics of a node.

@@ -342,36 +307,8 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
            node_cpu_util += instance_util['cpu']
            node_ram_util += instance_util['ram']
            node_disk_util += instance_util['disk']
-            LOG.debug("instance utilization: %s %s",
-                      instance, instance_util)

-        total_node_util = self._get_node_total_utilization(node)
-        total_node_cpu_util = total_node_util['cpu'] or 0
-        if total_node_cpu_util:
-            total_node_cpu_util = total_node_cpu_util * node.vcpus / 100
-            # account for planned migrations
-            total_node_cpu_util += self.host_metric_delta[node.hostname]['cpu']
-
-        total_node_ram_util = total_node_util['ram'] or 0
-        if total_node_ram_util:
-            total_node_ram_util /= oslo_utils.units.Ki
-            total_node_ram_util += self.host_metric_delta[node.hostname]['ram']
-
-        LOG.debug(
-            "node utilization: %s. "
-            "total instance cpu: %s, "
-            "total instance ram: %s, "
-            "total instance disk: %s, "
-            "total host cpu: %s, "
-            "total host ram: %s, "
-            "node delta usage: %s.",
-            node,
-            node_cpu_util, node_ram_util, node_disk_util,
-            total_node_cpu_util, total_node_ram_util,
-            self.host_metric_delta[node.hostname])
-
-        return dict(cpu=max(node_cpu_util, total_node_cpu_util),
-                    ram=max(node_ram_util, total_node_ram_util),
+        return dict(cpu=node_cpu_util, ram=node_ram_util,
                    disk=node_disk_util)

    def get_node_capacity(self, node):
@@ -451,15 +388,8 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
        instance_utilization = self.get_instance_utilization(instance)
        metrics = ['cpu', 'ram', 'disk']
        for m in metrics:
-            fits = (instance_utilization[m] + node_utilization[m] <=
-                    node_capacity[m] * cc[m])
-            LOG.debug(
-                "Instance fits: %s, metric: %s, instance: %s, "
-                "node: %s, instance utilization: %s, "
-                "node utilization: %s, node capacity: %s, cc: %s",
-                fits, m, instance, node, instance_utilization[m],
-                node_utilization[m], node_capacity[m], cc[m])
-            if not fits:
+            if (instance_utilization[m] + node_utilization[m] >
+                    node_capacity[m] * cc[m]):
                return False
        return True

@@ -494,9 +424,6 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
                for a in actions:
                    self.solution.actions.remove(a)
                    self.number_of_migrations -= 1
-                LOG.info("Optimized migrations: %s. "
-                         "Source: %s, destination: %s", actions,
-                         src_name, dst_name)
                src_node = self.compute_model.get_node_by_name(src_name)
                dst_node = self.compute_model.get_node_by_name(dst_name)
                instance = self.compute_model.get_instance_by_uuid(
@@ -533,8 +460,6 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
                        key=lambda x: self.get_instance_utilization(
                            x)['cpu']
                ):
-                    LOG.info("Node %s overloaded, attempting to reduce load.",
-                             node)
                    # skip exclude instance when migrating
                    if instance.watcher_exclude:
                        LOG.debug("Instance is excluded by scope, "
@@ -543,19 +468,11 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
                    for destination_node in reversed(sorted_nodes):
                        if self.instance_fits(
                                instance, destination_node, cc):
-                            LOG.info("Offload: found fitting "
-                                     "destination (%s) for instance: %s. "
-                                     "Planning migration.",
-                                     destination_node, instance.uuid)
                            self.add_migration(instance, node,
                                               destination_node)
                            break
                    if not self.is_overloaded(node, cc):
-                        LOG.info("Node %s no longer overloaded.", node)
                        break
-                    else:
-                        LOG.info("Node still overloaded (%s), "
-                                 "continuing offload phase.", node)

    def consolidation_phase(self, cc):
        """Perform consolidation phase.
@@ -591,10 +508,6 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy):
                        break
                    if self.instance_fits(
                            instance, destination_node, cc):
-                        LOG.info("Consolidation: found fitting "
-                                 "destination (%s) for instance: %s. "
-                                 "Planning migration.",
-                                 destination_node, instance.uuid)
                        self.add_migration(instance, node,
                                           destination_node)
                        break
--- a/watcher/decision_engine/strategy/strategies/workload_balance.py
+++ b/watcher/decision_engine/strategy/strategies/workload_balance.py
@@ -295,7 +295,7 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
                        self.threshold)
            return self.solution

-        # choose the server with largest cpu usage
+        # choose the server with largest cpu_util
        source_nodes = sorted(source_nodes,
                              reverse=True,
                              key=lambda x: (x[self._meter]))
--- a/watcher/decision_engine/strategy/strategies/zone_migration.py
+++ b/watcher/decision_engine/strategy/strategies/zone_migration.py
@@ -57,19 +57,8 @@ class ZoneMigration(base.ZoneMigrationBaseStrategy):
        self.planned_cold_count = 0
        self.volume_count = 0
        self.planned_volume_count = 0
-
-    # TODO(sean-n-mooney) This is backward compatibility
-    # for calling the swap code paths. Swap is now an alias
-    # for migrate, we should clean this up in a future
-    # cycle.
-    @property
-    def volume_update_count(self):
-        return self.volume_count
-
-    # same as above clean up later.
-    @property
-    def planned_volume_update_count(self):
-        return self.planned_volume_count
+        self.volume_update_count = 0
+        self.planned_volume_update_count = 0

    @classmethod
    def get_name(cls):
@@ -323,8 +312,8 @@ class ZoneMigration(base.ZoneMigrationBaseStrategy):
            planned_cold_migrate_instance_count=self.planned_cold_count,
            volume_migrate_count=self.volume_count,
            planned_volume_migrate_count=self.planned_volume_count,
-            volume_update_count=self.volume_count,
-            planned_volume_update_count=self.planned_volume_count
+            volume_update_count=self.volume_update_count,
+            planned_volume_update_count=self.planned_volume_update_count
        )

    def set_migration_count(self, targets):
@@ -339,7 +328,10 @@ class ZoneMigration(base.ZoneMigrationBaseStrategy):
            elif self.is_cold(instance):
                self.cold_count += 1
        for volume in targets.get('volume', []):
-            self.volume_count += 1
+            if self.is_available(volume):
+                self.volume_count += 1
+            elif self.is_in_use(volume):
+                self.volume_update_count += 1

    def is_live(self, instance):
        status = getattr(instance, 'status')
@@ -412,16 +404,19 @@ class ZoneMigration(base.ZoneMigrationBaseStrategy):
            LOG.debug(src_type)
            LOG.debug("%s %s", dst_pool, dst_type)

-            if src_type == dst_type:
-                self._volume_migrate(volume, dst_pool)
-            else:
-                self._volume_retype(volume, dst_type)
+            if self.is_available(volume):
+                if src_type == dst_type:
+                    self._volume_migrate(volume, dst_pool)
+                else:
+                    self._volume_retype(volume, dst_type)
+            elif self.is_in_use(volume):
+                self._volume_update(volume, dst_type)

-            # if with_attached_volume is True, migrate attaching instances
-            if self.with_attached_volume:
-                instances = [self.nova.find_instance(dic.get('server_id'))
-                             for dic in volume.attachments]
-                self.instances_migration(instances, action_counter)
+                # if with_attached_volume is True, migrate attaching instances
+                if self.with_attached_volume:
+                    instances = [self.nova.find_instance(dic.get('server_id'))
+                                 for dic in volume.attachments]
+                    self.instances_migration(instances, action_counter)

            action_counter.add_pool(pool)

@@ -469,6 +464,16 @@ class ZoneMigration(base.ZoneMigrationBaseStrategy):
            input_parameters=parameters)
        self.planned_cold_count += 1

+    def _volume_update(self, volume, dst_type):
+        parameters = {"migration_type": "swap",
+                      "destination_type": dst_type,
+                      "resource_name": volume.name}
+        self.solution.add_action(
+            action_type="volume_migrate",
+            resource_id=volume.id,
+            input_parameters=parameters)
+        self.planned_volume_update_count += 1
+
    def _volume_migrate(self, volume, dst_pool):
        parameters = {"migration_type": "migrate",
                      "destination_node": dst_pool,
--- a/watcher/tests/applier/actions/test_change_node_power_state.py
+++ b/watcher/tests/applier/actions/test_change_node_power_state.py
@@ -19,151 +19,134 @@ import jsonschema

 from watcher.applier.actions import base as baction
 from watcher.applier.actions import change_node_power_state
-from watcher.common.metal_helper import constants as m_constants
-from watcher.common.metal_helper import factory as m_helper_factory
+from watcher.common import clients
 from watcher.tests import base
-from watcher.tests.decision_engine import fake_metal_helper

 COMPUTE_NODE = "compute-1"


+@mock.patch.object(clients.OpenStackClients, 'nova')
+@mock.patch.object(clients.OpenStackClients, 'ironic')
 class TestChangeNodePowerState(base.TestCase):

    def setUp(self):
        super(TestChangeNodePowerState, self).setUp()

-        p_m_factory = mock.patch.object(m_helper_factory, 'get_helper')
-        m_factory = p_m_factory.start()
-        self._metal_helper = m_factory.return_value
-        self.addCleanup(p_m_factory.stop)
-
-        # Let's avoid unnecessary sleep calls while running the test.
-        p_sleep = mock.patch('time.sleep')
-        p_sleep.start()
-        self.addCleanup(p_sleep.stop)
-
        self.input_parameters = {
            baction.BaseAction.RESOURCE_ID: COMPUTE_NODE,
-            "state": m_constants.PowerState.ON.value,
+            "state": change_node_power_state.NodeState.POWERON.value,
        }
        self.action = change_node_power_state.ChangeNodePowerState(
            mock.Mock())
        self.action.input_parameters = self.input_parameters

-    def test_parameters_down(self):
+    def test_parameters_down(self, mock_ironic, mock_nova):
        self.action.input_parameters = {
            baction.BaseAction.RESOURCE_ID: COMPUTE_NODE,
            self.action.STATE:
-                m_constants.PowerState.OFF.value}
+                change_node_power_state.NodeState.POWEROFF.value}
        self.assertTrue(self.action.validate_parameters())

-    def test_parameters_up(self):
+    def test_parameters_up(self, mock_ironic, mock_nova):
        self.action.input_parameters = {
            baction.BaseAction.RESOURCE_ID: COMPUTE_NODE,
            self.action.STATE:
-                m_constants.PowerState.ON.value}
+                change_node_power_state.NodeState.POWERON.value}
        self.assertTrue(self.action.validate_parameters())

-    def test_parameters_exception_wrong_state(self):
+    def test_parameters_exception_wrong_state(self, mock_ironic, mock_nova):
        self.action.input_parameters = {
            baction.BaseAction.RESOURCE_ID: COMPUTE_NODE,
            self.action.STATE: 'error'}
        self.assertRaises(jsonschema.ValidationError,
                          self.action.validate_parameters)

-    def test_parameters_resource_id_empty(self):
+    def test_parameters_resource_id_empty(self, mock_ironic, mock_nova):
        self.action.input_parameters = {
            self.action.STATE:
-                m_constants.PowerState.ON.value,
+                change_node_power_state.NodeState.POWERON.value,
        }
        self.assertRaises(jsonschema.ValidationError,
                          self.action.validate_parameters)

-    def test_parameters_applies_add_extra(self):
+    def test_parameters_applies_add_extra(self, mock_ironic, mock_nova):
        self.action.input_parameters = {"extra": "failed"}
        self.assertRaises(jsonschema.ValidationError,
                          self.action.validate_parameters)

-    def test_change_service_state_pre_condition(self):
+    def test_change_service_state_pre_condition(self, mock_ironic, mock_nova):
        try:
            self.action.pre_condition()
        except Exception as exc:
            self.fail(exc)

-    def test_change_node_state_post_condition(self):
+    def test_change_node_state_post_condition(self, mock_ironic, mock_nova):
        try:
            self.action.post_condition()
        except Exception as exc:
            self.fail(exc)

-    def test_execute_node_service_state_with_poweron_target(self):
+    def test_execute_node_service_state_with_poweron_target(
+            self, mock_ironic, mock_nova):
+        mock_irclient = mock_ironic.return_value
        self.action.input_parameters["state"] = (
-            m_constants.PowerState.ON.value)
-        mock_nodes = [
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.OFF),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON)
-        ]
-        self._metal_helper.get_node.side_effect = mock_nodes
+            change_node_power_state.NodeState.POWERON.value)
+        mock_irclient.node.get.side_effect = [
+            mock.MagicMock(power_state='power off'),
+            mock.MagicMock(power_state='power on')]

        result = self.action.execute()
        self.assertTrue(result)

-        mock_nodes[0].set_power_state.assert_called_once_with(
-            m_constants.PowerState.ON.value)
+        mock_irclient.node.set_power_state.assert_called_once_with(
+            COMPUTE_NODE, change_node_power_state.NodeState.POWERON.value)

-    def test_execute_change_node_state_with_poweroff_target(self):
+    def test_execute_change_node_state_with_poweroff_target(
+            self, mock_ironic, mock_nova):
+        mock_irclient = mock_ironic.return_value
+        mock_nvclient = mock_nova.return_value
+        mock_get = mock.MagicMock()
+        mock_get.to_dict.return_value = {'running_vms': 0}
+        mock_nvclient.hypervisors.get.return_value = mock_get
        self.action.input_parameters["state"] = (
-            m_constants.PowerState.OFF.value)
-
-        mock_nodes = [
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.OFF)
-        ]
-        self._metal_helper.get_node.side_effect = mock_nodes
-
+            change_node_power_state.NodeState.POWEROFF.value)
+        mock_irclient.node.get.side_effect = [
+            mock.MagicMock(power_state='power on'),
+            mock.MagicMock(power_state='power on'),
+            mock.MagicMock(power_state='power off')]
        result = self.action.execute()
        self.assertTrue(result)

-        mock_nodes[0].set_power_state.assert_called_once_with(
-            m_constants.PowerState.OFF.value)
+        mock_irclient.node.set_power_state.assert_called_once_with(
+            COMPUTE_NODE, change_node_power_state.NodeState.POWEROFF.value)

-    def test_revert_change_node_state_with_poweron_target(self):
+    def test_revert_change_node_state_with_poweron_target(
+            self, mock_ironic, mock_nova):
+        mock_irclient = mock_ironic.return_value
+        mock_nvclient = mock_nova.return_value
+        mock_get = mock.MagicMock()
+        mock_get.to_dict.return_value = {'running_vms': 0}
+        mock_nvclient.hypervisors.get.return_value = mock_get
        self.action.input_parameters["state"] = (
-            m_constants.PowerState.ON.value)
-
-        mock_nodes = [
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.OFF)
-        ]
-        self._metal_helper.get_node.side_effect = mock_nodes
-
+            change_node_power_state.NodeState.POWERON.value)
+        mock_irclient.node.get.side_effect = [
+            mock.MagicMock(power_state='power on'),
+            mock.MagicMock(power_state='power on'),
+            mock.MagicMock(power_state='power off')]
        self.action.revert()

-        mock_nodes[0].set_power_state.assert_called_once_with(
-            m_constants.PowerState.OFF.value)
+        mock_irclient.node.set_power_state.assert_called_once_with(
+            COMPUTE_NODE, change_node_power_state.NodeState.POWEROFF.value)

-    def test_revert_change_node_state_with_poweroff_target(self):
+    def test_revert_change_node_state_with_poweroff_target(
+            self, mock_ironic, mock_nova):
+        mock_irclient = mock_ironic.return_value
        self.action.input_parameters["state"] = (
-            m_constants.PowerState.OFF.value)
-        mock_nodes = [
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.OFF),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON)
-        ]
-        self._metal_helper.get_node.side_effect = mock_nodes
-
+            change_node_power_state.NodeState.POWEROFF.value)
+        mock_irclient.node.get.side_effect = [
+            mock.MagicMock(power_state='power off'),
+            mock.MagicMock(power_state='power on')]
        self.action.revert()

-        mock_nodes[0].set_power_state.assert_called_once_with(
-            m_constants.PowerState.ON.value)
+        mock_irclient.node.set_power_state.assert_called_once_with(
+            COMPUTE_NODE, change_node_power_state.NodeState.POWERON.value)
--- a/watcher/tests/applier/actions/test_volume_migration.py
+++ b/watcher/tests/applier/actions/test_volume_migration.py
@@ -22,6 +22,7 @@ from watcher.common import cinder_helper
 from watcher.common import clients
 from watcher.common import keystone_helper
 from watcher.common import nova_helper
+from watcher.common import utils as w_utils
 from watcher.tests import base


@@ -101,15 +102,12 @@ class TestMigration(base.TestCase):

    @staticmethod
    def fake_volume(**kwargs):
-        # FIXME(sean-k-mooney): we should be using real objects in this
-        # test or at lease something more Representative of the real data
        volume = mock.MagicMock()
        volume.id = kwargs.get('id', TestMigration.VOLUME_UUID)
        volume.size = kwargs.get('size', '1')
        volume.status = kwargs.get('status', 'available')
        volume.snapshot_id = kwargs.get('snapshot_id', None)
        volume.availability_zone = kwargs.get('availability_zone', 'nova')
-        volume.attachments = kwargs.get('attachments', [])
        return volume

    @staticmethod
@@ -177,14 +175,42 @@ class TestMigration(base.TestCase):
            "storage1-typename",
        )

-    def test_can_swap_success(self):
+    def test_swap_success(self):
        volume = self.fake_volume(
-            status='in-use', attachments=[
-                {'server_id': TestMigration.INSTANCE_UUID}])
+            status='in-use', attachments=[{'server_id': 'server_id'}])
+        self.m_n_helper.find_instance.return_value = self.fake_instance()

-        instance = self.fake_instance()
+        new_volume = self.fake_volume(id=w_utils.generate_uuid())
+        user = mock.Mock()
+        session = mock.MagicMock()
+        self.m_k_helper.create_user.return_value = user
+        self.m_k_helper.create_session.return_value = session
+        self.m_c_helper.get_volume.return_value = volume
+        self.m_c_helper.create_volume.return_value = new_volume
+
+        result = self.action_swap.execute()
+        self.assertTrue(result)
+
+        self.m_n_helper.swap_volume.assert_called_once_with(
+            volume,
+            new_volume
+        )
+        self.m_k_helper.delete_user.assert_called_once_with(user)
+
+    def test_swap_fail(self):
+        # _can_swap fail
+        instance = self.fake_instance(status='STOPPED')
        self.m_n_helper.find_instance.return_value = instance

+        result = self.action_swap.execute()
+        self.assertFalse(result)
+
+    def test_can_swap_success(self):
+        volume = self.fake_volume(
+            status='in-use', attachments=[{'server_id': 'server_id'}])
+        instance = self.fake_instance()
+
+        self.m_n_helper.find_instance.return_value = instance
        result = self.action_swap._can_swap(volume)
        self.assertTrue(result)

@@ -193,33 +219,16 @@ class TestMigration(base.TestCase):
        result = self.action_swap._can_swap(volume)
        self.assertTrue(result)

+        instance = self.fake_instance(status='RESIZED')
+        self.m_n_helper.find_instance.return_value = instance
+        result = self.action_swap._can_swap(volume)
+        self.assertTrue(result)
+
    def test_can_swap_fail(self):

        volume = self.fake_volume(
-            status='in-use', attachments=[
-                {'server_id': TestMigration.INSTANCE_UUID}])
+            status='in-use', attachments=[{'server_id': 'server_id'}])
        instance = self.fake_instance(status='STOPPED')
        self.m_n_helper.find_instance.return_value = instance
        result = self.action_swap._can_swap(volume)
        self.assertFalse(result)
-
-        instance = self.fake_instance(status='RESIZED')
-        self.m_n_helper.find_instance.return_value = instance
-        result = self.action_swap._can_swap(volume)
-        self.assertFalse(result)
-
-    def test_swap_success(self):
-        volume = self.fake_volume(
-            status='in-use', attachments=[
-                {'server_id': TestMigration.INSTANCE_UUID}])
-        self.m_c_helper.get_volume.return_value = volume
-
-        instance = self.fake_instance()
-        self.m_n_helper.find_instance.return_value = instance
-
-        result = self.action_swap.execute()
-        self.assertTrue(result)
-        self.m_c_helper.migrate.assert_called_once_with(
-            volume,
-            "storage1-poolname"
-        )
--- a/watcher/tests/common/metal_helper/init.py
+++ b/watcher/tests/common/metal_helper/init.py
--- a/watcher/tests/common/metal_helper/test_base.py
+++ b/watcher/tests/common/metal_helper/test_base.py
@@ -1,96 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from unittest import mock
-
-from watcher.common import exception
-from watcher.common.metal_helper import base as m_helper_base
-from watcher.common.metal_helper import constants as m_constants
-from watcher.tests import base
-
-
-# The base classes have abstract methods, we'll need to
-# stub them.
-class MockMetalNode(m_helper_base.BaseMetalNode):
-    def get_power_state(self):
-        raise NotImplementedError()
-
-    def get_id(self):
-        raise NotImplementedError()
-
-    def power_on(self):
-        raise NotImplementedError()
-
-    def power_off(self):
-        raise NotImplementedError()
-
-
-class MockMetalHelper(m_helper_base.BaseMetalHelper):
-    def list_compute_nodes(self):
-        pass
-
-    def get_node(self, node_id):
-        pass
-
-
-class TestBaseMetalNode(base.TestCase):
-    def setUp(self):
-        super().setUp()
-
-        self._nova_node = mock.Mock()
-        self._node = MockMetalNode(self._nova_node)
-
-    def test_get_hypervisor_node(self):
-        self.assertEqual(
-            self._nova_node,
-            self._node.get_hypervisor_node())
-
-    def test_get_hypervisor_node_missing(self):
-        node = MockMetalNode()
-        self.assertRaises(
-            exception.Invalid,
-            node.get_hypervisor_node)
-
-    def test_get_hypervisor_hostname(self):
-        self.assertEqual(
-            self._nova_node.hypervisor_hostname,
-            self._node.get_hypervisor_hostname())
-
-    @mock.patch.object(MockMetalNode, 'power_on')
-    @mock.patch.object(MockMetalNode, 'power_off')
-    def test_set_power_state(self,
-                             mock_power_off, mock_power_on):
-        self._node.set_power_state(m_constants.PowerState.ON)
-        mock_power_on.assert_called_once_with()
-
-        self._node.set_power_state(m_constants.PowerState.OFF)
-        mock_power_off.assert_called_once_with()
-
-        self.assertRaises(
-            exception.UnsupportedActionType,
-            self._node.set_power_state,
-            m_constants.PowerState.UNKNOWN)
-
-
-class TestBaseMetalHelper(base.TestCase):
-    def setUp(self):
-        super().setUp()
-
-        self._osc = mock.Mock()
-        self._helper = MockMetalHelper(self._osc)
-
-    def test_nova_client_attr(self):
-        self.assertEqual(self._osc.nova.return_value,
-                         self._helper.nova_client)
--- a/watcher/tests/common/metal_helper/test_factory.py
+++ b/watcher/tests/common/metal_helper/test_factory.py
@@ -1,38 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from unittest import mock
-
-from watcher.common import clients
-from watcher.common.metal_helper import factory
-from watcher.common.metal_helper import ironic
-from watcher.common.metal_helper import maas
-from watcher.tests import base
-
-
-class TestMetalHelperFactory(base.TestCase):
-
-    @mock.patch.object(clients, 'OpenStackClients')
-    @mock.patch.object(maas, 'MaasHelper')
-    @mock.patch.object(ironic, 'IronicHelper')
-    def test_factory(self, mock_ironic, mock_maas, mock_osc):
-        self.assertEqual(
-            mock_ironic.return_value,
-            factory.get_helper())
-
-        self.config(url="fake_maas_url", group="maas_client")
-        self.assertEqual(
-            mock_maas.return_value,
-            factory.get_helper())
--- a/watcher/tests/common/metal_helper/test_ironic.py
+++ b/watcher/tests/common/metal_helper/test_ironic.py
@@ -1,128 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from unittest import mock
-
-from watcher.common.metal_helper import constants as m_constants
-from watcher.common.metal_helper import ironic
-from watcher.tests import base
-
-
-class TestIronicNode(base.TestCase):
-    def setUp(self):
-        super().setUp()
-
-        self._wrapped_node = mock.Mock()
-        self._nova_node = mock.Mock()
-        self._ironic_client = mock.Mock()
-
-        self._node = ironic.IronicNode(
-            self._wrapped_node, self._nova_node, self._ironic_client)
-
-    def test_get_power_state(self):
-        states = (
-            "power on",
-            "power off",
-            "rebooting",
-            "soft power off",
-            "soft reboot",
-            'SomeOtherState')
-        type(self._wrapped_node).power_state = mock.PropertyMock(
-            side_effect=states)
-
-        expected_states = (
-            m_constants.PowerState.ON,
-            m_constants.PowerState.OFF,
-            m_constants.PowerState.ON,
-            m_constants.PowerState.OFF,
-            m_constants.PowerState.ON,
-            m_constants.PowerState.UNKNOWN)
-
-        for expected_state in expected_states:
-            actual_state = self._node.get_power_state()
-            self.assertEqual(expected_state, actual_state)
-
-    def test_get_id(self):
-        self.assertEqual(
-            self._wrapped_node.uuid,
-            self._node.get_id())
-
-    def test_power_on(self):
-        self._node.power_on()
-        self._ironic_client.node.set_power_state.assert_called_once_with(
-            self._wrapped_node.uuid, "on")
-
-    def test_power_off(self):
-        self._node.power_off()
-        self._ironic_client.node.set_power_state.assert_called_once_with(
-            self._wrapped_node.uuid, "off")
-
-
-class TestIronicHelper(base.TestCase):
-    def setUp(self):
-        super().setUp()
-
-        self._mock_osc = mock.Mock()
-        self._mock_nova_client = self._mock_osc.nova.return_value
-        self._mock_ironic_client = self._mock_osc.ironic.return_value
-        self._helper = ironic.IronicHelper(osc=self._mock_osc)
-
-    def test_list_compute_nodes(self):
-        mock_machines = [
-            mock.Mock(
-                extra=dict(compute_node_id=mock.sentinel.compute_node_id)),
-            mock.Mock(
-                extra=dict(compute_node_id=mock.sentinel.compute_node_id2)),
-            mock.Mock(
-                extra=dict())
-        ]
-        mock_hypervisor = mock.Mock()
-
-        self._mock_ironic_client.node.list.return_value = mock_machines
-        self._mock_ironic_client.node.get.side_effect = mock_machines
-        self._mock_nova_client.hypervisors.get.side_effect = (
-            mock_hypervisor, None)
-
-        out_nodes = self._helper.list_compute_nodes()
-        self.assertEqual(1, len(out_nodes))
-
-        out_node = out_nodes[0]
-        self.assertIsInstance(out_node, ironic.IronicNode)
-        self.assertEqual(mock_hypervisor, out_node._nova_node)
-        self.assertEqual(mock_machines[0], out_node._ironic_node)
-        self.assertEqual(self._mock_ironic_client, out_node._ironic_client)
-
-    def test_get_node(self):
-        mock_machine = mock.Mock(
-            extra=dict(compute_node_id=mock.sentinel.compute_node_id))
-        self._mock_ironic_client.node.get.return_value = mock_machine
-
-        out_node = self._helper.get_node(mock.sentinel.id)
-
-        self.assertEqual(self._mock_nova_client.hypervisors.get.return_value,
-                         out_node._nova_node)
-        self.assertEqual(self._mock_ironic_client, out_node._ironic_client)
-        self.assertEqual(mock_machine, out_node._ironic_node)
-
-    def test_get_node_not_a_hypervisor(self):
-        mock_machine = mock.Mock(extra=dict(compute_node_id=None))
-        self._mock_ironic_client.node.get.return_value = mock_machine
-
-        out_node = self._helper.get_node(mock.sentinel.id)
-
-        self._mock_nova_client.hypervisors.get.assert_not_called()
-        self.assertIsNone(out_node._nova_node)
-        self.assertEqual(self._mock_ironic_client, out_node._ironic_client)
-        self.assertEqual(mock_machine, out_node._ironic_node)
--- a/watcher/tests/common/metal_helper/test_maas.py
+++ b/watcher/tests/common/metal_helper/test_maas.py
@@ -1,126 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from unittest import mock
-
-try:
-    from maas.client import enum as maas_enum
-except ImportError:
-    maas_enum = None
-
-from watcher.common.metal_helper import constants as m_constants
-from watcher.common.metal_helper import maas
-from watcher.tests import base
-
-
-class TestMaasNode(base.TestCase):
-    def setUp(self):
-        super().setUp()
-
-        self._wrapped_node = mock.Mock()
-        self._nova_node = mock.Mock()
-        self._maas_client = mock.Mock()
-
-        self._node = maas.MaasNode(
-            self._wrapped_node, self._nova_node, self._maas_client)
-
-    def test_get_power_state(self):
-        if not maas_enum:
-            self.skipTest("python-libmaas not intalled.")
-
-        self._wrapped_node.query_power_state.side_effect = (
-            maas_enum.PowerState.ON,
-            maas_enum.PowerState.OFF,
-            maas_enum.PowerState.ERROR,
-            maas_enum.PowerState.UNKNOWN,
-            'SomeOtherState')
-
-        expected_states = (
-            m_constants.PowerState.ON,
-            m_constants.PowerState.OFF,
-            m_constants.PowerState.ERROR,
-            m_constants.PowerState.UNKNOWN,
-            m_constants.PowerState.UNKNOWN)
-
-        for expected_state in expected_states:
-            actual_state = self._node.get_power_state()
-            self.assertEqual(expected_state, actual_state)
-
-    def test_get_id(self):
-        self.assertEqual(
-            self._wrapped_node.system_id,
-            self._node.get_id())
-
-    def test_power_on(self):
-        self._node.power_on()
-        self._wrapped_node.power_on.assert_called_once_with()
-
-    def test_power_off(self):
-        self._node.power_off()
-        self._wrapped_node.power_off.assert_called_once_with()
-
-
-class TestMaasHelper(base.TestCase):
-    def setUp(self):
-        super().setUp()
-
-        self._mock_osc = mock.Mock()
-        self._mock_nova_client = self._mock_osc.nova.return_value
-        self._mock_maas_client = self._mock_osc.maas.return_value
-        self._helper = maas.MaasHelper(osc=self._mock_osc)
-
-    def test_list_compute_nodes(self):
-        compute_fqdn = "compute-0"
-        # some other MAAS node, not a Nova node
-        ctrl_fqdn = "ctrl-1"
-
-        mock_machines = [
-            mock.Mock(fqdn=compute_fqdn,
-                      system_id=mock.sentinel.compute_node_id),
-            mock.Mock(fqdn=ctrl_fqdn,
-                      system_id=mock.sentinel.ctrl_node_id),
-        ]
-        mock_hypervisors = [
-            mock.Mock(hypervisor_hostname=compute_fqdn),
-        ]
-
-        self._mock_maas_client.machines.list.return_value = mock_machines
-        self._mock_nova_client.hypervisors.list.return_value = mock_hypervisors
-
-        out_nodes = self._helper.list_compute_nodes()
-        self.assertEqual(1, len(out_nodes))
-
-        out_node = out_nodes[0]
-        self.assertIsInstance(out_node, maas.MaasNode)
-        self.assertEqual(mock.sentinel.compute_node_id, out_node.get_id())
-        self.assertEqual(compute_fqdn, out_node.get_hypervisor_hostname())
-
-    def test_get_node(self):
-        mock_machine = mock.Mock(fqdn='compute-0')
-        self._mock_maas_client.machines.get.return_value = mock_machine
-
-        mock_compute_nodes = [
-            mock.Mock(hypervisor_hostname="compute-011"),
-            mock.Mock(hypervisor_hostname="compute-0"),
-            mock.Mock(hypervisor_hostname="compute-01"),
-        ]
-        self._mock_nova_client.hypervisors.search.return_value = (
-            mock_compute_nodes)
-
-        out_node = self._helper.get_node(mock.sentinel.id)
-
-        self.assertEqual(mock_compute_nodes[1], out_node._nova_node)
-        self.assertEqual(self._mock_maas_client, out_node._maas_client)
-        self.assertEqual(mock_machine, out_node._maas_node)
--- a/watcher/tests/common/test_service.py
+++ b/watcher/tests/common/test_service.py
@@ -80,13 +80,13 @@ class TestService(base.TestCase):
        super(TestService, self).setUp()

    @mock.patch.object(om.rpc.server, "RPCServer")
-    def _test_start(self, m_handler):
+    def test_start(self, m_handler):
        dummy_service = service.Service(DummyManager)
        dummy_service.start()
        self.assertEqual(1, m_handler.call_count)

    @mock.patch.object(om.rpc.server, "RPCServer")
-    def _test_stop(self, m_handler):
+    def test_stop(self, m_handler):
        dummy_service = service.Service(DummyManager)
        dummy_service.stop()
        self.assertEqual(1, m_handler.call_count)
--- a/watcher/tests/common/test_utils.py
+++ b/watcher/tests/common/test_utils.py
@@ -1,52 +0,0 @@
-# Copyright 2023 Cloudbase Solutions
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import asyncio
-import time
-from unittest import mock
-
-from watcher.common import utils
-from watcher.tests import base
-
-
-class TestCommonUtils(base.TestCase):
-    async def test_coro(self, sleep=0, raise_exc=None):
-        time.sleep(sleep)
-        if raise_exc:
-            raise raise_exc
-        return mock.sentinel.ret_val
-
-    def test_async_compat(self):
-        ret_val = utils.async_compat_call(self.test_coro)
-        self.assertEqual(mock.sentinel.ret_val, ret_val)
-
-    def test_async_compat_exc(self):
-        self.assertRaises(
-            IOError,
-            utils.async_compat_call,
-            self.test_coro,
-            raise_exc=IOError('fake error'))
-
-    def test_async_compat_timeout(self):
-        # Timeout not reached.
-        ret_val = utils.async_compat_call(self.test_coro, timeout=10)
-        self.assertEqual(mock.sentinel.ret_val, ret_val)
-
-        # Timeout reached.
-        self.assertRaises(
-            asyncio.TimeoutError,
-            utils.async_compat_call,
-            self.test_coro,
-            sleep=0.5, timeout=0.1)
--- a/watcher/tests/db/base.py
+++ b/watcher/tests/db/base.py
@@ -17,10 +17,9 @@

 import fixtures
 from oslo_config import cfg
-from oslo_db.sqlalchemy import enginefacade
-

 from watcher.db import api as dbapi
+from watcher.db.sqlalchemy import api as sqla_api
 from watcher.db.sqlalchemy import migration
 from watcher.db.sqlalchemy import models
 from watcher.tests import base
@@ -36,16 +35,16 @@ _DB_CACHE = None

 class Database(fixtures.Fixture):

-    def __init__(self, engine, db_migrate, sql_connection):
+    def __init__(self, db_api, db_migrate, sql_connection):
        self.sql_connection = sql_connection

-        self.engine = engine
+        self.engine = db_api.get_engine()
        self.engine.dispose()
+        conn = self.engine.connect()
+        self.setup_sqlite(db_migrate)
+        self.post_migrations()

-        with self.engine.connect() as conn:
-            self.setup_sqlite(db_migrate)
-            self.post_migrations()
-            self._DB = "".join(line for line in conn.connection.iterdump())
+        self._DB = "".join(line for line in conn.connection.iterdump())
        self.engine.dispose()

    def setup_sqlite(self, db_migrate):
@@ -56,8 +55,9 @@ class Database(fixtures.Fixture):

    def setUp(self):
        super(Database, self).setUp()
-        with self.engine.connect() as conn:
-            conn.connection.executescript(self._DB)
+
+        conn = self.engine.connect()
+        conn.connection.executescript(self._DB)
        self.addCleanup(self.engine.dispose)

    def post_migrations(self):
@@ -80,9 +80,7 @@ class DbTestCase(base.TestCase):

        global _DB_CACHE
        if not _DB_CACHE:
-            engine = enginefacade.writer.get_engine()
-            _DB_CACHE = Database(engine, migration,
+            _DB_CACHE = Database(sqla_api, migration,
                                 sql_connection=CONF.database.connection)
-            engine.dispose()
        self.useFixture(_DB_CACHE)
        self._id_gen = utils.id_generator()
--- a/watcher/tests/decision_engine/audit/test_audit_handlers.py
+++ b/watcher/tests/decision_engine/audit/test_audit_handlers.py
@@ -263,7 +263,7 @@ class TestContinuousAuditHandler(base.DbTestCase):
        cfg.CONF.set_override("host", "hostname1")

    @mock.patch.object(objects.service.Service, 'list')
-    @mock.patch.object(sq_api.enginefacade.writer, 'get_engine')
+    @mock.patch.object(sq_api, 'get_engine')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'add_job')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'get_jobs')
    @mock.patch.object(objects.audit.Audit, 'list')
@@ -286,7 +286,7 @@ class TestContinuousAuditHandler(base.DbTestCase):
        self.assertIsNone(self.audits[1].next_run_time)

    @mock.patch.object(objects.service.Service, 'list')
-    @mock.patch.object(sq_api.enginefacade.writer, 'get_engine')
+    @mock.patch.object(sq_api, 'get_engine')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'add_job')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'get_jobs')
    @mock.patch.object(objects.audit.Audit, 'list')
@@ -309,7 +309,7 @@ class TestContinuousAuditHandler(base.DbTestCase):

    @mock.patch.object(continuous.ContinuousAuditHandler, '_next_cron_time')
    @mock.patch.object(objects.service.Service, 'list')
-    @mock.patch.object(sq_api.enginefacade.writer, 'get_engine')
+    @mock.patch.object(sq_api, 'get_engine')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'add_job')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'get_jobs')
    @mock.patch.object(objects.audit.Audit, 'list')
@@ -328,7 +328,7 @@ class TestContinuousAuditHandler(base.DbTestCase):
                          audit_handler.launch_audits_periodically)

    @mock.patch.object(objects.service.Service, 'list')
-    @mock.patch.object(sq_api.enginefacade.writer, 'get_engine')
+    @mock.patch.object(sq_api, 'get_engine')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'add_job')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'get_jobs')
    @mock.patch.object(objects.audit.Audit, 'list')
@@ -349,7 +349,7 @@ class TestContinuousAuditHandler(base.DbTestCase):
        m_add_job.assert_has_calls(calls)

    @mock.patch.object(objects.service.Service, 'list')
-    @mock.patch.object(sq_api.enginefacade.writer, 'get_engine')
+    @mock.patch.object(sq_api, 'get_engine')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'add_job')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'get_jobs')
    @mock.patch.object(objects.audit.Audit, 'list')
@@ -384,7 +384,7 @@ class TestContinuousAuditHandler(base.DbTestCase):
        self.assertTrue(is_inactive)

    @mock.patch.object(objects.service.Service, 'list')
-    @mock.patch.object(sq_api.enginefacade.writer, 'get_engine')
+    @mock.patch.object(sq_api, 'get_engine')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'get_jobs')
    @mock.patch.object(objects.audit.AuditStateTransitionManager,
                       'is_inactive')
@@ -406,7 +406,7 @@ class TestContinuousAuditHandler(base.DbTestCase):
        self.assertIsNotNone(self.audits[0].next_run_time)

    @mock.patch.object(objects.service.Service, 'list')
-    @mock.patch.object(sq_api.enginefacade.writer, 'get_engine')
+    @mock.patch.object(sq_api, 'get_engine')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'remove_job')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'add_job')
    @mock.patch.object(scheduling.BackgroundSchedulerService, 'get_jobs')
--- a/watcher/tests/decision_engine/datasources/test_gnocchi_helper.py
+++ b/watcher/tests/decision_engine/datasources/test_gnocchi_helper.py
@@ -40,25 +40,17 @@ class TestGnocchiHelper(base.BaseTestCase):
        self.addCleanup(stat_agg_patcher.stop)

    def test_gnocchi_statistic_aggregation(self, mock_gnocchi):
-        vcpus = 2
-        mock_instance = mock.Mock(
-            id='16a86790-327a-45f9-bc82-45839f062fdc',
-            vcpus=vcpus)
-
        gnocchi = mock.MagicMock()
-        # cpu time rate of change (ns)
-        mock_rate_measure = 360 * 10e+8 * vcpus * 5.5 / 100
        expected_result = 5.5

-        expected_measures = [
-            ["2017-02-02T09:00:00.000000", 360, mock_rate_measure]]
+        expected_measures = [["2017-02-02T09:00:00.000000", 360, 5.5]]

        gnocchi.metric.get_measures.return_value = expected_measures
        mock_gnocchi.return_value = gnocchi

        helper = gnocchi_helper.GnocchiHelper()
        result = helper.statistic_aggregation(
-            resource=mock_instance,
+            resource=mock.Mock(id='16a86790-327a-45f9-bc82-45839f062fdc'),
            resource_type='instance',
            meter_name='instance_cpu_usage',
            period=300,
@@ -67,14 +59,6 @@ class TestGnocchiHelper(base.BaseTestCase):
        )
        self.assertEqual(expected_result, result)

-        gnocchi.metric.get_measures.assert_called_once_with(
-            metric="cpu",
-            start=mock.ANY,
-            stop=mock.ANY,
-            resource_id=mock_instance.uuid,
-            granularity=360,
-            aggregation="rate:mean")
-
    def test_gnocchi_statistic_series(self, mock_gnocchi):
        gnocchi = mock.MagicMock()
        expected_result = {
--- a/watcher/tests/decision_engine/fake_metal_helper.py
+++ b/watcher/tests/decision_engine/fake_metal_helper.py
@@ -1,47 +0,0 @@
-# Copyright (c) 2023 Cloudbase Solutions
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from unittest import mock
-import uuid
-
-from watcher.common.metal_helper import constants as m_constants
-
-
-def get_mock_metal_node(node_id=None,
-                        power_state=m_constants.PowerState.ON,
-                        running_vms=0,
-                        hostname=None,
-                        compute_state='up'):
-    node_id = node_id or str(uuid.uuid4())
-    # NOTE(lpetrut): the hostname is important for some of the tests,
-    # which expect it to match the fake cluster model.
-    hostname = hostname or "compute-" + str(uuid.uuid4()).split('-')[0]
-
-    hypervisor_node_dict = {
-        'hypervisor_hostname': hostname,
-        'running_vms': running_vms,
-        'service': {
-            'host': hostname,
-        },
-        'state': compute_state,
-    }
-    hypervisor_node = mock.Mock(**hypervisor_node_dict)
-    hypervisor_node.to_dict.return_value = hypervisor_node_dict
-
-    node = mock.Mock()
-    node.get_power_state.return_value = power_state
-    node.get_id.return_value = uuid
-    node.get_hypervisor_node.return_value = hypervisor_node
-    return node
--- a/watcher/tests/decision_engine/model/faker_cluster_and_metrics.py
+++ b/watcher/tests/decision_engine/model/faker_cluster_and_metrics.py
@@ -80,7 +80,7 @@ class FakerModelCollector(base.BaseClusterDataModelCollector):
        return self.load_model('scenario_4_with_metrics.xml')


-class FakeGnocchiMetrics(object):
+class FakeCeilometerMetrics(object):
    def __init__(self, model):
        self.model = model

@@ -90,9 +90,6 @@ class FakeGnocchiMetrics(object):
        if meter_name == 'host_cpu_usage':
            return self.get_compute_node_cpu_util(
                resource, period, aggregate, granularity)
-        elif meter_name == 'host_ram_usage':
-            return self.get_compute_node_ram_util(
-                resource, period, aggregate, granularity)
        elif meter_name == 'instance_cpu_usage':
            return self.get_instance_cpu_util(
                resource, period, aggregate, granularity)
@@ -113,28 +110,18 @@ class FakeGnocchiMetrics(object):
        Returns relative node CPU utilization <0, 100>.
        :param r_id: resource id
        """
-        node = self.model.get_node_by_uuid(resource.uuid)
+        node_uuid = '%s_%s' % (resource.uuid, resource.hostname)
+        node = self.model.get_node_by_uuid(node_uuid)
        instances = self.model.get_node_instances(node)
        util_sum = 0.0
-        for instance in instances:
+        for instance_uuid in instances:
+            instance = self.model.get_instance_by_uuid(instance_uuid)
            total_cpu_util = instance.vcpus * self.get_instance_cpu_util(
-                instance, period, aggregate, granularity)
+                instance.uuid)
            util_sum += total_cpu_util / 100.0
        util_sum /= node.vcpus
        return util_sum * 100.0

-    def get_compute_node_ram_util(self, resource, period, aggregate,
-                                  granularity):
-        # Returns mock host ram usage in KB based on the allocated
-        # instances.
-        node = self.model.get_node_by_uuid(resource.uuid)
-        instances = self.model.get_node_instances(node)
-        util_sum = 0.0
-        for instance in instances:
-            util_sum += self.get_instance_ram_util(
-                instance, period, aggregate, granularity)
-        return util_sum / 1024
-
    @staticmethod
    def get_instance_cpu_util(resource, period, aggregate,
                              granularity):
@@ -184,7 +171,93 @@ class FakeGnocchiMetrics(object):
        return instance_disk_util[str(resource.uuid)]


-# TODO(lpetrut): consider dropping Ceilometer support, it was deprecated
-# in Ocata.
-class FakeCeilometerMetrics(FakeGnocchiMetrics):
-    pass
+class FakeGnocchiMetrics(object):
+    def __init__(self, model):
+        self.model = model
+
+    def mock_get_statistics(self, resource=None, resource_type=None,
+                            meter_name=None, period=300, aggregate='mean',
+                            granularity=300):
+        if meter_name == 'host_cpu_usage':
+            return self.get_compute_node_cpu_util(
+                resource, period, aggregate, granularity)
+        elif meter_name == 'instance_cpu_usage':
+            return self.get_instance_cpu_util(
+                resource, period, aggregate, granularity)
+        elif meter_name == 'instance_ram_usage':
+            return self.get_instance_ram_util(
+                resource, period, aggregate, granularity)
+        elif meter_name == 'instance_root_disk_size':
+            return self.get_instance_disk_root_size(
+                resource, period, aggregate, granularity)
+
+    def get_compute_node_cpu_util(self, resource, period, aggregate,
+                                  granularity):
+        """Calculates node utilization dynamicaly.
+
+        node CPU utilization should consider
+        and corelate with actual instance-node mappings
+        provided within a cluster model.
+        Returns relative node CPU utilization <0, 100>.
+
+        :param r_id: resource id
+        """
+        node_uuid = "%s_%s" % (resource.uuid, resource.hostname)
+        node = self.model.get_node_by_uuid(node_uuid)
+        instances = self.model.get_node_instances(node)
+        util_sum = 0.0
+        for instance_uuid in instances:
+            instance = self.model.get_instance_by_uuid(instance_uuid)
+            total_cpu_util = instance.vcpus * self.get_instance_cpu_util(
+                instance.uuid)
+            util_sum += total_cpu_util / 100.0
+        util_sum /= node.vcpus
+        return util_sum * 100.0
+
+    @staticmethod
+    def get_instance_cpu_util(resource, period, aggregate,
+                              granularity):
+        instance_cpu_util = dict()
+        instance_cpu_util['INSTANCE_0'] = 10
+        instance_cpu_util['INSTANCE_1'] = 30
+        instance_cpu_util['INSTANCE_2'] = 60
+        instance_cpu_util['INSTANCE_3'] = 20
+        instance_cpu_util['INSTANCE_4'] = 40
+        instance_cpu_util['INSTANCE_5'] = 50
+        instance_cpu_util['INSTANCE_6'] = 100
+        instance_cpu_util['INSTANCE_7'] = 100
+        instance_cpu_util['INSTANCE_8'] = 100
+        instance_cpu_util['INSTANCE_9'] = 100
+        return instance_cpu_util[str(resource.uuid)]
+
+    @staticmethod
+    def get_instance_ram_util(resource, period, aggregate,
+                              granularity):
+        instance_ram_util = dict()
+        instance_ram_util['INSTANCE_0'] = 1
+        instance_ram_util['INSTANCE_1'] = 2
+        instance_ram_util['INSTANCE_2'] = 4
+        instance_ram_util['INSTANCE_3'] = 8
+        instance_ram_util['INSTANCE_4'] = 3
+        instance_ram_util['INSTANCE_5'] = 2
+        instance_ram_util['INSTANCE_6'] = 1
+        instance_ram_util['INSTANCE_7'] = 2
+        instance_ram_util['INSTANCE_8'] = 4
+        instance_ram_util['INSTANCE_9'] = 8
+        return instance_ram_util[str(resource.uuid)]
+
+    @staticmethod
+    def get_instance_disk_root_size(resource, period, aggregate,
+                                    granularity):
+        instance_disk_util = dict()
+        instance_disk_util['INSTANCE_0'] = 10
+        instance_disk_util['INSTANCE_1'] = 15
+        instance_disk_util['INSTANCE_2'] = 30
+        instance_disk_util['INSTANCE_3'] = 35
+        instance_disk_util['INSTANCE_4'] = 20
+        instance_disk_util['INSTANCE_5'] = 25
+        instance_disk_util['INSTANCE_6'] = 25
+        instance_disk_util['INSTANCE_7'] = 25
+        instance_disk_util['INSTANCE_8'] = 25
+        instance_disk_util['INSTANCE_9'] = 25
+        return instance_disk_util[str(resource.uuid)]
--- a/watcher/tests/decision_engine/strategy/strategies/test_saving_energy.py
+++ b/watcher/tests/decision_engine/strategy/strategies/test_saving_energy.py
@@ -18,10 +18,8 @@
 from unittest import mock

 from watcher.common import clients
-from watcher.common.metal_helper import constants as m_constants
 from watcher.common import utils
 from watcher.decision_engine.strategy import strategies
-from watcher.tests.decision_engine import fake_metal_helper
 from watcher.tests.decision_engine.strategy.strategies.test_base \
    import TestBaseStrategy

@@ -31,15 +29,26 @@ class TestSavingEnergy(TestBaseStrategy):
    def setUp(self):
        super(TestSavingEnergy, self).setUp()

-        self.fake_nodes = [fake_metal_helper.get_mock_metal_node(),
-                           fake_metal_helper.get_mock_metal_node()]
-        self._metal_helper = mock.Mock()
-        self._metal_helper.list_compute_nodes.return_value = self.fake_nodes
+        mock_node1_dict = {
+            'uuid': '922d4762-0bc5-4b30-9cb9-48ab644dd861'}
+        mock_node2_dict = {
+            'uuid': '922d4762-0bc5-4b30-9cb9-48ab644dd862'}
+        mock_node1 = mock.Mock(**mock_node1_dict)
+        mock_node2 = mock.Mock(**mock_node2_dict)
+        self.fake_nodes = [mock_node1, mock_node2]

-        p_nova = mock.patch.object(clients.OpenStackClients, 'nova')
+        p_ironic = mock.patch.object(
+            clients.OpenStackClients, 'ironic')
+        self.m_ironic = p_ironic.start()
+        self.addCleanup(p_ironic.stop)
+
+        p_nova = mock.patch.object(
+            clients.OpenStackClients, 'nova')
        self.m_nova = p_nova.start()
        self.addCleanup(p_nova.stop)

+        self.m_ironic.node.list.return_value = self.fake_nodes
+
        self.m_c_model.return_value = self.fake_c_cluster.generate_scenario_1()

        self.strategy = strategies.SavingEnergy(
@@ -50,20 +59,27 @@ class TestSavingEnergy(TestBaseStrategy):
             'min_free_hosts_num': 1})
        self.strategy.free_used_percent = 10.0
        self.strategy.min_free_hosts_num = 1
-        self.strategy._metal_helper = self._metal_helper
+        self.strategy._ironic_client = self.m_ironic
        self.strategy._nova_client = self.m_nova

    def test_get_hosts_pool_with_vms_node_pool(self):
-        self._metal_helper.list_compute_nodes.return_value = [
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON,
-                hostname='hostname_0',
-                running_vms=2),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.OFF,
-                hostname='hostname_1',
-                running_vms=2),
-        ]
+        mock_node1_dict = {
+            'extra': {'compute_node_id': 1},
+            'power_state': 'power on'}
+        mock_node2_dict = {
+            'extra': {'compute_node_id': 2},
+            'power_state': 'power off'}
+        mock_node1 = mock.Mock(**mock_node1_dict)
+        mock_node2 = mock.Mock(**mock_node2_dict)
+        self.m_ironic.node.get.side_effect = [mock_node1, mock_node2]
+
+        mock_hyper1 = mock.Mock()
+        mock_hyper2 = mock.Mock()
+        mock_hyper1.to_dict.return_value = {
+            'running_vms': 2, 'service': {'host': 'hostname_0'}, 'state': 'up'}
+        mock_hyper2.to_dict.return_value = {
+            'running_vms': 2, 'service': {'host': 'hostname_1'}, 'state': 'up'}
+        self.m_nova.hypervisors.get.side_effect = [mock_hyper1, mock_hyper2]

        self.strategy.get_hosts_pool()

@@ -72,16 +88,23 @@ class TestSavingEnergy(TestBaseStrategy):
        self.assertEqual(len(self.strategy.free_poweroff_node_pool), 0)

    def test_get_hosts_pool_free_poweron_node_pool(self):
-        self._metal_helper.list_compute_nodes.return_value = [
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON,
-                hostname='hostname_0',
-                running_vms=0),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON,
-                hostname='hostname_1',
-                running_vms=0),
-        ]
+        mock_node1_dict = {
+            'extra': {'compute_node_id': 1},
+            'power_state': 'power on'}
+        mock_node2_dict = {
+            'extra': {'compute_node_id': 2},
+            'power_state': 'power on'}
+        mock_node1 = mock.Mock(**mock_node1_dict)
+        mock_node2 = mock.Mock(**mock_node2_dict)
+        self.m_ironic.node.get.side_effect = [mock_node1, mock_node2]
+
+        mock_hyper1 = mock.Mock()
+        mock_hyper2 = mock.Mock()
+        mock_hyper1.to_dict.return_value = {
+            'running_vms': 0, 'service': {'host': 'hostname_0'}, 'state': 'up'}
+        mock_hyper2.to_dict.return_value = {
+            'running_vms': 0, 'service': {'host': 'hostname_1'}, 'state': 'up'}
+        self.m_nova.hypervisors.get.side_effect = [mock_hyper1, mock_hyper2]

        self.strategy.get_hosts_pool()

@@ -90,16 +113,23 @@ class TestSavingEnergy(TestBaseStrategy):
        self.assertEqual(len(self.strategy.free_poweroff_node_pool), 0)

    def test_get_hosts_pool_free_poweroff_node_pool(self):
-        self._metal_helper.list_compute_nodes.return_value = [
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.OFF,
-                hostname='hostname_0',
-                running_vms=0),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.OFF,
-                hostname='hostname_1',
-                running_vms=0),
-        ]
+        mock_node1_dict = {
+            'extra': {'compute_node_id': 1},
+            'power_state': 'power off'}
+        mock_node2_dict = {
+            'extra': {'compute_node_id': 2},
+            'power_state': 'power off'}
+        mock_node1 = mock.Mock(**mock_node1_dict)
+        mock_node2 = mock.Mock(**mock_node2_dict)
+        self.m_ironic.node.get.side_effect = [mock_node1, mock_node2]
+
+        mock_hyper1 = mock.Mock()
+        mock_hyper2 = mock.Mock()
+        mock_hyper1.to_dict.return_value = {
+            'running_vms': 0, 'service': {'host': 'hostname_0'}, 'state': 'up'}
+        mock_hyper2.to_dict.return_value = {
+            'running_vms': 0, 'service': {'host': 'hostname_1'}, 'state': 'up'}
+        self.m_nova.hypervisors.get.side_effect = [mock_hyper1, mock_hyper2]

        self.strategy.get_hosts_pool()

@@ -108,16 +138,26 @@ class TestSavingEnergy(TestBaseStrategy):
        self.assertEqual(len(self.strategy.free_poweroff_node_pool), 2)

    def test_get_hosts_pool_with_node_out_model(self):
-        self._metal_helper.list_compute_nodes.return_value = [
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.OFF,
-                hostname='hostname_0',
-                running_vms=0),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.OFF,
-                hostname='hostname_10',
-                running_vms=0),
-        ]
+        mock_node1_dict = {
+            'extra': {'compute_node_id': 1},
+            'power_state': 'power off'}
+        mock_node2_dict = {
+            'extra': {'compute_node_id': 2},
+            'power_state': 'power off'}
+        mock_node1 = mock.Mock(**mock_node1_dict)
+        mock_node2 = mock.Mock(**mock_node2_dict)
+        self.m_ironic.node.get.side_effect = [mock_node1, mock_node2]
+
+        mock_hyper1 = mock.Mock()
+        mock_hyper2 = mock.Mock()
+        mock_hyper1.to_dict.return_value = {
+            'running_vms': 0, 'service': {'host': 'hostname_0'},
+            'state': 'up'}
+        mock_hyper2.to_dict.return_value = {
+            'running_vms': 0, 'service': {'host': 'hostname_10'},
+            'state': 'up'}
+        self.m_nova.hypervisors.get.side_effect = [mock_hyper1, mock_hyper2]
+
        self.strategy.get_hosts_pool()

        self.assertEqual(len(self.strategy.with_vms_node_pool), 0)
@@ -126,9 +166,9 @@ class TestSavingEnergy(TestBaseStrategy):

    def test_save_energy_poweron(self):
        self.strategy.free_poweroff_node_pool = [
-            fake_metal_helper.get_mock_metal_node(),
-            fake_metal_helper.get_mock_metal_node(),
-        ]
+            mock.Mock(uuid='922d4762-0bc5-4b30-9cb9-48ab644dd861'),
+            mock.Mock(uuid='922d4762-0bc5-4b30-9cb9-48ab644dd862')
+            ]
        self.strategy.save_energy()
        self.assertEqual(len(self.strategy.solution.actions), 1)
        action = self.strategy.solution.actions[0]
@@ -145,16 +185,23 @@ class TestSavingEnergy(TestBaseStrategy):
        self.assertEqual(action.get('input_parameters').get('state'), 'off')

    def test_execute(self):
-        self._metal_helper.list_compute_nodes.return_value = [
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON,
-                hostname='hostname_0',
-                running_vms=0),
-            fake_metal_helper.get_mock_metal_node(
-                power_state=m_constants.PowerState.ON,
-                hostname='hostname_1',
-                running_vms=0),
-        ]
+        mock_node1_dict = {
+            'extra': {'compute_node_id': 1},
+            'power_state': 'power on'}
+        mock_node2_dict = {
+            'extra': {'compute_node_id': 2},
+            'power_state': 'power on'}
+        mock_node1 = mock.Mock(**mock_node1_dict)
+        mock_node2 = mock.Mock(**mock_node2_dict)
+        self.m_ironic.node.get.side_effect = [mock_node1, mock_node2]
+
+        mock_hyper1 = mock.Mock()
+        mock_hyper2 = mock.Mock()
+        mock_hyper1.to_dict.return_value = {
+            'running_vms': 0, 'service': {'host': 'hostname_0'}, 'state': 'up'}
+        mock_hyper2.to_dict.return_value = {
+            'running_vms': 0, 'service': {'host': 'hostname_1'}, 'state': 'up'}
+        self.m_nova.hypervisors.get.side_effect = [mock_hyper1, mock_hyper2]

        model = self.fake_c_cluster.generate_scenario_1()
        self.m_c_model.return_value = model
--- a/watcher/tests/decision_engine/strategy/strategies/test_vm_workload_consolidation.py
+++ b/watcher/tests/decision_engine/strategy/strategies/test_vm_workload_consolidation.py
@@ -64,10 +64,6 @@ class TestVMWorkloadConsolidation(TestBaseStrategy):
                self.fake_metrics.get_instance_ram_util),
            get_instance_root_disk_size=(
                self.fake_metrics.get_instance_disk_root_size),
-            get_host_cpu_usage=(
-                self.fake_metrics.get_compute_node_cpu_util),
-            get_host_ram_usage=(
-                self.fake_metrics.get_compute_node_ram_util)
            )
        self.strategy = strategies.VMWorkloadConsolidation(
            config=mock.Mock(datasources=self.datasource))
@@ -92,71 +88,6 @@ class TestVMWorkloadConsolidation(TestBaseStrategy):
            node_util,
            self.strategy.get_node_utilization(node_0))

-    def test_get_node_utilization_using_host_metrics(self):
-        model = self.fake_c_cluster.generate_scenario_1()
-        self.m_c_model.return_value = model
-        self.fake_metrics.model = model
-        node_0 = model.get_node_by_uuid("Node_0")
-
-        # "get_node_utilization" is expected to return the maximum
-        # between the host metrics and the sum of the instance metrics.
-        data_src = self.m_datasource.return_value
-        cpu_usage = 30
-        data_src.get_host_cpu_usage = mock.Mock(return_value=cpu_usage)
-        data_src.get_host_ram_usage = mock.Mock(return_value=512 * 1024)
-
-        exp_cpu_usage = cpu_usage * node_0.vcpus / 100
-        exp_node_util = dict(cpu=exp_cpu_usage, ram=512, disk=10)
-        self.assertEqual(
-            exp_node_util,
-            self.strategy.get_node_utilization(node_0))
-
-    def test_get_node_utilization_after_migrations(self):
-        model = self.fake_c_cluster.generate_scenario_1()
-        self.m_c_model.return_value = model
-        self.fake_metrics.model = model
-        node_0 = model.get_node_by_uuid("Node_0")
-        node_1 = model.get_node_by_uuid("Node_1")
-
-        data_src = self.m_datasource.return_value
-        cpu_usage = 30
-        host_ram_usage_mb = 512
-        data_src.get_host_cpu_usage = mock.Mock(return_value=cpu_usage)
-        data_src.get_host_ram_usage = mock.Mock(
-            return_value=host_ram_usage_mb * 1024)
-
-        instance_uuid = 'INSTANCE_0'
-        instance = model.get_instance_by_uuid(instance_uuid)
-        self.strategy.add_migration(instance, node_0, node_1)
-
-        instance_util = self.strategy.get_instance_utilization(instance)
-
-        # Ensure that we take into account planned migrations when
-        # determining node utilization
-        exp_node_0_cpu_usage = (
-            cpu_usage * node_0.vcpus) / 100 - instance_util['cpu']
-        exp_node_1_cpu_usage = (
-            cpu_usage * node_1.vcpus) / 100 + instance_util['cpu']
-
-        exp_node_0_ram_usage = host_ram_usage_mb - instance.memory
-        exp_node_1_ram_usage = host_ram_usage_mb + instance.memory
-
-        exp_node_0_util = dict(
-            cpu=exp_node_0_cpu_usage,
-            ram=exp_node_0_ram_usage,
-            disk=0)
-        exp_node_1_util = dict(
-            cpu=exp_node_1_cpu_usage,
-            ram=exp_node_1_ram_usage,
-            disk=25)
-
-        self.assertEqual(
-            exp_node_0_util,
-            self.strategy.get_node_utilization(node_0))
-        self.assertEqual(
-            exp_node_1_util,
-            self.strategy.get_node_utilization(node_1))
-
    def test_get_node_capacity(self):
        model = self.fake_c_cluster.generate_scenario_1()
        self.m_c_model.return_value = model
@@ -182,8 +113,7 @@ class TestVMWorkloadConsolidation(TestBaseStrategy):
        expected_cru = {'cpu': 0.05, 'disk': 0.05, 'ram': 0.0234375}
        self.assertEqual(expected_cru, cru)

-    def _test_add_migration(self, instance_state, expect_migration=True,
-                            expected_migration_type="live"):
+    def test_add_migration_with_active_state(self):
        model = self.fake_c_cluster.generate_scenario_1()
        self.m_c_model.return_value = model
        self.fake_metrics.model = model
@@ -191,36 +121,38 @@ class TestVMWorkloadConsolidation(TestBaseStrategy):
        n2 = model.get_node_by_uuid('Node_1')
        instance_uuid = 'INSTANCE_0'
        instance = model.get_instance_by_uuid(instance_uuid)
-        instance.state = instance_state
        self.strategy.add_migration(instance, n1, n2)
-
-        if expect_migration:
-            self.assertEqual(1, len(self.strategy.solution.actions))
-
-            expected = {'action_type': 'migrate',
-                        'input_parameters': {
-                            'destination_node': n2.hostname,
-                            'source_node': n1.hostname,
-                            'migration_type': expected_migration_type,
-                            'resource_id': instance.uuid,
-                            'resource_name': instance.name}}
-            self.assertEqual(expected, self.strategy.solution.actions[0])
-        else:
-            self.assertEqual(0, len(self.strategy.solution.actions))
-
-    def test_add_migration_with_active_state(self):
-        self._test_add_migration(element.InstanceState.ACTIVE.value)
+        self.assertEqual(1, len(self.strategy.solution.actions))
+        expected = {'action_type': 'migrate',
+                    'input_parameters': {'destination_node': n2.hostname,
+                                         'source_node': n1.hostname,
+                                         'migration_type': 'live',
+                                         'resource_id': instance.uuid,
+                                         'resource_name': instance.name}}
+        self.assertEqual(expected, self.strategy.solution.actions[0])

    def test_add_migration_with_paused_state(self):
-        self._test_add_migration(element.InstanceState.PAUSED.value)
+        model = self.fake_c_cluster.generate_scenario_1()
+        self.m_c_model.return_value = model
+        self.fake_metrics.model = model
+        n1 = model.get_node_by_uuid('Node_0')
+        n2 = model.get_node_by_uuid('Node_1')
+        instance_uuid = 'INSTANCE_0'
+        instance = model.get_instance_by_uuid(instance_uuid)
+        setattr(instance, 'state', element.InstanceState.ERROR.value)
+        self.strategy.add_migration(instance, n1, n2)
+        self.assertEqual(0, len(self.strategy.solution.actions))

-    def test_add_migration_with_error_state(self):
-        self._test_add_migration(element.InstanceState.ERROR.value,
-                                 expect_migration=False)
-
-    def test_add_migration_with_stopped_state(self):
-        self._test_add_migration(element.InstanceState.STOPPED.value,
-                                 expected_migration_type="cold")
+        setattr(instance, 'state', element.InstanceState.PAUSED.value)
+        self.strategy.add_migration(instance, n1, n2)
+        self.assertEqual(1, len(self.strategy.solution.actions))
+        expected = {'action_type': 'migrate',
+                    'input_parameters': {'destination_node': n2.hostname,
+                                         'source_node': n1.hostname,
+                                         'migration_type': 'live',
+                                         'resource_id': instance.uuid,
+                                         'resource_name': instance.name}}
+        self.assertEqual(expected, self.strategy.solution.actions[0])

    def test_is_overloaded(self):
        model = self.fake_c_cluster.generate_scenario_1()
--- a/watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py
+++ b/watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py
@@ -320,10 +320,7 @@ class TestZoneMigration(TestBaseStrategy):
        migration_types = collections.Counter(
            [action.get('input_parameters')['migration_type']
             for action in solution.actions])
-        # watcher no longer implements swap. it is now an
-        # alias for migrate.
-        self.assertEqual(0, migration_types.get("swap", 0))
-        self.assertEqual(1, migration_types.get("migrate", 1))
+        self.assertEqual(1, migration_types.get("swap", 0))
        global_efficacy_value = solution.global_efficacy[3].get('value', 0)
        self.assertEqual(100, global_efficacy_value)

--- a/watcher/tests/objects/test_objects.py
+++ b/watcher/tests/objects/test_objects.py
@@ -531,7 +531,6 @@ class TestRegistry(test_base.TestCase):

    @mock.patch('watcher.objects.base.objects')
    def test_hook_chooses_newer_properly(self, mock_objects):
-        mock_objects.MyObj.VERSION = MyObj.VERSION
        reg = base.WatcherObjectRegistry()
        reg.registration_hook(MyObj, 0)

@@ -548,7 +547,6 @@ class TestRegistry(test_base.TestCase):

    @mock.patch('watcher.objects.base.objects')
    def test_hook_keeps_newer_properly(self, mock_objects):
-        mock_objects.MyObj.VERSION = MyObj.VERSION
        reg = base.WatcherObjectRegistry()
        reg.registration_hook(MyObj, 0)