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

{watcher_tempest_plugin-3.9.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.9.0 → watcher_tempest_plugin-3.10.0}/AUTHORS

@@ -34,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.9.0 → watcher_tempest_plugin-3.10.0}/ChangeLog

@@ -1,10 +1,21 @@
 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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: watcher-tempest-plugin
-Version: 3.9.0
+Version: 3.10.0
 Summary: Tempest plugin watcher-tempest-plugin
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack

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

@@ -202,5 +202,12 @@ OptimizationGroup = [
              "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.9.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.9.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.9.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/tests/api/admin/test_audit.py

@@ -423,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."""
 
@@ -487,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.9.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.9.0 → watcher_tempest_plugin-3.10.0}/watcher_tempest_plugin/tests/common/base.py

@@ -115,7 +115,8 @@ class WatcherHelperMixin:
     # ### AUDIT TEMPLATES ### #
 
     def create_audit_template(self, goal, name=None, description=None,
-                              strategy=None, scope=None):
+                              strategy=None, scope=None,
+                              default_parameters=None):
         """Wrapper utility for creating a test audit template
 
         :param goal: Goal UUID or name related to the audit template.
@@ -123,13 +124,15 @@ class WatcherHelperMixin:
         :param description: The description of the audit template.
         :param strategy: Strategy UUID or name related to the audit template.
         :param scope: Audit scope
+        :param default_parameters: Default strategy parameters dict
         :return: A tuple with The HTTP response and its body
         """
         description = description or data_utils.rand_name(
             'test-audit_template')
         resp, body = self.client.create_audit_template(
             name=name, description=description, goal=goal,
-            strategy=strategy, scope=scope)
+            strategy=strategy, scope=scope,
+            default_parameters=default_parameters)
 
         self.addCleanup(
             test_utils.call_and_ignore_notfound_exc,