watcher-tempest-plugin 3.4.0__tar.gz → 3.6.0__tar.gz

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/.zuul.yaml

@@ -7,16 +7,34 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - watcherclient-tempest-functional
         - watcher-tempest-functional
         - watcher-tempest-actuator
         - watcher-tempest-strategies
+        - watcher-prometheus-integration
+        - watcher-aetos-integration
+        - watcher-tempest-functional-2025-2
+        - watcher-tempest-functional-2025-1
         - watcher-tempest-functional-2024-2
         - watcher-tempest-functional-2024-1
-        - watcher-tempest-functional-2023-2
     gate:
       jobs:
         - watcher-tempest-functional
+    experimental:
+      jobs:
+        - watcher-prometheus-integration-realdata
+        - watcher-aetos-integration-realdata
+
+- job:
+    name: watcher-tempest-functional-2025-2
+    parent: watcher-tempest-functional
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.2
+
+- job:
+    name: watcher-tempest-functional-2025-1
+    parent: watcher-tempest-functional
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.1
 
 - job:
     name: watcher-tempest-functional-2024-2
@@ -29,9 +47,3 @@
     parent: watcher-tempest-functional
     nodeset: openstack-single-node-jammy
     override-checkout: stable/2024.1
-
-- job:
-    name: watcher-tempest-functional-2023-2
-    parent: watcher-tempest-functional
-    nodeset: openstack-single-node-jammy
-    override-checkout: stable/2023.2

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/AUTHORS

@@ -1,5 +1,6 @@
 98k <18552437190@163.com>
 Alexander Chadin <a.chadin@servionica.ru>
+Alfredo Moralejo <amoralej@redhat.com>
 Andrea Frittoli <andrea.frittoli@gmail.com>
 Andreas Jaeger <aj@suse.com>
 Chandan Kumar (raukadah) <chkumar@redhat.com>
@@ -13,6 +14,7 @@ Gábor Antal <antal@inf.u-szeged.hu>
 Hervé Beraud <hberaud@redhat.com>
 Hidekazu Nakamura <hid-nakamura@vf.jp.nec.com>
 Jaewoo Park <jp655p@att.com>
+Jaromir Wysoglad <jwysogla@redhat.com>
 Ken'ichi Ohmichi <ken-oomichi@wx.jp.nec.com>
 Larry Rensing <lr699s@att.com>
 Martin Kopec <mkopec@redhat.com>
@@ -21,6 +23,7 @@ Ngo Quoc Cuong <cuongnq@vn.fujitsu.com>
 Nguyen Hai <nguyentrihai93@gmail.com>
 Nishant Kumar <nishant.e.kumar@ericsson.com>
 Roman Popelka <rpopelka@redhat.com>
+Sean Mooney <work@seanmooney.info>
 ShangXiao <shangxiaobj@inspur.com>
 Sumit Jamgade <sjamgade@suse.com>
 Takashi Kajinami <kajinamit@oss.nttdata.com>
@@ -37,11 +40,14 @@ digambar <digambarpatil15@yahoo.co.in>
 ghanshyam <gmann@ghanshyammann.com>
 gujin <gu.jin@99cloud.net>
 huang.zhiping <huang.zhiping@99cloud.net>
+jgilaber <jgilaber@redhat.com>
 licanwei <li.canwei2@zte.com.cn>
 limin.lc <limin.lc@inspur.com>
 liyou01 <liyou01@inspur.com>
 maaoyu <maaoyu@inspur.com>
 malinga tembo <mtembo@redhat.com>
+morenod <dsanz@redhat.com>
+morenod <dsanzmor@redhat.com>
 qinchunhua <qin.chunhua@zte.com.cn>
 qingszhao <zhao.daqing@99cloud.net>
 rajat29 <rajat.sharma@nectechnologies.in>

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/ChangeLog

@@ -1,6 +1,63 @@
 CHANGES
 =======
 
