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

{watcher_tempest_plugin-3.7.0 → watcher_tempest_plugin-3.8.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.8.0}/AUTHORS

@@ -14,6 +14,7 @@ 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.8.0}/ChangeLog

@@ -1,10 +1,20 @@
 CHANGES
 =======
 
+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.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: watcher-tempest-plugin
-Version: 3.7.0
+Version: 3.8.0
 Summary: Tempest plugin watcher-tempest-plugin
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack
@@ -39,6 +39,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.8.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.8.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.8.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",

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

@@ -55,6 +55,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,
         )
 
 

{watcher_tempest_plugin-3.7.0 → watcher_tempest_plugin-3.8.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.8.0}/watcher_tempest_plugin/tests/scenario/test_execute_zone_migration.py

@@ -167,20 +167,57 @@ class TestExecuteZoneMigrationStrategyVolume(TestZoneMigrationStrategyBase):
                 f"test volume migration, {len(pools)} found"
             )
 
+    def calculate_dst_pools(self, src_pool1, src_pool2):
+        """Check which should be the destination pool of the volumes
+
+        Calculate which should be the destination pool for each volume
+        according to where they were scheduled.
+        """
+        if src_pool1 == src_pool2:
+            # if both volumes are scheduled in the same storage host we only
+            # need one entry in the input parameters, it's enough picking one
+            # pool that is different than the source pool
+            all_pools = self.get_pool_names()
+            other_pools = all_pools - {src_pool1}
+            if not other_pools:
+                self.fail(
+                    "could not find a destination pool for volumes "
+                    f"in {src_pool1}"
+                )
+            dst_pool1 = dst_pool2 = other_pools.pop()
+        else:
+            dst_pool1 = src_pool2
+            dst_pool2 = src_pool1
+        return dst_pool1, dst_pool2
+
     @decorators.attr(type=['strategy', 'zone_migration', 'volume_migration'])
     @decorators.idempotent_id('f8f4d551-d892-4111-ab92-5b6b5523e5dc')
     def test_execute_zone_migration_volume_retype(self):
         self.check_min_enabled_compute_nodes(2)
         self.addCleanup(self.wait_delete_instances_from_model)
 
-        # create second volume type
-        volume_type = self.create_volume_type()
+        src_volume_type = self.create_volume_type()
+        src_type = src_volume_type["name"]
+
+        dst_volume_type = self.create_volume_type()
+        dst_type = dst_volume_type["name"]
+
+        # create additional volume type, with a volume
+        # associated. The test will use the src_type parameter to filter the
+        # volumes being retyped, and at the end of the test we will check the
+        # volume with this extra_volume_type was not changed as a result of the
+        # action plan.
+        extra_volume_type = self.create_volume_type()
+        extra_volume = self.create_volume(
+            name="extra_volume_retype",
+            volume_type=extra_volume_type["name"]
+        )
 
         # create a free volume
         free_volume = self.create_volume(
             name="free_volume_retype",
+            volume_type=src_type
         )
-        src_type = free_volume['volume_type']
 
         # create a volume and attach it to an instance
         instance = self.create_server(
@@ -190,6 +227,7 @@ class TestExecuteZoneMigrationStrategyVolume(TestZoneMigrationStrategyBase):
         )
         vm_volume = self.create_volume(
             name="attached_volume_retype",
+            volume_type=src_type
             )
         self.nova_volume_attach(
             instance, vm_volume, servers_client=self.os_primary.servers_client
@@ -203,9 +241,13 @@ class TestExecuteZoneMigrationStrategyVolume(TestZoneMigrationStrategyBase):
         }
 
         audit_parameters = {
+            # add the parameter to detect any possible regression on
+            # https://bugs.launchpad.net/watcher/+bug/2111429, for this test
+            # the parameter should have no impact
+            "with_attached_volume": True,
             "storage_pools": [
                 {"src_pool": src_pool, "src_type": src_type,
-                 "dst_type": volume_type['name']}
+                 "dst_type": dst_type}
                 for src_pool in src_pools
                 ]
             }
@@ -226,15 +268,25 @@ class TestExecuteZoneMigrationStrategyVolume(TestZoneMigrationStrategyBase):
 
         # check that the available volume was retyped
         self.assertEqual(
-            self.get_type_for_volume(free_volume['id']), volume_type['name']
+            self.get_type_for_volume(free_volume['id']), dst_type
+        )
+        self.assertEqual(
+            self.get_type_for_volume(vm_volume['id']), dst_type
         )
