python-watcher 15.0.0__tar.gz → 15.1.0__tar.gz

{python_watcher-15.0.0 → python_watcher-15.1.0}/.zuul.yaml

@@ -1,140 +1,65 @@
-- job:
-    name: watcher-tempest-actuator
-    parent: watcher-tempest-multinode
-    vars:
-      tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_actuator
+- nodeset:
+    name: openstack-three-node-noble
+    nodes:
+      - name: controller
+        label: ubuntu-noble
+      - name: compute1
+        label: ubuntu-noble
+      - name: compute2
+        label: ubuntu-noble
+    groups:
+      # Node where tests are executed and test results collected
+      - name: tempest
+        nodes:
+          - controller
+      # Nodes running the compute service
+      - name: compute
+        nodes:
+          - controller
+          - compute1
+          - compute2
+      # Nodes that are not the controller
+      - name: subnode
+        nodes:
+          - compute1
+          - compute2
+      # Switch node for multinode networking setup
+      - name: switch
+        nodes:
+          - controller
+      # Peer nodes for multinode networking setup
+      - name: peers
+        nodes:
+          - compute1
+          - compute2
 
 - job:
-    name: watcher-tempest-strategies
-    parent: watcher-tempest-multinode
-    vars:
-      tempest_concurrency: 1
-      # All tests inside watcher_tempest_plugin.tests.scenario with tag "strategy"
-      # or test_execute_strategies file
-      # excluding tests with tag "real_load"
-      tempest_test_regex: (^watcher_tempest_plugin.tests.scenario)(.*\[.*\bstrategy\b.*\].*)|(^watcher_tempest_plugin.tests.scenario.test_execute_strategies)
-      tempest_exclude_regex: .*\[.*\breal_load\b.*\].*
-
-- job:
-    name: watcher-tempest-multinode
-    parent: watcher-tempest-functional
-    nodeset: openstack-two-node-noble
-    roles:
-      - zuul: openstack/tempest
-    group-vars:
-      subnode:
-        devstack_local_conf:
-          post-config:
-            $WATCHER_CONF:
-              watcher_cluster_data_model_collectors.compute:
-                period: 120
-              watcher_cluster_data_model_collectors.baremetal:
-                period: 120
-              watcher_cluster_data_model_collectors.storage:
-                period: 120
-            $CINDER_CONF:
-              # enable notifications in compute node, by default they are only
-              # configured in the controller
-              oslo_messaging_notifications:
-                driver: messagingv2
-        devstack_services:
-          watcher-api: false
-          watcher-decision-engine: true
-          watcher-applier: false
-          c-bak: false
-          ceilometer: false
-          ceilometer-acompute: false
-          ceilometer-acentral: false
-          ceilometer-anotification: false
-          watcher: false
-          gnocchi-api: false
-          gnocchi-metricd: false
-          rabbit: false
-          mysql: false
+    name: watcher-tempest-gnocchi
+    parent: watcher-tempest-base-two-node
+    description: |
+      Watcher multinode devstack tempest job with Gnocchi as datasource. This
+      job uses fake metrics injection and does not requires ceilometer-acompute
+      to be enabled.
     vars:
       devstack_localrc:
         GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-low-rate"
         CEILOMETER_PIPELINE_INTERVAL: 15
-      devstack_services:
-        ceilometer-acompute: false
-        ceilometer-acentral: true
-        ceilometer-anotification: true
-      devstack_local_conf:
-        post-config:
-          $WATCHER_CONF:
-            watcher_cluster_data_model_collectors.compute:
-              period: 120
-            watcher_cluster_data_model_collectors.baremetal:
-              period: 120
-            watcher_cluster_data_model_collectors.storage:
-              period: 120
-          $CINDER_CONF:
-            # enable notifications in compute node, by default they are only
-            # configured in the controller
-            oslo_messaging_notifications:
-              driver: messagingv2
-        test-config:
-          $TEMPEST_CONFIG:
-            compute:
-              min_compute_nodes: 2
-              min_microversion: 2.56
-            compute-feature-enabled:
-              live_migration: true
-              block_migration_for_live_migration: true
-            placement:
-              min_microversion: 1.29
-            telemetry:
-              ceilometer_polling_interval: 15
-      devstack_plugins:
-        ceilometer: https://opendev.org/openstack/ceilometer
 
 - job:
-    name: watcher-tempest-functional
+    name: watcher-tempest-base
     parent: devstack-tempest
+    description: |
+      Watcher single node devstack tempest base job template.
+    abstract: true
     timeout: 7200
-    required-projects: &base_required_projects
+    required-projects: &tempest_base_required_projects
       - openstack/ceilometer
       - openstack/python-openstackclient
       - openstack/python-watcherclient
       - openstack/watcher
       - openstack/watcher-tempest-plugin
       - openstack/tempest
-    vars: &base_vars
-      devstack_plugins:
-        watcher: https://opendev.org/openstack/watcher
-      devstack_services:
-        watcher-api: true
-        watcher-decision-engine: true
-        watcher-applier: true
-        tempest: true
-        s-account: false
-        s-container: false
-        s-object: false
-        s-proxy: false
-      tempest_plugins:
-        - watcher-tempest-plugin
-      tempest_test_regex: watcher_tempest_plugin.tests.api
-      tox_envlist: all
-      zuul_copy_output:
-        /etc/hosts: logs
-
-- job:
-    name: watcher-tempest-functional-ipv6-only
-    parent: devstack-tempest-ipv6
-    description: |
-      Watcher devstack tempest tests job for IPv6-only deployment
-    required-projects: *base_required_projects
-    vars: *base_vars
-
-- job:
-    name: watcher-grenade
-    parent: grenade
-    required-projects:
-      - openstack/watcher
-      - openstack/python-watcherclient
-      - openstack/watcher-tempest-plugin
-    vars: *base_vars
-    irrelevant-files: &irrelevent_files
+    irrelevant-files: &irrelevant_files
       - ^(test-|)requirements.txt$
       - ^.*\.rst$
       - ^api-ref/.*$
@@ -145,63 +70,32 @@
       - ^setup.cfg$
       - ^tools/.*$
       - ^tox.ini$
-
-- job:
-    name: watcher-sg-core-tempest-base
-    parent: devstack-tempest
-    nodeset: openstack-two-node-noble
-    description: |
-      This job is for testing watcher and sg-core/prometheus installation
-    abstract: true
-    pre-run:
-      - playbooks/generate_prometheus_config.yml
-    irrelevant-files: *irrelevent_files
-    timeout: 7800
-    required-projects: &base_sg_required_projects
-      - openstack/aodh
-      - openstack/ceilometer
-      - openstack/tempest
-      - openstack-k8s-operators/sg-core
-      - openstack/watcher
-      - openstack/python-watcherclient
-      - openstack/watcher-tempest-plugin
-      - openstack/devstack-plugin-prometheus
-    vars:
+    vars: &tempest_base_vars
       configure_swap_size: 8192
       devstack_plugins:
         ceilometer: https://opendev.org/openstack/ceilometer
-        aodh: https://opendev.org/openstack/aodh
-        sg-core: https://github.com/openstack-k8s-operators/sg-core
         watcher: https://opendev.org/openstack/watcher
-        devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
       devstack_services:
-        ceilometer-acompute: true
         watcher-api: true
         watcher-decision-engine: true
         watcher-applier: true
         tempest: true
-        # We do not need Swift in this job so disable it for speed
-        # Swift services
         s-account: false
         s-container: false
         s-object: false
         s-proxy: false
-        # Prometheus related service
-        prometheus: true
-        node_exporter: true
+        ceilometer-acentral: true
+        ceilometer-anotification: true
+        # ceilometer-acompute disabled by default since most jobs use fake data
+        ceilometer-acompute: false
+      tempest_plugins:
+        - watcher-tempest-plugin
       devstack_localrc:
-        CEILOMETER_BACKENDS: "sg-core"
         CEILOMETER_PIPELINE_INTERVAL: 15
         CEILOMETER_ALARM_THRESHOLD: 6000000000