+3.6.0
+-----
+
+* Skip Storage Capacity test until it's fixed
+* Add tests for extended compute datamodel
+* Remove server\_state check from data\_model test
+* Fail if action plan cannot be execute
+* Remove resource\_setup skip checks
+* Refactor execute\_strategy method into smaller helpers
+* Organize strategy tests and remove duplicated tests
+* Add basic datamodel list tests
+* Add a scenario test with continuous audit
+
+3.5.0
+-----
+
+* Add stable/2025.2 job
+* Add test for volume retype with zone migration
+* Check for single instance migration to backup node
+* Add Aetos jobs in check and experimental pipelines
+* Add custom flavor and dynamic threshold to workload\_balance tests
+* Add api test for skip action
+* Add support for microversion testing for api and scenario tests
+* Skip execute\_workload\_balance\_strategy\_cpu|ram due to known bug
+* Create a function for deleting old injected metrics on prometheus
+* Inject metrics for host total ram on prometheus
+* Add workload\_stabilization RAM tests and adapt the current one for CPU
+* Add tests for workload\_balance with injected data
+* Add tests for workload balance with real data
+* Fix injected host\_ram\_usage metrics
+* Refact on creating instances and inject metrics
+* Update tests on zone migration strategy
+* Update tests for host maintenance strategy
+* Move function for creating instances from 1 to variable number
+* Add reusable method for getting enabled compute nodes
+* Enforce compute host in create\_one\_instance\_per\_host
+* Change destination node calculation on actuator tests
+* Change timeframe of fake metrics uploaded to gnocchi
+* Use get\_host\_for\_server and get\_host\_other\_than to get src/dst node
+* Remove stable/2023.2 job
+* Add metrics for RAM to gnocchi and prometheus injected data
+* Add experimental pipeline to allow run jobs with real data
+* Refactor of wait\_for\_instances\_in\_model function to wait until all instances are in the correct compute node on the model
+* add pyproject.toml to support pip 23.1
+* Add tests for host\_maintenance strategy with backup node
+* Add check-uuid to pep8 tox tests
+* Bug: 2107531. Adding unique uuid decorator to all watcher tests
+* Ensure test\_execute\_workload\_stabilization\_strategy creates non-emtpy action nplan
+* skip metric injection when not needed
+* Replace UPPER\_CONSTRAINTS\_FILE
+* Fix typo on bugs link
+* Add stable/2025.1 job
+* Add real-data scenario tests
+* Add deprecation about client\_functional tests
+* Check expected actions included in plans when executing strategies
+* Drop watcherclient-tempest-functional job
+
 3.4.0
 -----
 

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: watcher-tempest-plugin
-Version: 3.4.0
+Version: 3.6.0
 Summary: Tempest plugin watcher-tempest-plugin
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack
@@ -39,7 +39,7 @@ See the following docs to learn more:
 * Documentation: https://docs.openstack.org/watcher-tempest-plugin/latest/
 * Release notes: https://docs.openstack.org/releasenotes/watcher-tempest-plugin/
 * Source: https://opendev.org/openstack/watcher-tempest-plugin
-* Bugs: https://bugs.launchpad.net/watcher plugin watcher-tempest-plugin
+* Bugs: https://bugs.launchpad.net/watcher-tempest-plugin
 
 .. _Tempest: https://docs.openstack.org/tempest
 .. _test plugin: https://docs.openstack.org/tempest/latest/plugin.html

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/README.rst

@@ -11,7 +11,7 @@ See the following docs to learn more:
 * Documentation: https://docs.openstack.org/watcher-tempest-plugin/latest/
 * Release notes: https://docs.openstack.org/releasenotes/watcher-tempest-plugin/
 * Source: https://opendev.org/openstack/watcher-tempest-plugin
-* Bugs: https://bugs.launchpad.net/watcher plugin watcher-tempest-plugin
+* Bugs: https://bugs.launchpad.net/watcher-tempest-plugin
 
 .. _Tempest: https://docs.openstack.org/tempest
 .. _test plugin: https://docs.openstack.org/tempest/latest/plugin.html

watcher_tempest_plugin-3.6.0/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["pbr>=6.0.0", "setuptools>=64.0.0"]
+build-backend = "pbr.build"

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/test-requirements.txt

@@ -2,6 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
+debtcollector>=1.2.0 # Apache-2.0
 hacking>=3.2
 stestr>=1.0.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/tox.ini

@@ -7,10 +7,11 @@ ignore_basepython_conflict = True
 [testenv]
 basepython = python3
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
+install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 setenv =
    PYTHONWARNINGS=default::DeprecationWarning
 deps =
+    -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
@@ -19,11 +20,12 @@ commands =
     doc8 doc/source/ CONTRIBUTING.rst HACKING.rst README.rst
     flake8
     bandit -r watcher_tempest_plugin -x tests -n5 -ll
