watcher-tempest-plugin 3.8.0__tar.gz → 3.10.0__tar.gz

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/.zuul.yaml

@@ -10,28 +10,39 @@
         - watcher-tempest-aetos
         - watcher-tempest-gnocchi
         - watcher-tempest-prometheus
+        - watcher-tempest-aetos-2026-2
+        - watcher-tempest-gnocchi-2026-2
         - watcher-tempest-aetos-2026-1
         - watcher-tempest-gnocchi-2026-1
         - watcher-tempest-aetos-2025-2
         - watcher-tempest-gnocchi-2025-2
-        - watcher-tempest-gnocchi-2025-1
-        - watcher-tempest-prometheus-2025-1
     gate:
       jobs:
         - watcher-tempest-aetos
         - watcher-tempest-gnocchi
         - watcher-tempest-prometheus
+        - watcher-tempest-aetos-2026-2
+        - watcher-tempest-gnocchi-2026-2
         - watcher-tempest-aetos-2026-1
         - watcher-tempest-gnocchi-2026-1
         - watcher-tempest-aetos-2025-2
         - watcher-tempest-gnocchi-2025-2
-        - watcher-tempest-gnocchi-2025-1
-        - watcher-tempest-prometheus-2025-1
     experimental:
       jobs:
         - watcher-tempest-prometheus-realdata
         - watcher-tempest-aetos-realdata
 
+# stable/2026.2 jobs
+- job:
+    name: watcher-tempest-aetos-2026-2
+    parent: watcher-tempest-aetos
+    override-checkout: stable/2026.2
+
+- job:
+    name: watcher-tempest-gnocchi-2026-2
+    parent: watcher-tempest-gnocchi
+    override-checkout: stable/2026.2
+
 # stable/2026.1 jobs
 - job:
     name: watcher-tempest-aetos-2026-1
@@ -54,13 +65,3 @@
     parent: watcher-tempest-gnocchi
     override-checkout: stable/2025.2
 
-# stable/2025.1 jobs
-- job:
-    name: watcher-tempest-gnocchi-2025-1
-    parent: watcher-tempest-gnocchi
-    override-checkout: stable/2025.1
-
-- job:
-    name: watcher-tempest-prometheus-2025-1
-    parent: watcher-tempest-prometheus
-    override-checkout: stable/2025.1

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/AUTHORS

@@ -9,6 +9,7 @@ Dantali0n <info@dantalion.nl>
 David TARDIVEL <David.TARDIVEL@b-com.com>
 Douglas Viroel <viroel@gmail.com>
 Drew Thorstensen <thorst@us.ibm.com>
+Ghanshyam Maan <gmaan.os14@gmail.com>
 Ghanshyam Maan <gmaan@ghanshyammann.com>
 Ghanshyam Mann <gmann@ghanshyammann.com>
 Gábor Antal <antal@inf.u-szeged.hu>
@@ -33,6 +34,7 @@ Tin Lam <tl3438@att.com>
 Vieri <15050873171@163.com>
 Vincent Françoise <Vincent.FRANCOISE@b-com.com>
 Vu Cong Tuan <tuanvc@vn.fujitsu.com>
+Winicius Allan <wdasilva@redhat.com>
 Xing Zhang <angeiv.zhang@gmail.com>
 Yumeng_Bao <yumeng_bao@yahoo.com>
 avnish <avnish.pal@nectechnologies.in>

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/ChangeLog

@@ -1,6 +1,29 @@
 CHANGES
 =======
 
