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

watcher_tempest_plugin-3.7.0/.zuul.yaml

@@ -0,0 +1,59 @@
+- project:
+    queue: watcher
+    templates:
+      - check-requirements
+      - tempest-plugin-jobs
+      - publish-openstack-docs-pti
+      - release-notes-jobs-python3
+    check:
+      jobs:
+        - watcher-tempest-aetos
+        - watcher-tempest-gnocchi
+        - watcher-tempest-prometheus
+        - watcher-tempest-aetos-2025-2
+        - watcher-tempest-gnocchi-2025-2
+        - watcher-tempest-gnocchi-2025-1
+        - watcher-tempest-prometheus-2025-1
+        - watcher-tempest-gnocchi-2024-2
+    gate:
+      jobs:
+        - watcher-tempest-aetos
+        - watcher-tempest-gnocchi
+        - watcher-tempest-prometheus
+        - watcher-tempest-aetos-2025-2
+        - watcher-tempest-gnocchi-2025-2
+        - watcher-tempest-gnocchi-2025-1
+        - watcher-tempest-prometheus-2025-1
+        - watcher-tempest-gnocchi-2024-2
+    experimental:
+      jobs:
+        - watcher-tempest-prometheus-realdata
+        - watcher-tempest-aetos-realdata
+
+# stable/2025.2 jobs
+- job:
+    name: watcher-tempest-aetos-2025-2
+    parent: watcher-tempest-aetos
+    override-checkout: stable/2025.2
+
+- job:
+    name: watcher-tempest-gnocchi-2025-2
+    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
+
+# stable/2024.2 jobs
+- job:
+    name: watcher-tempest-gnocchi-2024-2
+    parent: watcher-tempest-gnocchi
+    override-checkout: stable/2024.2

{watcher_tempest_plugin-3.6.0 → watcher_tempest_plugin-3.7.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@ghanshyammann.com>
 Ghanshyam Mann <gmann@ghanshyammann.com>
 Gábor Antal <antal@inf.u-szeged.hu>
 Hervé Beraud <hberaud@redhat.com>

{watcher_tempest_plugin-3.6.0 → watcher_tempest_plugin-3.7.0}/ChangeLog

@@ -1,6 +1,23 @@
 CHANGES
 =======
 
+3.7.0
+-----
+
+* Add test for volume migrate with zone migration
+* Consolidate and improve Zuul CI jobs for stable branches
+* Fix unsupported operand types in internal methods
+* Refresh the state of the actionplan before asserting status
+* Fix experimental job names after refactoring watcher jobs
+* Add config flags to control zone migration test execution
+* Skip test api.admin.test\_audit.TestShowListAudit.test\_list\_with\_limit
+* Consolidate and improve Zuul CI job definitions
+* Wait action plan to finish before asserting state
+* Improved continuous audit api test coverage
+* Refactor: Extract common test utilities into shared base class
+* Drop job to test unmaintained 2024.1 branch
+* Drop python 3.9 and support python 3.13
+
 3.6.0
 -----
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: watcher-tempest-plugin
-Version: 3.6.0
+Version: 3.7.0
 Summary: Tempest plugin watcher-tempest-plugin
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack
@@ -14,17 +14,26 @@ 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.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.9
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.10
 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: os-traits>=0.15.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ======================
 watcher-tempest-plugin

{watcher_tempest_plugin-3.6.0 → watcher_tempest_plugin-3.7.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.9
+python_requires = >=3.10
 classifier = 
 	Environment :: OpenStack
 	Intended Audience :: Information Technology
@@ -17,10 +17,10 @@ classifier =
 	Programming Language :: Python :: Implementation :: CPython
 	Programming Language :: Python :: 3 :: Only
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
 	Programming Language :: Python :: 3.11
 	Programming Language :: Python :: 3.12
+	Programming Language :: Python :: 3.13
 
 [files]
 packages = 

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

@@ -144,4 +144,15 @@ OptimizationGroup = [
              "`watcher_cluster_data_model_collectors` period configuration is "
              "less than 300 seconds."
     ),
+    cfg.BoolOpt(
+        "run_zone_migration_extra_tests",
+        default=False,
+        help="Whether or not to run extra zone migration tests that test"
+             "migration without specified destination nodes."
+    ),
+    cfg.BoolOpt(
+        "run_zone_migration_storage_tests",
+        default=False,
+        help="Whether or not to run storage zone migration tests."
+    ),
 ]

watcher_tempest_plugin-3.7.0/watcher_tempest_plugin/tests/api/admin/base.py

@@ -0,0 +1,114 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2016 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 tempest import config
+from tempest.lib.common import api_version_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
+)
+from watcher_tempest_plugin.tests.common import base
+
+CONF = config.CONF
+
+
+class BaseInfraOptimTest(api_version_utils.BaseMicroversionTest,
+                         test.BaseTestCase,
+                         base.WatcherHelperMixin):
+    """Base class for Infrastructure Optimization API tests."""
+
+    @classmethod
+    def skip_checks(cls):
+        super(BaseInfraOptimTest, cls).skip_checks()
+        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()
+        cls.mgr = clients.AdminManager()
+
+    @classmethod
+    def setup_clients(cls):
+        super(BaseInfraOptimTest, cls).setup_clients()
+        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()
+
+        # Set of all created audit templates UUIDs
+        cls.created_audit_templates = set()
+        # Set of all created audit UUIDs
+        cls.created_audits = set()
+        # Set of all created audit UUIDs. We use it to build the list of
+        # 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."""
+        super(BaseInfraOptimTest, cls).resource_cleanup()
+
+    def _are_all_action_plans_finished(self):
+        _, action_plans = self.client.list_action_plans()
+        return all([ap['state'] in self.IDLE_STATES.values()
+                    for ap in action_plans['action_plans']])
+
+    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
+        )
+
+    def validate_self_link(self, resource, uuid, link):
+        """Check whether the given self link formatted correctly."""
+        expected_link = "{base}/{pref}/{res}/{uuid}".format(
+            base='https?://[^/]*',
+            pref=self.client.URI_PREFIX,
+            res=resource,
+            uuid=uuid
+        )
+        self.assertRegex(link, expected_link)
+
+    def assert_expected(self, expected, actual,
+                        keys=('created_at', 'updated_at', 'deleted_at')):
+        # Check if not expected keys/values exists in actual response body
+        for key, value in expected.items():
+            if key not in keys:
+                self.assertIn(key, actual)
+                self.assertEqual(value, actual[key])

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