+    check-uuid --package watcher_tempest_plugin
 
 [testenv:cover]
 setenv =
     {[testenv]setenv}
-    PYTHON=coverage run --source ironic_tempest_plugin --parallel-mode
+    PYTHON=coverage run --source watcher_tempest_plugin --parallel-mode
 commands =
     stestr run {posargs}
     coverage combine
@@ -74,3 +76,6 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,demo/,releasenotes
 
 [doc8]
 extension=.rst
+
+[testenv:uuidgen]
+commands = check-uuid --fix --package watcher_tempest_plugin

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/watcher_tempest_plugin/config.py

@@ -109,4 +109,39 @@ OptimizationGroup = [
         help="Namespace where OpenStack is deployed in a podified "
              "control plane environment."
     ),
+    cfg.IntOpt(
+        "real_workload_period",
+        default=120,
+        help="In real-data test cases, the period of time during which "
+             "the load will be executed in seconds."
+    ),
+    cfg.StrOpt(
+        "min_microversion",
+        default=None,
+        help="Lower version of the test target microversion range. "
+             "The format is 'X.Y', where 'X' and 'Y' are int values."
+    ),
+    cfg.StrOpt(
+        "max_microversion",
+        default=None,
+        help="Upper version of the test target microversion range. "
+             "The format is 'X.Y', where 'X' and 'Y' are int values."
+    ),
+    cfg.BoolOpt(
+        "run_continuous_audit_tests",
+        default=False,
+        help="Whether or not to run continuous audit scenario tests.",
+    ),
+    cfg.BoolOpt(
+        "run_extended_attributes_tests",
+        default=False,
+        help="Whether or not to run compute model extended attributes tests. "
+             "Note that Watcher also needs to be configured to enable the "
+             "collection of extended attributes for the compute model and the "
+             "watcher option nova_client.api_version must be set configured "
+             "accordingly. Note that some attributes require the model "
+             "collector to run and update the model, so make sure that your "
+             "`watcher_cluster_data_model_collectors` period configuration is "
+             "less than 300 seconds."
+    ),
 ]

watcher_tempest_plugin-3.6.0/watcher_tempest_plugin/services/infra_optim/v1/json/api_microversion_fixture.py

@@ -0,0 +1,47 @@
+# Copyright 2025 Red Hat, Inc.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import fixtures
+
+from watcher_tempest_plugin.services.infra_optim.v1.json import client
+
+
+class APIMicroversionFixture(fixtures.Fixture):
+    """API Microversion Fixture to set service microversion.
+
+    This class provides the fixture to set and reset the microversion
+    on service client. Service client has global variable to set the
+    microversion for that service API request.
+    This class can be used with useFixture: Example::
+
+        def setUp(self):
+            super(BaseInfraOptimTest, self).setUp()
+            self.useFixture(api_microversion_fixture.APIMicroversionFixture(
+                optimize_microversion=self.request_microversion))
+    This class only supports the Resource Optimization service.
+
+    :param str optimize_microversion: microvesion to be set on resource
+                                      optimization service client
+    """
+
+    def __init__(self, optimize_microversion):
+        self.optimize_microversion = optimize_microversion
+
+    def _setUp(self):
+        super(APIMicroversionFixture, self)._setUp()
+        client.INFRA_OPTIM_VERSION = self.optimize_microversion
+        self.addCleanup(self._reset_optimize_microversion)
+
+    def _reset_optimize_microversion(self):
+        client.INFRA_OPTIM_VERSION = None

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/watcher_tempest_plugin/services/infra_optim/v1/json/client.py

@@ -19,7 +19,7 @@ from oslo_utils import uuidutils
 from watcher_tempest_plugin.services import base
 
 
-INFRA_OPTIM_VERSION = '1.4'
+INFRA_OPTIM_VERSION = None
 
 
 class InfraOptimClientJSON(base.BaseClient):
