Merge "Update .gitreview for stable/wallaby" into stable/wallaby

Update TOX_CONSTRAINTS_FILE for stable/wallaby
Update the URL to the upper-constraints file to point to the redirect rule on releases.openstack.org so that anyone working on this branch will switch to the correct upper-constraints list automatically when the requirements repository branches. Until the requirements repository has as stable/wallaby branch, tests will continue to use the upper-constraints list on master. Change-Id: I5986087281694580acc3c19feed461b5949f7001
2021-07-01 13:32:11 +00:00 · 2021-07-01 11:44:53 +00:00 · 2021-07-01 11:44:34 +00:00 · 2021-07-01 09:11:58 +00:00
42 changed files with 459 additions and 271 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/watcher.git
+defaultbranch=stable/wallaby
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,7 @@
    templates:
      - check-requirements
      - openstack-cover-jobs
-      - openstack-python3-yoga-jobs
+      - openstack-python3-wallaby-jobs
      - publish-openstack-docs-pti
      - release-notes-jobs-python3
    check:
@@ -12,6 +12,7 @@
        - watcher-tempest-strategies
        - watcher-tempest-actuator
        - watcherclient-tempest-functional
+        - watcher-tls-test
        - watcher-tempest-functional-ipv6-only
    gate:
      queue: watcher
@@ -86,6 +87,17 @@
      tempest_concurrency: 1
      tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_strategies

+- job:
+    name: watcher-tls-test
+    parent: watcher-tempest-multinode
+    group-vars:
+      subnode:
+          devstack_services:
+            tls-proxy: true
+    vars:
+      devstack_services:
+        tls-proxy: true
+
 - job:
    name: watcher-tempest-multinode
    parent: watcher-tempest-functional
@@ -107,6 +119,8 @@
          watcher-api: false
          watcher-decision-engine: true
          watcher-applier: false
+          # We need to add TLS support for watcher plugin
+          tls-proxy: false
          ceilometer: false
          ceilometer-acompute: false
          ceilometer-acentral: false
@@ -154,6 +168,7 @@
      devstack_plugins:
        watcher: https://opendev.org/openstack/watcher
      devstack_services:
+        tls-proxy: false
        watcher-api: true
        watcher-decision-engine: true
        watcher-applier: true
--- a/doc/source/contributor/devstack.rst
+++ b/doc/source/contributor/devstack.rst
@@ -47,8 +47,6 @@ unavailable as well as `instance_l3_cpu_cache`::
        [[local|localrc]]
        enable_plugin watcher https://opendev.org/openstack/watcher

-        enable_plugin watcher-dashboard https://opendev.org/openstack/watcher-dashboard
-
        enable_plugin ceilometer https://opendev.org/openstack/ceilometer.git
        CEILOMETER_BACKEND=gnocchi

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

   unreleased
-   xena
-   wallaby
   victoria
   ussuri
   train
--- a/releasenotes/source/wallaby.rst
+++ b/releasenotes/source/wallaby.rst
@@ -1,6 +0,0 @@
-============================
-Wallaby Series Release Notes
-============================
-
-.. release-notes::
-   :branch: stable/wallaby
--- a/releasenotes/source/xena.rst
+++ b/releasenotes/source/xena.rst
@@ -1,6 +0,0 @@
-=========================
-Xena Series Release Notes
-=========================
-
-.. release-notes::
-   :branch: stable/xena
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,6 +30,7 @@ pbr>=3.1.1 # Apache-2.0
 pecan>=1.3.2 # BSD
 PrettyTable>=0.7.2 # BSD
 gnocchiclient>=7.0.1 # Apache-2.0
+python-ceilometerclient>=2.9.0 # Apache-2.0
 python-cinderclient>=3.5.0 # Apache-2.0
 python-glanceclient>=2.9.1 # Apache-2.0
 python-keystoneclient>=3.15.0 # Apache-2.0
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,12 @@
 [metadata]
 name = python-watcher
 summary = OpenStack Watcher provides a flexible and scalable resource optimization service for multi-tenant OpenStack-based clouds.
-description_file =
+description-file =
    README.rst
 author = OpenStack
-author_email = openstack-discuss@lists.openstack.org
-home_page = https://docs.openstack.org/watcher/latest/
-python_requires = >=3.6
+author-email = openstack-discuss@lists.openstack.org
+home-page = https://docs.openstack.org/watcher/latest/
+python-requires = >=3.6
 classifier =
    Environment :: OpenStack
    Intended Audience :: Information Technology
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,7 @@ doc8>=0.8.0 # Apache-2.0
 freezegun>=0.3.10 # Apache-2.0
 hacking>=3.0.1,<3.1.0 # Apache-2.0
 oslotest>=3.3.0 # Apache-2.0
+os-testr>=1.0.0 # Apache-2.0
 testscenarios>=0.5.0 # Apache-2.0/BSD
 testtools>=2.3.0 # MIT
 stestr>=2.0.0 # Apache-2.0
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,19 @@
 [tox]
-minversion = 3.18.0
-envlist = py3,pep8
+minversion = 2.0
+envlist = py38,pep8
 skipsdist = True
 ignore_basepython_conflict = True

 [testenv]
 basepython = python3
 usedevelop = True
-allowlist_externals = find
+whitelist_externals = find
                      rm
-install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
+install_command = pip install {opts} {packages}
 setenv =
   VIRTUAL_ENV={envdir}
 deps =
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
    -r{toxinidir}/test-requirements.txt
    -r{toxinidir}/requirements.txt
 commands =
@@ -30,6 +31,7 @@ commands =
 [testenv:venv]
 setenv = PYTHONHASHSEED=0
 deps =
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/wallaby}
    -r{toxinidir}/doc/requirements.txt
    -r{toxinidir}/test-requirements.txt
    -r{toxinidir}/requirements.txt
@@ -48,6 +50,7 @@ commands =
 [testenv:docs]
 setenv = PYTHONHASHSEED=0
 deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
  -r{toxinidir}/doc/requirements.txt
 commands =
  rm -fr doc/build doc/source/api/ .autogenerated
@@ -55,7 +58,7 @@ commands =

 [testenv:api-ref]
 deps = -r{toxinidir}/doc/requirements.txt
-allowlist_externals = bash
+whitelist_externals = bash
 commands =
  bash -c 'rm -rf api-ref/build'
  sphinx-build -W --keep-going -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
@@ -72,28 +75,6 @@ commands =
 commands =
    oslopolicy-sample-generator --config-file etc/watcher/oslo-policy-generator/watcher-policy-generator.conf