+        # check that extra_volume was not retyped as a result of the audit,
+        # meaning that the volume was ignored due to the value of src_type,
+        # this should serve to detect a possible regression on
+        # https://bugs.launchpad.net/watcher/+bug/2111507
         self.assertEqual(
-            self.get_type_for_volume(vm_volume['id']), volume_type['name']
+            self.get_type_for_volume(extra_volume['id']),
+            extra_volume_type['name']
         )
 
     @decorators.attr(type=['strategy', 'zone_migration', 'volume_migration'])
     @decorators.idempotent_id('2287000d-6f0e-4275-8741-cfeb38090307')
     def test_execute_zone_migration_volume_migrate(self):
+        """Test zone migration strategy with volume migrations."""
+
         # check that there are multiple cinder pools configured
         # to be able to test migrations between them
         self.check_multiple_pools()
@@ -267,49 +319,31 @@ class TestExecuteZoneMigrationStrategyVolume(TestZoneMigrationStrategyBase):
 
         src_pool_free_volume = self.get_host_for_volume(free_volume['id'])
         src_pool_vm_volume = self.get_host_for_volume(vm_volume['id'])
-        if src_pool_free_volume == src_pool_vm_volume:
-            # if both volumes are scheduled in the same storage host we only
-            # need one entry in the input parameters, it's enough picking one
-            # pool that is different than the source pool
-            all_pools = self.get_pool_names()
-            other_pools = all_pools - {src_pool_free_volume}
-            if not other_pools:
-                self.fail(
-                    "could not find a destination pool for volumes "
-                    f"in {src_pool_free_volume}"
-                )
-            dst_pool_free_volume = dst_pool_vm_volume = other_pools.pop()
-            audit_parameters = {
-                'storage_pools': [
-                    {
-                        'src_pool': src_pool_free_volume,
-                        'src_type': volume_type['name'],
-                        'dst_pool': dst_pool_free_volume
-                    }
-                ]
-            }
-        else:
+        dst_pool_free_volume, dst_pool_vm_volume = self.calculate_dst_pools(
+            src_pool_free_volume, src_pool_vm_volume
+        )
+        audit_parameters = {
+            'storage_pools': [
+                {
+                    'src_pool': src_pool_free_volume,
+                    'src_type': volume_type['name'],
+                    'dst_pool': dst_pool_free_volume
+                }
+            ]
+        }
+        if dst_pool_free_volume != dst_pool_vm_volume:
             # if the two volumes are scheduled in different hosts, we need to
             # add both source hosts to the input parameters. Each volume is
             # then migrated to the other's source pool and the 'src_type'
             # parameter is set to the volume type created in the test to ensure
             # no other volumes are migrated
-            dst_pool_free_volume = src_pool_vm_volume
-            dst_pool_vm_volume = src_pool_free_volume
-            audit_parameters = {
-                'storage_pools': [
-                    {
-                        'src_pool': src_pool_free_volume,
-                        'src_type': volume_type['name'],
-                        'dst_pool': dst_pool_free_volume
-                    },
-                    {
-                        'src_pool': src_pool_vm_volume,
-                        'src_type': volume_type['name'],
-                        'dst_pool': dst_pool_vm_volume
-                    }
-                ]
-            }
+            audit_parameters['storage_pools'].append(
+                {
+                    'src_pool': src_pool_vm_volume,
+                    'src_type': volume_type['name'],
+                    'dst_pool': dst_pool_vm_volume
+                }
+            )
 
         audit_kwargs = {'parameters': audit_parameters}
 
@@ -332,3 +366,99 @@ class TestExecuteZoneMigrationStrategyVolume(TestZoneMigrationStrategyBase):
         vm_volume_host = self.get_host_for_volume(vm_volume['id'])
         self.assertEqual(vm_volume_host, dst_pool_vm_volume)
         self.assertNotEqual(vm_volume_host, src_pool_vm_volume)
