python-watcher 14.1.0__py3-none-any.whl → 14.1.1__py3-none-any.whl

{python_watcher-14.1.0.dist-info → python_watcher-14.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-watcher
-Version: 14.1.0
+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
@@ -20,52 +20,61 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: apscheduler >=3.5.1
-Requires-Dist: eventlet >=0.27.0
-Requires-Dist: jsonpatch >=1.21
-Requires-Dist: keystoneauth1 >=3.4.0
-Requires-Dist: jsonschema >=3.2.0
-Requires-Dist: keystonemiddleware >=4.21.0
-Requires-Dist: lxml >=4.5.1
-Requires-Dist: croniter >=0.3.20
-Requires-Dist: os-resource-classes >=0.4.0
-Requires-Dist: oslo.concurrency >=3.26.0
-Requires-Dist: oslo.cache >=1.29.0
-Requires-Dist: oslo.config >=6.8.0
-Requires-Dist: oslo.context >=2.21.0
-Requires-Dist: oslo.db >=4.44.0
-Requires-Dist: oslo.i18n >=3.20.0
-Requires-Dist: oslo.log >=3.37.0
-Requires-Dist: oslo.messaging >=14.1.0
-Requires-Dist: oslo.policy >=4.5.0
-Requires-Dist: oslo.reports >=1.27.0
-Requires-Dist: oslo.serialization >=2.25.0
-Requires-Dist: oslo.service >=1.30.0
-Requires-Dist: oslo.upgradecheck >=1.3.0
-Requires-Dist: oslo.utils >=7.0.0
-Requires-Dist: oslo.versionedobjects >=1.32.0
-Requires-Dist: PasteDeploy >=1.5.2
-Requires-Dist: pbr >=3.1.1
-Requires-Dist: pecan >=1.3.2
-Requires-Dist: PrettyTable >=0.7.2
-Requires-Dist: gnocchiclient >=7.0.1
-Requires-Dist: python-cinderclient >=3.5.0
-Requires-Dist: python-glanceclient >=2.9.1
-Requires-Dist: python-keystoneclient >=3.15.0
-Requires-Dist: python-monascaclient >=1.12.0
-Requires-Dist: python-neutronclient >=6.7.0
-Requires-Dist: python-novaclient >=14.1.0
-Requires-Dist: python-observabilityclient >=0.3.0
-Requires-Dist: python-openstackclient >=3.14.0
-Requires-Dist: python-ironicclient >=2.5.0
-Requires-Dist: SQLAlchemy >=1.2.5
-Requires-Dist: stevedore >=1.28.0
-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: futurist >=1.8.0
+Requires-Dist: apscheduler>=3.5.1
+Requires-Dist: eventlet>=0.27.0
+Requires-Dist: jsonpatch>=1.21
+Requires-Dist: keystoneauth1>=3.4.0
+Requires-Dist: jsonschema>=3.2.0
+Requires-Dist: keystonemiddleware>=4.21.0
+Requires-Dist: lxml>=4.5.1
+Requires-Dist: croniter>=0.3.20
+Requires-Dist: os-resource-classes>=0.4.0
+Requires-Dist: oslo.concurrency>=3.26.0
+Requires-Dist: oslo.cache>=1.29.0
+Requires-Dist: oslo.config>=6.8.0
+Requires-Dist: oslo.context>=2.21.0
+Requires-Dist: oslo.db>=4.44.0
+Requires-Dist: oslo.i18n>=3.20.0
+Requires-Dist: oslo.log>=3.37.0
+Requires-Dist: oslo.messaging>=14.1.0
+Requires-Dist: oslo.policy>=4.5.0
+Requires-Dist: oslo.reports>=1.27.0
+Requires-Dist: oslo.serialization>=2.25.0
+Requires-Dist: oslo.service>=1.30.0
+Requires-Dist: oslo.upgradecheck>=1.3.0
+Requires-Dist: oslo.utils>=7.0.0
+Requires-Dist: oslo.versionedobjects>=1.32.0
+Requires-Dist: PasteDeploy>=1.5.2
+Requires-Dist: pbr>=3.1.1
+Requires-Dist: pecan>=1.3.2
+Requires-Dist: PrettyTable>=0.7.2
+Requires-Dist: gnocchiclient>=7.0.1
+Requires-Dist: python-cinderclient>=3.5.0
+Requires-Dist: python-glanceclient>=2.9.1
+Requires-Dist: python-keystoneclient>=3.15.0
+Requires-Dist: python-monascaclient>=1.12.0
+Requires-Dist: python-neutronclient>=6.7.0
+Requires-Dist: python-novaclient>=14.1.0
+Requires-Dist: python-observabilityclient>=0.3.0
+Requires-Dist: python-openstackclient>=3.14.0
+Requires-Dist: python-ironicclient>=2.5.0
+Requires-Dist: SQLAlchemy>=1.2.5
+Requires-Dist: stevedore>=1.28.0
+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: 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.1.0.dist-info → python_watcher-14.1.1.dist-info}/RECORD