-[testenv:wheel]
-commands = python setup.py bdist_wheel
-
-[testenv:pdf-docs]
-envdir = {toxworkdir}/docs
-deps = {[testenv:docs]deps}
-allowlist_externals =
-  rm
-  make
-commands =
-  rm -rf doc/build/pdf
-  sphinx-build -W --keep-going -b latex doc/source doc/build/pdf
-  make -C doc/build/pdf
-
-[testenv:releasenotes]
-deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -a -W -E -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
-
-[testenv:bandit]
-deps = -r{toxinidir}/test-requirements.txt
-commands = bandit -r watcher -x watcher/tests/* -n5 -ll -s B320
-
 [flake8]
 filename = *.py,app.wsgi
 show-source=True
@@ -103,6 +84,9 @@ builtins= _
 enable-extensions = H106,H203,H904
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,*sqlalchemy/alembic/versions/*,demo/,releasenotes

+[testenv:wheel]
+commands = python setup.py bdist_wheel
+
 [hacking]
 import_exceptions = watcher._i18n

@@ -126,7 +110,27 @@ extension =
   N366 = checks:import_stock_mock
 paths = ./watcher/hacking

+
 [doc8]
 extension=.rst
 # todo: stop ignoring doc/source/man when https://bugs.launchpad.net/doc8/+bug/1502391 is fixed
 ignore-path=doc/source/image_src,doc/source/man,doc/source/api
+
+[testenv:pdf-docs]
+envdir = {toxworkdir}/docs
+deps = {[testenv:docs]deps}
+whitelist_externals =
+  rm
+  make
+commands =
+  rm -rf doc/build/pdf
+  sphinx-build -W --keep-going -b latex doc/source doc/build/pdf
+  make -C doc/build/pdf
+
+[testenv:releasenotes]
+deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -a -W -E -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
+
+[testenv:bandit]
+deps = -r{toxinidir}/test-requirements.txt
+commands = bandit -r watcher -x watcher/tests/* -n5 -ll -s B320
--- a/watcher/api/controllers/v1/action.py
+++ b/watcher/api/controllers/v1/action.py
@@ -57,7 +57,6 @@ are dynamically loaded by Watcher at launch time.

 import datetime

-from http import HTTPStatus
 import pecan
 from pecan import rest
 import wsme
@@ -363,7 +362,7 @@ class ActionsController(rest.RestController):

        return Action.convert_with_links(action)

-    @wsme_pecan.wsexpose(Action, body=Action, status_code=HTTPStatus.CREATED)
+    @wsme_pecan.wsexpose(Action, body=Action, status_code=201)
    def post(self, action):
        """Create a new action(forbidden).

@@ -423,7 +422,7 @@ class ActionsController(rest.RestController):
        action_to_update.save()
        return Action.convert_with_links(action_to_update)

-    @wsme_pecan.wsexpose(None, types.uuid, status_code=HTTPStatus.NO_CONTENT)
+    @wsme_pecan.wsexpose(None, types.uuid, status_code=204)
    def delete(self, action_uuid):
        """Delete a action(forbidden).

--- a/watcher/api/controllers/v1/action_plan.py
+++ b/watcher/api/controllers/v1/action_plan.py
@@ -56,7 +56,6 @@ state machine <action_plan_state_machine>`.

 import datetime

-from http import HTTPStatus
 from oslo_log import log
 import pecan
 from pecan import rest
@@ -461,7 +460,7 @@ class ActionPlansController(rest.RestController):

        return ActionPlan.convert_with_links(action_plan)

-    @wsme_pecan.wsexpose(None, types.uuid, status_code=HTTPStatus.NO_CONTENT)
+    @wsme_pecan.wsexpose(None, types.uuid, status_code=204)
    def delete(self, action_plan_uuid):
        """Delete an action plan.

--- a/watcher/api/controllers/v1/audit.py
+++ b/watcher/api/controllers/v1/audit.py
@@ -32,7 +32,6 @@ states, visit :ref:`the Audit State machine <audit_state_machine>`.
 import datetime
 from dateutil import tz

-from http import HTTPStatus
 import pecan
 from pecan import rest
 import wsme
@@ -596,8 +595,7 @@ class AuditsController(rest.RestController):

        return Audit.convert_with_links(rpc_audit)

-    @wsme_pecan.wsexpose(Audit, body=AuditPostType,
-                         status_code=HTTPStatus.CREATED)
+    @wsme_pecan.wsexpose(Audit, body=AuditPostType, status_code=201)
    def post(self, audit_p):
        """Create a new audit.

@@ -719,7 +717,7 @@ class AuditsController(rest.RestController):
        audit_to_update.save()
        return Audit.convert_with_links(audit_to_update)

-    @wsme_pecan.wsexpose(None, wtypes.text, status_code=HTTPStatus.NO_CONTENT)
+    @wsme_pecan.wsexpose(None, wtypes.text, status_code=204)
    def delete(self, audit):
        """Delete an audit.

--- a/watcher/api/controllers/v1/audit_template.py
+++ b/watcher/api/controllers/v1/audit_template.py
@@ -45,7 +45,6 @@ will be launched automatically or will need a manual confirmation from the

 import datetime

-from http import HTTPStatus
 import pecan
 from pecan import rest
 import wsme
@@ -619,7 +618,7 @@ class AuditTemplatesController(rest.RestController):

    @wsme.validate(types.uuid, AuditTemplatePostType)
    @wsme_pecan.wsexpose(AuditTemplate, body=AuditTemplatePostType,
-                         status_code=HTTPStatus.CREATED)
+                         status_code=201)
    def post(self, audit_template_postdata):
        """Create a new audit template.

@@ -695,7 +694,7 @@ class AuditTemplatesController(rest.RestController):
        audit_template_to_update.save()
        return AuditTemplate.convert_with_links(audit_template_to_update)

-    @wsme_pecan.wsexpose(None, wtypes.text, status_code=HTTPStatus.NO_CONTENT)
+    @wsme_pecan.wsexpose(None, wtypes.text, status_code=204)
    def delete(self, audit_template):
        """Delete a audit template.

--- a/watcher/api/controllers/v1/webhooks.py
+++ b/watcher/api/controllers/v1/webhooks.py
@@ -14,7 +14,6 @@
 Webhook endpoint for Watcher v1 REST API.
 """

-from http import HTTPStatus
 from oslo_log import log
 import pecan
 from pecan import rest
@@ -37,7 +36,7 @@ class WebhookController(rest.RestController):
        self.dc_client = rpcapi.DecisionEngineAPI()

    @wsme_pecan.wsexpose(None, wtypes.text, body=types.jsontype,
-                         status_code=HTTPStatus.ACCEPTED)
+                         status_code=202)
    def post(self, audit_ident, body):
        """Trigger the given audit.

--- a/watcher/api/hooks.py
+++ b/watcher/api/hooks.py
@@ -15,7 +15,7 @@
 # under the License.


-from http import HTTPStatus
+from http import client as http_client
 from oslo_config import cfg
 from pecan import hooks

@@ -91,8 +91,8 @@ class NoExceptionTracebackHook(hooks.PecanHook):
        # Do nothing if there is no error.
        # Status codes in the range 200 (OK) to 399 (400 = BAD_REQUEST) are not
        # an error.
-        if (HTTPStatus.OK <= state.response.status_int <
-                HTTPStatus.BAD_REQUEST):
+        if (http_client.OK <= state.response.status_int <
+                http_client.BAD_REQUEST):
            return

        json_body = state.response.json
--- a/watcher/common/cinder_helper.py
+++ b/watcher/common/cinder_helper.py
@@ -17,7 +17,7 @@ import time
 from oslo_log import log

 from cinderclient import exceptions as cinder_exception
-from cinderclient.v3.volumes import Volume
+from cinderclient.v2.volumes import Volume
 from watcher._i18n import _
 from watcher.common import clients
 from watcher.common import exception
--- a/watcher/common/exception.py
+++ b/watcher/common/exception.py
@@ -25,7 +25,6 @@ SHOULD include dedicated exception logging.
 import functools
 import sys

-from http import HTTPStatus
 from keystoneclient import exceptions as keystone_exceptions
 from oslo_config import cfg
 from oslo_log import log
@@ -63,7 +62,7 @@ class WatcherException(Exception):

    """
    msg_fmt = _("An unknown exception occurred")
-    code = HTTPStatus.INTERNAL_SERVER_ERROR
+    code = 500
    headers = {}
    safe = False

@@ -115,12 +114,12 @@ class UnsupportedError(WatcherException):

 class NotAuthorized(WatcherException):
    msg_fmt = _("Not authorized")
-    code = HTTPStatus.FORBIDDEN
+    code = 403


 class NotAcceptable(WatcherException):
    msg_fmt = _("Request not acceptable.")
-    code = HTTPStatus.NOT_ACCEPTABLE
+    code = 406


 class PolicyNotAuthorized(NotAuthorized):
@@ -133,7 +132,7 @@ class OperationNotPermitted(NotAuthorized):

 class Invalid(WatcherException, ValueError):
    msg_fmt = _("Unacceptable parameters")
-    code = HTTPStatus.BAD_REQUEST
+    code = 400


 class ObjectNotFound(WatcherException):
@@ -142,12 +141,12 @@ class ObjectNotFound(WatcherException):

 class Conflict(WatcherException):
    msg_fmt = _('Conflict')
-    code = HTTPStatus.CONFLICT
+    code = 409


 class ResourceNotFound(ObjectNotFound):
    msg_fmt = _("The %(name)s resource %(id)s could not be found")
-    code = HTTPStatus.NOT_FOUND
+    code = 404


 class InvalidParameter(Invalid):
--- a/watcher/common/placement_helper.py
+++ b/watcher/common/placement_helper.py
@@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from http import HTTPStatus
 from oslo_config import cfg
 from oslo_log import log as logging

@@ -54,7 +53,7 @@ class PlacementHelper(object):
        if rp_name:
            url += '?name=%s' % rp_name
        resp = self.get(url)
-        if resp.status_code == HTTPStatus.OK:
+        if resp.status_code == 200:
            json_resp = resp.json()
            return json_resp['resource_providers']

@@ -78,7 +77,7 @@ class PlacementHelper(object):
        """
        url = '/resource_providers/%s/inventories' % rp_uuid
        resp = self.get(url)
-        if resp.status_code == HTTPStatus.OK:
+        if resp.status_code == 200:
            json = resp.json()
            return json['inventories']
        msg = ("Failed to get resource provider %(rp_uuid)s inventories. "
@@ -98,7 +97,7 @@ class PlacementHelper(object):
        """
        resp = self.get("/resource_providers/%s/traits" % rp_uuid)

-        if resp.status_code == HTTPStatus.OK:
+        if resp.status_code == 200:
            json = resp.json()
            return json['traits']
        msg = ("Failed to get resource provider %(rp_uuid)s traits. "
@@ -119,7 +118,7 @@ class PlacementHelper(object):
        """
        url = '/allocations/%s' % consumer_uuid
        resp = self.get(url)
-        if resp.status_code == HTTPStatus.OK:
+        if resp.status_code == 200:
            json = resp.json()
            return json['allocations']
        msg = ("Failed to get allocations for consumer %(c_uuid). "
@@ -140,7 +139,7 @@ class PlacementHelper(object):
        """
        url = '/resource_providers/%s/usages' % rp_uuid
        resp = self.get(url)
-        if resp.status_code == HTTPStatus.OK:
+        if resp.status_code == 200:
            json = resp.json()
            return json['usages']
        msg = ("Failed to get resource provider %(rp_uuid)s usages. "
@@ -165,7 +164,7 @@ class PlacementHelper(object):
        """
        url = "/allocation_candidates?%s" % resources
        resp = self.get(url)
-        if resp.status_code == HTTPStatus.OK:
+        if resp.status_code == 200:
            data = resp.json()
            return data['provider_summaries']

--- a/watcher/decision_engine/datasources/grafana.py
+++ b/watcher/decision_engine/datasources/grafana.py
@@ -18,7 +18,6 @@

 from urllib import parse as urlparse

-from http import HTTPStatus
 from oslo_config import cfg
 from oslo_log import log

@@ -139,11 +138,11 @@ class GrafanaHelper(base.DataSourceBase):

        resp = requests.get(self._base_url + str(project_id) + '/query',
                            params=params, headers=self._headers)
-        if resp.status_code == HTTPStatus.OK:
+        if resp.status_code == 200:
            return resp
-        elif resp.status_code == HTTPStatus.BAD_REQUEST:
+        elif resp.status_code == 400:
            LOG.error("Query for metric is invalid")
-        elif resp.status_code == HTTPStatus.UNAUTHORIZED:
+        elif resp.status_code == 401:
            LOG.error("Authorization token is invalid")
        raise exception.DataSourceNotAvailable(self.NAME)

--- a/watcher/decision_engine/model/collector/cinder.py
+++ b/watcher/decision_engine/model/collector/cinder.py
@@ -205,7 +205,7 @@ class CinderModelBuilder(base.BaseModelBuilder):
        """Build a storage node from a Cinder storage node

        :param node: A storage node
-        :type node: :py:class:`~cinderclient.v3.services.Service`
+        :type node: :py:class:`~cinderclient.v2.services.Service`
        """
        # node.host is formatted as host@backendname since ocata,
        # or may be only host as of ocata
@@ -233,7 +233,7 @@ class CinderModelBuilder(base.BaseModelBuilder):
        """Build a storage pool from a Cinder storage pool

        :param pool: A storage pool
-        :type pool: :py:class:`~cinderclient.v3.pools.Pool`
+        :type pool: :py:class:`~cinderclient.v2.pools.Pool`
        :raises: exception.InvalidPoolAttributeValue
        """
        # build up the storage pool.
--- a/watcher/decision_engine/strategy/strategies/saving_energy.py
+++ b/watcher/decision_engine/strategy/strategies/saving_energy.py
@@ -197,9 +197,9 @@ class SavingEnergy(base.SavingEnergyBaseStrategy):

    def save_energy(self):

-        need_poweron = int(max(
+        need_poweron = max(
            (len(self.with_vms_node_pool) * self.free_used_percent / 100), (
-                self.min_free_hosts_num)))
+                self.min_free_hosts_num))
        len_poweron = len(self.free_poweron_node_pool)
        len_poweroff = len(self.free_poweroff_node_pool)
        if len_poweron > need_poweron:
--- a/watcher/decision_engine/strategy/strategies/zone_migration.py
+++ b/watcher/decision_engine/strategy/strategies/zone_migration.py
@@ -16,7 +16,7 @@ from dateutil.parser import parse

 from oslo_log import log

-from cinderclient.v3.volumes import Volume
+from cinderclient.v2.volumes import Volume
 from novaclient.v2.servers import Server
 from watcher._i18n import _
 from watcher.common import cinder_helper
--- a/watcher/tests/api/test_base.py
+++ b/watcher/tests/api/test_base.py
@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-from http import HTTPStatus
-
 from watcher.tests.api import base


@@ -27,6 +25,6 @@ class TestBase(base.FunctionalTest):
        response = self.get_json('/bad/path',
                                 expect_errors=True,
                                 headers={"Accept": "application/json"})
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual("application/json", response.content_type)
        self.assertTrue(response.json['error_message'])
--- a/watcher/tests/api/v1/test_actions.py
+++ b/watcher/tests/api/v1/test_actions.py
@@ -14,7 +14,6 @@ import datetime
 import itertools
 from unittest import mock

-from http import HTTPStatus
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from wsme import types as wtypes
@@ -103,7 +102,7 @@ class TestListAction(api_base.FunctionalTest):

        response = self.get_json('/actions/%s' % action['uuid'],
                                 expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_detail(self):
        action = obj_utils.create_test_action(self.context, parents=None)
@@ -126,7 +125,7 @@ class TestListAction(api_base.FunctionalTest):
        action = obj_utils.create_test_action(self.context, parents=None)
        response = self.get_json('/actions/%s/detail' % action['uuid'],
                                 expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_many(self):
        action_list = []
@@ -267,7 +266,7 @@ class TestListAction(api_base.FunctionalTest):
        url = '/actions?action_plan_uuid=%s&audit_uuid=%s' % (
            action_plan.uuid, self.audit.uuid)
        response = self.get_json(url, expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)

    def test_many_with_sort_key_uuid(self):
        action_plan = obj_utils.create_test_action_plan(
@@ -328,7 +327,7 @@ class TestListAction(api_base.FunctionalTest):
        response = self.get_json(
            '/actions?sort_key=%s' % 'bad_name',
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)

    def test_many_with_soft_deleted_action_plan_uuid(self):
        action_plan1 = obj_utils.create_test_action_plan(
@@ -489,7 +488,7 @@ class TestPatch(api_base.FunctionalTest):
            [{'path': '/state', 'value': new_state, 'op': 'replace'}],
            expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertTrue(response.json['error_message'])


@@ -517,7 +516,7 @@ class TestDelete(api_base.FunctionalTest):
        mock_utcnow.return_value = test_time
        response = self.delete('/actions/%s' % self.action.uuid,
                               expect_errors=True)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -537,7 +536,7 @@ class TestActionPolicyEnforcement(api_base.FunctionalTest):
            "default": "rule:admin_api",
            rule: "rule:defaut"})
        response = func(*arg, **kwarg)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(
            "Policy doesn't allow %s to be performed." % rule,
--- a/watcher/tests/api/v1/test_actions_plans.py
+++ b/watcher/tests/api/v1/test_actions_plans.py
@@ -14,7 +14,6 @@ import datetime
 import itertools
 from unittest import mock

-from http import HTTPStatus
 from oslo_config import cfg
 from oslo_serialization import jsonutils

@@ -88,7 +87,7 @@ class TestListActionPlan(api_base.FunctionalTest):

        response = self.get_json('/action_plans/%s' % action_plan['uuid'],
                                 expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_detail(self):
        action_plan = obj_utils.create_test_action_plan(self.context)
@@ -114,7 +113,7 @@ class TestListActionPlan(api_base.FunctionalTest):
        response = self.get_json(
            '/action_plan/%s/detail' % action_plan['uuid'],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_many(self):
        action_plan_list = []
@@ -261,7 +260,7 @@ class TestListActionPlan(api_base.FunctionalTest):
        response = self.get_json(
            '/action_plans?sort_key=%s' % 'bad_name',
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)

    def test_links(self):
        uuid = utils.generate_uuid()
@@ -318,7 +317,7 @@ class TestDelete(api_base.FunctionalTest):
    def test_delete_action_plan_without_action(self):
        response = self.delete('/action_plans/%s' % self.action_plan.uuid,
                               expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])
        self.action_plan.state = objects.action_plan.State.SUCCEEDED
@@ -326,7 +325,7 @@ class TestDelete(api_base.FunctionalTest):
        self.delete('/action_plans/%s' % self.action_plan.uuid)
        response = self.get_json('/action_plans/%s' % self.action_plan.uuid,
                                 expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -346,20 +345,20 @@ class TestDelete(api_base.FunctionalTest):
            expect_errors=True)

        # The action plan does not exist anymore
-        self.assertEqual(HTTPStatus.NOT_FOUND, ap_response.status_int)
+        self.assertEqual(404, ap_response.status_int)
        self.assertEqual('application/json', ap_response.content_type)
        self.assertTrue(ap_response.json['error_message'])

        # Nor does the action
        self.assertEqual(0, len(acts_response['actions']))
-        self.assertEqual(HTTPStatus.NOT_FOUND, act_response.status_int)
+        self.assertEqual(404, act_response.status_int)
        self.assertEqual('application/json', act_response.content_type)
        self.assertTrue(act_response.json['error_message'])

    def test_delete_action_plan_not_found(self):
        uuid = utils.generate_uuid()
        response = self.delete('/action_plans/%s' % uuid, expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -389,7 +388,7 @@ class TestStart(api_base.FunctionalTest):
        uuid = utils.generate_uuid()
        response = self.post('/v1/action_plans/%s/%s' %
                             (uuid, 'start'), expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -402,11 +401,11 @@ class TestStart(api_base.FunctionalTest):
        response = self.post('/v1/action_plans/%s/%s/'
                             % (self.action_plan.uuid, 'start'),
                             expect_errors=True)
-        self.assertEqual(HTTPStatus.OK, response.status_int)
+        self.assertEqual(200, response.status_int)
        act_response = self.get_json(
            '/actions/%s' % action.uuid,
            expect_errors=True)
-        self.assertEqual(HTTPStatus.OK, act_response.status_int)
+        self.assertEqual(200, act_response.status_int)
        self.assertEqual('PENDING', act_response.json['state'])
        self.assertEqual('application/json', act_response.content_type)

@@ -446,7 +445,7 @@ class TestPatch(api_base.FunctionalTest):
            expect_errors=True)

        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertTrue(response.json['error_message'])

    def test_replace_non_existent_action_plan_denied(self):
@@ -456,7 +455,7 @@ class TestPatch(api_base.FunctionalTest):
              'value': objects.action_plan.State.PENDING,
              'op': 'replace'}],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -466,7 +465,7 @@ class TestPatch(api_base.FunctionalTest):
            [{'path': '/foo', 'value': 'bar', 'op': 'add'}],
            expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertTrue(response.json['error_message'])

    def test_remove_denied(self):
@@ -481,7 +480,7 @@ class TestPatch(api_base.FunctionalTest):
            expect_errors=True)

        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertTrue(response.json['error_message'])

    def test_remove_uuid_denied(self):
@@ -489,7 +488,7 @@ class TestPatch(api_base.FunctionalTest):
            '/action_plans/%s' % self.action_plan.uuid,
            [{'path': '/uuid', 'op': 'remove'}],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -498,7 +497,7 @@ class TestPatch(api_base.FunctionalTest):
            '/action_plans/%s' % self.action_plan.uuid,
            [{'path': '/non-existent', 'op': 'remove'}],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_code)
+        self.assertEqual(400, response.status_code)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -513,7 +512,7 @@ class TestPatch(api_base.FunctionalTest):
            [{'path': '/state', 'value': new_state,
              'op': 'replace'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_code)
+        self.assertEqual(200, response.status_code)
        applier_mock.assert_called_once_with(mock.ANY,
                                             self.action_plan.uuid)

@@ -580,7 +579,7 @@ class TestPatchStateTransitionDenied(api_base.FunctionalTest):

        self.assertNotEqual(self.new_state, initial_ap['state'])
        self.assertEqual(self.original_state, updated_ap['state'])
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_code)
+        self.assertEqual(400, response.status_code)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -619,7 +618,7 @@ class TestPatchStateTransitionOk(api_base.FunctionalTest):
        self.assertNotEqual(self.new_state, initial_ap['state'])
        self.assertEqual(self.new_state, updated_ap['state'])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_code)
+        self.assertEqual(200, response.status_code)


 class TestActionPlanPolicyEnforcement(api_base.FunctionalTest):
@@ -636,7 +635,7 @@ class TestActionPlanPolicyEnforcement(api_base.FunctionalTest):
            "default": "rule:admin_api",
            rule: "rule:defaut"})
        response = func(*arg, **kwarg)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(
            "Policy doesn't allow %s to be performed." % rule,
--- a/watcher/tests/api/v1/test_audit_templates.py
+++ b/watcher/tests/api/v1/test_audit_templates.py
@@ -15,7 +15,6 @@ import itertools
 from unittest import mock
 from urllib import parse as urlparse

-from http import HTTPStatus
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
@@ -127,7 +126,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup):
        response = self.get_json(
            '/audit_templates/%s' % audit_template['uuid'],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_detail(self):
        audit_template = obj_utils.create_test_audit_template(self.context)
@@ -153,7 +152,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup):
        response = self.get_json(
            '/audit_templates/%s/detail' % audit_template['uuid'],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_many(self):
        audit_template_list = []
@@ -337,7 +336,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup):
        response = self.get_json(
            '/audit_templates?sort_key=%s' % 'goal_bad_name',
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)


 class TestPatch(FunctionalTestWithSetup):
@@ -363,7 +362,7 @@ class TestPatch(FunctionalTestWithSetup):
            [{'path': '/goal', 'value': new_goal_uuid,
              'op': 'replace'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_code)
+        self.assertEqual(200, response.status_code)

        response = self.get_json(
            '/audit_templates/%s' % self.audit_template.uuid)
@@ -387,7 +386,7 @@ class TestPatch(FunctionalTestWithSetup):
            [{'path': '/goal', 'value': new_goal_uuid,
              'op': 'replace'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_code)
+        self.assertEqual(200, response.status_code)

        response = self.get_json(
            '/audit_templates/%s' % self.audit_template.name)
@@ -402,7 +401,7 @@ class TestPatch(FunctionalTestWithSetup):
            [{'path': '/goal', 'value': self.fake_goal1.uuid,
              'op': 'replace'}],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -417,7 +416,7 @@ class TestPatch(FunctionalTestWithSetup):
                [{'path': '/goal', 'value': utils.generate_uuid(),
                  'op': 'replace'}],
                expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        assert not cn_mock.called

    def test_add_goal_uuid(self):
@@ -427,7 +426,7 @@ class TestPatch(FunctionalTestWithSetup):
              'value': self.fake_goal2.uuid,
              'op': 'add'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_int)
+        self.assertEqual(200, response.status_int)

        response = self.get_json(
            '/audit_templates/%s' % self.audit_template.uuid)
@@ -440,7 +439,7 @@ class TestPatch(FunctionalTestWithSetup):
              'value': self.fake_strategy1.uuid,
              'op': 'add'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_int)
+        self.assertEqual(200, response.status_int)

        response = self.get_json(
            '/audit_templates/%s' % self.audit_template.uuid)
@@ -453,7 +452,7 @@ class TestPatch(FunctionalTestWithSetup):
              'value': self.fake_strategy2['uuid'],
              'op': 'replace'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_int)
+        self.assertEqual(200, response.status_int)

        response = self.get_json(
            '/audit_templates/%s' % self.audit_template.uuid)
@@ -467,7 +466,7 @@ class TestPatch(FunctionalTestWithSetup):
              'value': utils.generate_uuid(),  # Does not exist
              'op': 'replace'}], expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertTrue(response.json['error_message'])

    def test_add_non_existent_property(self):
@@ -476,7 +475,7 @@ class TestPatch(FunctionalTestWithSetup):
            [{'path': '/foo', 'value': 'bar', 'op': 'add'}],
            expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertTrue(response.json['error_message'])

    def test_remove_strategy(self):
@@ -493,7 +492,7 @@ class TestPatch(FunctionalTestWithSetup):
            '/audit_templates/%s' % self.audit_template.uuid,
            [{'path': '/strategy', 'op': 'remove'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_code)
+        self.assertEqual(200, response.status_code)

    def test_remove_goal(self):
        response = self.get_json(
@@ -504,7 +503,7 @@ class TestPatch(FunctionalTestWithSetup):
            '/audit_templates/%s' % self.audit_template.uuid,
            [{'path': '/goal', 'op': 'remove'}],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_code)
+        self.assertEqual(403, response.status_code)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -513,7 +512,7 @@ class TestPatch(FunctionalTestWithSetup):
            '/audit_templates/%s' % self.audit_template.uuid,
            [{'path': '/uuid', 'op': 'remove'}],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -522,7 +521,7 @@ class TestPatch(FunctionalTestWithSetup):
            '/audit_templates/%s' % self.audit_template.uuid,
            [{'path': '/non-existent', 'op': 'remove'}],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_code)
+        self.assertEqual(400, response.status_code)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -539,7 +538,7 @@ class TestPost(FunctionalTestWithSetup):

        response = self.post_json('/audit_templates', audit_template_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        # Check location header
        self.assertIsNotNone(response.location)
        expected_location = \
@@ -566,7 +565,7 @@ class TestPost(FunctionalTestWithSetup):

        response = self.post_json('/audit_templates', audit_template_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        # Check location header
        self.assertIsNotNone(response.location)
        expected_location = \
@@ -614,8 +613,7 @@ class TestPost(FunctionalTestWithSetup):
            strategy=self.fake_strategy1.uuid, scope=scope)
        response = self.post_json('/audit_templates',
                                  audit_template_dict, expect_errors=True)
-        self.assertEqual(HTTPStatus.INTERNAL_SERVER_ERROR,
-                         response.status_int)
+        self.assertEqual(500, response.status_int)

    def test_create_audit_template_does_autogenerate_id(self):
        audit_template_dict = post_get_test_audit_template(
@@ -637,7 +635,7 @@ class TestPost(FunctionalTestWithSetup):

        response = self.post_json('/audit_templates', audit_template_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertTrue(utils.is_uuid_like(response.json['uuid']))

    def test_create_audit_template_with_invalid_goal(self):
@@ -650,7 +648,7 @@ class TestPost(FunctionalTestWithSetup):
                goal_uuid=utils.generate_uuid())
            response = self.post_json('/audit_templates',
                                      audit_template_dict, expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        assert not cn_mock.called

    def test_create_audit_template_with_invalid_strategy(self):
@@ -664,7 +662,7 @@ class TestPost(FunctionalTestWithSetup):
                strategy_uuid=utils.generate_uuid())
            response = self.post_json('/audit_templates',
                                      audit_template_dict, expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        assert not cn_mock.called

    def test_create_audit_template_with_unrelated_strategy(self):
@@ -678,7 +676,7 @@ class TestPost(FunctionalTestWithSetup):
                strategy=self.fake_strategy2['uuid'])
            response = self.post_json('/audit_templates',
                                      audit_template_dict, expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        assert not cn_mock.called

    def test_create_audit_template_with_uuid(self):
@@ -691,7 +689,7 @@ class TestPost(FunctionalTestWithSetup):
            response = self.post_json('/audit_templates', audit_template_dict,
                                      expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        assert not cn_mock.called

    def test_create_audit_template_with_old_scope(self):
@@ -712,7 +710,7 @@ class TestPost(FunctionalTestWithSetup):
            strategy=self.fake_strategy1.uuid, scope=scope)
        response = self.post_json('/audit_templates',
                                  audit_template_dict)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)


 class TestDelete(api_base.FunctionalTest):
@@ -732,7 +730,7 @@ class TestDelete(api_base.FunctionalTest):
        response = self.get_json(
            urlparse.quote('/audit_templates/%s' % self.audit_template.uuid),
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -755,7 +753,7 @@ class TestDelete(api_base.FunctionalTest):
        response = self.get_json(
            urlparse.quote('/audit_templates/%s' % self.audit_template.name),
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -773,7 +771,7 @@ class TestDelete(api_base.FunctionalTest):
        uuid = utils.generate_uuid()
        response = self.delete(
            '/audit_templates/%s' % uuid, expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -786,7 +784,7 @@ class TestAuditTemplatePolicyEnforcement(api_base.FunctionalTest):
            "default": "rule:admin_api",
            rule: "rule:defaut"})
        response = func(*arg, **kwarg)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(
            "Policy doesn't allow %s to be performed." % rule,
--- a/watcher/tests/api/v1/test_audits.py
+++ b/watcher/tests/api/v1/test_audits.py
@@ -16,7 +16,6 @@ import itertools
 from unittest import mock
 from urllib import parse as urlparse

-from http import HTTPStatus
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
@@ -131,7 +130,7 @@ class TestListAudit(api_base.FunctionalTest):

        response = self.get_json('/audits/%s' % audit['uuid'],
                                 expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_detail(self):
        audit = obj_utils.create_test_audit(self.context)
@@ -154,7 +153,7 @@ class TestListAudit(api_base.FunctionalTest):
        audit = obj_utils.create_test_audit(self.context)
        response = self.get_json('/audits/%s/detail' % audit['uuid'],
                                 expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_many(self):
        audit_list = []
@@ -226,7 +225,7 @@ class TestListAudit(api_base.FunctionalTest):
        response = self.get_json(
            '/audits?sort_key=%s' % 'bad_name',
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)

    def test_links(self):
        uuid = utils.generate_uuid()
@@ -296,7 +295,7 @@ class TestPatch(api_base.FunctionalTest):
            [{'path': '/state', 'value': new_state,
             'op': 'replace'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_code)
+        self.assertEqual(200, response.status_code)

        response = self.get_json('/audits/%s' % self.audit.uuid)
        self.assertEqual(new_state, response['state'])
@@ -309,7 +308,7 @@ class TestPatch(api_base.FunctionalTest):
            '/audits/%s' % utils.generate_uuid(),
            [{'path': '/state', 'value': objects.audit.State.SUCCEEDED,
              'op': 'replace'}], expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -319,7 +318,7 @@ class TestPatch(api_base.FunctionalTest):
            '/audits/%s' % self.audit.uuid,
            [{'path': '/state', 'value': new_state, 'op': 'add'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_int)
+        self.assertEqual(200, response.status_int)

        response = self.get_json('/audits/%s' % self.audit.uuid)
        self.assertEqual(new_state, response['state'])
@@ -330,7 +329,7 @@ class TestPatch(api_base.FunctionalTest):
            [{'path': '/foo', 'value': 'bar', 'op': 'add'}],
            expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertTrue(response.json['error_message'])

    def test_remove_ok(self):
@@ -340,7 +339,7 @@ class TestPatch(api_base.FunctionalTest):
        response = self.patch_json('/audits/%s' % self.audit.uuid,
                                   [{'path': '/interval', 'op': 'remove'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_code)
+        self.assertEqual(200, response.status_code)

        response = self.get_json('/audits/%s' % self.audit.uuid)
        self.assertIsNone(response['interval'])
@@ -349,7 +348,7 @@ class TestPatch(api_base.FunctionalTest):
        response = self.patch_json('/audits/%s' % self.audit.uuid,
                                   [{'path': '/uuid', 'op': 'remove'}],
                                   expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -358,7 +357,7 @@ class TestPatch(api_base.FunctionalTest):
            '/audits/%s' % self.audit.uuid,
            [{'path': '/non-existent', 'op': 'remove'}],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_code)
+        self.assertEqual(400, response.status_code)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -416,7 +415,7 @@ class TestPatchStateTransitionDenied(api_base.FunctionalTest):
              'op': 'replace'}],
            expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_code)
+        self.assertEqual(400, response.status_code)
        self.assertTrue(response.json['error_message'])

        response = self.get_json('/audits/%s' % self.audit.uuid)
@@ -463,7 +462,7 @@ class TestPatchStateTransitionOk(api_base.FunctionalTest):
            [{'path': '/state', 'value': self.new_state,
             'op': 'replace'}])
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.OK, response.status_code)
+        self.assertEqual(200, response.status_code)

        response = self.get_json('/audits/%s' % self.audit.uuid)
        self.assertEqual(self.new_state, response['state'])
@@ -503,7 +502,7 @@ class TestPost(api_base.FunctionalTest):

        response = self.post_json('/audits', audit_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        # Check location header
        self.assertIsNotNone(response.location)
        expected_location = '/v1/audits/%s' % response.json['uuid']
@@ -528,7 +527,7 @@ class TestPost(api_base.FunctionalTest):
        audit_dict = post_get_test_audit(state=objects.audit.State.SUCCEEDED)

        response = self.post_json('/audits', audit_dict, expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -543,7 +542,7 @@ class TestPost(api_base.FunctionalTest):
                               'next_run_time', 'hostname'])

        response = self.post_json('/audits', audit_dict, expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -558,7 +557,7 @@ class TestPost(api_base.FunctionalTest):

        response = self.post_json('/audits', audit_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertEqual(objects.audit.State.PENDING,
                         response.json['state'])
        self.assertTrue(utils.is_uuid_like(response.json['uuid']))
@@ -574,7 +573,7 @@ class TestPost(api_base.FunctionalTest):

        response = self.post_json('/audits', audit_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertEqual(objects.audit.State.PENDING,
                         response.json['state'])
        self.assertTrue(utils.is_uuid_like(response.json['uuid']))
@@ -591,7 +590,7 @@ class TestPost(api_base.FunctionalTest):

        response = self.post_json('/audits', audit_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertEqual(objects.audit.State.PENDING,
                         response.json['state'])
        self.assertTrue(utils.is_uuid_like(response.json['uuid']))
@@ -609,7 +608,7 @@ class TestPost(api_base.FunctionalTest):
            '01234567-8910-1112-1314-151617181920')

        response = self.post_json('/audits', audit_dict, expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual("application/json", response.content_type)
        expected_error_msg = ('The audit template UUID or name specified is '
                              'invalid')
@@ -644,7 +643,7 @@ class TestPost(api_base.FunctionalTest):

        response = self.post_json('/audits', audit_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertEqual(objects.audit.State.PENDING,
                         response.json['state'])
        self.assertTrue(utils.is_uuid_like(response.json['uuid']))
@@ -661,7 +660,7 @@ class TestPost(api_base.FunctionalTest):

        response = self.post_json('/audits', audit_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertEqual(objects.audit.State.PENDING,
                         response.json['state'])
        self.assertEqual(audit_dict['interval'], response.json['interval'])
@@ -680,7 +679,7 @@ class TestPost(api_base.FunctionalTest):

        response = self.post_json('/audits', audit_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertEqual(objects.audit.State.PENDING,
                         response.json['state'])
        self.assertEqual(audit_dict['interval'], response.json['interval'])
@@ -699,9 +698,9 @@ class TestPost(api_base.FunctionalTest):

        response = self.post_json('/audits', audit_dict, expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.INTERNAL_SERVER_ERROR, response.status_int)
+        self.assertEqual(500, response.status_int)
        expected_error_msg = ('Exactly 5 or 6 columns has to be '
-                              'specified for iterator expression.')
+                              'specified for iteratorexpression.')
        self.assertTrue(response.json['error_message'])
        self.assertIn(expected_error_msg, response.json['error_message'])

@@ -715,7 +714,7 @@ class TestPost(api_base.FunctionalTest):
        audit_dict['audit_type'] = objects.audit.AuditType.CONTINUOUS.value

        response = self.post_json('/audits', audit_dict, expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        expected_error_msg = ('Interval of audit must be specified '
                              'for CONTINUOUS.')
@@ -732,7 +731,7 @@ class TestPost(api_base.FunctionalTest):
        audit_dict['audit_type'] = objects.audit.AuditType.ONESHOT.value

        response = self.post_json('/audits', audit_dict, expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        expected_error_msg = 'Interval of audit must not be set for ONESHOT.'
        self.assertTrue(response.json['error_message'])
@@ -756,7 +755,7 @@ class TestPost(api_base.FunctionalTest):
        del audit_dict['scope']
        response = self.post_json('/audits', audit_dict, expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        assert not mock_trigger_audit.called

    @mock.patch.object(deapi.DecisionEngineAPI, 'trigger_audit')
@@ -770,7 +769,7 @@ class TestPost(api_base.FunctionalTest):

        response = self.post_json('/audits', audit_dict, expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        expected_error_msg = ('Specify parameters but no predefined '
                              'strategy for audit, or no '
                              'parameter spec in predefined strategy')
@@ -793,7 +792,7 @@ class TestPost(api_base.FunctionalTest):

        response = self.post_json('/audits', audit_dict, expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        expected_error_msg = ('Specify parameters but no predefined '
                              'strategy for audit, or no '
                              'parameter spec in predefined strategy')
@@ -817,7 +816,7 @@ class TestPost(api_base.FunctionalTest):
            del audit_dict[k]

        response = self.post_json('/audits', audit_dict, expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual("application/json", response.content_type)
        expected_error_msg = 'Audit parameter fake2 are not allowed'
        self.assertTrue(response.json['error_message'])
@@ -876,13 +875,13 @@ class TestPost(api_base.FunctionalTest):
        audit_dict['name'] = normal_name
        response = self.post_json('/audits', audit_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertEqual(normal_name, response.json['name'])

        audit_dict['name'] = long_name
        response = self.post_json('/audits', audit_dict)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertNotEqual(long_name, response.json['name'])

    @mock.patch.object(deapi.DecisionEngineAPI, 'trigger_audit')
@@ -906,7 +905,7 @@ class TestPost(api_base.FunctionalTest):
            audit_dict,
            headers={'OpenStack-API-Version': 'infra-optim 1.1'})
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertEqual(objects.audit.State.PENDING,
                         response.json['state'])
        self.assertEqual(audit_dict['interval'], response.json['interval'])
@@ -945,7 +944,7 @@ class TestPost(api_base.FunctionalTest):
            headers={'OpenStack-API-Version': 'infra-optim 1.0'},
            expect_errors=True)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.NOT_ACCEPTABLE, response.status_int)
+        self.assertEqual(406, response.status_int)
        expected_error_msg = 'Request not acceptable.'
        self.assertTrue(response.json['error_message'])
        self.assertIn(expected_error_msg, response.json['error_message'])
@@ -964,7 +963,7 @@ class TestPost(api_base.FunctionalTest):
            audit_dict,
            headers={'OpenStack-API-Version': 'infra-optim 1.2'})
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertFalse(response.json['force'])

    @mock.patch.object(deapi.DecisionEngineAPI, 'trigger_audit')
@@ -981,7 +980,7 @@ class TestPost(api_base.FunctionalTest):
            audit_dict,
            headers={'OpenStack-API-Version': 'infra-optim 1.2'})
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.CREATED, response.status_int)
+        self.assertEqual(201, response.status_int)
        self.assertTrue(response.json['force'])


@@ -1014,7 +1013,7 @@ class TestDelete(api_base.FunctionalTest):
             'op': 'replace'}])
        response = self.delete('/audits/%s' % self.audit.uuid,
                               expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -1026,7 +1025,7 @@ class TestDelete(api_base.FunctionalTest):
        self.delete('/audits/%s' % self.audit.uuid)
        response = self.get_json('/audits/%s' % self.audit.uuid,
                                 expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -1042,7 +1041,7 @@ class TestDelete(api_base.FunctionalTest):
    def test_delete_audit_not_found(self):
        uuid = utils.generate_uuid()
        response = self.delete('/audits/%s' % uuid, expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -1059,7 +1058,7 @@ class TestAuditPolicyEnforcement(api_base.FunctionalTest):
            "default": "rule:admin_api",
            rule: "rule:defaut"})
        response = func(*arg, **kwarg)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(
            "Policy doesn't allow %s to be performed." % rule,
--- a/watcher/tests/api/v1/test_data_model.py
+++ b/watcher/tests/api/v1/test_data_model.py
@@ -15,7 +15,6 @@

 from unittest import mock

-from http import HTTPStatus
 from oslo_serialization import jsonutils

 from watcher.decision_engine import rpcapi as deapi
@@ -43,7 +42,7 @@ class TestListDataModel(api_base.FunctionalTest):
            '/data_model/?data_model_type=compute',
            headers={'OpenStack-API-Version': 'infra-optim 1.2'},
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_ACCEPTABLE, response.status_int)
+        self.assertEqual(406, response.status_int)


 class TestDataModelPolicyEnforcement(api_base.FunctionalTest):
@@ -60,7 +59,7 @@ class TestDataModelPolicyEnforcement(api_base.FunctionalTest):
            "default": "rule:admin_api",
            rule: "rule:defaut"})
        response = func(*arg, **kwarg)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(
            "Policy doesn't allow %s to be performed." % rule,
--- a/watcher/tests/api/v1/test_goals.py
+++ b/watcher/tests/api/v1/test_goals.py
@@ -10,7 +10,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.

-from http import HTTPStatus
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from urllib import parse as urlparse
@@ -60,7 +59,7 @@ class TestListGoal(api_base.FunctionalTest):
        response = self.get_json(
            '/goals/%s' % goal['uuid'],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_detail(self):
        goal = obj_utils.create_test_goal(self.context)
@@ -72,7 +71,7 @@ class TestListGoal(api_base.FunctionalTest):
        goal = obj_utils.create_test_goal(self.context)
        response = self.get_json('/goals/%s/detail' % goal.uuid,
                                 expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_many(self):
        goal_list = []
@@ -140,7 +139,7 @@ class TestListGoal(api_base.FunctionalTest):
        response = self.get_json(
            '/goals?sort_key=%s' % 'bad_name',
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)


 class TestGoalPolicyEnforcement(api_base.FunctionalTest):
@@ -151,7 +150,7 @@ class TestGoalPolicyEnforcement(api_base.FunctionalTest):
            "default": "rule:admin_api",
            rule: "rule:default"})
        response = func(*arg, **kwarg)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(
            "Policy doesn't allow %s to be performed." % rule,
--- a/watcher/tests/api/v1/test_microversions.py
+++ b/watcher/tests/api/v1/test_microversions.py
@@ -10,8 +10,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.

-from http import HTTPStatus
-
 from watcher.api.controllers.v1 import versions
 from watcher.tests.api import base as api_base

@@ -40,7 +38,7 @@ class TestMicroversions(api_base.FunctionalTest):
                                                        '10'])},
            expect_errors=True, return_json=False)
        self.assertEqual('application/json', response.content_type)
-        self.assertEqual(HTTPStatus.NOT_ACCEPTABLE, response.status_int)
+        self.assertEqual(406, response.status_int)
        expected_error_msg = ('Invalid value for'
                              ' OpenStack-API-Version header')
        self.assertTrue(response.json['error_message'])
@@ -100,7 +98,7 @@ class TestMicroversions(api_base.FunctionalTest):
            headers={'OpenStack-API-Version': ' '.join([SERVICE_TYPE,
                                                        '1.999'])},
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_ACCEPTABLE, response.status_int)
+        self.assertEqual(406, response.status_int)
        self.assertEqual(response.headers[H_MIN_VER], MIN_VER)
        self.assertEqual(response.headers[H_MAX_VER], MAX_VER)
        expected_error_msg = ('Version 1.999 was requested but the minor '
--- a/watcher/tests/api/v1/test_scoring_engines.py
+++ b/watcher/tests/api/v1/test_scoring_engines.py
@@ -10,7 +10,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.

-from http import HTTPStatus
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from watcher.common import utils
@@ -45,7 +44,7 @@ class TestListScoringEngine(api_base.FunctionalTest):
        response = self.get_json(
            '/scoring_engines/%s' % scoring_engine['name'],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_detail(self):
        obj_utils.create_test_goal(self.context)
@@ -64,7 +63,7 @@ class TestListScoringEngine(api_base.FunctionalTest):
        response = self.get_json(
            '/scoring_engines/%s/detail' % scoring_engine.id,
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_many(self):
        scoring_engine_list = []
@@ -132,7 +131,7 @@ class TestListScoringEngine(api_base.FunctionalTest):
        response = self.get_json(
            '/goals?sort_key=%s' % 'bad_name',
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)


 class TestScoringEnginePolicyEnforcement(api_base.FunctionalTest):
@@ -143,7 +142,7 @@ class TestScoringEnginePolicyEnforcement(api_base.FunctionalTest):
            "default": "rule:admin_api",
            rule: "rule:default"})
        response = func(*arg, **kwarg)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(
            "Policy doesn't allow %s to be performed." % rule,
--- a/watcher/tests/api/v1/test_services.py
+++ b/watcher/tests/api/v1/test_services.py
@@ -10,7 +10,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.

-from http import HTTPStatus
 from oslo_config import cfg
 from oslo_serialization import jsonutils
 from urllib import parse as urlparse
@@ -58,7 +57,7 @@ class TestListService(api_base.FunctionalTest):
        response = self.get_json(
            '/services/%s' % service['id'],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_detail(self):
        service = obj_utils.create_test_service(self.context)
@@ -75,7 +74,7 @@ class TestListService(api_base.FunctionalTest):
        service = obj_utils.create_test_service(self.context)
        response = self.get_json('/services/%s/detail' % service.id,
                                 expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_many(self):
        service_list = []
@@ -150,7 +149,7 @@ class TestListService(api_base.FunctionalTest):
        response = self.get_json(
            '/services?sort_key=%s' % 'bad_name',
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)


 class TestServicePolicyEnforcement(api_base.FunctionalTest):
@@ -161,7 +160,7 @@ class TestServicePolicyEnforcement(api_base.FunctionalTest):
            "default": "rule:admin_api",
            rule: "rule:default"})
        response = func(*arg, **kwarg)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(
            "Policy doesn't allow %s to be performed." % rule,
--- a/watcher/tests/api/v1/test_strategies.py
+++ b/watcher/tests/api/v1/test_strategies.py
@@ -13,7 +13,6 @@
 from unittest import mock
 from urllib import parse as urlparse

-from http import HTTPStatus
 from oslo_config import cfg
 from oslo_serialization import jsonutils

@@ -89,7 +88,7 @@ class TestListStrategy(api_base.FunctionalTest):
        response = self.get_json(
            '/strategies/%s' % strategy['uuid'],
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_detail(self):
        strategy = obj_utils.create_test_strategy(self.context)
@@ -105,7 +104,7 @@ class TestListStrategy(api_base.FunctionalTest):
        strategy = obj_utils.create_test_strategy(self.context)
        response = self.get_json('/strategies/%s/detail' % strategy.uuid,
                                 expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)

    def test_many(self):
        strategy_list = []
@@ -241,7 +240,7 @@ class TestListStrategy(api_base.FunctionalTest):
        response = self.get_json(
            '/strategies?sort_key=%s' % 'bad_name',
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)


 class TestStrategyPolicyEnforcement(api_base.FunctionalTest):
@@ -257,7 +256,7 @@ class TestStrategyPolicyEnforcement(api_base.FunctionalTest):
            "default": "rule:admin_api",
            rule: "rule:defaut"})
        response = func(*arg, **kwarg)
-        self.assertEqual(HTTPStatus.FORBIDDEN, response.status_int)
+        self.assertEqual(403, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(
            "Policy doesn't allow %s to be performed." % rule,
--- a/watcher/tests/api/v1/test_types.py
+++ b/watcher/tests/api/v1/test_types.py
@@ -18,8 +18,6 @@ import webtest
 import wsme
 from wsme import types as wtypes

-from http import HTTPStatus
-
 from watcher.api.controllers.v1 import types
 from watcher.common import exception
 from watcher.common import utils
@@ -122,68 +120,68 @@ class TestJsonPatchType(base.TestCase):
                         {'path': '/dict', 'op': 'add',
                          'value': {'cat': 'meow'}}]
        ret = self._patch_json(valid_patches, False)
-        self.assertEqual(HTTPStatus.OK, ret.status_int)
+        self.assertEqual(200, ret.status_int)
        self.assertEqual(valid_patches, ret.json)

    def test_cannot_update_internal_attr(self):
        patch = [{'path': '/internal', 'op': 'replace', 'value': 'foo'}]
        ret = self._patch_json(patch, True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, ret.status_int)
+        self.assertEqual(400, ret.status_int)
        self.assertTrue(ret.json['faultstring'])

    def test_cannot_update_internal_dict_attr(self):
        patch = [{'path': '/internal', 'op': 'replace',
                 'value': 'foo'}]
        ret = self._patch_json(patch, True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, ret.status_int)
+        self.assertEqual(400, ret.status_int)
        self.assertTrue(ret.json['faultstring'])

    def test_mandatory_attr(self):
        patch = [{'op': 'replace', 'path': '/mandatory', 'value': 'foo'}]
        ret = self._patch_json(patch, False)
-        self.assertEqual(HTTPStatus.OK, ret.status_int)
+        self.assertEqual(200, ret.status_int)
        self.assertEqual(patch, ret.json)

    def test_cannot_remove_mandatory_attr(self):
        patch = [{'op': 'remove', 'path': '/mandatory'}]
        ret = self._patch_json(patch, True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, ret.status_int)
+        self.assertEqual(400, ret.status_int)
        self.assertTrue(ret.json['faultstring'])

    def test_missing_required_fields_path(self):
        missing_path = [{'op': 'remove'}]
        ret = self._patch_json(missing_path, True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, ret.status_int)
+        self.assertEqual(400, ret.status_int)
        self.assertTrue(ret.json['faultstring'])

    def test_missing_required_fields_op(self):
        missing_op = [{'path': '/foo'}]
        ret = self._patch_json(missing_op, True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, ret.status_int)
+        self.assertEqual(400, ret.status_int)
        self.assertTrue(ret.json['faultstring'])

    def test_invalid_op(self):
        patch = [{'path': '/foo', 'op': 'invalid'}]
        ret = self._patch_json(patch, True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, ret.status_int)
+        self.assertEqual(400, ret.status_int)
        self.assertTrue(ret.json['faultstring'])

    def test_invalid_path(self):
        patch = [{'path': 'invalid-path', 'op': 'remove'}]
        ret = self._patch_json(patch, True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, ret.status_int)
+        self.assertEqual(400, ret.status_int)
        self.assertTrue(ret.json['faultstring'])

    def test_cannot_add_with_no_value(self):
        patch = [{'path': '/extra/foo', 'op': 'add'}]
        ret = self._patch_json(patch, True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, ret.status_int)
+        self.assertEqual(400, ret.status_int)
        self.assertTrue(ret.json['faultstring'])

    def test_cannot_replace_with_no_value(self):
        patch = [{'path': '/foo', 'op': 'replace'}]
        ret = self._patch_json(patch, True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, ret.status_int)
+        self.assertEqual(400, ret.status_int)
        self.assertTrue(ret.json['faultstring'])


--- a/watcher/tests/api/v1/test_webhooks.py
+++ b/watcher/tests/api/v1/test_webhooks.py
@@ -12,8 +12,6 @@

 from unittest import mock

-from http import HTTPStatus
-
 from watcher.decision_engine import rpcapi as deapi
 from watcher import objects
 from watcher.tests.api import base as api_base
@@ -36,7 +34,7 @@ class TestPost(api_base.FunctionalTest):
        response = self.post_json(
            '/webhooks/%s' % audit['uuid'], {},
            headers={'OpenStack-API-Version': 'infra-optim 1.4'})
-        self.assertEqual(HTTPStatus.ACCEPTED, response.status_int)
+        self.assertEqual(202, response.status_int)
        mock_trigger_audit.assert_called_once_with(
            mock.ANY, audit['uuid'])

@@ -45,7 +43,7 @@ class TestPost(api_base.FunctionalTest):
            '/webhooks/no-audit', {},
            headers={'OpenStack-API-Version': 'infra-optim 1.4'},
            expect_errors=True)
-        self.assertEqual(HTTPStatus.NOT_FOUND, response.status_int)
+        self.assertEqual(404, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -55,7 +53,7 @@ class TestPost(api_base.FunctionalTest):
            '/webhooks/%s' % audit['uuid'], {},
            headers={'OpenStack-API-Version': 'infra-optim 1.4'},
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])

@@ -68,6 +66,6 @@ class TestPost(api_base.FunctionalTest):
            '/webhooks/%s' % audit['uuid'], {},
            headers={'OpenStack-API-Version': 'infra-optim 1.4'},
            expect_errors=True)
-        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        self.assertEqual(400, response.status_int)
        self.assertEqual('application/json', response.content_type)
        self.assertTrue(response.json['error_message'])
--- a/watcher/tests/common/test_cinder_helper.py
+++ b/watcher/tests/common/test_cinder_helper.py
@@ -13,10 +13,8 @@
 # limitations under the License.
 #

-from unittest import mock
-
-from http import HTTPStatus
 import time
+from unittest import mock

 from cinderclient import exceptions as cinder_exception

@@ -293,8 +291,7 @@ class TestCinderHelper(base.TestCase):

        volume = self.fake_volume()
        cinder_util.get_volume = mock.MagicMock()
-        cinder_util.get_volume.side_effect =\
-            cinder_exception.NotFound(HTTPStatus.NOT_FOUND)
+        cinder_util.get_volume.side_effect = cinder_exception.NotFound(404)
        result = cinder_util._can_get_volume(volume.id)
        self.assertFalse(result)

@@ -342,7 +339,7 @@ class TestCinderHelper(base.TestCase):
        cinder_util = cinder_helper.CinderHelper()

        volume = self.fake_volume()
-        side_effect = cinder_exception.NotFound(HTTPStatus.NOT_FOUND)
+        side_effect = cinder_exception.NotFound(404)
        cinder_util.cinder.volumes.get.side_effect = side_effect
        cinder_util.cinder.volumes.find.return_value = False
        result = cinder_util.get_volume(volume)
--- a/watcher/tests/common/test_clients.py
+++ b/watcher/tests/common/test_clients.py
@@ -10,6 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.

+from ceilometerclient import client as ceclient
+import ceilometerclient.v2.client as ceclient_v2
 from unittest import mock

 from cinderclient import client as ciclient
@@ -268,6 +270,56 @@ class TestClients(base.TestCase):
        cinder_cached = osc.cinder()
        self.assertEqual(cinder, cinder_cached)

+    @mock.patch.object(ceclient, 'Client')
+    @mock.patch.object(clients.OpenStackClients, 'session')
+    def test_clients_ceilometer(self, mock_session, mock_call):
+        osc = clients.OpenStackClients()
+        osc._ceilometer = None
+        osc.ceilometer()
+        mock_call.assert_called_once_with(
+            CONF.ceilometer_client.api_version,
+            None,
+            endpoint_type=CONF.ceilometer_client.endpoint_type,
+            region_name=CONF.ceilometer_client.region_name,
+            session=mock_session)
+
+    @mock.patch.object(clients.OpenStackClients, 'session')
+    @mock.patch.object(ceclient_v2.Client, '_get_redirect_client')
+    def test_clients_ceilometer_diff_vers(self, mock_get_redirect_client,
+                                          mock_session):
+        '''ceilometerclient currently only has one version (v2)'''
+        mock_get_redirect_client.return_value = [mock.Mock(), mock.Mock()]
+        CONF.set_override('api_version', '2',
+                          group='ceilometer_client')
+        osc = clients.OpenStackClients()
+        osc._ceilometer = None
+        osc.ceilometer()
+        self.assertEqual(ceclient_v2.Client,
+                         type(osc.ceilometer()))
+
+    @mock.patch.object(clients.OpenStackClients, 'session')
+    @mock.patch.object(ceclient_v2.Client, '_get_redirect_client')
+    def test_clients_ceilometer_diff_endpoint(self, mock_get_redirect_client,
+                                              mock_session):
+        mock_get_redirect_client.return_value = [mock.Mock(), mock.Mock()]
+        CONF.set_override('endpoint_type', 'publicURL',
+                          group='ceilometer_client')
+        osc = clients.OpenStackClients()
+        osc._ceilometer = None
+        osc.ceilometer()
+        self.assertEqual('publicURL', osc.ceilometer().http_client.interface)
+
+    @mock.patch.object(clients.OpenStackClients, 'session')
+    @mock.patch.object(ceclient_v2.Client, '_get_redirect_client')
+    def test_clients_ceilometer_cached(self, mock_get_redirect_client,
+                                       mock_session):
+        mock_get_redirect_client.return_value = [mock.Mock(), mock.Mock()]
+        osc = clients.OpenStackClients()
+        osc._ceilometer = None
+        ceilometer = osc.ceilometer()
+        ceilometer_cached = osc.ceilometer()
+        self.assertEqual(ceilometer, ceilometer_cached)
+
    @mock.patch.object(netclient, 'Client')
    @mock.patch.object(clients.OpenStackClients, 'session')
    def test_clients_neutron(self, mock_session, mock_call):
--- a/watcher/tests/common/test_placement_helper.py
+++ b/watcher/tests/common/test_placement_helper.py
@@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-from http import HTTPStatus
 from unittest import mock

 from watcher.common import placement_helper
@@ -56,10 +55,10 @@ class TestPlacementHelper(base.TestCase):
        kss_req.assert_called_once_with(url, method, **kwargs)

    def test_get(self, kss_req):
-        kss_req.return_value = fake_requests.FakeResponse(HTTPStatus.OK)
+        kss_req.return_value = fake_requests.FakeResponse(200)
        url = '/resource_providers'
        resp = self.client.get(url)
-        self.assertEqual(HTTPStatus.OK, resp.status_code)
+        self.assertEqual(200, resp.status_code)
        self._assert_keystone_called_once(kss_req, url, 'GET')

    def test_get_resource_providers_OK(self, kss_req):
@@ -77,7 +76,7 @@ class TestPlacementHelper(base.TestCase):
        }

        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.OK, content=jsonutils.dump_as_bytes(mock_json_data))
+            200, content=jsonutils.dump_as_bytes(mock_json_data))

        result = self.client.get_resource_providers(rp_name)

@@ -100,7 +99,7 @@ class TestPlacementHelper(base.TestCase):
        }

        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.OK, content=jsonutils.dump_as_bytes(mock_json_data))
+            200, content=jsonutils.dump_as_bytes(mock_json_data))

        result = self.client.get_resource_providers(rp_name)

@@ -111,8 +110,7 @@ class TestPlacementHelper(base.TestCase):
    def test_get_resource_providers_fail(self, kss_req):
        rp_name = 'compute'
        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.BAD_REQUEST,
-            content=jsonutils.dump_as_bytes(self.fake_err_msg))
+            400, content=jsonutils.dump_as_bytes(self.fake_err_msg))
        result = self.client.get_resource_providers(rp_name)
        self.assertIsNone(result)

@@ -151,7 +149,7 @@ class TestPlacementHelper(base.TestCase):
        }

        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.OK, content=jsonutils.dump_as_bytes(mock_json_data))
+            200, content=jsonutils.dump_as_bytes(mock_json_data))

        result = self.client.get_inventories(rp_uuid)

@@ -162,8 +160,7 @@ class TestPlacementHelper(base.TestCase):
    def test_get_inventories_fail(self, kss_req):
        rp_uuid = uuidutils.generate_uuid()
        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.NOT_FOUND,
-            content=jsonutils.dump_as_bytes(self.fake_err_msg))
+            404, content=jsonutils.dump_as_bytes(self.fake_err_msg))
        result = self.client.get_inventories(rp_uuid)
        self.assertIsNone(result)

@@ -178,7 +175,7 @@ class TestPlacementHelper(base.TestCase):
        }

        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.OK, content=jsonutils.dump_as_bytes(mock_json_data))
+            200, content=jsonutils.dump_as_bytes(mock_json_data))

        result = self.client.get_provider_traits(rp_uuid)

@@ -189,8 +186,7 @@ class TestPlacementHelper(base.TestCase):
    def test_get_provider_traits_fail(self, kss_req):
        rp_uuid = uuidutils.generate_uuid()
        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.NOT_FOUND,
-            content=jsonutils.dump_as_bytes(self.fake_err_msg))
+            404, content=jsonutils.dump_as_bytes(self.fake_err_msg))
        result = self.client.get_provider_traits(rp_uuid)
        self.assertIsNone(result)

@@ -220,7 +216,7 @@ class TestPlacementHelper(base.TestCase):
        }

        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.OK, content=jsonutils.dump_as_bytes(mock_json_data))
+            200, content=jsonutils.dump_as_bytes(mock_json_data))

        result = self.client.get_allocations_for_consumer(c_uuid)

@@ -231,8 +227,7 @@ class TestPlacementHelper(base.TestCase):
    def test_get_allocations_for_consumer_fail(self, kss_req):
        c_uuid = uuidutils.generate_uuid()
        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.NOT_FOUND,
-            content=jsonutils.dump_as_bytes(self.fake_err_msg))
+            404, content=jsonutils.dump_as_bytes(self.fake_err_msg))
        result = self.client.get_allocations_for_consumer(c_uuid)
        self.assertIsNone(result)

@@ -250,7 +245,7 @@ class TestPlacementHelper(base.TestCase):
        }

        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.OK, content=jsonutils.dump_as_bytes(mock_json_data))
+            200, content=jsonutils.dump_as_bytes(mock_json_data))

        result = self.client.get_usages_for_resource_provider(rp_uuid)

@@ -261,8 +256,7 @@ class TestPlacementHelper(base.TestCase):
    def test_get_usages_for_resource_provider_fail(self, kss_req):
        rp_uuid = uuidutils.generate_uuid()
        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.NOT_FOUND,
-            content=jsonutils.dump_as_bytes(self.fake_err_msg))
+            404, content=jsonutils.dump_as_bytes(self.fake_err_msg))
        result = self.client.get_usages_for_resource_provider(rp_uuid)
        self.assertIsNone(result)

@@ -302,7 +296,7 @@ class TestPlacementHelper(base.TestCase):
        }

        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.OK, content=jsonutils.dump_as_bytes(mock_json_data))
+            200, content=jsonutils.dump_as_bytes(mock_json_data))

        result = self.client.get_candidate_providers(resources)

@@ -313,7 +307,6 @@ class TestPlacementHelper(base.TestCase):
    def test_get_candidate_providers_fail(self, kss_req):
        rp_uuid = uuidutils.generate_uuid()
        kss_req.return_value = fake_requests.FakeResponse(
-            HTTPStatus.NOT_FOUND,
-            content=jsonutils.dump_as_bytes(self.fake_err_msg))
+            404, content=jsonutils.dump_as_bytes(self.fake_err_msg))
        result = self.client.get_candidate_providers(rp_uuid)
        self.assertIsNone(result)
--- a/watcher/tests/decision_engine/datasources/test_ceilometer_helper.py
+++ b/watcher/tests/decision_engine/datasources/test_ceilometer_helper.py
@@ -0,0 +1,168 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2015 b<>com
+#
+# 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 import exception
+from watcher.decision_engine.datasources import ceilometer as ceilometer_helper
+from watcher.tests import base
+
+
+@mock.patch.object(clients.OpenStackClients, 'ceilometer')
+class TestCeilometerHelper(base.BaseTestCase):
+
+    def setUp(self):
+        super(TestCeilometerHelper, self).setUp()
+        self.osc_mock = mock.Mock()
+        self.helper = ceilometer_helper.CeilometerHelper(osc=self.osc_mock)
+        stat_agg_patcher = mock.patch.object(
+            self.helper, 'statistic_aggregation',
+            spec=ceilometer_helper.CeilometerHelper.statistic_aggregation)
+        self.mock_aggregation = stat_agg_patcher.start()
+        self.addCleanup(stat_agg_patcher.stop)
+
+    def test_build_query(self, mock_ceilometer):
+        mock_ceilometer.return_value = mock.MagicMock()
+        cm = ceilometer_helper.CeilometerHelper()
+        expected = [{'field': 'user_id', 'op': 'eq', 'value': u'user_id'},
+                    {'field': 'project_id', 'op': 'eq', 'value': u'tenant_id'},
+                    {'field': 'resource_id', 'op': 'eq',
+                     'value': u'resource_id'}]
+
+        query = cm.build_query(user_id="user_id",
+                               tenant_id="tenant_id",
+                               resource_id="resource_id",
+                               user_ids=["user_ids"],
+                               tenant_ids=["tenant_ids"],
+                               resource_ids=["resource_ids"])
+        self.assertEqual(expected, query)
+
+    def test_statistic_aggregation(self, mock_ceilometer):
+        ceilometer = mock.MagicMock()
+        statistic = mock.MagicMock()
+        expected_result = 100
+        statistic[-1]._info = {'aggregate': {'avg': expected_result}}
+        ceilometer.statistics.list.return_value = statistic
+        mock_ceilometer.return_value = ceilometer
+        cm = ceilometer_helper.CeilometerHelper()
+        val = cm.statistic_aggregation(
+            resource=mock.Mock(id="INSTANCE_ID"),
+            resource_type='instance',
+            meter_name="instance_cpu_usage",
+            period="7300",
+            granularity=None
+        )
+        self.assertEqual(expected_result, val)
+
+    def test_statistic_aggregation_metric_unavailable(self, mock_ceilometer):
+        helper = ceilometer_helper.CeilometerHelper()
+
+        # invalidate instance_cpu_usage in metric map
+        original_metric_value = helper.METRIC_MAP.get('instance_cpu_usage')
+        helper.METRIC_MAP.update(
+            instance_cpu_usage=None
+        )
+
+        self.assertRaises(
+            exception.MetricNotAvailable,
+            helper.statistic_aggregation, resource=mock.Mock(id="INSTANCE_ID"),
+            resource_type='instance', meter_name="instance_cpu_usage",
+            period="7300",
+            granularity=None
+        )
+
+        # restore the metric map as it is a static attribute that does not get
+        # restored between unit tests!
+        helper.METRIC_MAP.update(
+            instance_cpu_usage=original_metric_value
+        )
+
+    def test_get_host_cpu_usage(self, mock_ceilometer):
+        self.helper.get_host_cpu_usage('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'compute_node', 'host_cpu_usage', 600, 'mean', None)
+
+    def test_get_host_ram_usage(self, mock_ceilometer):
+        self.helper.get_host_ram_usage('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'compute_node', 'host_ram_usage', 600, 'mean', None)
+
+    def test_get_host_outlet_temp(self, mock_ceilometer):
+        self.helper.get_host_outlet_temp('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'compute_node', 'host_outlet_temp', 600, 'mean', None)
+
+    def test_get_host_inlet_temp(self, mock_ceilometer):
+        self.helper.get_host_inlet_temp('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'compute_node', 'host_inlet_temp', 600, 'mean', None)
+
+    def test_get_host_airflow(self, mock_ceilometer):
+        self.helper.get_host_airflow('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'compute_node', 'host_airflow', 600, 'mean', None)
+
+    def test_get_host_power(self, mock_ceilometer):
+        self.helper.get_host_power('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'compute_node', 'host_power', 600, 'mean', None)
+
+    def test_get_instance_cpu_usage(self, mock_ceilometer):
+        self.helper.get_instance_cpu_usage('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'instance', 'instance_cpu_usage', 600, 'mean',
+            None)
+
+    def test_get_instance_ram_usage(self, mock_ceilometer):
+        self.helper.get_instance_ram_usage('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'instance', 'instance_ram_usage', 600, 'mean',
+            None)
+
+    def test_get_instance_ram_allocated(self, mock_ceilometer):
+        self.helper.get_instance_ram_allocated('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'instance', 'instance_ram_allocated', 600, 'mean',
+            None)
+
+    def test_get_instance_l3_cache_usage(self, mock_ceilometer):
+        self.helper.get_instance_l3_cache_usage('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'instance', 'instance_l3_cache_usage', 600, 'mean',
+            None)
+
+    def test_get_instance_root_disk_size(self, mock_ceilometer):
+        self.helper.get_instance_root_disk_size('compute1', 600, 'mean')
+        self.mock_aggregation.assert_called_once_with(
+            'compute1', 'instance', 'instance_root_disk_size', 600, 'mean',
+            None)
+
+    def test_check_availability(self, mock_ceilometer):
+        ceilometer = mock.MagicMock()
+        ceilometer.resources.list.return_value = True
+        mock_ceilometer.return_value = ceilometer
+        helper = ceilometer_helper.CeilometerHelper()
+        result = helper.check_availability()
+        self.assertEqual('available', result)
+
+    def test_check_availability_with_failure(self, mock_ceilometer):
+        ceilometer = mock.MagicMock()
+        ceilometer.resources.list.side_effect = Exception()
+        mock_ceilometer.return_value = ceilometer
+        helper = ceilometer_helper.CeilometerHelper()
+
+        self.assertEqual('not available', helper.check_availability())
--- a/watcher/tests/decision_engine/datasources/test_grafana_helper.py
+++ b/watcher/tests/decision_engine/datasources/test_grafana_helper.py
@@ -26,7 +26,6 @@ from watcher.common import exception
 from watcher.decision_engine.datasources import grafana
 from watcher.tests import base

-from http import HTTPStatus
 import requests

 CONF = cfg.CONF
@@ -129,7 +128,7 @@ class TestGrafana(base.BaseTestCase):
        problems.
        """

-        m_request.return_value = mock.Mock(status_code=HTTPStatus.NOT_FOUND)
+        m_request.return_value = mock.Mock(status_code=404)

        t_grafana = grafana.GrafanaHelper(osc=mock.Mock())

--- a/watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py
+++ b/watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py
@@ -144,7 +144,7 @@ class TestZoneMigration(TestBaseStrategy):

    @staticmethod
    def fake_volume(**kwargs):
-        volume = mock.MagicMock(spec=cinderclient.v3.volumes.Volume)
+        volume = mock.MagicMock(spec=cinderclient.v2.volumes.Volume)
        volume.id = kwargs.get('id', utils.generate_uuid())
        volume.name = kwargs.get('name', 'fake_name')
        volume.status = kwargs.get('status', 'available')
Author	SHA1	Message	Date
Zuul	d60e2a96e4	Merge "Update .gitreview for stable/wallaby" into stable/wallaby	2021-07-01 13:32:11 +00:00
OpenStack Release Bot	adf4725f8c	Update TOX_CONSTRAINTS_FILE for stable/wallaby Update the URL to the upper-constraints file to point to the redirect rule on releases.openstack.org so that anyone working on this branch will switch to the correct upper-constraints list automatically when the requirements repository branches. Until the requirements repository has as stable/wallaby branch, tests will continue to use the upper-constraints list on master. Change-Id: I5986087281694580acc3c19feed461b5949f7001	2021-07-01 11:44:53 +00:00
OpenStack Release Bot	537823b216	Update .gitreview for stable/wallaby Change-Id: Ic8aa9518d5ccc65d43444d42c584db476cd79429	2021-07-01 11:44:34 +00:00
ericxiett	281455a08a	Replace deprecated with_lockmode with with_for_update The Query.with_lockmode() method is deprecated since version 0.9.0 and will be removed in a future release. [1] This patch replaces it with Query.with_for_update(). The 'faultstring' was been modified to 'Exactly 5 or 6 columns has to be specified for iterator expression', so adds one space between "iterator" and "expression" for 'expected_error_msg'. Also use upper-constraints in doc build to avoid issues in pdf build. [1] https://docs.sqlalchemy.org/en/13/orm/query.html#sqlalchemy.orm.query.Query.with_lockmode Closes-Bug: #1933226 Change-Id: I0ad514da647bb08790259fd27e56a41f6dbbbaa0 (cherry picked from commit `9ca44fa3ab`)	2021-07-01 09:11:58 +00:00