@@ -279,6 +279,16 @@ class InfraOptimClientJSON(base.BaseClient):
         """
         return self._show_request('/actions', action_uuid)
 
+    @base.handle_errors
+    def update_action(self, action_uuid, patch):
+        """Update the specified action
+
+        :param action_uuid: The unique identifier of the action
+        :param patch: List of dicts representing json patches.
+        :return: Tuple with the server response and the updated action_plan
+        """
+        return self._patch_request('/actions', action_uuid, patch)
+
     # ### STRATEGIES ### #
 
     @base.handle_errors

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/watcher_tempest_plugin/services/metric/prometheus_client.py

@@ -15,6 +15,7 @@
 import json
 
 from oslo_log import log
+from urllib.parse import quote
 
 from watcher_tempest_plugin.services import base
 
@@ -62,12 +63,15 @@ class PromtoolClient:
 
         self.prometheus_url = url
         self.prometheus_write_url = url + "/api/v1/write"
+        self.prometheus_delete_series_url = (
+            url + "/api/v1/admin/tsdb/delete_series")
         # active targets
         self.prometheus_targets_url = url + "/api/v1/targets?state=active"
         self.prometheus_fqdn_label = prometheus_fqdn_label
         self.promtool_cmd = [promtool_path]
         if prometheus_ssl_cert:
             self.promtool_cmd.insert(0, f"SSL_CERT_DIR={prometheus_ssl_cert}")
+
         # Map hostnames and fqdn to prometheus instances
         self._prometheus_instances = {}
 
@@ -122,6 +126,27 @@ class PromtoolClient:
 
         return self.client.exec_cmd(cmd)
 
+    def delete_series(self, expr='{job="promtool"}'):
+        """Delete prometheus time series with the specified parameters.
+
+        :param expr: expression to match the time series
+        :returns: Stdout output generated by the command.
+        """
+
+        # Having a lot of problems passing the expression
+        # with double quotes both on direct command and
+        # ssh command so using url encoding
+
+        quoted_expr = quote(expr)
+
+        cmd = ['curl', '-s', '-k', '-X', 'POST', '-g',
+               self.prometheus_delete_series_url + '?match[]=' + quoted_expr]
+
+        LOG.debug(f"curl command: {' '.join(cmd)}")
+        out = self.client.exec_cmd(cmd)
+        if len(out) > 1:
+            LOG.debug(f"delete_series execution output: {out}")
+
     def add_measures(self, input_data):
         """Add measures resources with the specified parameters.
 

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/watcher_tempest_plugin/tests/api/admin/base.py

@@ -18,16 +18,21 @@ import functools
 import time
 
 from tempest import config
+from tempest.lib.common import api_version_utils
 from tempest.lib.common.utils import data_utils
 from tempest.lib.common.utils import test_utils
 from tempest import test
 
 from watcher_tempest_plugin import infra_optim_clients as clients
+from watcher_tempest_plugin.services.infra_optim.v1.json import (
+    api_microversion_fixture
+)
 
 CONF = config.CONF
 
 
-class BaseInfraOptimTest(test.BaseTestCase):
+class BaseInfraOptimTest(api_version_utils.BaseMicroversionTest,
+                         test.BaseTestCase):
     """Base class for Infrastructure Optimization API tests."""
 
     # States where the object is waiting for some event to perform a transition
@@ -35,6 +40,7 @@ class BaseInfraOptimTest(test.BaseTestCase):
                    'FAILED',
                    'SUCCEEDED',
                    'CANCELLED',
