Merge "Modify saving_energy log info"

update saving_energy docs
Change-Id: I3b0c86911a8d32912c2de2e2392af9539b8d9be0
2023-02-07 12:18:58 +00:00 · 2023-02-07 10:27:54 +00:00 · 2023-02-07 10:20:04 +00:00 · 2023-02-07 08:02:20 +00:00 · 2022-09-26 14:19:58 +02:00 · 2022-09-16 06:36:21 +00:00
8 changed files with 27 additions and 11 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,8 +1,9 @@
 - project:
+    queue: watcher
    templates:
      - check-requirements
      - openstack-cover-jobs
-      - openstack-python3-zed-jobs
+      - openstack-python3-jobs
      - publish-openstack-docs-pti
      - release-notes-jobs-python3
    check:
@@ -14,7 +15,6 @@
        - watcherclient-tempest-functional
        - watcher-tempest-functional-ipv6-only
    gate:
-      queue: watcher
      jobs:
        - watcher-tempest-functional
        - watcher-tempest-functional-ipv6-only
--- a/doc/source/strategies/saving_energy.rst
+++ b/doc/source/strategies/saving_energy.rst
@@ -89,9 +89,9 @@ step 2: Create audit to do optimization
 .. code-block:: shell

    $ openstack optimize audittemplate create \
-      at1 saving_energy --strategy saving_energy
+      saving_energy_template1 saving_energy --strategy saving_energy

-    $ openstack optimize audit create -a at1 \
+    $ openstack optimize audit create -a saving_energy_audit1 \
      -p free_used_percent=20.0

 External Links
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -21,6 +21,7 @@ Contents:
   :maxdepth: 1

   unreleased
+   zed
   yoga
   xena
   wallaby
--- a/releasenotes/source/zed.rst
+++ b/releasenotes/source/zed.rst
@@ -0,0 +1,6 @@
+========================
+Zed Series Release Notes
+========================
+
+.. release-notes::
+   :branch: stable/zed
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 minversion = 3.18.0
 envlist = py3,pep8
-skipsdist = True
 ignore_basepython_conflict = True

 [testenv]
@@ -19,7 +18,13 @@ 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 =
--- a/watcher/db/sqlalchemy/api.py
+++ b/watcher/db/sqlalchemy/api.py
@@ -44,7 +44,11 @@ _FACADE = None
 def _create_facade_lazily():
    global _FACADE
    if _FACADE is None:
-        _FACADE = db_session.EngineFacade.from_config(CONF)
+        # FIXME(amoralej): Remove autocommit=True (and ideally use of
+        # LegacyEngineFacade) asap since it's not compatible with SQLAlchemy
+        # 2.0.
+        _FACADE = db_session.EngineFacade.from_config(CONF,
+                                                      autocommit=True)
    return _FACADE


--- a/watcher/decision_engine/strategy/strategies/saving_energy.py
+++ b/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.debug("power off %s", node.uuid)
+                LOG.info("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.debug("power on %s", node.uuid)
+                LOG.info("power on %s", node.uuid)

    def pre_execute(self):
        self._pre_execute()
--- a/watcher/tests/common/test_service.py
+++ b/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)
Author	SHA1	Message	Date
Zuul	e7cda537e7	Merge "Modify saving_energy log info"	2023-02-07 12:18:58 +00:00
chenker	c7be34fbaa	update saving_energy docs Change-Id: I3b0c86911a8d32912c2de2e2392af9539b8d9be0	2023-02-07 10:27:54 +00:00
chenker	52da088011	Modify saving_energy log info Change-Id: I84879a453aa3ff78917d1136c62978b9d0e606de	2023-02-07 10:20:04 +00:00
Tobias Urdin	6ac3a6febf	Fix passenv in tox.ini Change-Id: If1ddb1d48eeb96191bcbfadd1a5e14f4350a02e4	2023-02-07 08:02:20 +00:00
Thierry Carrez	6003322711	Move queue declaration to project level This moves the watcher queue declaration from the pipeline level (where it is no longer valid) to the project level. https: //lists.openstack.org/pipermail/openstack-discuss/2022-May/028603.html Change-Id: I06923abb00f7eecd59587f44cd1f6a069e88a9fc	2022-09-26 14:19:58 +02:00
Zuul	f4ffca01b8	Merge "Switch to 2023.1 Python3 unit tests and generic template name"	2022-09-16 06:36:21 +00:00
Alfredo Moralejo	5d70c207cd	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. Co-Authored-By: Stephen Finucane <stephenfin@redhat.com> Change-Id: I7db39d958d087322bfa0aad70dfbd04de9228dd7	2022-09-15 16:52:41 +02:00
OpenStack Release Bot	0b2e641d00	Switch to 2023.1 Python3 unit tests and generic template name This is an automatically generated patch to ensure unit testing is in place for all the of the tested runtimes for antelope. Also, updating the template name to generic one. See also the PTI in governance [1]. [1]: https://governance.openstack.org/tc/reference/project-testing-interface.html Change-Id: Ide6c6c398f8e6cdd590c6620a752ad802a1f5cf8	2022-09-13 12:30:33 +00:00
OpenStack Release Bot	ff84b052a5	Update master for stable/zed Add file to the reno documentation build to show release notes for stable/zed. Use pbr instruction to increment the minor version number automatically so that master versions are higher than the versions on stable/zed. Sem-Ver: feature Change-Id: I1726e33a14038712dbb9fd5e5c0cddf8ad872e69	2022-09-13 12:30:32 +00:00