@@ -1,8 +1,10 @@
-python_watcher-14.1.0.data/data/etc/apache2/watcher,sha256=urybYUTb0kAVIvbm4WK5oDfXR82QSK2lyMl4Z9dCz4Q,1190
-python_watcher-14.1.0.data/data/etc/watcher/README-watcher.conf.txt,sha256=EIa_sjXDyl1XSg0ovsFwUjqw0euS0N2PYn4HtyBGJME,131
-python_watcher-14.1.0.data/data/etc/watcher/oslo-config-generator/watcher.conf,sha256=O7g1DZqgXvbQgkBfot0dR1ar1d-3SBkOU_ZK4Dz7SFc,406
-python_watcher-14.1.0.data/data/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf,sha256=ZfIuVdtrj7IZm2BrRQvAW3JOL_kqCiILf-vBmwX3ufw,76
-python_watcher-14.1.0.data/scripts/watcher-api-wsgi,sha256=YcIpUO3iRVW6Fu3Md_ooAeHkmJJasG031naMdf8cv2A,1829
+python_watcher-14.1.1.data/data/etc/apache2/watcher,sha256=urybYUTb0kAVIvbm4WK5oDfXR82QSK2lyMl4Z9dCz4Q,1190
+python_watcher-14.1.1.data/data/etc/watcher/README-watcher.conf.txt,sha256=EIa_sjXDyl1XSg0ovsFwUjqw0euS0N2PYn4HtyBGJME,131
+python_watcher-14.1.1.data/data/etc/watcher/oslo-config-generator/watcher.conf,sha256=O7g1DZqgXvbQgkBfot0dR1ar1d-3SBkOU_ZK4Dz7SFc,406
+python_watcher-14.1.1.data/data/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf,sha256=ZfIuVdtrj7IZm2BrRQvAW3JOL_kqCiILf-vBmwX3ufw,76
+python_watcher-14.1.1.data/scripts/watcher-api-wsgi,sha256=YcIpUO3iRVW6Fu3Md_ooAeHkmJJasG031naMdf8cv2A,1829
+python_watcher-14.1.1.dist-info/licenses/AUTHORS,sha256=9d2KSouBWGvHRnwW5J5wzVLYye0DXA0miYTgIytR-X0,7961
+python_watcher-14.1.1.dist-info/licenses/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
 watcher/__init__.py,sha256=Vs2olXPZ_IAV1rukHYRl3ITzYFBNXX9mIUtFXkMWYwg,640
 watcher/_i18n.py,sha256=-25OcpwjDCiYdFIUJh86S7Sg0fs3wMIIjEreaGUyCyY,1295
 watcher/eventlet.py,sha256=W4qOoDisSJSax28o30p3_w5QRjy_zdE3vNdRUkegXu4,1365
@@ -86,7 +88,7 @@ watcher/common/placement_helper.py,sha256=jo9Ksofh7AGd8rLFsib-cF1kRocP05-trpJOxd
 watcher/common/policy.py,sha256=8WGBY79RJItBN4RphBEacYj7JKtSHJLoVw3WW7oM5oA,4893
 watcher/common/rpc.py,sha256=X1ZEohTH6Maw_iZaj9JBDAD_sfUPzV35W4lCeJhRITc,4415
 watcher/common/scheduling.py,sha256=EDlbXf86tgjzHN_qdTpk_JhfaZI5varD9-meThH7ync,2619
