python-watcher 14.0.0.0rc1__tar.gz → 14.1.1__tar.gz

{python_watcher-14.0.0.0rc1 → python_watcher-14.1.1}/.zuul.yaml

@@ -8,100 +8,60 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - watcher-tempest-functional
-        - watcher-tempest-functional-jammy
-        - watcher-grenade
-        - watcher-tempest-strategies
-        - watcher-tempest-actuator
+        - watcher-tempest-api-jammy
+        - watcher-tempest-gnocchi
         - watcherclient-tempest-functional
-        - watcher-tempest-functional-ipv6-only
-        - watcher-prometheus-integration
+        - watcher-tempest-api-ipv6-only
+        - watcher-tempest-prometheus
     gate:
       jobs:
-        - watcher-tempest-functional
-        - watcher-tempest-functional-jammy
-        - watcher-tempest-functional-ipv6-only
-
-- job:
-    name: watcher-tempest-actuator
-    parent: watcher-tempest-multinode
-    vars:
-      tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_actuator
-
-- job:
-    name: watcher-tempest-strategies
-    parent: watcher-tempest-multinode
-    vars:
-      tempest_concurrency: 1
-      tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_strategies
+        - watcher-tempest-api-jammy
+        - watcher-tempest-gnocchi
+        - watcherclient-tempest-functional
+        - watcher-tempest-api-ipv6-only
+        - watcher-tempest-prometheus
 
 - 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
-        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_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
-        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
-      devstack_plugins:
-        ceilometer: https://opendev.org/openstack/ceilometer
+      devstack_localrc:
+        GNOCCHI_ARCHIVE_POLICY_TEMPEST: "ceilometer-low-rate"
+        CEILOMETER_PIPELINE_INTERVAL: 15
 
 - 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
+    irrelevant-files: &irrelevant_files
+      - ^(test-|)requirements.txt$
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^watcher/hacking/.*$
+      - ^watcher/tests/.*$
+      - ^releasenotes/.*$
+      - ^setup.cfg$
+      - ^tools/.*$
+      - ^tox.ini$
+    vars: &tempest_base_vars
+      configure_swap_size: 8192
       devstack_plugins:
+        ceilometer: https://opendev.org/openstack/ceilometer
         watcher: https://opendev.org/openstack/watcher
       devstack_services:
         watcher-api: true
@@ -112,178 +72,195 @@
         s-container: false
         s-object: false
         s-proxy: false
+        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_PIPELINE_INTERVAL: 15
+        CEILOMETER_ALARM_THRESHOLD: 6000000000
+      devstack_local_conf:
+        post-config:
+          $WATCHER_CONF: &watcher_conf_base
+            watcher_cluster_data_model_collectors.compute:
+              period: 120
+            watcher_cluster_data_model_collectors.baremetal:
+              period: 120
+            watcher_cluster_data_model_collectors.storage:
+              period: 120
+            nova_client:
+              api_version: "2.96"
+          $CINDER_CONF:
+            oslo_messaging_notifications:
+              driver: messagingv2
+        test-config:
+          $TEMPEST_CONFIG:
+            compute:
+              min_compute_nodes: 2
+              min_microversion: 2.56
+              max_microversion: 2.96
+            placement:
+              min_microversion: 1.29
+            telemetry:
+              disable_ssl_certificate_validation: true
+              ceilometer_polling_interval: 15
+      # tempest variables
+      tempest_concurrency: 1
+      # Run only API tests
       tempest_test_regex: watcher_tempest_plugin.tests.api
       tox_envlist: all
       zuul_copy_output:
         /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
+      # 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
+          watcher: https://opendev.org/openstack/watcher
+        devstack_services:
+          # 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_BACKENDS: "none"
+        devstack_local_conf:
+          post-config:
+            $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
+
+
 # TODO(gmann): As per the 2025.1 testing runtime, we need to run at least
 # one job on jammy. This job can be removed in the next cycle(2025.2)
 - job:
-    name: watcher-tempest-functional-jammy
+    name: watcher-tempest-api-jammy
     description: This is integrated job testing on Ubuntu jammy(22.04)
-    parent: watcher-tempest-functional
+    parent: watcher-tempest-base
     nodeset: openstack-single-node-jammy
+    required-projects:
+      - name: openstack/tempest
+        override-checkout: 46.3.0
+      - name: openstack/watcher-tempest-plugin
+        override-checkout: 3.7.0
     vars:
-      <<: *base_vars
+      devstack_localrc:
+        TEMPEST_VENV_UPPER_CONSTRAINTS: '/opt/stack/requirements/upper-constraints.txt'
       python_version: '3.9'
 
 - job:
-    name: watcher-tempest-functional-ipv6-only
+    name: watcher-tempest-api-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
-      - ^(test-|)requirements.txt$
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^watcher/hacking/.*$
-      - ^watcher/tests/.*$
-      - ^releasenotes/.*$
-      - ^setup.cfg$
-      - ^tools/.*$
-      - ^tox.ini$
+      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:
     # This job is used in python-watcherclient repo
     name: watcherclient-tempest-functional
-    parent: watcher-tempest-functional
+    parent: watcher-tempest-base
     timeout: 4200
     vars:
       tempest_concurrency: 1
       tempest_test_regex: watcher_tempest_plugin.tests.client_functional
 
 - job:
-    name: watcher-sg-core-tempest-base
-    parent: devstack-tempest
-    nodeset: openstack-two-node-noble
+    name: watcher-tempest-prometheus
+    parent: watcher-tempest-base-two-node
     description: |
-      This job is for testing watcher and sg-core/prometheus installation
-    abstract: true
+      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
-    irrelevant-files: *irrelevent_files
-    timeout: 7800
-    required-projects: &base_sg_required_projects
+    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:
-      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
+        sg-core: https``://github.com/openstack-k8s-operators/sg-core
         devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
       devstack_services:
-        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
+        # Node exporter service is disable since job uses fake metrics injection
+        node_exporter: false
       devstack_localrc:
         CEILOMETER_BACKENDS: "sg-core"
-        CEILOMETER_PIPELINE_INTERVAL: 15
-        CEILOMETER_ALARM_THRESHOLD: 6000000000
-        NODE_EXPORTER_ENABLE: false
-        PROMETHEUS_ENABLE: false
-        PROMETHEUS_SERVICE_SCRAPE_TARGETS: "sg-core,node-exporter"
         PROMETHEUS_CONFIG_FILE: "/home/zuul/prometheus.yml"
       devstack_local_conf:
         post-config:
-          $WATCHER_CONF:
+          $WATCHER_CONF: &watcher_conf_prom
             watcher_datasources:
               datasources: prometheus
             prometheus_client:
-              host: 127.0.0.1
+              host: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
               port: 9090
-            watcher_cluster_data_model_collectors.compute:
-              period: 120
-            watcher_cluster_data_model_collectors.baremetal:
-              period: 120
-            watcher_cluster_data_model_collectors.storage:
-              period: 120
         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
             service_available:
-              sg_core: True
+              sg_core: true
             telemetry_services:
               metric_backends: prometheus
-            telemetry:
-              disable_ssl_certificate_validation: True
-              ceilometer_polling_interval: 15
             optimize:
               datasource: prometheus
-      tempest_plugins:
-        - watcher-tempest-plugin
-      tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_strategies
-      tempest_concurrency: 1
-      tox_envlist: all
       zuul_copy_output:
         /etc/prometheus/prometheus.yml: logs
     group-vars:
       subnode:
         devstack_plugins:
-          ceilometer: https://opendev.org/openstack/ceilometer
-          sg-core: https://github.com/openstack-k8s-operators/sg-core
           devstack-plugin-prometheus: https://opendev.org/openstack/devstack-plugin-prometheus
         devstack_services:
-          ceilometer-acompute: true
           sg-core: false
           prometheus: false
-          node_exporter: true
-        devstack_localrc:
-          CEILOMETER_BACKEND: "none"
-          CEILOMETER_BACKENDS: "none"
-          # sg_core related var
-          NODE_EXPORTER_ENABLE: false
-          PROMETHEUS_ENABLE: false
+          node_exporter: false
         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
+            $WATCHER_CONF: *watcher_conf_prom
+
+# 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/devstack-plugin-prometheus)
 - job:
     name: watcher-prometheus-integration
-    parent: watcher-sg-core-tempest-base
+    parent: watcher-tempest-prometheus

{python_watcher-14.0.0.0rc1 → python_watcher-14.1.1}/ChangeLog

@@ -1,8 +1,41 @@
 CHANGES
 =======
 
-14.0.0.0rc1
------------
+14.1.1
+------
+
+* Avoid logging messaging transport URLs
+* [stable-only] Pin Jammy Tempest job inputs
+* Add debug message to report calculated metric for workload\_balance
+* [Stable-only][CI] Pin setuptools in docs job
+* [stable-only] Consolidate and improve Zuul CI job definitions
+* use the correct package name for microversion-parse
+
+14.1.0
+------
+
+* use cinder migrate for swap volume
+* Configure watcher tempest's microversion in devstack
+* Fix audit creation with no name and no goal or audit\_template
+* Set actionplan state to FAILED if any action has failed
+* Add unit test to check action plan state when a nested action fails
+* Return HTTP code 400 when creating an audit with wrong parameters
+* Use KiB as unit for host\_ram\_usage when using prometheus datasource
+* Aggregate by label when querying instance cpu usage in prometheus
+* Drop code from Host maintenance strategy migrating instance to disabled hosts
+* Added unit test to validate audit creation with no goal and no name
+* Add a unit test to check the error when creating an audit with wrong parameters
+* [host\_maintenance] Pass des hostname in add\_action solution
+* Add support for pyproject.toml and wsgi module paths
+* Skip real-data tests in non-real-data jobs
+* Aggregate by fqdn label instead instance in host cpu metrics
+* Query by fqdn\_label instead of instance for host metrics
+* Drop sg\_core prometheus related vars
+* Update TOX\_CONSTRAINTS\_FILE for stable/2025.1
+* Update .gitreview for stable/2025.1
+
+14.0.0
+------
 
 * Add epoxy prelude
 * Replace deprecated abc.abstractproperty

{python_watcher-14.0.0.0rc1 → python_watcher-14.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-watcher
-Version: 14.0.0.0rc1
+Version: 14.1.1
 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
@@ -14,7 +14,6 @@ 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
@@ -64,8 +63,17 @@ 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
+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-14.0.0.0rc1 → python_watcher-14.1.1}/devstack/lib/watcher

@@ -55,11 +55,7 @@ else
     WATCHER_BIN_DIR=$(get_python_exec_prefix)
 fi
 
-# There are 2 modes, which is "uwsgi" which runs with an apache
-# proxy uwsgi in front of it, or "mod_wsgi", which runs in
-# apache. mod_wsgi is deprecated, don't use it.
-WATCHER_USE_WSGI_MODE=${WATCHER_USE_WSGI_MODE:-$WSGI_MODE}
-WATCHER_UWSGI=$WATCHER_BIN_DIR/watcher-api-wsgi
+WATCHER_UWSGI=watcher.wsgi.api:application
 WATCHER_UWSGI_CONF=$WATCHER_CONF_DIR/watcher-uwsgi.ini
 
 if is_suse; then