-        PROMETHEUS_CONFIG_FILE: "/home/zuul/prometheus.yml"
       devstack_local_conf:
         post-config:
-          $WATCHER_CONF:
-            watcher_datasources:
-              datasources: prometheus
-            prometheus_client:
-              host: 127.0.0.1
-              port: 9090
+          $WATCHER_CONF: &watcher_conf_base
             watcher_cluster_data_model_collectors.compute:
               period: 120
             watcher_cluster_data_model_collectors.baremetal:
@@ -212,92 +106,167 @@
               enable_extended_attributes: true
             nova_client:
               api_version: "2.96"
+            nova:
+              migration_max_retries: 120
+              migration_interval: 1
+          $CINDER_CONF:
+            oslo_messaging_notifications:
+              driver: messagingv2
         test-config:
           $TEMPEST_CONFIG:
             compute:
               min_compute_nodes: 2
               min_microversion: 2.56
-            compute-feature-enabled:
-              live_migration: true
-              block_migration_for_live_migration: true
+              max_microversion: 2.96
             placement:
               min_microversion: 1.29
-            service_available:
-              sg_core: True
-            telemetry_services:
-              metric_backends: prometheus
             telemetry:
-              disable_ssl_certificate_validation: True
+              disable_ssl_certificate_validation: true
               ceilometer_polling_interval: 15
-            optimize:
-              datasource: prometheus
-              extended_attributes_nova_microversion: "2.96"
-              data_model_collectors_period: 120
-      tempest_plugins:
-        - watcher-tempest-plugin
-      # All tests inside watcher_tempest_plugin.tests.scenario with tag "strategy"
-      # and test_execute_strategies, test_data_model files
-      # excluding tests with tag "real_load"
-      tempest_test_regex: (watcher_tempest_plugin.tests.scenario)(.*\[.*\bstrategy\b.*\].*)|(watcher_tempest_plugin.tests.scenario.(test_execute_strategies|test_data_model))
-      tempest_exclude_regex: .*\[.*\breal_load\b.*\].*
+      # tempest variables
       tempest_concurrency: 1
+      # Run only API tests
+      tempest_test_regex: watcher_tempest_plugin.tests.api
       tox_envlist: all
       zuul_copy_output:
-        /etc/prometheus/prometheus.yml: logs
+        /etc/hosts: logs
+
+- job:
+    name: watcher-tempest-base-two-node
+    parent: watcher-tempest-base
+    nodeset: openstack-two-node-noble
+    abstract: true
+    description: |
+      Watcher multinode devstack tempest job base template.
+    vars:
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            compute-feature-enabled:
+              live_migration: true
+              block_migration_for_live_migration: true
+            optimize:
+              run_extended_attributes_tests: true
+      # tempest variables
+      tempest_test_regex: watcher_tempest_plugin.tests\.(api|scenario)
+      # excluding tests with tag "real_load"
+      tempest_exclude_regex: .*\[.*\breal_load\b.*\].*
     group-vars:
       subnode:
         devstack_plugins:
           ceilometer: https://opendev.org/openstack/ceilometer
-          devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
+          watcher: https://opendev.org/openstack/watcher
         devstack_services:
-          ceilometer-acompute: true
-          sg-core: false
-          prometheus: false
-          node_exporter: true
+          # Not needed for jobs with fake metrics injection
+          ceilometer-acompute: false
+          ceilometer-acentral: false
+          ceilometer-anotification: false
+          c-bak: false
+          gnocchi-api: false
+          gnocchi-metricd: false
+          rabbit: false
+          mysql: false
+          watcher-api: false
+          watcher-applier: false
+          watcher-decision-engine: true
         devstack_localrc:
-          CEILOMETER_BACKEND: "none"
           CEILOMETER_BACKENDS: "none"
         devstack_local_conf:
           post-config:
-            $WATCHER_CONF:
-              watcher_cluster_data_model_collectors.compute:
-                period: 120
-              watcher_cluster_data_model_collectors.baremetal:
-                period: 120
-              watcher_cluster_data_model_collectors.storage:
-                period: 120
+            $CINDER_CONF:
+              # enable notifications in compute node, by default they are only
+              # configured in the controller
+              oslo_messaging_notifications:
+                driver: messagingv2
+            $WATCHER_CONF: *watcher_conf_base
+
+- job:
+    name: watcher-tempest-api-ipv6-only
+    parent: devstack-tempest-ipv6
+    description: |
+      Watcher single node devstack tempest job for IPv6-only deployment.
+    required-projects: *tempest_base_required_projects
+    vars: *tempest_base_vars
+    irrelevant-files: *irrelevant_files
 
 - job:
-    name: watcher-prometheus-integration
-    parent: watcher-sg-core-tempest-base
+    name: watcher-grenade
+    parent: grenade
+    required-projects: *tempest_base_required_projects
+    vars:
+      <<: *tempest_base_vars
+      devstack_plugins:
+        watcher: https://opendev.org/openstack/watcher
+    irrelevant-files: *irrelevant_files
+
+- job:
+    name: watcher-tempest-prometheus
+    parent: watcher-tempest-base-two-node
+    description: |
+      Watcher multinode devstack tempest job with Prometheus as datasource.
+      This job uses fake metrics injection and does not require ceilometer-acompute
+      and node_exporter to be enabled.
+    pre-run:
+      - playbooks/generate_prometheus_config.yml
+    required-projects:
+      - openstack/aodh
+      - openstack-k8s-operators/sg-core
+      - openstack/devstack-plugin-prometheus
     vars:
+      devstack_plugins:
+        aodh: https://opendev.org/openstack/aodh
+        sg-core: https://github.com/openstack-k8s-operators/sg-core
+        devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
       devstack_services:
-        ceilometer-acompute: false
+        prometheus: true
+        # Node exporter service is disable since job uses fake metrics injection
         node_exporter: false
+      devstack_localrc:
+        CEILOMETER_BACKENDS: "sg-core"
+        PROMETHEUS_CONFIG_FILE: "/home/zuul/prometheus.yml"
+      devstack_local_conf:
+        post-config:
+          $WATCHER_CONF: &watcher_conf_prom
+            watcher_datasources:
+              datasources: prometheus
+            prometheus_client:
+              host: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
+              port: 9090
+        test-config:
+          $TEMPEST_CONFIG:
+            service_available:
+              sg_core: true
+            telemetry_services:
+              metric_backends: prometheus
+            optimize:
+              datasource: prometheus
+      zuul_copy_output:
+        /etc/prometheus/prometheus.yml: logs
     group-vars:
       subnode:
+        devstack_plugins:
+          devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
         devstack_services:
-          ceilometer-acompute: false
+          sg-core: false
+          prometheus: false
           node_exporter: false
+        devstack_local_conf:
+          post-config:
+            $WATCHER_CONF: *watcher_conf_prom
 
 - job:
-    name: watcher-aetos-integration
-    parent: watcher-sg-core-tempest-base
+    name: watcher-tempest-aetos
+    parent: watcher-tempest-prometheus
     description: |
-      This job tests Watcher with Aetos reverse-proxy for Prometheus
-      using Keystone authentication instead of direct Prometheus access.
+      Watcher multinode devstack tempest job with Aetos reverse-proxy for
+      Prometheus, using Keystone authentication instead of direct Prometheus access.
+      This job uses fake metrics injection and does not require ceilometer-acompute
+      and node_exporter to be enabled.
     required-projects:
       - openstack/python-observabilityclient
       - openstack/aetos
     vars: &aetos_vars
-      devstack_services:
-        ceilometer-acompute: false
-        node_exporter: false
       devstack_plugins:
-        ceilometer: https://opendev.org/openstack/ceilometer
-        sg-core: https://github.com/openstack-k8s-operators/sg-core
-        watcher: https://opendev.org/openstack/watcher
-        devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
         aetos: https://opendev.org/openstack/aetos
       devstack_local_conf:
         post-config:
@@ -309,31 +278,29 @@
               region_name: RegionOne
               fqdn_label: fqdn
               instance_uuid_label: resource
-        test-config:
-          $TEMPEST_CONFIG:
-            optimize:
-              datasource: prometheus
-    group-vars:
-      subnode:
-        devstack_services:
-          ceilometer-acompute: false
-          node_exporter: false
 
 - job:
-    name: watcher-prometheus-integration-realdata
-    parent: watcher-sg-core-tempest-base
+    name: watcher-tempest-prometheus-realdata
+    parent: watcher-tempest-prometheus
+    nodeset: openstack-three-node-noble
+    description: |
+      Watcher multinode devstack tempest job with Prometheus as datasource and
+      real workload data. This job is executed on a three-node setup to have
+      pure controller and compute nodes and avoid resource competition.
     vars: &realdata_vars
       devstack_services:
-        ceilometer-acompute: true
-        node_exporter: true
+        ceilometer-acompute: false
+        node_exporter: false
+        n-cpu: false
       devstack_localrc:
         NODE_EXPORTER_COLLECTOR_EXCLUDE: ""
+        CEILOMETER_PIPELINE_INTERVAL: 15
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
             optimize:
               datasource: ""
-              real_workload_period: 300
+              real_workload_period: 480 # 8 minutes
       # All tests inside watcher_tempest_plugin.tests.scenario with tag "real_load"
       tempest_test_regex: (^watcher_tempest_plugin.tests.scenario)(.*\[.*\breal_load\b.*\].*)
       tempest_exclude_regex: ""
@@ -342,15 +309,26 @@
         devstack_services:
           ceilometer-acompute: true
           node_exporter: true
+          n-cpu: true
         devstack_localrc:
-          NODE_EXPORTER_COLLECTOR_EXCLUDE: ""
+          CEILOMETER_PIPELINE_INTERVAL: 15
 
 - job:
-    name: watcher-prometheus-integration-threading
-    parent: watcher-prometheus-integration
-    vars:
+    name: watcher-tempest-prometheus-threading
+    parent: watcher-tempest-prometheus
+    description: |
+      Watcher multinode devstack tempest job with Prometheus as datasource and
+      threading mode enabled in specific services.
+    vars: &threading_vars
       devstack_localrc:
         'SYSTEMD_ENV_VARS["watcher-decision-engine"]': OS_WATCHER_DISABLE_EVENTLET_PATCHING=true
+      devstack_local_conf:
+        post-config:
+          $WATCHER_CONF:
+            DEFAULT:
+              print_thread_pool_stats: true
+    group-vars:
+      subnode: *threading_vars
 
 - job:
     name: openstack-tox-py312-threading
@@ -361,11 +339,28 @@
       tox_envlist: py3-threading
 
 - job:
-    name: watcher-aetos-integration-realdata
-    parent: watcher-aetos-integration
+    name: watcher-tempest-aetos-realdata
+    parent: watcher-tempest-aetos
+    nodeset: openstack-three-node-noble
+    description: |
+      Watcher multinode devstack tempest job with Aetos reverse-proxy and real
+      workload data. This job is executed on a three-node setup to have
+      pure controller and compute nodes and avoid resource competition.
     vars: *realdata_vars
     group-vars: *realdata_group_vars
 
+# TODO(dviroel): Remove this job when we update other projects that depend on
+# its definition.
+- job:
+    name: watcher-tempest-functional
+    parent: watcher-tempest-base
+
+# TODO(dviroel): Remove this job when we update other projects that depend on
+# its definition (e.g.: openstack/aetos)
+- job:
+    name: watcher-aetos-integration
+    parent: watcher-tempest-aetos
+
 - project:
     queue: watcher
     templates:
@@ -377,26 +372,31 @@
     check:
       jobs:
         - openstack-tox-py312-threading
-        - watcher-tempest-functional
         - watcher-grenade
-        - watcher-tempest-strategies
-        - watcher-tempest-actuator
+        - watcher-tempest-api-ipv6-only
+        - watcher-tempest-gnocchi
         - python-watcherclient-functional:
-            files:
+            files: &watcherclient_functional_files
               - ^watcher/api/*
-        - watcher-tempest-functional-ipv6-only
-        - watcher-prometheus-integration
-        - watcher-prometheus-integration-threading
-        - watcher-aetos-integration
+        - watcher-tempest-prometheus
+        - watcher-tempest-prometheus-threading
+        - watcher-tempest-aetos
     gate:
       jobs:
-        - watcher-tempest-functional
-        - watcher-tempest-functional-ipv6-only
+        - openstack-tox-py312-threading
+        - watcher-grenade
+        - watcher-tempest-api-ipv6-only
+        - watcher-tempest-gnocchi
+        - python-watcherclient-functional:
+            files: *watcherclient_functional_files
+        - watcher-tempest-prometheus
+        - watcher-tempest-prometheus-threading
+        - watcher-tempest-aetos
     experimental:
       jobs:
-        - watcher-prometheus-integration-realdata
-        - watcher-aetos-integration-realdata
+        - watcher-tempest-prometheus-realdata
+        - watcher-tempest-aetos-realdata
     periodic-weekly:
       jobs:
-        - watcher-prometheus-integration-realdata
-        - watcher-aetos-integration-realdata
+        - watcher-tempest-prometheus-realdata
+        - watcher-tempest-aetos-realdata

{python_watcher-15.0.0 → python_watcher-15.1.0}/ChangeLog

@@ -1,6 +1,30 @@
 CHANGES
 =======
 
+15.1.0
+------
+
+* Revert "Update migration notification"
+* Move real data jobs nodeset to three nodes (two computes + 1 controller)
+* Retry calls to nova API when connection errors are detected
+* update unit tests for nova\_helper module
+* Make VM resize timeout configurable with migration defaults
+* Make VM migrations timeout configurable and apply reasonable defaults
+* Consolidate and improve Zuul CI job definitions
+* Fix zone migration to accept dst\_pool or dst\_type
+* use the correct package name for microversion-parse
+* Ignore cinder notifications if the Storage model is empty
+* Fix zone migration instance not found issue
+* Add unit tests for instance and volume not found in model
+* Add missing 1.6 API doc in rest version history
+* Improve unit tests for zone migration strategy
+* Support zone migration audit without compute\_nodes
+* Allow volume and vm migrations in zone\_migration
+* Add test for zone\_migration with instances and volumes
+* Use src\_type to filter volumes in zone migration
+* Update TOX\_CONSTRAINTS\_FILE for stable/2025.2
+* Update .gitreview for stable/2025.2
+
 15.0.0
 ------
 

{python_watcher-15.0.0 → python_watcher-15.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-watcher
-Version: 15.0.0
+Version: 15.1.0
 Summary: OpenStack Watcher provides a flexible and scalable resource optimization service for multi-tenant OpenStack-based clouds.
 Home-page: https://docs.openstack.org/watcher/latest/
 Author: OpenStack
@@ -63,10 +63,19 @@ Requires-Dist: taskflow>=3.8.0
 Requires-Dist: WebOb>=1.8.5
 Requires-Dist: WSME>=0.9.2
 Requires-Dist: networkx>=2.4
-Requires-Dist: microversion_parse>=0.2.1
+Requires-Dist: microversion-parse>=0.2.1
 Requires-Dist: futurist>=1.8.0
 Provides-Extra: monasca
 Requires-Dist: python-monascaclient>=1.12.0; extra == "monasca"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 =======
 Watcher

{python_watcher-15.0.0 → python_watcher-15.1.0}/doc/source/strategies/zone_migration.rst

@@ -126,7 +126,7 @@ parameter     type    default  required  description
                                          volumes migrate.
 ``dst_pool``  string  None     Optional  Storage pool to which
                                          volumes migrate.
-``src_type``  string  None     Required  Source volume type.
+``src_type``  string  None     Optional  Source volume type.
 ``dst_type``  string  None     Required  Destination volume type
 ============= ======= ======== ========= ========================