+                   'SUPERSEDED',
                    'SUSPENDED')
     # States where the object can only be DELETED (end of its life-cycle)
     FINISHED_STATES = ('FAILED',
@@ -48,6 +54,12 @@ class BaseInfraOptimTest(test.BaseTestCase):
         if not CONF.service_available.watcher:
             raise cls.skipException('Watcher support is required')
 
+        api_version_utils.check_skip_with_microversion(
+            cls.min_microversion,
+            cls.max_microversion,
+            CONF.optimize.min_microversion,
+            CONF.optimize.max_microversion)
+
     @classmethod
     def setup_credentials(cls):
         super(BaseInfraOptimTest, cls).setup_credentials()
@@ -59,6 +71,11 @@ class BaseInfraOptimTest(test.BaseTestCase):
         cls.client = cls.mgr.io_client
         cls.gnocchi = cls.mgr.gn_client
 
+    def setUp(self):
+        super(BaseInfraOptimTest, self).setUp()
+        self.useFixture(api_microversion_fixture.APIMicroversionFixture(
+            optimize_microversion=self.request_microversion))
+
     @classmethod
     def resource_setup(cls):
         super(BaseInfraOptimTest, cls).resource_setup()
@@ -71,6 +88,11 @@ class BaseInfraOptimTest(test.BaseTestCase):
         # action plans to delete (including potential orphan one(s))
         cls.created_action_plans_audit_uuids = set()
 
+        cls.request_microversion = (
+            api_version_utils.select_request_microversion(
+                cls.min_microversion,
+                CONF.optimize.min_microversion))
+
     @classmethod
     def resource_cleanup(cls):
         """Ensure that all created objects get destroyed."""

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/watcher_tempest_plugin/tests/api/admin/test_action.py

@@ -43,6 +43,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
         cls.action_plan = action_plans['action_plans'][0]
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('0390c465-df10-460f-9924-ff3d14779395')
     def test_show_one_action(self):
         _, body = self.client.list_actions(
             action_plan_uuid=self.action_plan["uuid"])
@@ -54,6 +55,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
         self.assertEqual("PENDING", action['state'])
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('a5dd767a-6d4f-4d72-bd58-9ce69a6c327d')
     def test_show_action_with_links(self):
         _, body = self.client.list_actions(
             action_plan_uuid=self.action_plan["uuid"])
@@ -66,6 +68,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
         self.assertIn(action['uuid'], action['links'][0]['href'])
 
     @decorators.attr(type="smoke")
+    @decorators.idempotent_id('530a308a-f590-4af7-832d-1714ee3e4d59')
     def test_list_actions(self):
         _, body = self.client.list_actions()
 
@@ -75,6 +78,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
                                     action['links'][0]['href'])
 
     @decorators.attr(type="smoke")
+    @decorators.idempotent_id('570ef821-af69-473d-989d-bbe86b585a78')
     def test_list_actions_by_action_plan(self):
         _, body = self.client.list_actions(
             action_plan_uuid=self.action_plan["uuid"])
@@ -92,6 +96,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
         self.assertEqual(1, action_counter.get("sleep"))
 
     @decorators.attr(type="smoke")
+    @decorators.idempotent_id('5aa8ff0c-aa8c-4488-a246-4e0c98180a69')
     def test_list_actions_by_audit(self):
         _, body = self.client.list_actions(audit_uuid=self.audit["uuid"])
 
@@ -106,3 +111,63 @@ class TestShowListAction(base.BaseInfraOptimTest):
         self.assertEqual(3, len(body['actions']))
         self.assertEqual(2, action_counter.get("nop"))
         self.assertEqual(1, action_counter.get("sleep"))
+
+
+class TestPatchAction(base.BaseInfraOptimTest):
+    """Tests for patch actions"""
+
+    # Minimal version required for Actions Patch API
+    min_microversion = "1.5"
+
+    @classmethod
+    def setup(cls):
+        super(TestPatchAction, cls).setup()
+
+    @classmethod
+    def resource_setup(cls):
+        super(TestPatchAction, cls).resource_setup()
+        _, cls.goal = cls.client.show_goal("DUMMY")
+        _, cls.audit_template = cls.create_audit_template(cls.goal['uuid'])
+        _, cls.audit = cls.create_audit(cls.audit_template['uuid'])
+
+        assert test_utils.call_until_true(
+            func=functools.partial(cls.has_audit_finished, cls.audit['uuid']),
+            duration=30,
+            sleep_for=.5
+        )
+        _, action_plans = cls.client.list_action_plans(
+            audit_uuid=cls.audit['uuid'])
+        cls.action_plan = action_plans['action_plans'][0]
+
+    @decorators.attr(type="smoke")
+    @decorators.idempotent_id('e2360342-8042-4faf-a028-5e63fd844387')
+    def test_skip_action(self):
+        _, body = self.client.list_actions(audit_uuid=self.audit["uuid"])
+        actions = body['actions']
+
+        _, action = self.client.show_action(actions[0]["uuid"])
+        action_plan = action['action_plan_uuid']
+
+        self.assertEqual("PENDING", action['state'])
+        self.client.update_action(
+            action['uuid'],
+            [{'op': 'replace', 'path': '/state', 'value': 'SKIPPED'},
+             {'op': 'replace', 'path': '/status_message',
+              'value': 'skipped test'}]
+        )
+        _, updated_action = self.client.show_action(actions[0]["uuid"])
+
+        self.assertEqual("SKIPPED", updated_action['state'])
+        self.assertEqual("Action skipped by user. Reason: skipped test",
+                         updated_action['status_message'])
+
+        self.start_action_plan(action_plan)
+
+        _, action_plan = self.client.show_action_plan(action_plan)
+        self.assertEqual('SUCCEEDED', action_plan['state'])
+
+        _, final_body = self.client.list_actions(audit_uuid=self.audit["uuid"])
+        final_actions = final_body['actions']
+        self.assertEqual("SKIPPED", final_actions[0]['state'])
+        self.assertEqual("SUCCEEDED", final_actions[1]['state'])
+        self.assertEqual("SUCCEEDED", final_actions[2]['state'])

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/watcher_tempest_plugin/tests/api/admin/test_action_plan.py