-watcher/common/service.py,sha256=E7zX4m-nskz-ODbhsKoYhfKHB9-Sbj-FntikvUflFes,9740
+watcher/common/service.py,sha256=nFyaWGiCrlJawrR73EKNe10jfLQbNjp47qSRiwz6gD0,9730
 watcher/common/service_manager.py,sha256=PQwa-58CTLD0bWS_5i9KigSTp9OGeP7m7D1oMg3f50A,1421
 watcher/common/utils.py,sha256=PCPgzMtVfZR9613P7guKv1DJljK_4e0TbW7LgMXmwcg,6038
 watcher/common/loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -122,11 +124,11 @@ watcher/conf/decision_engine.py,sha256=eptqMmeCTEw0g6JJw-rLhHB3pb-gHlnS12rW1HPjC
 watcher/conf/exception.py,sha256=_VAlIawyQZGHbn8zFzXsNaOiCv5miZD9VGR3HJn2Y1Q,989
 watcher/conf/glance_client.py,sha256=4Z_8qz6tNSBIO6McnyYs6w8OlyntXaLWGomLh4A7JrY,1593
 watcher/conf/gnocchi_client.py,sha256=oFbFgpA9dbQcA5pW4-gBBYuuvrIkm4ucRwZ67UopvJ0,1581
-watcher/conf/grafana_client.py,sha256=JMalRmtMpRwpMMr8EkkV_maUcbEw4PGzPSv8Z4DTDpc,6908
+watcher/conf/grafana_client.py,sha256=FOG9dDck_PYptoX6cGsyTXdzewIoHO3kbbxLHrgjIXA,6936
 watcher/conf/grafana_translators.py,sha256=5mqq-ZUYpiOaOtm7GRbxiyiJQFw_GFb8JynGhCMAwyE,1651
 watcher/conf/ironic_client.py,sha256=Ux2gvBHlHBrrnfR8vDlwHrCWJLgileiaL6xSgqXkOxw,1589
 watcher/conf/keystone_client.py,sha256=V7PKGylRSrw9zwMw_xuehxmpqXM7up9y_DIdYJBJFdg,1349
-watcher/conf/maas_client.py,sha256=7KGb3yIKWDvCdYA5Kc22uszkFEOp9rcJQHpQFES2dfA,1277
+watcher/conf/maas_client.py,sha256=99UaXMNg_1GPyfU2q4TjjHpRmI6zAStcrYzvo6lDyyg,1305
 watcher/conf/monasca_client.py,sha256=LcUhyHOZ-VgAY2p3dhuvNeNsmITBhHaoKJxGYD7-Q5w,1596
 watcher/conf/neutron_client.py,sha256=VyLPAeKSJ6hy-eL_a-DhRLUrLCPQ2TBsb7eBIrAB8Ws,1608
 watcher/conf/nova_client.py,sha256=hEYsV5j5TzvK1iAl9JA-ESZ2AT2HXtJ_F7qGTqvr0nk,1923
@@ -261,7 +263,7 @@ watcher/decision_engine/strategy/strategies/saving_energy.py,sha256=gzjv0Uk3bEV6
 watcher/decision_engine/strategy/strategies/storage_capacity_balance.py,sha256=a2C12V3LfISTJLEVFsjvrXWCXmv9knhmU5smzG0N-XE,15669
 watcher/decision_engine/strategy/strategies/uniform_airflow.py,sha256=MzCCmXirahFlzbPCR8_E8Bek1iB0sqVKamzIhEwi3NY,13391
 watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py,sha256=-usWMjqFcbTSWbGKNmsSlZ-0wnMNwLv2w22Fu6nIqyw,27190
-watcher/decision_engine/strategy/strategies/workload_balance.py,sha256=MMJZkfi8kFJDT4Hcp-NTCclN1MMKj02t88OdMinWYnI,14333
+watcher/decision_engine/strategy/strategies/workload_balance.py,sha256=Q0S8niQ0paVG7QDVPVSRcK8wsQH-oric0It1xYSBQLo,15629
 watcher/decision_engine/strategy/strategies/workload_stabilization.py,sha256=xKnjDeSAkGxvAuUKlxRGuaHVyBjSy-1nFcgI4ni8pnk,24902
 watcher/decision_engine/strategy/strategies/zone_migration.py,sha256=Dt82_SkERBm-GyoGxsdS4cAFlzUQjGEMEoE9x_5B_hE,32798
 watcher/hacking/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -357,7 +359,7 @@ watcher/tests/common/test_ironic_helper.py,sha256=Ut-bpvPBQJWdu9xWPvzQ0sFEimuHU0
 watcher/tests/common/test_nova_helper.py,sha256=BaJ4Gfn1hGG5sho2QZ7btCvzrvzbIpR6PI6kAejr6Yw,28524
 watcher/tests/common/test_placement_helper.py,sha256=Y4P2YbWhC0itWGJbaDkoua9ot0XknXuM8disvceIXQQ,11761
 watcher/tests/common/test_scheduling.py,sha256=nWmLBoRwNZCSRRW_3DtlgWC0zpY9jfbb1wIkYY47_aE,2494