@@ -26,21 +26,36 @@ from watcher_tempest_plugin.tests.api.admin import base
 class TestShowListAction(base.BaseInfraOptimTest):
     """Tests for actions"""
 
-    @classmethod
-    def resource_setup(cls):
-        super(TestShowListAction, 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'])
+    def setUp(self):
+        super().setUp()
+        _, self.goal = self.client.show_goal("DUMMY")
+        _, self.audit_template = self.create_audit_template(self.goal['uuid'])
 
+        # Wait for any running action plans to finish before creating audit
+        self.wait_for_all_action_plans_to_finish()
+
+        _, self.audit = self.create_audit(self.audit_template['uuid'])
+
+        # Wait for audit to finish (in any state)
         assert test_utils.call_until_true(
-            func=functools.partial(cls.has_audit_finished, cls.audit['uuid']),
+            func=functools.partial(self.has_audit_finished,
+                                   self.audit['uuid']),
             duration=30,
             sleep_for=.5
+        ), "Audit %s did not finish within expected time" % self.audit['uuid']
+
+        # Check if audit succeeded
+        _, finished_audit = self.client.show_audit(self.audit['uuid'])
+        audit_state = finished_audit.get('state')
+        assert audit_state == 'SUCCEEDED', (
+            "Audit %s ended in state %s instead of SUCCEEDED" %
+            (self.audit['uuid'], audit_state)
         )
-        _, action_plans = cls.client.list_action_plans(
-            audit_uuid=cls.audit['uuid'])
-        cls.action_plan = action_plans['action_plans'][0]
+
+        _, action_plans = self.client.list_action_plans(
+            audit_uuid=self.audit['uuid'])
+
+        self.action_plan = action_plans['action_plans'][0]
 
     @decorators.attr(type='smoke')
     @decorators.idempotent_id('0390c465-df10-460f-9924-ff3d14779395')
@@ -119,25 +134,36 @@ class TestPatchAction(base.BaseInfraOptimTest):
     # Minimal version required for Actions Patch API
     min_microversion = "1.5"
 
-    @classmethod
-    def setup(cls):
-        super(TestPatchAction, cls).setup()
+    def setUp(self):
+        super().setUp()
+        _, self.goal = self.client.show_goal("DUMMY")
+        _, self.audit_template = self.create_audit_template(self.goal['uuid'])
 
-    @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'])
+        # Wait for any running action plans to finish before creating audit
+        self.wait_for_all_action_plans_to_finish()
 
+        _, self.audit = self.create_audit(self.audit_template['uuid'])
+
+        # Wait for audit to finish (in any state)
         assert test_utils.call_until_true(
-            func=functools.partial(cls.has_audit_finished, cls.audit['uuid']),
+            func=functools.partial(self.has_audit_finished,
+                                   self.audit['uuid']),
             duration=30,
             sleep_for=.5
+        ), "Audit %s did not finish within expected time" % self.audit['uuid']
+
+        # Check if audit succeeded
+        _, finished_audit = self.client.show_audit(self.audit['uuid'])
+        audit_state = finished_audit.get('state')
+        assert audit_state == 'SUCCEEDED', (
+            "Audit %s ended in state %s instead of SUCCEEDED" %
+            (self.audit['uuid'], audit_state)
         )
-        _, action_plans = cls.client.list_action_plans(
-            audit_uuid=cls.audit['uuid'])
-        cls.action_plan = action_plans['action_plans'][0]
+
+        _, action_plans = self.client.list_action_plans(
+            audit_uuid=self.audit['uuid'])
+
+        self.action_plan = action_plans['action_plans'][0]
 
     @decorators.attr(type="smoke")
     @decorators.idempotent_id('e2360342-8042-4faf-a028-5e63fd844387')

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

@@ -52,6 +52,10 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
     def test_execute_action_plan(self):
         _, goal = self.client.show_goal("dummy")
         _, audit_template = self.create_audit_template(goal['uuid'])
+
+        # Wait for any running action plans to finish before creating audit
+        self.wait_for_all_action_plans_to_finish()
+
         _, audit = self.create_audit(audit_template['uuid'])
 
         self.assertTrue(test_utils.call_until_true(
@@ -59,6 +63,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
             duration=30,
             sleep_for=.5
         ))
+
         _, action_plans = self.client.list_action_plans(
             audit_uuid=audit['uuid'])
         action_plan = action_plans['action_plans'][0]
@@ -76,6 +81,10 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
     def test_delete_action_plan(self):
         _, goal = self.client.show_goal("dummy")
         _, audit_template = self.create_audit_template(goal['uuid'])
+
+        # Wait for any running action plans to finish before creating audit
+        self.wait_for_all_action_plans_to_finish()
+
         _, audit = self.create_audit(audit_template['uuid'])
 
         self.assertTrue(test_utils.call_until_true(
@@ -83,6 +92,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
             duration=30,
             sleep_for=.5
         ))
+
         _, action_plans = self.client.list_action_plans(
             audit_uuid=audit['uuid'])
         action_plan = action_plans['action_plans'][0]
@@ -98,22 +108,27 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
 class TestShowListActionPlan(base.BaseInfraOptimTest):
     """Tests for action_plan."""
 
-    @classmethod
-    def resource_setup(cls):
-        super(TestShowListActionPlan, 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'])
+    def setUp(self):
+        super().setUp()
+        _, self.goal = self.client.show_goal("dummy")
+        _, self.audit_template = self.create_audit_template(self.goal['uuid'])
+
+        # Wait for any running action plans to finish before creating audit
+        self.wait_for_all_action_plans_to_finish()
+
+        _, self.audit = self.create_audit(self.audit_template['uuid'])
 
         assert test_utils.call_until_true(
-            func=functools.partial(cls.has_audit_finished, cls.audit['uuid']),
+            func=functools.partial(
+                self.has_audit_finished, self.audit['uuid']),
             duration=30,
             sleep_for=.5
         )
-        _, action_plans = cls.client.list_action_plans(
-            audit_uuid=cls.audit['uuid'])
+
+        _, action_plans = self.client.list_action_plans(
+            audit_uuid=self.audit['uuid'])
         if len(action_plans['action_plans']) > 0:
-            cls.action_plan = action_plans['action_plans'][0]
+            self.action_plan = action_plans['action_plans'][0]
 
     @decorators.attr(type='smoke')
     @decorators.idempotent_id('33465228-aac1-4688-9db3-6b1532c84323')