python-watcher 15.1.0__py3-none-any.whl → 15.1.1__py3-none-any.whl

{python_watcher-15.1.0.dist-info → python_watcher-15.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-watcher
-Version: 15.1.0
+Version: 15.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

{python_watcher-15.1.0.dist-info → python_watcher-15.1.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-python_watcher-15.1.0.data/data/etc/apache2/watcher,sha256=urybYUTb0kAVIvbm4WK5oDfXR82QSK2lyMl4Z9dCz4Q,1190
-python_watcher-15.1.0.data/data/etc/watcher/README-watcher.conf.txt,sha256=EIa_sjXDyl1XSg0ovsFwUjqw0euS0N2PYn4HtyBGJME,131
-python_watcher-15.1.0.data/data/etc/watcher/oslo-config-generator/watcher.conf,sha256=O7g1DZqgXvbQgkBfot0dR1ar1d-3SBkOU_ZK4Dz7SFc,406
-python_watcher-15.1.0.data/data/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf,sha256=ZfIuVdtrj7IZm2BrRQvAW3JOL_kqCiILf-vBmwX3ufw,76
-python_watcher-15.1.0.data/scripts/watcher-api-wsgi,sha256=YcIpUO3iRVW6Fu3Md_ooAeHkmJJasG031naMdf8cv2A,1829
-python_watcher-15.1.0.dist-info/licenses/AUTHORS,sha256=_WO5_45pJAVeBpD3J-G8AFeMPJyA5OV0Fzms6SOsqO4,8168
-python_watcher-15.1.0.dist-info/licenses/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+python_watcher-15.1.1.data/data/etc/apache2/watcher,sha256=urybYUTb0kAVIvbm4WK5oDfXR82QSK2lyMl4Z9dCz4Q,1190
+python_watcher-15.1.1.data/data/etc/watcher/README-watcher.conf.txt,sha256=EIa_sjXDyl1XSg0ovsFwUjqw0euS0N2PYn4HtyBGJME,131
+python_watcher-15.1.1.data/data/etc/watcher/oslo-config-generator/watcher.conf,sha256=O7g1DZqgXvbQgkBfot0dR1ar1d-3SBkOU_ZK4Dz7SFc,406
+python_watcher-15.1.1.data/data/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf,sha256=ZfIuVdtrj7IZm2BrRQvAW3JOL_kqCiILf-vBmwX3ufw,76
+python_watcher-15.1.1.data/scripts/watcher-api-wsgi,sha256=YcIpUO3iRVW6Fu3Md_ooAeHkmJJasG031naMdf8cv2A,1829
+python_watcher-15.1.1.dist-info/licenses/AUTHORS,sha256=_WO5_45pJAVeBpD3J-G8AFeMPJyA5OV0Fzms6SOsqO4,8168
+python_watcher-15.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=z6WuDS9HJAq6vRZCg5ozYpWCs3lwhDuv9R70bj8tpQ0,1476
@@ -77,7 +77,7 @@ watcher/cmd/eventlet/api.py,sha256=n_MTSrrNGQH7EN4q9BFpeQFcfTU0OEAGdD97TdcLmxc,1
 watcher/cmd/eventlet/applier.py,sha256=5qprJMg2_ypyAawaoOiZiaeJ8cyCVCnud3F9apyXorg,1335
 watcher/cmd/eventlet/decisionengine.py,sha256=_uZFvf5KRusXcr91ZvQGgQuxgQd_Q_z-vj9xVTnCOLY,1455
 watcher/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-watcher/common/cinder_helper.py,sha256=8MTEyGpXT2ybuMcryD1fk2NceWNxeIJAVevOuDfDpOo,11435
+watcher/common/cinder_helper.py,sha256=fjFRddZKT2zefMLa0SttF6sNvTJAyO1V8Xir3IVNaJ0,13336
 watcher/common/clients.py,sha256=Gv6RUJ-HB-vNqriApEn6syn_3QntxmpNHuCtTeQ8998,13920
 watcher/common/config.py,sha256=2_9hklnzAICpZAIDQmxoE8d8qMFS03sjkoVdXPLchmU,1465
 watcher/common/context.py,sha256=7ZZv4FMSKZZQ00NiqZFAsmico21O05UaGlc46U50_6U,3188
@@ -92,7 +92,7 @@ watcher/common/placement_helper.py,sha256=YP02OHiZOCaJODPAE2QRojf4PKJDlctW-dFn9a
 watcher/common/policy.py,sha256=8WGBY79RJItBN4RphBEacYj7JKtSHJLoVw3WW7oM5oA,4893
 watcher/common/rpc.py,sha256=eM0yHwmMDKHq29oualMp3lbVhEol2ffGTZdIJ9CgO_4,4357
 watcher/common/scheduling.py,sha256=kIWt7-vNg7wrebKEP4Xkig5r_DKfY3EnB4E4KCo3-Bo,1986
-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
@@ -129,11 +129,11 @@ watcher/conf/decision_engine.py,sha256=dh-3zFzATi8H-CYnwkxCEcHb5XV3qrSpMhWXheGuC
 watcher/conf/exception.py,sha256=_VAlIawyQZGHbn8zFzXsNaOiCv5miZD9VGR3HJn2Y1Q,989
 watcher/conf/glance_client.py,sha256=7ftFKm_Y4kf9ZYy7HVZkr0_h3EfmTbNoa2z_iIcMeHs,1589
 watcher/conf/gnocchi_client.py,sha256=wb643c4R_G9oY1le3SPHQ679ErbSqtPRivC4VJWrnmA,1589
-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=6VXcRcPtkBtXrXS8xIMRYPzqCeQdXIKtFdTYq-YzC3E,1587
 watcher/conf/keystone_client.py,sha256=zELzoqwBuWLm2S27XyzDZdlmBZBkOyAfxileyjuNJaw,1350
-watcher/conf/maas_client.py,sha256=7KGb3yIKWDvCdYA5Kc22uszkFEOp9rcJQHpQFES2dfA,1277
+watcher/conf/maas_client.py,sha256=99UaXMNg_1GPyfU2q4TjjHpRmI6zAStcrYzvo6lDyyg,1305
 watcher/conf/models.py,sha256=Fo1zQMcUjtEIroMZ4mx3kRLr2A_-3JldMZJQZ7SKIko,1390
 watcher/conf/monasca_client.py,sha256=8agQc5E5PJ2Na7MRTj9OCJbBd8coF1Ug1GvzG-GJMxw,1602
 watcher/conf/neutron_client.py,sha256=MrrdfkephVKwZjxdN7Jh1oIzR8bymsb8CB8ixs55e1Q,1604
@@ -209,7 +209,7 @@ watcher/decision_engine/messaging/audit_endpoint.py,sha256=D_GdRWpYHS8mKSvpbENd7
 watcher/decision_engine/messaging/data_model_endpoint.py,sha256=bh_ViPvF7I_Nha32eSqsRpDt8FPomM78PENZkGOyDYs,2180
 watcher/decision_engine/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/decision_engine/model/base.py,sha256=epNLXZ-bxuglMdyNe9oQawAfBlzip7foRzqu9FOPU-k,1131
-watcher/decision_engine/model/model_root.py,sha256=z7e2PkNdc3Sn4t_4TXO0ZrRAp5FsvpZR60nXUtOU8dU,24504
+watcher/decision_engine/model/model_root.py,sha256=cE8B8mdwqTOHaQjqJIhtGQm--utSvC8-J75RwOt8PGQ,25079
 watcher/decision_engine/model/collector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/decision_engine/model/collector/base.py,sha256=Nv2vbhUXU7jRw-btFKAyP_6ev0OB1R2WCQdpufRA124,9593
 watcher/decision_engine/model/collector/cinder.py,sha256=gZ_NpfoJ9BNVTELd73Tw9cLXtpti8ToxmbY3iWZNLHY,11684
@@ -218,7 +218,7 @@ watcher/decision_engine/model/collector/manager.py,sha256=3dWsClSXB1hXu8mUbTDuoa
 watcher/decision_engine/model/collector/nova.py,sha256=7Tj8OwQVgkIR2cBsbHPNxM6SFmVdD0juqerDg0eS0aY,21882
 watcher/decision_engine/model/element/__init__.py,sha256=R3XmeW4-ufWnbWruWGLR4SQJP9olmBLADRfyrvP-PaE,1320
 watcher/decision_engine/model/element/baremetal_resource.py,sha256=WC6CkGhruAXIiynWDsvKbV3VdvDihBMy3YNTa18Q5bg,924
-watcher/decision_engine/model/element/base.py,sha256=zQ1YrW-yUaVOCjS0N_x_Gu0-_kQ5cDdSUu0YfCOrt4E,2078
+watcher/decision_engine/model/element/base.py,sha256=3J5bFef8-y3xwrrS87mVKGt5p7X3mBnUYJvDH6q4eZ8,2247
 watcher/decision_engine/model/element/compute_resource.py,sha256=yeFx-ZQxryLja0oKyJubCc2XQG4i9HL4fpspWhJaSsM,860
 watcher/decision_engine/model/element/instance.py,sha256=pZMxlfALbX34eN0tO4JmxBXEjrKvkq6NMTtj9-pgL7k,2325
 watcher/decision_engine/model/element/node.py,sha256=p8uUG97FJIMBqjUUcLWxEnDFUqJEM6briS8aW_Cp4_A,3777
@@ -277,7 +277,7 @@ watcher/decision_engine/strategy/strategies/uniform_airflow.py,sha256=MzCCmXirah
 watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py,sha256=-usWMjqFcbTSWbGKNmsSlZ-0wnMNwLv2w22Fu6nIqyw,27190
 watcher/decision_engine/strategy/strategies/workload_balance.py,sha256=QFOr-UwJkv0XrYPpm-oZmbEoznDyk2yTDnGHJvkzCe4,15893
 watcher/decision_engine/strategy/strategies/workload_stabilization.py,sha256=Lfn51YMJTxS6n3AwGe-Dc0oVsMCMLXypoTwfevlOl88,25445
-watcher/decision_engine/strategy/strategies/zone_migration.py,sha256=C4DYdSErOHuihuE1KARE4KyyID4HF1evFlxCX4xrL80,34934
+watcher/decision_engine/strategy/strategies/zone_migration.py,sha256=rWrrOauKtXuH6YK-xg9BIISZN2u5b6dcKgzd75suZ98,35867
 watcher/hacking/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/hacking/checks.py,sha256=D-PG1fgVyU5TIKVmZcJ0CXbmLx-8_ivU5vCKQvtZkjk,10383
 watcher/locale/de/LC_MESSAGES/watcher.po,sha256=-EqexOllNxp5DIvacuQAKPVDB8NASduyQXOpoXRMbB4,26317
@@ -325,7 +325,7 @@ watcher/tests/api/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 watcher/tests/api/v1/test_actions.py,sha256=l27mglSLBQE_A-eQFv5rUzu4nwS3CaIQtLo37JMxgqI,33989
 watcher/tests/api/v1/test_actions_plans.py,sha256=L7xC9ZANo41qfnmBL3RNQf-jAb6e8NaIQekTPpp0sSk,33795
 watcher/tests/api/v1/test_audit_templates.py,sha256=Snj3vFLthLDciTlLUFu80Rj2u91mnVvHa5afY6LRRIo,38366
-watcher/tests/api/v1/test_audits.py,sha256=NpVDYiVTg4t75A06AsZztrdxPIFx8QAQb3f5eRcveKc,64432
+watcher/tests/api/v1/test_audits.py,sha256=T4_8hu4-L-bQIXCseVF0bEJUHtTxoV06IN7gB69PZcA,65828
 watcher/tests/api/v1/test_data_model.py,sha256=jR5yf5jSxbwb89N5XxlZcqDdxrLCuKuCxudZ6xCZHdM,6635
 watcher/tests/api/v1/test_goals.py,sha256=vveUL0rQHv0LV9xa1T4EQCNpyAbdQMFF14_HHKsyHUs,7335
 watcher/tests/api/v1/test_microversions.py,sha256=0Oo_AZqg-Mvmc5GGVvIPkWvr2Czl1ku4tUPlEh8WclE,4998
@@ -366,7 +366,7 @@ watcher/tests/cmd/test_db_manage.py,sha256=itbu-PM6I5OAP_nvWUxGYDfl5tE2e58eVafwx
 watcher/tests/cmd/test_decision_engine.py,sha256=7hSHAPLQo2WZxQoY-pEfuVMjpnAJytyK7SUizin54Ig,2267
 watcher/tests/cmd/test_status.py,sha256=EBwifVusDZuTOpiVGKNqrmJv6hK8ZlZcngm15Jntyc8,1586
 watcher/tests/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-watcher/tests/common/test_cinder_helper.py,sha256=nRTvqOURsME31QBHZxeG-75YdriW2HCr60mCR1cyl20,24754
+watcher/tests/common/test_cinder_helper.py,sha256=iFf6qgvyF-VfOg3jnm2Xj3MoQVIBP6h3-vJZiYWIYXg,32071
 watcher/tests/common/test_clients.py,sha256=SD6qQsND91faF9Q1eTR8TIEFiAoiqKZef6FgBKIFqRw,17984
 watcher/tests/common/test_executor.py,sha256=W1F7ANlyTEX-v8wycQXE5SQ0yIkagvh3w2u7xk7x4p0,1404
 watcher/tests/common/test_ironic_helper.py,sha256=Ut-bpvPBQJWdu9xWPvzQ0sFEimuHU0_i3bC3T9aHvE0,2162
@@ -375,7 +375,7 @@ watcher/tests/common/test_nova_helper.py,sha256=Fjtp-RFr-M46U_6hnkS5Z2GhDNEBvdmH
 watcher/tests/common/test_oslo_service_helper.py,sha256=aG28fDYYtCDGrSPrRbcPBKeFtq4v8KBYMslXzLYLXlQ,1677
 watcher/tests/common/test_placement_helper.py,sha256=Y4P2YbWhC0itWGJbaDkoua9ot0XknXuM8disvceIXQQ,11761
 watcher/tests/common/test_scheduling.py,sha256=pOokZK33L9eaXUX42OZmBukkIwu91wAthSG4XwezXU4,2235
-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
@@ -443,7 +443,7 @@ watcher/tests/decision_engine/model/faker_cluster_state.py,sha256=p3SW99eEzDQWId
 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=9PggbUFDshEEcbVYhU-49TKQgtufHIlTfqoJNI8Czb4,6000
-watcher/tests/decision_engine/model/test_model.py,sha256=UwqHkRyo9puoWjZaRto90HE3k_ycwveUYvg_a3jGNlY,20671
+watcher/tests/decision_engine/model/test_model.py,sha256=BLWwwRXXrc4TcoUPRwpHe4YXDGgyW1rt8XR7oJEWLeo,21982
 watcher/tests/decision_engine/model/data/ironic_scenario_1.xml,sha256=BxJ0R1FlqJa4ryyMPY81rswjW9WOSQxpsbX5lhL_Ono,451
 watcher/tests/decision_engine/model/data/scenario_1.xml,sha256=7vAaXW--mVZPuhXMh5bIhj072IY1SQVnphnh6StZHJs,10426
 watcher/tests/decision_engine/model/data/scenario_10.xml,sha256=XkdELZDxrUIrAnEqCxHbav0g_8FKzP_zbGuHrWv_4r8,4984
@@ -550,7 +550,7 @@ watcher/tests/decision_engine/strategy/strategies/test_uniform_airflow.py,sha256
 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=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=syUFRGHNi6kPfzgTgJ0AtAliajR16bCb4jGpa27bKS0,68197
+watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py,sha256=kH0fqMw0URbBJG9BSnZg2qvTMxXZEuJhQWyTNFOc70Y,72059
 watcher/tests/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/tests/fixtures/watcher.py,sha256=9BqKxgaBLWG0LEss-rnRQu3CuB4Z6hzry6hjI0UNxhk,4923
 watcher/tests/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -574,9 +574,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-15.1.0.dist-info/METADATA,sha256=4m3xIlcgr8hXxtg5K6sgpHe44fk93wlMpz4a7bnm7Vw,4110
-python_watcher-15.1.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python_watcher-15.1.0.dist-info/entry_points.txt,sha256=neFmDxaEe7U6uSPJEFcai3Aw4cyI_aFnHXDoWBK1fqI,4464
-python_watcher-15.1.0.dist-info/pbr.json,sha256=tq55Q-B7howl7MbzEzrOBt5yHnr2WaArntB3YJ6VSjI,47
-python_watcher-15.1.0.dist-info/top_level.txt,sha256=O2B7Sbzshq5s-tZxb2a7VETvMDiJItSYieAiJ6Jm5yY,8
-python_watcher-15.1.0.dist-info/RECORD,,
+python_watcher-15.1.1.dist-info/METADATA,sha256=6uqqmtya0CNSmsp7JIq1pubEj-Hp97Yqy3Aluj_JOHA,4110
+python_watcher-15.1.1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_watcher-15.1.1.dist-info/entry_points.txt,sha256=neFmDxaEe7U6uSPJEFcai3Aw4cyI_aFnHXDoWBK1fqI,4464
+python_watcher-15.1.1.dist-info/pbr.json,sha256=Cbz81KbjaXA-Il88VMNiuOYe2l9fdNhmiCGFdY4tpZU,47
+python_watcher-15.1.1.dist-info/top_level.txt,sha256=O2B7Sbzshq5s-tZxb2a7VETvMDiJItSYieAiJ6Jm5yY,8
+python_watcher-15.1.1.dist-info/RECORD,,

{python_watcher-15.1.0.dist-info → python_watcher-15.1.1.dist-info}/WHEEL

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

python_watcher-15.1.1.dist-info/pbr.json

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

watcher/common/cinder_helper.py

@@ -94,18 +94,6 @@ class CinderHelper(object):
         except cinder_exception.NotFound:
             return self.cinder.volumes.find(name=volume)
 
-    def backendname_from_poolname(self, poolname):
-        """Get backendname from poolname"""
-        # pooolname formatted as host@backend#pool since ocata
-        # as of ocata, may as only host
-        backend = poolname.split('#')[0]
-        backendname = ""
-        try:
-            backendname = backend.split('@')[1]
-        except IndexError:
-            pass
-        return backendname
-
     def _has_snapshot(self, volume):
         """Judge volume has a snapshot"""
         volume = self.get_volume(volume)
@@ -132,6 +120,51 @@ class CinderHelper(object):
         else:
             return True
 
+    def _check_backend_matches_type(self, pool, volume_type):
+        """Check if a storage pool matches volume type requirements.
+
+        Verifies that all extra_specs properties defined in the volume
+        type are present in the pool's capabilities with matching values.
+
+        :param pool: Storage pool dictionary with capabilities
+        :param volume_type: Volume type object with extra_specs
+        :returns: True if pool matches all volume type requirements,
+                  False otherwise
+        """
+        for field_name, field_value in volume_type.extra_specs.items():
+            pool_value = pool.get("capabilities", {}).get(field_name)
+            if pool_value is not None and field_value != pool_value:
+                # the property associated with the volume type is
+                # not defined in the pool, so the type can't be used in the
+                # pool
+                LOG.debug(
+                    f"property {field_name} with value {field_value} "
+                    f"does not match value {pool_value} from pool "
+                    f"{pool['name']}"
+                )
+                return False
+        return True
+
+    def get_volume_types_for_pool(self, pool):
+        """Return a list of volume types that can be associated with a pool.
+
+        :param pool: Storage pool dictionary with capabilities
+        :returns: List of volume types than can be scheduled in the input pool
+        """
+        volume_type_list = self.get_volume_type_list()
+
+        pool_volume_types = []
+        for volume_type in volume_type_list:
+            if not volume_type.extra_specs:
+                # if there are no properties associated with the volume type
+                # it can be used in any pool
+                pool_volume_types.append(volume_type.name)
+                continue
+            if self._check_backend_matches_type(pool, volume_type):
+                pool_volume_types.append(volume_type.name)
+
+        return pool_volume_types
+
     def check_volume_deleted(self, volume, retry=120, retry_interval=10):
         """Check volume has been deleted"""
         volume = self.get_volume(volume)
@@ -224,11 +257,20 @@ class CinderHelper(object):
     def migrate(self, volume, dest_node):
         """Migrate volume to dest_node"""
         volume = self.get_volume(volume)
-        dest_backend = self.backendname_from_poolname(dest_node)
-        dest_type = self.get_volume_type_by_backendname(dest_backend)
-        if volume.volume_type not in dest_type:
+        pool_dict = self.get_storage_pool_by_name(dest_node).to_dict()
+        dest_types = self.get_volume_types_for_pool(pool_dict)
+        if volume.volume_type not in dest_types:
             raise exception.Invalid(
-                message=(_("Volume type must be same for migrating")))
+                message=(
+                    _(
+                        "Volume type '%(volume_type)s' is not compatible with "
+                        "destination pool '%(pool_name)s'"
+                    ) % {
+                        'volume_type': volume.volume_type,
+                        'pool_name': dest_node
+                        }
+                )
+            )
 
         source_node = getattr(volume, 'os-vol-host-attr:host')
         LOG.debug("Volume %(volume)s found on host '%(host)s'.",

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/model/element/base.py

@@ -51,16 +51,19 @@ class Element(base.WatcherObject, base.WatcherObjectDictCompat,
 
     def as_xml_element(self):
         sorted_fieldmap = []
+        element_name = self.__class__.__name__
         for field in self.fields:
             try:
                 value = str(self[field])
                 sorted_fieldmap.append((field, value))
+            except NotImplementedError:
+                LOG.debug("Attribute %s for object %s: %s is not provided",
+                          field, element_name, self)
             except Exception as exc:
                 LOG.exception(exc)
 
         attrib = collections.OrderedDict(sorted_fieldmap)
 
-        element_name = self.__class__.__name__
         instance_el = etree.Element(element_name, attrib=attrib)
 
         return instance_el

watcher/decision_engine/model/model_root.py

@@ -269,7 +269,14 @@ class ModelRoot(nx.DiGraph, base.Model):
             in_dict = {}
             for field in cn.fields:
                 new_name = "node_"+str(field)
-                in_dict[new_name] = cn[field]
+                try:
+                    in_dict[new_name] = cn[field]
+                # NotImplementedError means field not assigned
+                # which is really not an issue as it can be an
+                # optional field
+                except NotImplementedError:
+                    LOG.debug("Attribute %s for Compute: %s is not provided",
+                              field, cn.hostname)
             node_instances = self.get_node_instances(cn)
             if not node_instances:
                 deep_in_dict = in_dict.copy()
@@ -278,7 +285,11 @@ class ModelRoot(nx.DiGraph, base.Model):
             for instance in sorted(node_instances, key=lambda x: x.uuid):
                 for field in instance.fields:
                     new_name = "server_"+str(field)
-                    in_dict[new_name] = instance[field]
+                    try:
+                        in_dict[new_name] = instance[field]
+                    except NotImplementedError:
+                        LOG.debug("Attribute %s for Instance: %s is not "
+                                  "provided", field, instance.uuid)
                 if in_dict != {}:
                     deep_in_dict = in_dict.copy()
                     ret_list.append(deep_in_dict)

watcher/decision_engine/strategy/strategies/zone_migration.py

@@ -381,16 +381,36 @@ class ZoneMigration(base.ZoneMigrationBaseStrategy):
             if node.get("src_node") == src_node:
                 return node.get("dst_node")
 
-    def get_dst_pool_and_type(self, src_pool):
+    def get_dst_pool_and_type(self, src_pool, src_type):
         """Get destination pool and type from self.migration_storage_pools
 
         :param src_pool: storage pool name
-        :returns: set of storage pool name and volume type name
+        :param src_type: storage volume type
+        :returns: set of storage dst pool name and dst volume type name, any
+        of those values can be None if no match for it is found in the
+        input_parameters
         """
+        src_pool_type_inputs = []
+        src_pool_inputs = []
         for pool in self.migrate_storage_pools:
+            if pool.get("src_type") is None:
+                src_pool_inputs.append(pool)
+            else:
+                src_pool_type_inputs.append(pool)
+
+        pool_to_check = (src_pool, src_type)
+        # First pass: prefer exact match (both src_pool and src_type)
+        for pool in src_pool_type_inputs:
+            user_pool = (pool.get("src_pool"), pool.get("src_type"))
+            if pool_to_check == user_pool:
+                return (pool.get("dst_pool"), pool.get("dst_type"))
+
+        # Second pass: fall back to matching just src_pool
+        for pool in src_pool_inputs:
             if pool.get("src_pool") == src_pool:
-                return (pool.get("dst_pool", None),
-                        pool.get("dst_type"))
+                return (pool.get("dst_pool"), pool.get("dst_type"))
+
+        return (None, None)
 
     def volumes_migration(self, volumes, action_counter, instance_targets=[]):
         instance_target_ids = {instance.id for instance in instance_targets}
@@ -406,17 +426,20 @@ class ZoneMigration(base.ZoneMigrationBaseStrategy):
                 continue
 
             src_type = volume.volume_type
-            dst_pool, dst_type = self.get_dst_pool_and_type(pool)
+            dst_pool, dst_type = self.get_dst_pool_and_type(pool, src_type)
             LOG.debug(src_type)
             LOG.debug("%s %s", dst_pool, dst_type)
 
-            if src_type == dst_type:
+            if dst_type is None or src_type == dst_type:
                 if dst_pool is None:
-                    LOG.warning("volume %s will not be migrated because "
-                                "it already has type %s and 'dst_pool'"
-                                " was not specified for src_pool %s",
-                                volume.name, dst_type,
-                                pool)
+                    type_msg = (
+                        "" if dst_type is None else
+                        f"it already has type {dst_type} and ")
+                    LOG.info(
+                        "volume %s will not be migrated because %s'dst_pool' "
+                        "was not specified for src_pool %s",
+                        volume.name, type_msg, pool
+                    )
                     continue
                 self._volume_migrate(volume, dst_pool)
             else:

watcher/tests/api/v1/test_audits.py

@@ -1394,6 +1394,39 @@ class TestAuditZoneMigration(TestPostBase):
             self.assertIn(expected_error_msg, response.json['error_message'])
         mock_trigger_audit.assert_not_called()
 
+    @mock.patch.object(deapi.DecisionEngineAPI, 'trigger_audit')
+    def test_create_audit_zone_migration_no_dst_pool_dst_type(
+        self, mock_trigger_audit
+    ):
+        """Verify zone migration rejects no destination parameters.
+
+        Tests that an audit creation fails with BAD_REQUEST when neither
+        dst_type nor dst_pool are passed in the input parameters. This
+        validates the schema correctly enforces that the at least one
+        destination parameters is present.
+        """
+        mock_trigger_audit.return_value = mock.ANY
+        zm_params = {
+            'storage_pools': [
+                    {"src_type": "src_type_name",
+                     "src_pool": "src_pool_name"}
+                ]
+            }
+
+        audit_input_dict = self._prepare_audit_params(zm_params)
+
+        response = self.post_json('/audits', audit_input_dict,
+                                  expect_errors=True)
+        self.assertEqual("application/json", response.content_type)
+        self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int)
+        expected_error_msgs = (
+            "is not valid under any of the given schemas",
+            "Failed validating 'oneOf' in schema"
+        )
+        for expected_error_msg in expected_error_msgs:
+            self.assertIn(expected_error_msg, response.json['error_message'])
+        mock_trigger_audit.assert_not_called()
+
     @mock.patch.object(deapi.DecisionEngineAPI, 'trigger_audit')
     def test_create_audit_zone_migration_with_multiple_valid_inputs(
         self, mock_trigger_audit

watcher/tests/common/test_cinder_helper.py

@@ -21,6 +21,9 @@ from http import HTTPStatus
 import time
 
 from cinderclient import exceptions as cinder_exception
+from cinderclient.v3.pools import Pool as CinderPool
+from cinderclient.v3.volume_types import VolumeType as CinderVolType
+from cinderclient.v3.volumes import Volume as CinderVolume
 
 from watcher.common import cinder_helper
 from watcher.common import clients
@@ -67,8 +70,20 @@ class TestCinderHelper(base.TestCase):
 
     @staticmethod
     def fake_pool(**kwargs):
-        pool = mock.MagicMock()
+        pool = mock.MagicMock(spec=CinderPool)
         pool.name = kwargs.get('name', 'host@backend#pool')
+        host_backend = pool.name.split('#')[0]
+        default_capabilities = {
+            'volume_backend_name': host_backend.split('@')[1]
+        }
+        pool.capabilities = kwargs.get('capabilities', default_capabilities)
+
+        def _to_dict():
+            return {
+                'name': pool.name,
+                'capabilities': pool.capabilities
+            }
+        pool.to_dict = _to_dict
 
         return pool
 
@@ -98,7 +113,7 @@ class TestCinderHelper(base.TestCase):
 
     @staticmethod
     def fake_volume_type(**kwargs):
-        volume_type = mock.MagicMock()
+        volume_type = mock.MagicMock(spec=CinderVolType)
         volume_type.name = kwargs.get('name', 'fake_type')
         extra_specs = {'volume_backend_name': 'backend'}
         volume_type.extra_specs = kwargs.get('extra_specs', extra_specs)
@@ -133,7 +148,7 @@ class TestCinderHelper(base.TestCase):
 
     @staticmethod
     def fake_volume(**kwargs):
-        volume = mock.MagicMock()
+        volume = mock.MagicMock(spec=CinderVolume)
         volume.id = kwargs.get('id', '45a37aeb-95ab-4ddb-a305-7d9f62c2f5ba')
         volume.name = kwargs.get('name', 'fakename')
         volume.size = kwargs.get('size', '1')
@@ -142,51 +157,72 @@ class TestCinderHelper(base.TestCase):
         volume.availability_zone = kwargs.get('availability_zone', 'nova')
         volume.volume_type = kwargs.get('volume_type', 'fake_type')
         volume.migration_status = kwargs.get('migration_status')
-        volume.os_vol_host_attr_host = kwargs.get('os_vol_host_attr_host')
+        setattr(
+            volume, 'os-vol-host-attr:host',
+            kwargs.get('os_vol_host_attr_host')
+        )
         return volume
 
     @mock.patch.object(time, 'sleep', mock.Mock())
-    def test_migrate_success(self, mock_cinder):
+    @mock.patch.object(cinder_helper.CinderHelper, 'get_storage_pool_by_name')
+    def test_migrate_success(self, mock_get_pool, mock_cinder):
 
         cinder_util = cinder_helper.CinderHelper()
 
-        volume = self.fake_volume()
-        setattr(volume, 'os-vol-host-attr:host', 'source_node')
-        setattr(volume, 'migration_status', 'success')
+        volume = self.fake_volume(
+            os_vol_host_attr_host='source_node',
+            migration_status='success'
+        )
         cinder_util.cinder.volumes.get.return_value = volume
 
         volume_type = self.fake_volume_type()
         cinder_util.cinder.volume_types.list.return_value = [volume_type]
+        mock_pool = self.fake_pool()
+        mock_get_pool.return_value = mock_pool
 
         result = cinder_util.migrate(volume, 'host@backend#pool')
+        mock_get_pool.assert_called_once_with('host@backend#pool')
         self.assertTrue(result)
 
     @mock.patch.object(time, 'sleep', mock.Mock())
-    def test_migrate_fail(self, mock_cinder):
+    @mock.patch.object(cinder_helper.CinderHelper, 'get_storage_pool_by_name')
+    def test_migrate_fail(self, mock_get_pool, mock_cinder):
 
         cinder_util = cinder_helper.CinderHelper()
 
         volume = self.fake_volume()
         cinder_util.cinder.volumes.get.return_value = volume
+        mock_pool = self.fake_pool()
+        mock_get_pool.return_value = mock_pool
 
-        volume_type = self.fake_volume_type()
-        volume_type.name = 'notbackend'
+        volume_type = self.fake_volume_type(
+            name='notbackend',
+            extra_specs={'volume_backend_name': 'diff_backend'}
+        )
         cinder_util.cinder.volume_types.list.return_value = [volume_type]
 
         self.assertRaisesRegex(
             exception.Invalid,
-            "Volume type must be same for migrating",
+            "Volume type 'fake_type' is not compatible with destination "
+            "pool 'host@backend#pool'",
             cinder_util.migrate, volume, 'host@backend#pool')
 
-        volume = self.fake_volume()
-        setattr(volume, 'os-vol-host-attr:host', 'source_node')
-        setattr(volume, 'migration_status', 'error')
+        volume = self.fake_volume(
+            migration_status='error',
+            os_vol_host_attr_host='source_node'
+        )
         cinder_util.cinder.volumes.get.return_value = volume
 
-        volume_type = self.fake_volume_type()
+        # check that a volume type without any volume_backend_name passes the
+        # volume type check and proceeds to the migration
+        volume_type = self.fake_volume_type(extra_specs={})
         cinder_util.cinder.volume_types.list.return_value = [volume_type]
 
         result = cinder_util.migrate(volume, 'host@backend#pool')
+        mock_get_pool.assert_called_with('host@backend#pool')
+        cinder_util.cinder.volumes.migrate_volume.assert_called_with(
+            volume, 'host@backend#pool', False, True
+        )
         self.assertFalse(result)
 
     @mock.patch.object(time, 'sleep', mock.Mock())
@@ -607,3 +643,157 @@ class TestCinderHelper(base.TestCase):
             "Volume migration error on volume %(volume)s.",
             {'volume': volume.id})
         self.assertFalse(result)
+
+    def test_get_volume_types_for_pool_matching_backend(
+            self, mock_cinder):
+        """Test matching backend and no extra_specs are selected."""
+        cinder_util = cinder_helper.CinderHelper()
+        pool = self.fake_pool(
+            name='host@backend#pool',
+            capabilities={'volume_backend_name': 'backend'}
+        )
+        volume_type1 = self.fake_volume_type(
+            name='type_matching',
+            extra_specs={'volume_backend_name': 'backend'}
+        )
+        volume_type2 = self.fake_volume_type(
+            name='type_no_specs',
+            extra_specs={}
+        )
+        cinder_util.cinder.volume_types.list.return_value = [
+            volume_type1, volume_type2
+        ]
+        result = cinder_util.get_volume_types_for_pool(
+            pool.to_dict())
+        self.assertEqual(
+            sorted(result),
+            ['type_matching', 'type_no_specs'])
+
+    def test_get_volume_types_for_pool_different_backend(
+            self, mock_cinder):
+        """Test different backend is excluded, no specs is included."""
+        cinder_util = cinder_helper.CinderHelper()
+        pool = self.fake_pool(
+            name='host@backend#pool',
+            capabilities={'volume_backend_name': 'backend'}
+        )
+        volume_type1 = self.fake_volume_type(
+            name='type_no_specs',
+            extra_specs={}
+        )
+        volume_type2 = self.fake_volume_type(
+            name='type_different_backend',
+            extra_specs={'volume_backend_name': 'different_backend'}
+        )
+        cinder_util.cinder.volume_types.list.return_value = [
+            volume_type1, volume_type2
+        ]
+        result = cinder_util.get_volume_types_for_pool(
+            pool.to_dict())
+        self.assertEqual(result, ['type_no_specs'])
+
+    def test_get_volume_types_for_pool_matching_capability(
+            self, mock_cinder):
+        """Test volume type with matching capability is selected."""
+        cinder_util = cinder_helper.CinderHelper()
+        pool = self.fake_pool(
+            name='host@backend#pool',
+            capabilities={'disk_speed': 'fast'}
+        )
+        volume_type = self.fake_volume_type(
+            name='type_fast_disk',
+            extra_specs={'disk_speed': 'fast'}
+        )
+        cinder_util.cinder.volume_types.list.return_value = [
+            volume_type]
+        result = cinder_util.get_volume_types_for_pool(
+            pool.to_dict())
+        self.assertEqual(result, ['type_fast_disk'])
+
+    def test_get_volume_types_for_pool_mismatched_capability(
+            self, mock_cinder):
+        """Test volume type with different capability value excluded."""
+        cinder_util = cinder_helper.CinderHelper()
+        pool = self.fake_pool(
+            name='host@backend#pool',
+            capabilities={'disk_speed': 'fast'}
+        )
+        volume_type = self.fake_volume_type(
+            name='type_slow_disk',
+            extra_specs={'disk_speed': 'slow'}
+        )
+        cinder_util.cinder.volume_types.list.return_value = [
+            volume_type]
+        result = cinder_util.get_volume_types_for_pool(
+            pool.to_dict())
+        self.assertEqual([], result)
+
+    def test_get_volume_types_for_pool_no_capabilities(
+            self, mock_cinder):
+        """Test pool with no capabilities selects no-specs types."""
+        cinder_util = cinder_helper.CinderHelper()
+        pool = self.fake_pool(
+            name='host@backend#pool',
+            capabilities={}
+        )
+        volume_type1 = self.fake_volume_type(
+            name='type_no_specs',
+            extra_specs={}
+        )
+        volume_type2 = self.fake_volume_type(
+            name='type_with_specs',
+            extra_specs={'volume_backend_name': 'backend'}
+        )
+        cinder_util.cinder.volume_types.list.return_value = [
+            volume_type1, volume_type2
+        ]
+        result = cinder_util.get_volume_types_for_pool(
+            pool.to_dict())
+        self.assertEqual(result, ['type_no_specs', 'type_with_specs'])
+
+    def test_get_volume_types_for_pool_requirements_not_in_caps(
+            self, mock_cinder):
+        """Test volume type with requirements not in pool capabilities."""
+        cinder_util = cinder_helper.CinderHelper()
+        pool = self.fake_pool(
+            name='host@backend#pool',
+            capabilities={'volume_backend_name': 'backend'}
+        )
+        volume_type = self.fake_volume_type(
+            name='type_extra_reqs',
+            extra_specs={
+                'volume_backend_name': 'backend',
+                'disk_speed': 'fast',
+            }
+        )
+        cinder_util.cinder.volume_types.list.return_value = [
+            volume_type]
+        result = cinder_util.get_volume_types_for_pool(
+            pool.to_dict())
+        self.assertEqual(result, ['type_extra_reqs'])
+
+    def test_get_volume_types_for_pool_multiple_specs_partial_match(
+            self, mock_cinder):
+        """Test volume type with multiple extra_specs partial match."""
+        cinder_util = cinder_helper.CinderHelper()
+        pool = self.fake_pool(
+            name='host@backend#pool',
+            capabilities={
+                'volume_backend_name': 'backend',
+                'disk_speed': 'fast',
+                'compression': 'enabled',
+            }
+        )
+        volume_type = self.fake_volume_type(
+            name='type_partial',
+            extra_specs={
+                'volume_backend_name': 'backend',
+                'disk_speed': 'slow',
+                'compression': 'enabled',
+            }
+        )
+        cinder_util.cinder.volume_types.list.return_value = [
+            volume_type]
+        result = cinder_util.get_volume_types_for_pool(
+            pool.to_dict())
+        self.assertEqual([], result)

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/test_model.py

@@ -66,18 +66,21 @@ class TestModel(base.TestCase):
 
     @mock.patch.object(model_root.ModelRoot, 'get_all_compute_nodes')
     @mock.patch.object(model_root.ModelRoot, 'get_node_instances')
-    def test_get_model_to_list(self, mock_instances, mock_nodes):
-        fake_compute_node = mock.MagicMock(
-            uuid='fake_node_uuid',
-            fields=['uuid'])
-        fake_instance = mock.MagicMock(
-            uuid='fake_instance_uuid',
-            fields=['uuid'])
+    @mock.patch('watcher.decision_engine.model.model_root.LOG')
+    def test_get_model_to_list(self, mock_log, mock_instances, mock_nodes):
+        fake_compute_node = element.ComputeNode(
+            uuid='fake_node_uuid', hostname="hostname0")
+        fake_instance = element.Instance(
+            uuid='fake_instance_uuid')
 
         mock_nodes.return_value = {'fake_node_uuid': fake_compute_node}
         mock_instances.return_value = [fake_instance]
 
-        expected_keys = ['server_uuid', 'node_uuid']
+        expected_keys = [
+            'server_uuid', 'node_uuid', 'node_state', 'node_hostname',
+            'node_status', 'server_flavor_extra_specs', 'server_locked',
+            'server_pinned_az', 'server_state', 'server_watcher_exclude'
+        ]
 
         result = model_root.ModelRoot().to_list()
         self.assertEqual(1, len(result))
@@ -85,10 +88,20 @@ class TestModel(base.TestCase):
         result_keys = result[0].keys()
         self.assertEqual(sorted(expected_keys), sorted(result_keys))
 
+        mock_log.debug.assert_any_call(
+            'Attribute %s for Instance: %s is not provided', 'name',
+            'fake_instance_uuid'
+        )
+        mock_log.debug.assert_any_call(
+            'Attribute %s for Compute: %s is not provided', 'memory',
+            'hostname0'
+        )
+
         # test compute node has no instance
         mock_instances.return_value = []
 
-        expected_keys = ['node_uuid']
+        expected_keys = ['node_hostname', 'node_status',
+                         'node_state', 'node_uuid']
 
         result = model_root.ModelRoot().to_list()
         self.assertEqual(1, len(result))
@@ -96,6 +109,23 @@ class TestModel(base.TestCase):
         result_keys = result[0].keys()
         self.assertEqual(expected_keys, list(result_keys))
 
+    def test_model_to_list_all_fields(self):
+        struct_str = self.load_data('scenario_1.xml')
+        model = model_root.ModelRoot.from_xml(struct_str)
+        model_list = model.to_list()
+        self.assertIsInstance(model_list, list)
+        self.assertEqual(len(model_list), 8)
+        self.assertEqual(model_list[0]['server_uuid'], 'INSTANCE_0')
+
+    def test_model_to_xml_all_fields(self):
+        struct_str = self.load_data('scenario_2_with_metrics.xml')
+
+        model = model_root.ModelRoot.from_xml(struct_str)
+        model_xml = model.to_xml()
+        self.assertIsInstance(model_xml, str)
+        self.assertIn('Instance', model_xml)
+        self.assertIn('Compute', model_xml)
+
     def test_get_node_by_instance_uuid(self):
         model = model_root.ModelRoot()
         uuid_ = "{0}".format(uuidutils.generate_uuid())

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

@@ -549,6 +549,30 @@ class TestZoneMigration(TestBaseStrategy):
         global_efficacy_value = solution.global_efficacy[2].get('value', 0)
         self.assertEqual(100, global_efficacy_value)
 
+    def test_execute_migrate_volume_no_dst_type(self):
+        volume_on_src1 = self.fake_volume(host="src1@back1#pool1",
+                                          id=volume_uuid_mapping["volume_1"],
+                                          name="volume_1")
+        self.m_c_helper.get_volume_list.return_value = [
+            volume_on_src1,
+        ]
+
+        self.m_n_helper.get_instance_list.return_value = []
+
+        self.input_parameters["storage_pools"] = [
+            {"src_pool": "src1@back1#pool1",
+             "src_type": "type1", "dst_pool": "dst1@back1#pool1"},
+        ]
+
+        solution = self.strategy.execute()
+
+        migration_types = collections.Counter(
+            [action.get('input_parameters')['migration_type']
+             for action in solution.actions])
+        self.assertEqual(1, migration_types.get("migrate", 0))
+        global_efficacy_value = solution.global_efficacy[2].get('value', 0)
+        self.assertEqual(100, global_efficacy_value)
+
     def test_execute_migrate_volume_no_dst_pool(self):
         volume_on_src1 = self.fake_volume(host="src1@back1#pool1",
                                           id=volume_uuid_mapping["volume_1"],
@@ -1549,3 +1573,88 @@ class TestZoneMigration(TestBaseStrategy):
         targets = self.strategy.filtered_targets()
         self.assertEqual(targets.get("volume"),
                          [volume_on_src2, volume_on_src1])
+
+    def test_get_dst_pool_and_type_matching_src_pool_type(self):
+        self.input_parameters["storage_pools"] = [
+            {
+                "src_pool": "src1@back1#pool1",
+                "src_type": "type1",
+                "dst_pool": "dst1@back1#pool1",
+            },
+            {
+                "src_pool": "src1@back1#pool1",
+                "src_type": "type2", "dst_type": "type3"
+            }
+        ]
+        pool = "src1@back1#pool1"
+        src_type = "type1"
+        dst_pool, dst_type = self.strategy.get_dst_pool_and_type(
+            pool, src_type
+        )
+        self.assertEqual(dst_pool, "dst1@back1#pool1")
+        self.assertIsNone(dst_type)
+
+    def test_get_dst_pool_and_type_matching_src_pool(self):
+        self.input_parameters["storage_pools"] = [
+            {
+                "src_pool": "src1@back1#pool1",
+                "src_type": "type1",
+                "dst_pool": "dst1@back1#pool1",
+            },
+            {
+                "src_pool": "src1@back1#pool1",
+                "dst_pool": "dst2@back2#pool2"
+            }
+        ]
+        pool = "src1@back1#pool1"
+        src_type = "type1"
+        dst_pool, dst_type = self.strategy.get_dst_pool_and_type(
+            pool, src_type
+        )
+        self.assertEqual(dst_pool, "dst1@back1#pool1")
+        self.assertIsNone(dst_type)
+
+        # check that after not matching type it falls backs to matching
+        # src_pool
+        pool = "src1@back1#pool1"
+        src_type = "typet"
+        dst_pool, dst_type = self.strategy.get_dst_pool_and_type(
+            pool, src_type
+        )
+        self.assertEqual(dst_pool, "dst2@back2#pool2")
+        self.assertIsNone(dst_type)
+
+    def test_get_dst_pool_and_type_not_matching_pool(self):
+        pool = "src3@back1#pool1"
+        src_type = "type5"
+        dst_pool, dst_type = self.strategy.get_dst_pool_and_type(
+            pool, src_type
+        )
+        self.assertIsNone(dst_pool)
+        self.assertIsNone(dst_type)
+
+    def test_get_dst_pool_and_type_same_src_pool_different_src_type(self):
+        self.input_parameters["storage_pools"] = [
+            {
+                "src_pool": "src1@back1#pool1",
+                "src_type": "type1",
+                "dst_pool": "dst1@back1#pool1",
+            },
+            {
+                "src_pool": "src1@back1#pool1",
+                "src_type": "type2", "dst_type": "type3"
+            }
+        ]
+        pool = "src1@back1#pool1"
+        src_type = "type2"
+        dst_pool, dst_type = self.strategy.get_dst_pool_and_type(
+            pool, src_type
+        )
+        self.assertIsNone(dst_pool)
+        self.assertEqual(dst_type, "type3")
+        src_type = "type1"
+        dst_pool, dst_type = self.strategy.get_dst_pool_and_type(
+            pool, src_type
+        )
+        self.assertEqual(dst_pool, "dst1@back1#pool1")
+        self.assertIsNone(dst_type)

python_watcher-15.1.0.dist-info/pbr.json

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