-watcher/tests/common/test_service.py,sha256=C7i4Pdawc_XKpqZuklJqQd3unztgiVpvkwwjUujGRK0,3535
+watcher/tests/common/test_service.py,sha256=zQ4kKVr6BsP-4cvlGS3GL2GyWzt2Zu0UhLmz2W97R_g,4401
 watcher/tests/common/test_utils.py,sha256=Mq-51gFQv2EPdGaO44_py8ewdbObvnhwE4fpnzPTQPM,1697
 watcher/tests/common/loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/tests/common/loader/test_loader.py,sha256=mBnhe2apSmqpEL-8QZUlRDhDuWEEGo7iZQxpZIuGCWM,3612
@@ -418,7 +420,7 @@ watcher/tests/decision_engine/messaging/test_data_model_endpoint.py,sha256=6wj90
 watcher/tests/decision_engine/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/tests/decision_engine/model/faker_cluster_and_metrics.py,sha256=jJ53BoXal8Vr516Mc60PgWMClIGVpck3yoDNe07Aw6g,7038
 watcher/tests/decision_engine/model/faker_cluster_state.py,sha256=whaEpzD8zt7BVnqsBrWcbugDOeyChAyn74d1YwO0P1o,12405
-watcher/tests/decision_engine/model/gnocchi_metrics.py,sha256=LoKRVLPPwi_BIJgRlPRZ_gG87Nqkfd0_4e0DcmonSu8,9358
+watcher/tests/decision_engine/model/gnocchi_metrics.py,sha256=Fs5gGrAgxHA2eENzJbWCMDEUNMZPxy2qUwhLFNWTS-M,9357
 watcher/tests/decision_engine/model/monasca_metrics.py,sha256=s-voe8Cu7Su2_Tn_sp3dSxWTPI3zgFd9Wtrf9CZ7Wu4,4121
 watcher/tests/decision_engine/model/test_element.py,sha256=m0Bti4A6DRsZbYvWbobowBF_CsBTHhXr2nmFmJuM0rU,5637
 watcher/tests/decision_engine/model/test_model.py,sha256=UwqHkRyo9puoWjZaRto90HE3k_ycwveUYvg_a3jGNlY,20671
@@ -523,7 +525,7 @@ watcher/tests/decision_engine/strategy/strategies/test_storage_capacity_balance.
 watcher/tests/decision_engine/strategy/strategies/test_strategy_endpoint.py,sha256=mw2CFX-JfWwaNM3EYFLoZzHZxJXpEh5YD7JPrZz0ggI,2886
 watcher/tests/decision_engine/strategy/strategies/test_uniform_airflow.py,sha256=ChNt74enUScPZFFrDLa9Xqnq4O1nU2CAg7KnyNl3JOM,7265
 watcher/tests/decision_engine/strategy/strategies/test_vm_workload_consolidation.py,sha256=AXY55dBg_8w37qpy0BT89ScUo81BUCZXwZO957jTgEE,19203
-watcher/tests/decision_engine/strategy/strategies/test_workload_balance.py,sha256=utqnw1rUNTFfdBhuNsxY8Q81Lr7SNhfYSyHCVxUL-BA,6074
+watcher/tests/decision_engine/strategy/strategies/test_workload_balance.py,sha256=m2VljGe-9IJBBRyJwkseDiRxLB1z510tQL3orGyG470,8380
 watcher/tests/decision_engine/strategy/strategies/test_workload_stabilization.py,sha256=eGr_PX8dpM4oTlC-GFrimDN1kQbKpNFzA_C5c4mo250,14313
 watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py,sha256=eEkK66H_nnhghDEuBXo8dvdifhN6N_9CO5mlVdN-ytM,30871
 watcher/tests/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -547,11 +549,9 @@ watcher/tests/objects/test_strategy.py,sha256=WoJYFQD0LU7vkUT2MMy1bx3S6eY458aTIC
 watcher/tests/objects/utils.py,sha256=WtBFlXWIBRvl1keAjz1GtrkUWppil2pFIA-RngcqA5c,8058
 watcher/wsgi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/wsgi/api.py,sha256=F1s1Q_CMuRdgS_f7Gl3XzavjZqdxqO9IHLxSWl6NOO4,789