+
+    @decorators.attr(type=['strategy', 'zone_migration', 'volume_migration'])
+    @decorators.idempotent_id('9ceff861-d6cd-4a88-8a8f-0a5d659b7b38')
+    def test_execute_zone_migration_with_volume_and_compute_migration(self):
+        """Test zone migration strategy with volume and compute migrations."""
+
+        # check that there are multiple cinder pools configured
+        # to be able to test migrations between them
+        self.check_multiple_pools()
+
+        self.check_min_enabled_compute_nodes(2)
+        self.addCleanup(self.wait_delete_instances_from_model)
+
+        volume_type = self.create_volume_type()
+
+        # create a free volume
+        free_volume = self.create_volume(
+            name='free_volume_migrate', volume_type=volume_type['name']
+        )
+
+        # create a volume and attach it to an instance
+        instance = self.create_server(
+            image_id=CONF.compute.image_ref,
+            wait_until='SSHABLE',
+            clients=self.os_primary,
+        )
+
+        vm_volume = self.create_volume(
+            name='attached_volume_migrate', volume_type=volume_type['name']
+        )
+        self.nova_volume_attach(
+            instance, vm_volume, servers_client=self.os_primary.servers_client
+        )
+        # wait for compute model updates
+        self.wait_for_instances_in_model([instance])
+
+        src_pool_free_volume = self.get_host_for_volume(free_volume['id'])
+        src_pool_vm_volume = self.get_host_for_volume(vm_volume['id'])
+        dst_pool_free_volume, dst_pool_vm_volume = self.calculate_dst_pools(
+            src_pool_free_volume, src_pool_vm_volume
+        )
+        audit_parameters = {
+            'storage_pools': [
+                {
+                    'src_pool': src_pool_free_volume,
+                    'src_type': volume_type['name'],
+                    'dst_pool': dst_pool_free_volume
+                }
+            ]
+        }
+        if dst_pool_free_volume != dst_pool_vm_volume:
+            # if the two volumes are scheduled in different hosts, we need to
+            # add both source hosts to the input parameters. Each volume is
+            # then migrated to the other's source pool and the 'src_type'
+            # parameter is set to the volume type created in the test to ensure
+            # no other volumes are migrated
+            audit_parameters['storage_pools'].append(
+                {
+                    'src_pool': src_pool_vm_volume,
+                    'src_type': volume_type['name'],
+                    'dst_pool': dst_pool_vm_volume
+                }
+            )
+
+        src_node = self.get_host_for_server(instance['id'])
+        dst_node = self.get_host_other_than(instance['id'])
+        audit_parameters['compute_nodes'] = [
+            {'src_node': src_node, 'dst_node': dst_node}
+        ]
+
+        audit_kwargs = {'parameters': audit_parameters}
+
+        audit_template = self.create_audit_template_for_strategy()
+
+        audit = self.create_audit_and_wait(
+            audit_template['uuid'], **audit_kwargs)
+
+        action_plan, _ = self.get_action_plan_and_validate_actions(
+            audit['uuid'], ['volume_migrate', 'migrate'])
+
+        self.assertEqual('RECOMMENDED', action_plan['state'])
+
+        self.execute_action_plan_and_validate_states(action_plan['uuid'])
+
+        free_volume_host = self.get_host_for_volume(free_volume['id'])
+        self.assertEqual(free_volume_host, dst_pool_free_volume)
+        self.assertNotEqual(free_volume_host, src_pool_free_volume)
+
+        vm_volume_host = self.get_host_for_volume(vm_volume['id'])
+        self.assertEqual(vm_volume_host, dst_pool_vm_volume)
+        self.assertNotEqual(vm_volume_host, src_pool_vm_volume)
+
+        self.assertEqual(
+            self.get_host_for_server(instance['id']),
+            dst_node
+        )

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: watcher-tempest-plugin
-Version: 3.7.0
+Version: 3.8.0
 Summary: Tempest plugin watcher-tempest-plugin
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack
@@ -39,6 +39,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.8.0}/watcher_tempest_plugin.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ doc/source/readme.rst
 releasenotes/notes/.placeholder
 releasenotes/notes/drop-py-2-7-eb1979587d237f5e.yaml
 releasenotes/notes/drop-python38-support-eeb09a8bc0170ce2.yaml
+releasenotes/notes/parametrize-promtool-write-url-path-3534f2b9.yaml
 releasenotes/source/conf.py
 releasenotes/source/index.rst
 releasenotes/source/unreleased.rst

watcher_tempest_plugin-3.8.0/watcher_tempest_plugin.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "b69f7ed", "is_release": true}

watcher_tempest_plugin-3.7.0/watcher_tempest_plugin.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "49e68f7", "is_release": true}