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

{watcher_tempest_plugin-3.7.0 → watcher_tempest_plugin-3.9.0}/.zuul.yaml

@@ -10,26 +10,39 @@
         - watcher-tempest-aetos
         - watcher-tempest-gnocchi
         - watcher-tempest-prometheus
+        - 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
-        - watcher-tempest-gnocchi-2024-2
     gate:
       jobs:
         - watcher-tempest-aetos
         - watcher-tempest-gnocchi
         - watcher-tempest-prometheus
+        - 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
-        - watcher-tempest-gnocchi-2024-2
     experimental:
       jobs:
         - watcher-tempest-prometheus-realdata
         - watcher-tempest-aetos-realdata
 
+# stable/2026.1 jobs
+- job:
+    name: watcher-tempest-aetos-2026-1
+    parent: watcher-tempest-aetos
+    override-checkout: stable/2026.1
+
+- job:
+    name: watcher-tempest-gnocchi-2026-1
+    parent: watcher-tempest-gnocchi
+    override-checkout: stable/2026.1
+
 # stable/2025.2 jobs
 - job:
     name: watcher-tempest-aetos-2025-2
@@ -51,9 +64,3 @@
     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.7.0 → watcher_tempest_plugin-3.9.0}/AUTHORS

@@ -9,11 +9,13 @@ 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>
 Hervé Beraud <hberaud@redhat.com>
 Hidekazu Nakamura <hid-nakamura@vf.jp.nec.com>
+Ivan Anfimov <lazekteam@gmail.com>
 Jaewoo Park <jp655p@att.com>
 Jaromir Wysoglad <jwysogla@redhat.com>
 Ken'ichi Ohmichi <ken-oomichi@wx.jp.nec.com>

{watcher_tempest_plugin-3.7.0 → watcher_tempest_plugin-3.9.0}/ChangeLog

@@ -1,10 +1,32 @@
 CHANGES
 =======
 
+3.9.0
+-----
+
+* Handle multi-cell deployments in live-migration scenario tests
+* 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
+-----
+
+* Remove 2024.2 jobs from the zuul gates
+* Add stable/2026.1 job
+* Parametrize promtool write URL path
+* Add extra checks to zone migration retype test
+* Test zone migration volume and compute migrations
+
 3.7.0
 -----
 
 * Add test for volume migrate with zone migration
+* Add project badge
 * 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

{watcher_tempest_plugin-3.7.0/watcher_tempest_plugin.egg-info → watcher_tempest_plugin-3.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: watcher-tempest-plugin
-Version: 3.7.0
+Version: 3.9.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
@@ -39,6 +38,10 @@ Dynamic: summary
 watcher-tempest-plugin
 ======================
 
+.. image:: https://governance.openstack.org/tc/badges/watcher-tempest-plugin.svg
+
+.. Change things from this point on
+
 This repository contains a `Tempest`_ `test plugin`_ to verify the
 functionality of the `Watcher`_ service.
 

{watcher_tempest_plugin-3.7.0 → watcher_tempest_plugin-3.9.0}/README.rst

@@ -2,6 +2,10 @@
 watcher-tempest-plugin
 ======================
 
+.. image:: https://governance.openstack.org/tc/badges/watcher-tempest-plugin.svg
+
+.. Change things from this point on
+
 This repository contains a `Tempest`_ `test plugin`_ to verify the
 functionality of the `Watcher`_ service.
 

watcher_tempest_plugin-3.9.0/releasenotes/notes/parametrize-promtool-write-url-path-3534f2b9.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Added a new ``prometheus_write_path`` configuration option under the
+    ``[optimize]`` section to allow customizing the URL path appended to the
+    Prometheus base URL for remote write operations. The default value is
+    ``/api/v1/write``, preserving the existing behavior. Set it to an empty
+    string if the base URL already includes the full write endpoint.

{watcher_tempest_plugin-3.7.0 → watcher_tempest_plugin-3.9.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.7.0 → watcher_tempest_plugin-3.9.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.7.0 → watcher_tempest_plugin-3.9.0}/watcher_tempest_plugin/config.py

@@ -96,6 +96,13 @@ OptimizationGroup = [
         help="The label that Prometheus uses to store the fqdn of "
              "exporters.",
     ),
+    cfg.StrOpt(
+        "prometheus_write_path",
+        default="/api/v1/write",
+        help="The URL path to append to the Prometheus base URL for "
+             "remote write operations. Set to an empty string if the "
+             "base URL already includes the full write endpoint.",
+    ),
     # Podified control plane configuration
     cfg.StrOpt(
         "podified_kubeconfig_path",
@@ -115,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,
@@ -155,4 +189,18 @@ 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."
+    )
 ]

{watcher_tempest_plugin-3.7.0 → watcher_tempest_plugin-3.9.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,
@@ -55,6 +50,7 @@ class BaseManager(clients.Manager, metaclass=abc.ABCMeta):
             podified_kubeconfig=CONF.optimize.podified_kubeconfig_path,
             prometheus_ssl_cert=CONF.optimize.prometheus_ssl_cert_dir,
             prometheus_fqdn_label=CONF.optimize.prometheus_fqdn_label,
+            write_url_path=CONF.optimize.prometheus_write_path,
         )
 
 