+3.10.0
+------
+
+* Drop unmaintained stable/2025.1 jobs
+* Unskip test\_list\_with\_limit now that bug 2134046 is fixed
+* Use 'oc exec' instead of 'oc rsh' for podified commands
+* Fix duplicated comment on delete and shelve actions
+
+3.9.0
+-----
+
+* Add stable/2026.2 job
+* Add tests for delete and shelve actions
+* Handle multi-cell deployments in live-migration scenario tests
+* Add API tests for audit template default\_parameters
+* Fix test\_data\_model\_with\_instances for environments with extra compute nodes
+* Make test polling intervals and timeouts configurable
+* Drop python 3.10
+* Add comprehensive tests for action precondition
+* Replace ExtendPlacementClient with tempest lib
+* Add disk constraint validation to workload\_balance
+* Add scenario tests for boot from volume instances
+
 3.8.0
 -----
 

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: watcher-tempest-plugin
-Version: 3.8.0
+Version: 3.10.0
 Summary: Tempest plugin watcher-tempest-plugin
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack
@@ -14,16 +14,15 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 License-File: LICENSE
 Requires-Dist: pbr>=3.1.1
 Requires-Dist: oslo.log>=3.36.0
 Requires-Dist: oslo.utils>=3.33.0
-Requires-Dist: tempest>=27.0.0
+Requires-Dist: tempest>=41.0.0
 Requires-Dist: os-traits>=0.15.0
 Dynamic: author
 Dynamic: author-email

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/requirements.txt

@@ -5,5 +5,5 @@
 pbr>=3.1.1 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
-tempest>=27.0.0 # Apache-2.0
+tempest>=41.0.0 # Apache-2.0
 os-traits>=0.15.0 # Apache-2.0

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/setup.cfg

@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/watcher/latest/
-python_requires = >=3.10
+python_requires = >=3.11
 classifier = 
 	Environment :: OpenStack
 	Intended Audience :: Information Technology
@@ -17,7 +17,6 @@ classifier =
 	Programming Language :: Python :: Implementation :: CPython
 	Programming Language :: Python :: 3 :: Only
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: 3.12
 	Programming Language :: Python :: 3.13

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/config.py

@@ -122,6 +122,33 @@ OptimizationGroup = [
         help="In real-data test cases, the period of time during which "
              "the load will be executed in seconds."
     ),
+    cfg.FloatOpt(
+        "model_check_interval",
+        default=1.0,
+        help="Interval in seconds between polls when waiting for the "
+             "Watcher compute data model to reflect instance changes "
+             "(creation, attribute updates, deletion)."
+    ),
+    cfg.FloatOpt(
+        "resource_check_interval",
+        default=1.0,
+        help="Interval in seconds between polls when waiting for Watcher "
+             "resources (audits, action plans, compute nodes) to reach "
+             "an expected state."
+    ),
+    cfg.IntOpt(
+        "resource_timeout",
+        default=300,
+        help="Maximum time in seconds to wait for Watcher resources "
+             "(audits, action plans, compute nodes) to reach an expected "
+             "state."
+    ),
+    cfg.IntOpt(
+        "model_timeout",
+        default=300,
+        help="Maximum time in seconds to wait for the Watcher compute "
+             "data model to reflect instance changes."
+    ),
     cfg.StrOpt(
         "min_microversion",
         default=None,
@@ -162,4 +189,25 @@ OptimizationGroup = [
         default=False,
         help="Whether or not to run storage zone migration tests."
     ),
+    cfg.BoolOpt(
+        "run_bfv_tests",
+        default=False,
+        help="Whether or not to run boot from volume tests."
+    ),
+    cfg.BoolOpt(
+        "run_skipped_action_tests",
+        default=False,
+        help="Whether or not to run skipped action precondition "
+             "validation tests. These tests validate that Watcher "
+             "properly skips or fails actions when preconditions "
+             "are not met. Requires Watcher to support the action "
+             "skipping feature."
+    ),
+    cfg.BoolOpt(
+        "run_delete_shelve_action_tests",
+        default=False,
+        help="Whether or not to run delete and shelve action tests. "
+             "These tests validate the actuator strategy's delete and "
+             "shelve actions, including precondition validation."
+    )
 ]

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/infra_optim_clients.py

@@ -16,12 +16,9 @@
 
 import abc
 
