Fix compatibility with oslo.db 12.1.0

oslo.db 12.1.0 has changed the default value for the 'autocommit'
parameter of 'LegacyEngineFacade' from 'True' to 'False'. This is a
necessary step to ensure compatibility with SQLAlchemy 2.0. However, we
are currently relying on the autocommit behavior and need changes to
explicitly manage sessions. Until that happens, we need to override the
default.

This also moves the watcher queue declaration from the pipeline level
(where it is no longer valid) to the project level.

Co-Authored-By: Thierry Carrez <thierry@openstack.org>
Co-Authored-By: Stephen Finucane <stephenfin@redhat.com>
(cherry picked from commit 5d70c207cd)
Change-Id: I7db39d958d087322bfa0aad70dfbd04de9228dd7

.gitreview

@@ -2,4 +2,3 @@
 host=review.opendev.org
 port=29418
 project=openstack/watcher.git
-defaultbranch=stable/2023.1

.zuul.yaml

@@ -3,7 +3,7 @@
     templates:
       - check-requirements
       - openstack-cover-jobs
-      - openstack-python3-jobs
+      - openstack-python3-zed-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:

doc/source/strategies/saving_energy.rst

@@ -89,9 +89,9 @@ step 2: Create audit to do optimization
 .. code-block:: shell
 
     $ openstack optimize audittemplate create \
-      saving_energy_template1 saving_energy --strategy saving_energy
+      at1 saving_energy --strategy saving_energy
 
-    $ openstack optimize audit create -a saving_energy_audit1 \
+    $ openstack optimize audit create -a at1 \
       -p free_used_percent=20.0
 
 External Links

releasenotes/source/index.rst

@@ -21,7 +21,6 @@ Contents:
    :maxdepth: 1
 
    unreleased
-   zed
    yoga
    xena
    wallaby

releasenotes/source/zed.rst

@@ -1,6 +0,0 @@
-========================
-Zed Series Release Notes
-========================
-
-.. release-notes::
-   :branch: stable/zed

tox.ini

@@ -1,6 +1,7 @@
 [tox]
 minversion = 3.18.0
 envlist = py3,pep8
+skipsdist = True
 ignore_basepython_conflict = True
 
 [testenv]
@@ -8,7 +9,7 @@ basepython = python3
 usedevelop = True
 allowlist_externals = find
                       rm
-install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1} {opts} {packages}
+install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps =
@@ -18,13 +19,7 @@ commands =
   rm -f .testrepository/times.dbm
   find . -type f -name "*.py[c|o]" -delete
   stestr run {posargs}
-passenv =
-  http_proxy
-  HTTP_PROXY
-  https_proxy
-  HTTPS_PROXY
-  no_proxy
-  NO_PROXY
+passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 
 [testenv:pep8]
 commands =

watcher/decision_engine/strategy/strategies/saving_energy.py

@@ -206,13 +206,13 @@ class SavingEnergy(base.SavingEnergyBaseStrategy):
             for node in random.sample(self.free_poweron_node_pool,
                                       (len_poweron - need_poweron)):
                 self.add_action_poweronoff_node(node, 'off')
-                LOG.info("power off %s", node.uuid)
+                LOG.debug("power off %s", node.uuid)
         elif len_poweron < need_poweron:
             diff = need_poweron - len_poweron
             for node in random.sample(self.free_poweroff_node_pool,
                                       min(len_poweroff, diff)):
                 self.add_action_poweronoff_node(node, 'on')
-                LOG.info("power on %s", node.uuid)
+                LOG.debug("power on %s", node.uuid)
 
     def pre_execute(self):
         self._pre_execute()

watcher/tests/common/test_service.py

@@ -80,13 +80,13 @@ class TestService(base.TestCase):
         super(TestService, self).setUp()
 
     @mock.patch.object(om.rpc.server, "RPCServer")
-    def _test_start(self, m_handler):
+    def test_start(self, m_handler):
         dummy_service = service.Service(DummyManager)
         dummy_service.start()
         self.assertEqual(1, m_handler.call_count)
 
     @mock.patch.object(om.rpc.server, "RPCServer")
-    def _test_stop(self, m_handler):
+    def test_stop(self, m_handler):
         dummy_service = service.Service(DummyManager)
         dummy_service.stop()
         self.assertEqual(1, m_handler.call_count)