-python_watcher-14.1.0.dist-info/AUTHORS,sha256=9d2KSouBWGvHRnwW5J5wzVLYye0DXA0miYTgIytR-X0,7961
-python_watcher-14.1.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-python_watcher-14.1.0.dist-info/METADATA,sha256=bpNI_tPLjPM568PVe3YLFl8uXnDwDhDB-vs_ywg8iOQ,3880
-python_watcher-14.1.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-python_watcher-14.1.0.dist-info/entry_points.txt,sha256=PN53WKewBT3McXxlv--kAOX-3NWeJqYVy8wkeCR0orc,4396
-python_watcher-14.1.0.dist-info/pbr.json,sha256=VdP5H0whv1sbxfhXfL9UYnztLRuOH2xlRrkMU-YtJfk,47
-python_watcher-14.1.0.dist-info/top_level.txt,sha256=O2B7Sbzshq5s-tZxb2a7VETvMDiJItSYieAiJ6Jm5yY,8
-python_watcher-14.1.0.dist-info/RECORD,,
+python_watcher-14.1.1.dist-info/METADATA,sha256=WySMYxnHrs_uuDWG55W5RxGJenw3h6IjXvG-zViKKHg,4019
+python_watcher-14.1.1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_watcher-14.1.1.dist-info/entry_points.txt,sha256=PN53WKewBT3McXxlv--kAOX-3NWeJqYVy8wkeCR0orc,4396
+python_watcher-14.1.1.dist-info/pbr.json,sha256=879o55rPCg0i2X1_4q2X756BVg5rlJIWWpR0FtSH_ZU,47
+python_watcher-14.1.1.dist-info/top_level.txt,sha256=O2B7Sbzshq5s-tZxb2a7VETvMDiJItSYieAiJ6Jm5yY,8
+python_watcher-14.1.1.dist-info/RECORD,,

{python_watcher-14.1.0.dist-info → python_watcher-14.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.2)
+Generator: setuptools (83.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

python_watcher-14.1.1.dist-info/pbr.json

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

watcher/common/service.py

@@ -241,7 +241,7 @@ class Service(service.ServiceBase):
         )
 
     def start(self):
-        LOG.debug("Connecting to '%s'", CONF.transport_url)
+        LOG.debug("Connecting to messaging transport")
         if self.conductor_topic_handler:
             self.conductor_topic_handler.start()
         if self.notification_handler:
@@ -250,7 +250,7 @@ class Service(service.ServiceBase):
             self.heartbeat.start()
 
     def stop(self):
-        LOG.debug("Disconnecting from '%s'", CONF.transport_url)
+        LOG.debug("Disconnecting from messaging transport")
         if self.conductor_topic_handler:
             self.conductor_topic_handler.stop()
         if self.notification_handler:

watcher/conf/grafana_client.py