-from oslo_serialization import jsonutils as json
 from tempest import clients
 from tempest.common import credentials_factory as creds_factory
 from tempest import config
-from tempest.lib.common import rest_client
-from tempest.lib.services.placement import placement_client
 
 from watcher_tempest_plugin.services.infra_optim.v1.json import client as ioc
 from watcher_tempest_plugin.services.metric import prometheus_client as pc
@@ -38,8 +35,6 @@ class BaseManager(clients.Manager, metaclass=abc.ABCMeta):
             self.auth_provider, 'infra-optim', CONF.identity.region)
         self.gn_client = gc.GnocchiClientJSON(
             self.auth_provider, 'metric', CONF.identity.region)
-        self.placement_client = ExtendPlacementClient(
-            self.auth_provider, 'placement', CONF.identity.region)
         prom_ssl = "s" if CONF.optimize.prometheus_ssl_enabled else ""
         self.prometheus_client = pc.PromtoolClient(
             "http{}://{}:{}".format(prom_ssl,
@@ -64,20 +59,3 @@ class AdminManager(BaseManager):
         super(AdminManager, self).__init__(
             creds_factory.get_configured_admin_credentials(),
         )
-
-
-class ExtendPlacementClient(placement_client.PlacementClient):
-
-    def list_provider_traits(self, rp_uuid):
-        """List resource provider traits.
-
-        For full list of available parameters, please refer to the official
-        API reference:
-        https://docs.openstack.org/api-ref/placement/#
-        list-resource-provider-traits-detail
-        """
-        url = '/resource_providers/%s/traits' % rp_uuid
-        resp, body = self.get(url)
-        self.expected_success(200, resp.status)
-        body = json.loads(body)
-        return rest_client.ResponseBody(resp, body)

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/services/infra_optim/v1/json/client.py

@@ -74,6 +74,8 @@ class InfraOptimClientJSON(base.BaseClient):
         :param goal_uuid: The related Goal UUID associated.
         :param strategy_uuid: The related Strategy UUID associated.
         :param audit_scope: Scope the audit should apply to.
+        :param default_parameters: Default strategy parameters for the audit
+            template (requires API version 1.7 or later).
         :return: A tuple with the server response and the created audit
                  template.
         """
@@ -90,6 +92,12 @@ class InfraOptimClientJSON(base.BaseClient):
             'scope': parameters.get('scope', []),
         }
 
+        # NOTE(dviroel): default_parameters was added in api version 1.7
+        if parameters.get('default_parameters') is not None:
+            audit_template['default_parameters'] = (
+                parameters.get('default_parameters')
+            )
+
         return self._create_request('audit_templates', audit_template)
 
     @base.handle_errors

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/services/metric/prometheus_client.py

@@ -82,7 +82,7 @@ class PromtoolClient:
             # podified control plane will run promtool inside
             # prometheus container
             self.prometheus_pod = self.get_prometheus_pod()
-            cmd_prefix = self.oc_cmd + ["rsh", self.prometheus_pod]
+            cmd_prefix = self.oc_cmd + ["exec", self.prometheus_pod, "--"]
             self.client.cmd_prefix = " ".join(cmd_prefix)
 
         # We keep the raw URL for reference/labels

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/tests/api/admin/base.py

@@ -91,8 +91,8 @@ class BaseInfraOptimTest(api_version_utils.BaseMicroversionTest,
     def wait_for_all_action_plans_to_finish(self):
         assert test_utils.call_until_true(
             func=self._are_all_action_plans_finished,
-            duration=300,
-            sleep_for=5
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         )
 
     def validate_self_link(self, resource, uuid, link):

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/tests/api/admin/test_action.py

@@ -17,11 +17,14 @@
 import collections
 import functools
 
+from tempest import config
 from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
 
 from watcher_tempest_plugin.tests.api.admin import base
 
+CONF = config.CONF
+
 
 class TestShowListAction(base.BaseInfraOptimTest):
     """Tests for actions"""
@@ -40,8 +43,8 @@ class TestShowListAction(base.BaseInfraOptimTest):
         assert test_utils.call_until_true(
             func=functools.partial(self.has_audit_finished,
                                    self.audit['uuid']),
-            duration=30,
-            sleep_for=.5
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         ), "Audit %s did not finish within expected time" % self.audit['uuid']
 
         # Check if audit succeeded
@@ -148,8 +151,8 @@ class TestPatchAction(base.BaseInfraOptimTest):
         assert test_utils.call_until_true(
             func=functools.partial(self.has_audit_finished,
                                    self.audit['uuid']),
-            duration=30,
-            sleep_for=.5
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         ), "Audit %s did not finish within expected time" % self.audit['uuid']
 
         # Check if audit succeeded

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/tests/api/admin/test_action_plan.py

@@ -16,12 +16,15 @@
 
 import functools
 
+from tempest import config
 from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
 from tempest.lib import exceptions
 
 from watcher_tempest_plugin.tests.api.admin import base
 
+CONF = config.CONF
+
 
 class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
     """Tests for action plans"""
@@ -35,8 +38,8 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
 
         self.assertTrue(test_utils.call_until_true(
             func=functools.partial(self.has_audit_finished, audit['uuid']),
-            duration=30,
-            sleep_for=.5
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         ))
         _, action_plans = self.client.list_action_plans(
             audit_uuid=audit['uuid'])
@@ -60,8 +63,8 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
 
         self.assertTrue(test_utils.call_until_true(
             func=functools.partial(self.has_audit_finished, audit['uuid']),
-            duration=30,
-            sleep_for=.5
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         ))
 
         _, action_plans = self.client.list_action_plans(
@@ -89,8 +92,8 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
 
         self.assertTrue(test_utils.call_until_true(
             func=functools.partial(self.has_audit_finished, audit['uuid']),
-            duration=30,
-            sleep_for=.5
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         ))
 
         _, action_plans = self.client.list_action_plans(
@@ -121,8 +124,8 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
         assert test_utils.call_until_true(
             func=functools.partial(
                 self.has_audit_finished, self.audit['uuid']),
-            duration=30,
-            sleep_for=.5
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         )
 
         _, action_plans = self.client.list_action_plans(

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/tests/api/admin/test_audit.py

@@ -20,6 +20,7 @@ from datetime import datetime
 from datetime import timedelta
 from datetime import timezone
 
+from tempest import config
 from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
 from tempest.lib import exceptions
@@ -27,6 +28,8 @@ from tempest.lib import exceptions
 from watcher_tempest_plugin.tests.api.admin import base
 from watcher_tempest_plugin.tests.common import base as common_base
 
+CONF = config.CONF
+
 
 class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
     """Tests for audit."""
@@ -149,8 +152,8 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
         test_utils.call_until_true(
             func=functools.partial(
                 self.is_audit_ongoing, audit_uuid),
-            duration=10,
-            sleep_for=.5
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         )
 
         self.cancel_audit(audit_uuid)
@@ -166,8 +169,8 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
         test_utils.call_until_true(
             func=functools.partial(
                 self.is_audit_idle, audit_uuid),
-            duration=10,
-            sleep_for=.5
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         )
 
         def is_audit_deleted(uuid):
@@ -180,8 +183,8 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
 
         test_utils.call_until_true(
             func=functools.partial(is_audit_deleted, audit_uuid),
-            duration=5,
-            sleep_for=1
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         )
 
         self.assertTrue(is_audit_deleted(audit_uuid))
@@ -291,13 +294,15 @@ class TestCreateUpdateDeleteAuditV11(base.BaseInfraOptimTest):
         # Wait for first action plan
         self.assertTrue(test_utils.call_until_true(
             func=functools.partial(self.has_action_plans, audit_uuid),
-            duration=300, sleep_for=10))
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval))
 
         # Wait for multiple action plans (superseding behavior)
         self.assertTrue(test_utils.call_until_true(
             func=functools.partial(self._has_multiple_action_plans,
                                    audit_uuid),
-            duration=180, sleep_for=10),
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval),
             "Failed to generate multiple action plans for superseding test")
 
         # Verify superseding: latest RECOMMENDED, previous CANCELLED
@@ -418,6 +423,57 @@ class TestCreateUpdateDeleteAuditV14(base.BaseInfraOptimTest):
         self.assertEqual(audit['state'], 'CANCELLED')
 
 
+class TestCreateAuditWithDefaultParameters(base.BaseInfraOptimTest):
+    """Tests for audit inheriting default_parameters from audit template."""
+
+    min_microversion = '1.7'
+
+    @decorators.attr(type='smoke')
+    @decorators.idempotent_id('2586951a-ce4c-4c10-8c61-ac673999010c')
+    def test_audit_inherits_template_default_parameters(self):
+        """Audit created from a template inherits default_parameters."""
+        _, goal = self.client.show_goal("dummy")
+        _, strategy = self.client.show_strategy("dummy")
+        default_params = {'para1': 5.0}
+
+        _, audit_template = self.create_audit_template(
+            goal['uuid'],
+            strategy=strategy['uuid'],
+            default_parameters=default_params,
+        )
+
+        _, body = self.create_audit(
+            audit_template['uuid'],
+            audit_type='ONESHOT',
+        )
+
+        for key, value in default_params.items():
+            self.assertEqual(value, body['parameters'][key])
+
+    @decorators.attr(type='smoke')
+    @decorators.idempotent_id('a340f036-0c6e-4bd5-a081-153265de013c')
+    def test_audit_parameters_override_template_defaults(self):
+        """Explicit audit parameters take precedence over template defaults."""
+        _, goal = self.client.show_goal("dummy")
+        _, strategy = self.client.show_strategy("dummy")
+
+        _, audit_template = self.create_audit_template(
+            goal['uuid'],
+            strategy=strategy['uuid'],
+            default_parameters={'para1': 3.0},
+        )
+
+        override_params = {'para1': 8.0}
+        _, body = self.create_audit(
+            audit_template['uuid'],
+            audit_type='ONESHOT',
+            parameters=override_params,
+        )
+
+        for key, value in override_params.items():
+            self.assertEqual(value, body['parameters'][key])
+
+
 class TestShowListAudit(base.BaseInfraOptimTest):
     """Tests for audit."""
 
@@ -432,8 +488,8 @@ class TestShowListAudit(base.BaseInfraOptimTest):
         self.assertTrue(test_utils.call_until_true(
             func=functools.partial(
                 self.has_audit_finished, self.audit['uuid']),
-            duration=30,
-            sleep_for=.5
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         ))
 
     def assert_expected(self, expected, actual,
@@ -482,7 +538,6 @@ class TestShowListAudit(base.BaseInfraOptimTest):
 
     @decorators.attr(type='smoke')
     @decorators.idempotent_id('5175607c-f2df-4df6-9168-45c789b4a6ea')
-    @decorators.skip_because(bug="2134046")
     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.8.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/tests/api/admin/test_audit_template.py

@@ -19,6 +19,9 @@ from oslo_utils import uuidutils
 from tempest.lib import decorators
 from tempest.lib import exceptions
 
+from watcher_tempest_plugin.services.infra_optim.v1.json import (
+    api_microversion_fixture
+)
 from watcher_tempest_plugin.tests.api.admin import base
 
 
@@ -233,3 +236,84 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
 
         _, body = self.client.show_audit_template(body['uuid'])
         self.assertEqual('description', body['description'])
+
+
+class TestAuditTemplateDefaultParameters(base.BaseInfraOptimTest):
+    """Tests for audit template default_parameters (API v1.7)."""
+
+    min_microversion = '1.7'
+
+    def setUp(self):
+        super().setUp()
+        _, self.goal = self.client.show_goal("dummy")
+        _, self.strategy = self.client.show_strategy("dummy")
+
+    @decorators.attr(type='smoke')
+    @decorators.idempotent_id('2253c638-194c-46dd-989f-b0f9b173e886')
+    def test_create_audit_template_with_default_parameters(self):
+        default_params = {'para1': 5.0}
+        _, body = self.create_audit_template(
+            goal=self.goal['uuid'],
+            strategy=self.strategy['uuid'],
+            default_parameters=default_params,
+        )
+
+        self.assertEqual(default_params, body['default_parameters'])
+
+        _, audit_template = self.client.show_audit_template(body['uuid'])
+        self.assertEqual(default_params, audit_template['default_parameters'])
+
+    @decorators.attr(type='smoke')
+    @decorators.idempotent_id('d21eb4db-123c-460e-91a8-78d6a66e4259')
+    def test_show_audit_template_default_parameters_hidden_old_microversion(
+            self):
+        default_params = {'para1': 5.0}
+        _, body = self.create_audit_template(
+            goal=self.goal['uuid'],
+            strategy=self.strategy['uuid'],
+            default_parameters=default_params,
+        )
+
+        # Retrieve with old microversion — field must be absent
+        self.useFixture(api_microversion_fixture.APIMicroversionFixture(
+            optimize_microversion='1.6'))
+        _, audit_template = self.client.show_audit_template(body['uuid'])
+        self.assertNotIn('default_parameters', audit_template)
+
+    @decorators.attr(type='smoke')
+    @decorators.idempotent_id('48de7d05-0ca7-4037-9292-9b0cfa213533')
+    def test_update_audit_template_default_parameters(self):
+        _, body = self.create_audit_template(
+            goal=self.goal['uuid'],
+            strategy=self.strategy['uuid'],
+            default_parameters={'para1': 3.0},
+        )
+
+        new_params = {'para1': 8.0}
+        patch = [{'path': '/default_parameters', 'op': 'replace',
+                  'value': new_params}]
+        self.client.update_audit_template(body['uuid'], patch)
+
+        _, updated = self.client.show_audit_template(body['uuid'])
+        self.assertEqual(new_params, updated['default_parameters'])
+
+    @decorators.attr(type='smoke')
+    @decorators.idempotent_id('f879e4f7-0b94-4015-9b8e-520346f2695e')
+    def test_create_audit_template_default_parameters_requires_strategy(self):
+        self.assertRaises(
+            exceptions.BadRequest,
+            self.client.create_audit_template,
+            goal=self.goal['uuid'],
+            default_parameters={'para1': 5.0},
+        )
+
+    @decorators.attr(type='smoke')
+    @decorators.idempotent_id('a3c1e8f2-7d4b-4f9e-bc02-1e5a6d8f3c07')
+    def test_create_audit_template_invalid_default_parameters_rejected(self):
+        self.assertRaises(
+            exceptions.BadRequest,
+            self.client.create_audit_template,
+            goal=self.goal['uuid'],
+            strategy=self.strategy['uuid'],
+            default_parameters={'para1': 5.0, 'fake_param': 'invalid'},
+        )

{watcher_tempest_plugin-3.8.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/tests/client_functional/v1/test_action.py

@@ -17,11 +17,14 @@ from oslo_utils import uuidutils
 
 import functools
 
+from tempest import config
 from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
 
 from watcher_tempest_plugin.tests.client_functional.v1 import base
 
+CONF = config.CONF
+
 
 class ActionTests(base.TestCase):
     """Functional tests for action."""
@@ -43,8 +46,8 @@ class ActionTests(base.TestCase):
         cls.audit_uuid = audit_output['UUID']
         audit_created = test_utils.call_until_true(
             func=functools.partial(cls.has_audit_created, cls.audit_uuid),
-            duration=600,
-            sleep_for=2)
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval)
         if not audit_created:
             raise Exception('Audit has not been succeeded')