@@ -63,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.7.0 → watcher_tempest_plugin-3.9.0}/watcher_tempest_plugin/services/metric/prometheus_client.py

@@ -13,9 +13,9 @@
 # under the License.
 
 import json
+from urllib import parse
 
 from oslo_log import log
-from urllib.parse import quote
 
 from watcher_tempest_plugin.services import base
 
@@ -31,8 +31,32 @@ class PromtoolClient:
                  proxy_host_pkey=None, proxy_host_pkey_type='rsa',
                  podified_ns=None, podified_kubeconfig=None,
                  prometheus_ssl_cert=None,
-                 prometheus_fqdn_label="fqdn"):
-
+                 prometheus_fqdn_label="fqdn",
+                 write_url_path=None):
+        """Initialize PromtoolClient.
+
+        :param url: Base URL of the Prometheus server (e.g.
+          'http://host:9090').
+        :param promtool_path: Path to the promtool binary.
+        :param openstack_type: Deployment type; use 'podified' for
+          Podified Control Plane deployments, 'devstack' otherwise.
+        :param proxy_host_address: Optional SSH proxy host address. When
+          provided together with proxy_host_user, commands are executed
+          over SSH instead of locally.
+        :param proxy_host_user: SSH username for the proxy host.
+        :param proxy_host_pkey: Path to the SSH private key file.
+        :param proxy_host_pkey_type: Type of the SSH private key
+          (default: 'rsa').
+        :param podified_ns: Kubernetes namespace for podified deployments.
+        :param podified_kubeconfig: Path to the kubeconfig file for
+          podified deployments.
+        :param prometheus_ssl_cert: Directory containing SSL certificates
+          used when connecting to Prometheus over HTTPS.
+        :param prometheus_fqdn_label: Prometheus label used to identify
+          host FQDNs in target metadata (default: 'fqdn').
+        :param write_url_path: URL path for the remote-write endpoint
+          (default: '/api/v1/write').
+        """
         # Podified Control Plane
         self.is_podified = ("podified" == openstack_type)
         LOG.debug(f"Configuring PromtoolClient for {openstack_type} "
@@ -61,12 +85,23 @@ class PromtoolClient:
             cmd_prefix = self.oc_cmd + ["rsh", self.prometheus_pod]
             self.client.cmd_prefix = " ".join(cmd_prefix)
 
+        # We keep the raw URL for reference/labels
         self.prometheus_url = url
-        self.prometheus_write_url = url + "/api/v1/write"
-        self.prometheus_delete_series_url = (
-            url + "/api/v1/admin/tsdb/delete_series")
+
+        # Internal base_url ensuring a trailing slash for reliable joining
+        base_url = url if url.endswith('/') else url + '/'
+
+        # Handle write_url_path: handles None/Empty and leading slash issues
+        clean_write_path = (write_url_path or "").lstrip('/')
+        self.prometheus_write_url = parse.urljoin(base_url, clean_write_path)
+
+        self.prometheus_delete_series_url = parse.urljoin(
+            base_url, "api/v1/admin/tsdb/delete_series"
+        )
         # active targets
-        self.prometheus_targets_url = url + "/api/v1/targets?state=active"
+        self.prometheus_targets_url = parse.urljoin(
+            base_url, "api/v1/targets?state=active"
+        )
         self.prometheus_fqdn_label = prometheus_fqdn_label
         self.promtool_cmd = [promtool_path]
         if prometheus_ssl_cert:
@@ -137,7 +172,7 @@ class PromtoolClient:
         # with double quotes both on direct command and
         # ssh command so using url encoding
 
-        quoted_expr = quote(expr)
+        quoted_expr = parse.quote(expr)
 
         cmd = ['curl', '-s', '-k', '-X', 'POST', '-g',
                self.prometheus_delete_series_url + '?match[]=' + quoted_expr]

{watcher_tempest_plugin-3.7.0 → watcher_tempest_plugin-3.9.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.7.0 → watcher_tempest_plugin-3.9.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.7.0 → watcher_tempest_plugin-3.9.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.7.0 → watcher_tempest_plugin-3.9.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
@@ -432,8 +437,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,

{watcher_tempest_plugin-3.7.0 → watcher_tempest_plugin-3.9.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')
 

{watcher_tempest_plugin-3.7.0 → watcher_tempest_plugin-3.9.0}/watcher_tempest_plugin/tests/client_functional/v1/test_action_plan.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 ActionPlanTests(base.TestCase):
     """Functional tests for action plan."""
@@ -45,8 +48,8 @@ class ActionPlanTests(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')
 
@@ -97,6 +100,6 @@ class ActionPlanTests(base.TestCase):
         self.assertTrue(test_utils.call_until_true(
             func=functools.partial(
                 self.has_actionplan_succeeded, action_plan_uuid),
-            duration=600,
-            sleep_for=2
+            duration=CONF.optimize.resource_timeout,
+            sleep_for=CONF.optimize.resource_check_interval
         ))