@@ -29,6 +29,7 @@ GRAFANA_CLIENT_OPTS = [
     # A similar structure to the database_map would solve this.
     cfg.StrOpt('token',
                default=None,
+               secret=True,
                help="Authentication token to gain access"),
     # TODO(Dantali0n) each individual metric could have its own base url.
     # A similar structure to the database_map would solve this.

watcher/conf/maas_client.py

@@ -23,6 +23,7 @@ MAAS_CLIENT_OPTS = [
     cfg.StrOpt('url',
                help='MaaS URL, example: http://1.2.3.4:5240/MAAS'),
     cfg.StrOpt('api_key',
+               secret=True,
                help='MaaS API authentication key.'),
     cfg.IntOpt('timeout',
                default=60,

watcher/decision_engine/strategy/strategies/workload_balance.py

@@ -192,15 +192,30 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
             if (free_res['vcpu'] >= required_cores and
                     free_res['memory'] >= required_mem and
                     free_res['disk'] >= required_disk):
-                if (self._meter == 'instance_cpu_usage' and
-                    ((src_instance_workload + workload) <
-                     self.threshold / 100 * host.vcpus)):
-                    destination_hosts.append(instance_data)
-                if (self._meter == 'instance_ram_usage' and
-                    ((src_instance_workload + workload) <
-                     self.threshold / 100 * host.memory)):
-                    destination_hosts.append(instance_data)
-
+                if self._meter == 'instance_cpu_usage':
+                    usage = src_instance_workload + workload
+                    usage_percent = usage / host.vcpus * 100
+                    limit = self.threshold / 100 * host.vcpus
+                    if usage < limit:
+                        destination_hosts.append(instance_data)
+                    LOG.debug(f"Host {host.hostname} evaluated as destination "
+                              f"for {instance_to_migrate.uuid}. Host usage "
+                              f"for cpu would be {usage_percent}."
+                              f"The threshold is: {self.threshold}. "
+                              f"selected: {usage < limit}"
+                              )
+                if self._meter == 'instance_ram_usage':
+                    usage = src_instance_workload + workload
+                    usage_percent = usage / host.memory * 100
+                    limit = self.threshold / 100 * host.memory
+                    if usage < limit:
+                        destination_hosts.append(instance_data)
+                    LOG.debug(f"Host {host.hostname} evaluated as destination "
+                              f"for {instance_to_migrate.uuid}. Host usage "
+                              f"for ram would be {usage_percent}."
+                              f"The threshold is: {self.threshold}. "
+                              f"selected: {usage < limit}"
+                              )
         return destination_hosts
 
     def group_hosts_by_cpu_or_ram_util(self):
@@ -251,8 +266,10 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
             cluster_workload += node_workload
             if self._meter == 'instance_cpu_usage':
                 node_util = node_workload / node.vcpus * 100
+                host_metric = 'host_cpu_usage_percent'
             else:
                 node_util = node_workload / node.memory * 100
+                host_metric = 'host_ram_usage_percent'
 
             instance_data = {
                 'compute_node': node, self._meter: node_util,
@@ -262,6 +279,9 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
                 overload_hosts.append(instance_data)
             else:
                 nonoverload_hosts.append(instance_data)
+            LOG.debug(f"Host usage for {node_id}: {host_metric} is "
+                      f"{node_util}. Higher than threshold {self.threshold}: "
+                      f"{node_util >= self.threshold}")
 
         avg_workload = 0
         if cluster_size != 0:

watcher/tests/common/test_service.py

@@ -104,3 +104,25 @@ class TestService(base.TestCase):
         self.assertIsInstance(
             dummy_service.conductor_topic_handler,
             om.rpc.server.RPCServer)
+
+    @mock.patch.object(service.LOG, 'debug', autospec=True)
+    def test_transport_url_not_logged(self, mock_debug):
+        transport_url = 'rabbit://api:secret-pass@example.com:5672/'
+        CONF.set_override('transport_url', transport_url)
+
+        dummy_service = service.Service(DummyManager)
+        dummy_service.conductor_topic_handler = None
+        dummy_service.notification_handler = None
+        dummy_service.heartbeat = None
+
+        dummy_service.start()
+        dummy_service.stop()
+
+        logged = ' '.join(
+            str(arg) for call in mock_debug.call_args_list for arg in call.args
+        )
+
+        self.assertNotIn(transport_url, logged)
+        self.assertNotIn('secret-pass', logged)
+        mock_debug.assert_any_call("Connecting to messaging transport")
+        mock_debug.assert_any_call("Disconnecting from messaging transport")

watcher/tests/decision_engine/model/gnocchi_metrics.py

@@ -304,8 +304,8 @@ class FakeGnocchiMetrics(object):
         mock = {}
 
         # node 0
-        mock['INSTANCE_1'] = 30
-        mock['73b09e16-35b7-4922-804e-e8f5d9b740fc'] = 12
+        mock['INSTANCE_1'] = 40
+        mock['73b09e16-35b7-4922-804e-e8f5d9b740fc'] = 9
         # node 1
         mock['INSTANCE_3'] = 12
         mock['INSTANCE_4'] = 12

watcher/tests/decision_engine/strategy/strategies/test_workload_balance.py

@@ -22,6 +22,7 @@ from unittest import mock
 from watcher.applier.loading import default
 from watcher.common import utils
 from watcher.decision_engine.strategy import strategies
+from watcher.decision_engine.strategy.strategies import workload_balance
 from watcher.tests.decision_engine.model import gnocchi_metrics
 from watcher.tests.decision_engine.strategy.strategies.test_base \
     import TestBaseStrategy
@@ -77,7 +78,7 @@ class TestWorkloadBalance(TestBaseStrategy):
         n1, n2, avg, w_map = self.strategy.group_hosts_by_cpu_or_ram_util()
         self.assertEqual(n1[0]['compute_node'].uuid, 'Node_0')
         self.assertEqual(n2[0]['compute_node'].uuid, 'Node_1')
-        self.assertEqual(avg, 33.0)
+        self.assertEqual(avg, 36.5)
 
     def test_choose_instance_to_migrate(self):
         model = self.fake_c_cluster.generate_scenario_6_with_2_nodes()
@@ -99,7 +100,8 @@ class TestWorkloadBalance(TestBaseStrategy):
             n1, avg, w_map)
         self.assertIsNone(instance_to_mig)
 
-    def test_filter_destination_hosts(self):
+    @mock.patch.object(workload_balance.LOG, 'debug', autospec=True)
+    def test_filter_destination_hosts_cpu(self, mock_debug):
         model = self.fake_c_cluster.generate_scenario_6_with_2_nodes()
         self.m_c_model.return_value = model
         self.strategy.datasource = mock.MagicMock(
@@ -111,6 +113,42 @@ class TestWorkloadBalance(TestBaseStrategy):
             n2, instance_to_mig[1], avg, w_map)
         self.assertEqual(len(dest_hosts), 1)
         self.assertEqual(dest_hosts[0]['compute_node'].uuid, 'Node_1')
+        expected_calls = [
+            mock.call('Host usage for Node_0: host_cpu_usage_percent is 32.5. '
+                      'Higher than threshold 25.0: True'),
+            mock.call('Host usage for Node_1: host_cpu_usage_percent is 7.5. '
+                      'Higher than threshold 25.0: False'),
+            mock.call('Host hostname_1 evaluated as destination for '
+                      '73b09e16-35b7-4922-804e-e8f5d9b740fc. Host usage for '
+                      'cpu would be 20.0.The threshold is: 25.0. selected: '
+                      'True')]
+        mock_debug.assert_has_calls(expected_calls, any_order=True)
+
+    @mock.patch.object(workload_balance.LOG, 'debug', autospec=True)
+    def test_filter_destination_hosts_ram(self, mock_debug):
+        model = self.fake_c_cluster.generate_scenario_6_with_2_nodes()
+        self.m_c_model.return_value = model
+        self.strategy._meter = 'instance_ram_usage'
+        self.strategy.threshold = 30.0
+        self.strategy.datasource = mock.MagicMock(
+            statistic_aggregation=self.fake_metrics.mock_get_statistics_wb)
+        n1, n2, avg, w_map = self.strategy.group_hosts_by_cpu_or_ram_util()
+        instance_to_mig = self.strategy.choose_instance_to_migrate(
+            n1, avg, w_map)
+        dest_hosts = self.strategy.filter_destination_hosts(
+            n2, instance_to_mig[1], avg, w_map)
+        self.assertEqual(len(dest_hosts), 1)
+        self.assertEqual(dest_hosts[0]['compute_node'].uuid, 'Node_1')
+        expected_calls = [
+            mock.call('Host usage for Node_0: host_ram_usage_percent is '
+                      '37.121212121212125. Higher than threshold 30.0: True'),
+            mock.call('Host usage for Node_1: host_ram_usage_percent is '
+                      '18.181818181818183. Higher than threshold 30.0: False'),
+            mock.call('Host hostname_1 evaluated as destination for '
+                      '73b09e16-35b7-4922-804e-e8f5d9b740fc. Host usage for '
+                      'ram would be 25.0.The threshold is: 30.0. selected: '
+                      'True')]
+        mock_debug.assert_has_calls(expected_calls, any_order=True)
 
     def test_execute_no_workload(self):
         model = self.fake_c_cluster.\

python_watcher-14.1.0.dist-info/pbr.json

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