@@ -27,6 +27,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
     """Tests for action plans"""
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('3ac90a92-1022-4868-b93d-ede7ef7b5041')
     def test_create_action_plan(self):
         _, goal = self.client.show_goal("dummy")
         _, audit_template = self.create_audit_template(goal['uuid'])
@@ -47,6 +48,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
         self.assertEqual('RECOMMENDED', action_plan['state'])
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('621878a9-0a0b-4cf7-952f-6fd5a0cd613e')
     def test_execute_action_plan(self):
         _, goal = self.client.show_goal("dummy")
         _, audit_template = self.create_audit_template(goal['uuid'])
@@ -70,6 +72,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
         self.assertEqual('SUCCEEDED', action_plan['state'])
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('67dbb485-5bcb-41d6-b19b-adc8e581eec8')
     def test_delete_action_plan(self):
         _, goal = self.client.show_goal("dummy")
         _, audit_template = self.create_audit_template(goal['uuid'])
@@ -113,6 +116,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
             cls.action_plan = action_plans['action_plans'][0]
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('33465228-aac1-4688-9db3-6b1532c84323')
     def test_show_action_plan(self):
         _, action_plan = self.client.show_action_plan(
             self.action_plan['uuid'])
@@ -120,6 +124,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
         self.assert_expected(self.action_plan, action_plan)
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('fec6938c-215e-41a1-a63b-65000051acdd')
     def test_show_action_plan_detail(self):
         _, action_plans = self.client.list_action_plans_detail(
             audit_uuid=self.audit['uuid'])
@@ -129,6 +134,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
         self.assert_expected(self.action_plan, action_plan)
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('edf017b4-5685-466d-825d-751ba624e36e')
     def test_show_action_plan_with_links(self):
         _, action_plan = self.client.show_action_plan(
             self.action_plan['uuid'])
@@ -138,6 +144,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
                       action_plan['links'][0]['href'])
 
     @decorators.attr(type="smoke")
+    @decorators.idempotent_id('1978e51a-9af2-4d80-a2ba-46caf7fa6f04')
     def test_list_action_plans(self):
         _, body = self.client.list_action_plans()
         self.assertIn(self.action_plan['uuid'],
@@ -148,6 +155,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
                                     action_plan['links'][0]['href'])
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('50e227a7-b173-40fb-8957-82989dba8bca')
     def test_list_with_limit(self):
         # We create 3 extra audits to exceed the limit we fix
         for _ in range(3):

{watcher_tempest_plugin-3.4.0 → watcher_tempest_plugin-3.6.0}/watcher_tempest_plugin/tests/api/admin/test_api_discovery.py

@@ -23,6 +23,7 @@ class TestApiDiscovery(base.BaseInfraOptimTest):
     """Tests for API discovery features."""
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('e5c9cfc5-1890-4e8e-949e-ab2dca4d5595')
     def test_api_versions(self):
         _, descr = self.client.get_api_description()
         expected_versions = ('v1',)
@@ -32,12 +33,14 @@ class TestApiDiscovery(base.BaseInfraOptimTest):
             self.assertIn(v, versions)
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('60602d80-fac7-44cc-a207-275dfcb62112')
     def test_default_version(self):
         _, descr = self.client.get_api_description()
         default_version = descr['default_version']
         self.assertEqual('v1', default_version['id'])
 
     @decorators.attr(type='smoke')
+    @decorators.idempotent_id('79e4bfd1-a349-4dd3-bb32-e24586649255')
     def test_version_1_resources(self):
         _, descr = self.client.get_version_description(version='v1')
         expected_resources = ('audit_templates', 'audits', 'action_plans',