@@ -73,11 +69,7 @@ WATCHER_SERVICE_PORT=${WATCHER_SERVICE_PORT:-9322}
 WATCHER_SERVICE_PORT_INT=${WATCHER_SERVICE_PORT_INT:-19322}
 WATCHER_SERVICE_PROTOCOL=${WATCHER_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
 
-if [[ "$WATCHER_USE_WSGI_MODE" == "uwsgi" ]]; then
-    WATCHER_API_URL="$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST/infra-optim"
-else
-    WATCHER_API_URL="$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST:$WATCHER_SERVICE_PORT"
-fi
+WATCHER_API_URL="$WATCHER_SERVICE_PROTOCOL://$WATCHER_SERVICE_HOST/infra-optim"
 
 # Entry Points
 # ------------
@@ -101,11 +93,7 @@ function _cleanup_watcher_apache_wsgi {
 # runs that a clean run would need to clean up
 function cleanup_watcher {
     sudo rm -rf $WATCHER_STATE_PATH
-    if [[ "$WATCHER_USE_WSGI_MODE" == "uwsgi" ]]; then
-        remove_uwsgi_config "$WATCHER_UWSGI_CONF" "$WATCHER_UWSGI"
-    else
-        _cleanup_watcher_apache_wsgi
-    fi
+    remove_uwsgi_config "$WATCHER_UWSGI_CONF" "$WATCHER_UWSGI"
 }
 
 # configure_watcher() - Set config files, create data dirs, etc
@@ -154,31 +142,6 @@ function create_watcher_accounts {
         "$WATCHER_API_URL"
 }
 
-# _config_watcher_apache_wsgi() - Set WSGI config files of watcher
-function _config_watcher_apache_wsgi {
-    local watcher_apache_conf
-    if [[ "$WATCHER_USE_WSGI_MODE" == "mod_wsgi" ]]; then
-        local service_port=$WATCHER_SERVICE_PORT
-        if is_service_enabled tls-proxy; then
-            service_port=$WATCHER_SERVICE_PORT_INT
-            service_protocol="http"
-        fi
-        sudo mkdir -p $WATCHER_WSGI_DIR
-        sudo cp $WATCHER_DIR/watcher/api/app.wsgi $WATCHER_WSGI_DIR/app.wsgi
-        watcher_apache_conf=$(apache_site_config_for watcher-api)
-        sudo cp $WATCHER_DEVSTACK_FILES_DIR/apache-watcher-api.template $watcher_apache_conf
-        sudo sed -e "
-            s|%WATCHER_SERVICE_PORT%|$service_port|g;
-            s|%WATCHER_WSGI_DIR%|$WATCHER_WSGI_DIR|g;
-            s|%USER%|$STACK_USER|g;
-            s|%APIWORKERS%|$API_WORKERS|g;
-            s|%APACHE_NAME%|$APACHE_NAME|g;
-        " -i $watcher_apache_conf
-        enable_apache_site watcher-api
-   fi
-
-}
-
 # create_watcher_conf() - Create a new watcher.conf file
 function create_watcher_conf {
     # (Re)create ``watcher.conf``
@@ -196,11 +159,6 @@ function create_watcher_conf {
         iniset $WATCHER_CONF api host "$(ipv6_unquote $WATCHER_SERVICE_HOST)"
         iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT_INT"
         # iniset $WATCHER_CONF api enable_ssl_api "True"
-    else
-        if [[ "$WATCHER_USE_WSGI_MODE" == "mod_wsgi" ]]; then
-            iniset $WATCHER_CONF api host "$(ipv6_unquote $WATCHER_SERVICE_HOST)"
-            iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT"
-        fi
     fi
 
     iniset $WATCHER_CONF oslo_policy policy_file $WATCHER_POLICY_YAML
@@ -228,12 +186,8 @@ function create_watcher_conf {
     # Format logging
     setup_logging $WATCHER_CONF
 
-    #config apache files
-    if [[ "$WATCHER_USE_WSGI_MODE" == "uwsgi" ]]; then
-        write_uwsgi_config "$WATCHER_UWSGI_CONF" "$WATCHER_UWSGI" "/infra-optim"
-    else
-        _config_watcher_apache_wsgi
-    fi
+    write_uwsgi_config "$WATCHER_UWSGI_CONF" "$WATCHER_UWSGI" "/infra-optim" "" "watcher-api"
+
     # Register SSL certificates if provided
     if is_ssl_enabled_service watcher; then
         ensure_certificates WATCHER
@@ -273,9 +227,6 @@ function install_watcherclient {
 function install_watcher {
     git_clone $WATCHER_REPO $WATCHER_DIR $WATCHER_BRANCH
     setup_develop $WATCHER_DIR
-    if [[ "$WATCHER_USE_WSGI_MODE" == "mod_wsgi" ]]; then
-        install_apache_wsgi
-    fi
 }
 
 # start_watcher_api() - Start the API process ahead of other things
@@ -289,19 +240,10 @@ function start_watcher_api {
         service_port=$WATCHER_SERVICE_PORT_INT
         service_protocol="http"
     fi
-    if [[ "$WATCHER_USE_WSGI_MODE" == "uwsgi" ]]; then
-        run_process "watcher-api" "$(which uwsgi) --procname-prefix watcher-api --ini $WATCHER_UWSGI_CONF"
-        watcher_url=$service_protocol://$SERVICE_HOST/infra-optim
-    else
-        watcher_url=$service_protocol://$SERVICE_HOST:$service_port
-        enable_apache_site watcher-api
-        restart_apache_server
-        # Start proxies if enabled
-        if is_service_enabled tls-proxy; then
-            start_tls_proxy watcher '*' $WATCHER_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT
-        fi
-    fi
-
+    run_process "watcher-api" "$(which uwsgi) --procname-prefix watcher-api --ini $WATCHER_UWSGI_CONF"
+    watcher_url=$service_protocol://$SERVICE_HOST/infra-optim
+    # TODO(sean-k-mooney): we should probably check that we can hit
+    # the microversion endpoint and get a valid response.
     echo "Waiting for watcher-api to start..."
     if ! wait_for_service $SERVICE_TIMEOUT $watcher_url; then
         die $LINENO "watcher-api did not start"
@@ -319,17 +261,25 @@ function start_watcher {
 
 # stop_watcher() - Stop running processes (non-screen)
 function stop_watcher {
-    if [[ "$WATCHER_USE_WSGI_MODE" == "uwsgi" ]]; then
-        stop_process watcher-api
-    else
-        disable_apache_site watcher-api
-        restart_apache_server
-    fi
+    stop_process watcher-api
     for serv in watcher-decision-engine watcher-applier; do
         stop_process $serv
     done
 }
 
+# configure_tempest_for_watcher() - Configure Tempest for watcher
+function configure_tempest_for_watcher {
+    # Set default microversion for watcher-tempest-plugin
+    # Please make sure to update this when the microversion is updated, otherwise
+    # new tests may be skipped.
+    TEMPEST_WATCHER_MIN_MICROVERSION=${TEMPEST_WATCHER_MIN_MICROVERSION:-"1.0"}
+    TEMPEST_WATCHER_MAX_MICROVERSION=${TEMPEST_WATCHER_MAX_MICROVERSION:-"1.4"}
+
+    # Set microversion options in tempest.conf
+    iniset $TEMPEST_CONFIG optimize min_microversion $TEMPEST_WATCHER_MIN_MICROVERSION
+    iniset $TEMPEST_CONFIG optimize max_microversion $TEMPEST_WATCHER_MAX_MICROVERSION
+}
+
 # Restore xtrace
 $_XTRACE_WATCHER
 

{python_watcher-14.0.0.0rc1 → python_watcher-14.1.1}/devstack/plugin.sh

@@ -36,6 +36,9 @@ if is_service_enabled watcher-api watcher-decision-engine watcher-applier; then
         # Start the watcher components
         echo_summary "Starting watcher"
         start_watcher
+    elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
+        echo_summary "Configuring tempest for watcher"
+        configure_tempest_for_watcher
     fi
 
     if [[ "$1" == "unstack" ]]; then