python-watcher 11.0.0__py3-none-any.whl → 11.0.1__py3-none-any.whl

{python_watcher-11.0.0.dist-info → python_watcher-11.0.1.dist-info}/AUTHORS

@@ -57,6 +57,7 @@ Lance Bragstad <lbragstad@gmail.com>
 Larry Rensing <lr699s@att.com>
 LiXiangyu <lixiangyu@cmss.chinamobile.com>
 Lin Yang <lin.a.yang@intel.com>
+Lucian Petrut <lpetrut@cloudbasesolutions.com>
 Luigi Toscano <ltoscano@redhat.com>
 Luong Anh Tuan <tuanla@vn.fujitsu.com>
 M V P Nitesh <m.nitesh@nectechnologies.in>

{python_watcher-11.0.0.dist-info → python_watcher-11.0.1.dist-info}/METADATA

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
 Name: python-watcher
-Version: 11.0.0
+Version: 11.0.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
 Author-email: openstack-discuss@lists.openstack.org
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Environment :: OpenStack
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: System Administrators
@@ -20,50 +18,52 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.6
-Requires-Dist: PasteDeploy (>=1.5.2)
-Requires-Dist: PrettyTable (>=0.7.2)
-Requires-Dist: SQLAlchemy (>=1.2.5)
-Requires-Dist: WSME (>=0.9.2)
-Requires-Dist: WebOb (>=1.8.5)
-Requires-Dist: apscheduler (>=3.5.1)
-Requires-Dist: croniter (>=0.3.20)
-Requires-Dist: futurist (>=1.8.0)
-Requires-Dist: gnocchiclient (>=7.0.1)
-Requires-Dist: jsonpatch (>=1.21)
-Requires-Dist: jsonschema (>=3.2.0)
-Requires-Dist: keystoneauth1 (>=3.4.0)
-Requires-Dist: keystonemiddleware (>=4.21.0)
-Requires-Dist: lxml (>=4.5.1)
-Requires-Dist: microversion-parse (>=0.2.1)
-Requires-Dist: networkx (>=2.4)
-Requires-Dist: os-resource-classes (>=0.4.0)
-Requires-Dist: oslo.cache (>=1.29.0)
-Requires-Dist: oslo.concurrency (>=3.26.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 (>=3.6.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 (>=3.36.0)
-Requires-Dist: oslo.versionedobjects (>=1.32.0)
-Requires-Dist: pbr (>=3.1.1)
-Requires-Dist: pecan (>=1.3.2)
-Requires-Dist: python-cinderclient (>=3.5.0)
-Requires-Dist: python-glanceclient (>=2.9.1)
-Requires-Dist: python-ironicclient (>=2.5.0)
-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-openstackclient (>=3.14.0)
-Requires-Dist: stevedore (>=1.28.0)
-Requires-Dist: taskflow (>=3.8.0)
+License-File: LICENSE
+License-File: AUTHORS
+Requires-Dist: apscheduler >=3.5.1
+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 >=3.6.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 >=3.36.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-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
 
 =======
 Watcher
@@ -95,5 +95,3 @@ migration, increased energy efficiency and more!
 * Release notes: https://docs.openstack.org/releasenotes/watcher/
 * Design specifications: https://specs.openstack.org/openstack/watcher-specs/
 
-
-

{python_watcher-11.0.0.dist-info → python_watcher-11.0.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-python_watcher-11.0.0.data/data/etc/apache2/watcher,sha256=urybYUTb0kAVIvbm4WK5oDfXR82QSK2lyMl4Z9dCz4Q,1190
-python_watcher-11.0.0.data/data/etc/watcher/README-watcher.conf.txt,sha256=EIa_sjXDyl1XSg0ovsFwUjqw0euS0N2PYn4HtyBGJME,131
-python_watcher-11.0.0.data/data/etc/watcher/oslo-config-generator/watcher.conf,sha256=O7g1DZqgXvbQgkBfot0dR1ar1d-3SBkOU_ZK4Dz7SFc,406
-python_watcher-11.0.0.data/data/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf,sha256=ZfIuVdtrj7IZm2BrRQvAW3JOL_kqCiILf-vBmwX3ufw,76
-python_watcher-11.0.0.data/scripts/watcher-api-wsgi,sha256=YcIpUO3iRVW6Fu3Md_ooAeHkmJJasG031naMdf8cv2A,1829
+python_watcher-11.0.1.data/data/etc/apache2/watcher,sha256=urybYUTb0kAVIvbm4WK5oDfXR82QSK2lyMl4Z9dCz4Q,1190
+python_watcher-11.0.1.data/data/etc/watcher/README-watcher.conf.txt,sha256=EIa_sjXDyl1XSg0ovsFwUjqw0euS0N2PYn4HtyBGJME,131
+python_watcher-11.0.1.data/data/etc/watcher/oslo-config-generator/watcher.conf,sha256=O7g1DZqgXvbQgkBfot0dR1ar1d-3SBkOU_ZK4Dz7SFc,406
+python_watcher-11.0.1.data/data/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf,sha256=ZfIuVdtrj7IZm2BrRQvAW3JOL_kqCiILf-vBmwX3ufw,76
+python_watcher-11.0.1.data/scripts/watcher-api-wsgi,sha256=YcIpUO3iRVW6Fu3Md_ooAeHkmJJasG031naMdf8cv2A,1829
 watcher/__init__.py,sha256=Vs2olXPZ_IAV1rukHYRl3ITzYFBNXX9mIUtFXkMWYwg,640
 watcher/_i18n.py,sha256=-25OcpwjDCiYdFIUJh86S7Sg0fs3wMIIjEreaGUyCyY,1295
 watcher/version.py,sha256=3bUsLHmwjNgOJ9hfzy5yQ67UGFOriUNFJqyh8lGQazE,760
@@ -166,7 +166,7 @@ watcher/decision_engine/audit/oneshot.py,sha256=hbcAofXAVEjC5HWJpKq8y1AEKuyFjk33
 watcher/decision_engine/datasources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/decision_engine/datasources/base.py,sha256=SdGgznrux59Dj-9yQ5Su4WdXctC_6RCoWrrD1yt8UaI,9376
 watcher/decision_engine/datasources/ceilometer.py,sha256=gvURZVkOl-RJ6M_-NAQzMopsrvzlUZZCITsMbQB08Aw,10668
-watcher/decision_engine/datasources/gnocchi.py,sha256=E5UJ9NOT1O-5i0KnkZP4sghl69M-nayW57hKqbxoj2c,8788
+watcher/decision_engine/datasources/gnocchi.py,sha256=3z2obHHAo-tFR05UmvNZBdtz3dAYUwK-nuYHky9iBL8,10162
 watcher/decision_engine/datasources/grafana.py,sha256=tzuswoqx_Yd2cBVR9r3QSH18RjDPIMZDhUETKaXpsp0,10287
 watcher/decision_engine/datasources/manager.py,sha256=3ovPD5qyzMW8YZeWki7gf6W5iu744fgl0G_XhmeOQqc,5680
 watcher/decision_engine/datasources/monasca.py,sha256=NtD_OV00uTUS5L3Vg1xJ_R0WhR1rHyueuXUeALMf_aU,6950
@@ -193,7 +193,7 @@ watcher/decision_engine/model/collector/base.py,sha256=t8S6gRd_uaV1GbBuGJLG4AvVw
 watcher/decision_engine/model/collector/cinder.py,sha256=B743mJca8gQiIu6QG9zaf_du3ihUY6iBv82W1EWoWgk,11683
 watcher/decision_engine/model/collector/ironic.py,sha256=XMcY9m-zUWyNtANnl_UZ-m1E9PWkt68V90zaRJl5Ba8,4037
 watcher/decision_engine/model/collector/manager.py,sha256=lEw6-CfyLPBmX97ZaZj7vEu1eHTzQU67oggoQo-KEoI,2327
-watcher/decision_engine/model/collector/nova.py,sha256=LRp1pX6HmbmGEpNhRmv0S-K9iynUzUKBgieJSqeQkf4,21542
+watcher/decision_engine/model/collector/nova.py,sha256=pmuxXBGEAgFr4Q_nh4L8uhaItNbvk2S8ulCXiU1HTr0,21616
 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=dYgFk33RSoylQbNjCmcwSIb3ZIDccVBpO8FFwqQEPBc,2063
@@ -253,7 +253,7 @@ watcher/decision_engine/strategy/strategies/saving_energy.py,sha256=beRAXqUumnkL
 watcher/decision_engine/strategy/strategies/storage_capacity_balance.py,sha256=a2C12V3LfISTJLEVFsjvrXWCXmv9knhmU5smzG0N-XE,15669
 watcher/decision_engine/strategy/strategies/uniform_airflow.py,sha256=8jaW5LGkM9dHb8q9aX_7_hQV-MOXHS2o6jyw9-Z6668,13390
 watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py,sha256=tFnVwAxuye5jLbt8vYElnQv-Hg5XuQSM-c0QDFJWlnA,23147
-watcher/decision_engine/strategy/strategies/workload_balance.py,sha256=hPoX5LbIjITQn43hjLg5Z_rr1a_vVzgJmgbYe5dglgA,14332
+watcher/decision_engine/strategy/strategies/workload_balance.py,sha256=MMJZkfi8kFJDT4Hcp-NTCclN1MMKj02t88OdMinWYnI,14333
 watcher/decision_engine/strategy/strategies/workload_stabilization.py,sha256=xKnjDeSAkGxvAuUKlxRGuaHVyBjSy-1nFcgI4ni8pnk,24902
 watcher/decision_engine/strategy/strategies/zone_migration.py,sha256=bNKarllyWVgtNMSIzckV2C4I9IFjQPHfgqdTiOTvEes,33189
 watcher/hacking/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -382,7 +382,7 @@ watcher/tests/decision_engine/cluster/test_cluster_data_model_collector.py,sha25
 watcher/tests/decision_engine/cluster/test_nova_cdmc.py,sha256=GtqTL9jfS5w6CvmZQUGYATtVtRcboHbzvasLGeMBkEA,19581
 watcher/tests/decision_engine/datasources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/tests/decision_engine/datasources/test_base.py,sha256=swGXWVrnypcsVB7eBqhHGqlX0ewkIWheVlX0NRBhMcE,2391
-watcher/tests/decision_engine/datasources/test_gnocchi_helper.py,sha256=fyBTVP29n1waFCBvFBNzOMUR5JAtL36dllYLP2WyaJw,8381
+watcher/tests/decision_engine/datasources/test_gnocchi_helper.py,sha256=CqvO0wcvmmBL3rXPW_x9D9RuQcQqNfYkHIlBQmK9z8M,8855
 watcher/tests/decision_engine/datasources/test_grafana_helper.py,sha256=NVGVlzjAtxOaJLL-1s1V0jETAc5_2QP0Hr0qb4TiEn0,11858
 watcher/tests/decision_engine/datasources/test_manager.py,sha256=_daZ57iHQI6PWkNHLV7H-B6_Ljk9d9xtzST7IcZ-E1c,6822
 watcher/tests/decision_engine/datasources/test_monasca_helper.py,sha256=toxxJCRCDgjvnN3wAXzdi6MPOCeMpKRikzXtcg-Oq0k,5697
@@ -529,11 +529,11 @@ watcher/tests/objects/test_scoring_engine.py,sha256=y_crleFQFOUKrqT9tSI1NIP7eEMs
 watcher/tests/objects/test_service.py,sha256=w8r6qgLJd0Vp3B774BInkWij4qUbMiykisIRSaxiqaA,5100
 watcher/tests/objects/test_strategy.py,sha256=WoJYFQD0LU7vkUT2MMy1bx3S6eY458aTICjoGRiPccI,7364
 watcher/tests/objects/utils.py,sha256=WtBFlXWIBRvl1keAjz1GtrkUWppil2pFIA-RngcqA5c,8058
-python_watcher-11.0.0.dist-info/AUTHORS,sha256=08XBbMJwOj9SJiMhnpHUCr96nKVexCsUY9OfZss9Y2s,7476
-python_watcher-11.0.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-python_watcher-11.0.0.dist-info/METADATA,sha256=bFi4zdopmPZDAnVCn5MmzMTTTQbTkORI7rMXzJuv4gI,3876
-python_watcher-11.0.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-python_watcher-11.0.0.dist-info/entry_points.txt,sha256=FCdhj8D9hluy9jjmwnwmFVumvMeOCv6n_IoOCHF8-WU,4397
-python_watcher-11.0.0.dist-info/pbr.json,sha256=EZscyvXwW8ULxvq17Kxh5LgPHkK-5G07mUZahS6SfXA,47
-python_watcher-11.0.0.dist-info/top_level.txt,sha256=O2B7Sbzshq5s-tZxb2a7VETvMDiJItSYieAiJ6Jm5yY,8
-python_watcher-11.0.0.dist-info/RECORD,,
+python_watcher-11.0.1.dist-info/AUTHORS,sha256=gYRreEvkTWbr4fksqrJEGcezpWZQYUY9Lq26sj1ptw4,7523
+python_watcher-11.0.1.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+python_watcher-11.0.1.dist-info/METADATA,sha256=NbWbsBGCXcHr6dy4L6BK_CKoZ-57hWQ2CpYz4ugwmNU,3795
+python_watcher-11.0.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+python_watcher-11.0.1.dist-info/entry_points.txt,sha256=PN53WKewBT3McXxlv--kAOX-3NWeJqYVy8wkeCR0orc,4396
+python_watcher-11.0.1.dist-info/pbr.json,sha256=0KtWf3M7hSupFcAuGBe-riFdCEB7bdUyG_DBEyNZ1OA,47
+python_watcher-11.0.1.dist-info/top_level.txt,sha256=O2B7Sbzshq5s-tZxb2a7VETvMDiJItSYieAiJ6Jm5yY,8
+python_watcher-11.0.1.dist-info/RECORD,,

{python_watcher-11.0.0.dist-info → python_watcher-11.0.1.dist-info}/WHEEL

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

{python_watcher-11.0.0.dist-info → python_watcher-11.0.1.dist-info}/entry_points.txt

@@ -78,4 +78,3 @@ taskflow = watcher.applier.workflow_engine.default:DefaultWorkFlowEngine
 
 [wsgi_scripts]
 watcher-api-wsgi = watcher.api.wsgi:initialize_wsgi_app
-

python_watcher-11.0.1.dist-info/pbr.json

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

watcher/decision_engine/datasources/gnocchi.py

@@ -38,7 +38,7 @@ class GnocchiHelper(base.DataSourceBase):
                       host_inlet_temp='hardware.ipmi.node.temperature',
                       host_airflow='hardware.ipmi.node.airflow',
                       host_power='hardware.ipmi.node.power',
-                      instance_cpu_usage='cpu_util',
+                      instance_cpu_usage='cpu',
                       instance_ram_usage='memory.resident',
                       instance_ram_allocated='memory',
                       instance_l3_cache_usage='cpu_l3_cache',
@@ -93,6 +93,25 @@ class GnocchiHelper(base.DataSourceBase):
 
             resource_id = resources[0]['id']
 
+        if meter_name == "instance_cpu_usage":
+            if resource_type != "instance":
+                LOG.warning("Unsupported resource type for metric "
+                            "'instance_cpu_usage': ", resource_type)
+                return
+
+            # The "cpu_util" gauge (percentage) metric has been removed.
+            # We're going to obtain the same result by using the rate of change
+            # aggregate operation.
+            if aggregate not in ("mean", "rate:mean"):
+                LOG.warning("Unsupported aggregate for instance_cpu_usage "
+                            "metric: %s. "
+                            "Supported aggregates: mean, rate:mean ",
+                            aggregate)
+                return
+
+            # TODO(lpetrut): consider supporting other aggregates.
+            aggregate = "rate:mean"
+
         raw_kwargs = dict(
             metric=meter,
             start=start_time,
@@ -117,6 +136,17 @@ class GnocchiHelper(base.DataSourceBase):
                 # Airflow from hardware.ipmi.node.airflow is reported as
                 # 1/10 th of actual CFM
                 return_value *= 10
+            if meter_name == "instance_cpu_usage":
+                # "rate:mean" can return negative values for migrated vms.
+                return_value = max(0, return_value)
+
+                # We're converting the cumulative cpu time (ns) to cpu usage
+                # percentage.
+                vcpus = resource.vcpus
+                if not vcpus:
+                    LOG.warning("instance vcpu count not set, assuming 1")
+                    vcpus = 1
+                return_value *= 100 / (granularity * 10e+8) / vcpus
 
         return return_value
 

watcher/decision_engine/model/collector/nova.py

@@ -48,7 +48,7 @@ class NovaClusterDataModelCollector(base.BaseClusterDataModelCollector):
                     "type": "array",
                     "items": {
                         "anyOf": [
-                            {"$ref": HOST_AGGREGATES + "id"},
+                            {"$ref": HOST_AGGREGATES + "host_aggr_id"},
                             {"$ref": HOST_AGGREGATES + "name"},
                         ]
                     }
@@ -98,7 +98,8 @@ class NovaClusterDataModelCollector(base.BaseClusterDataModelCollector):
                                 "type": "array",
                                 "items": {
                                     "anyOf": [
-                                        {"$ref": HOST_AGGREGATES + "id"},
+                                        {"$ref":
+                                            HOST_AGGREGATES + "host_aggr_id"},
                                         {"$ref": HOST_AGGREGATES + "name"},
                                     ]
                                 }
@@ -129,7 +130,7 @@ class NovaClusterDataModelCollector(base.BaseClusterDataModelCollector):
             "additionalProperties": False
         },
         "host_aggregates": {
-            "id": {
+            "host_aggr_id": {
                 "properties": {
                     "id": {
                         "oneOf": [

watcher/decision_engine/strategy/strategies/workload_balance.py

@@ -295,7 +295,7 @@ class WorkloadBalance(base.WorkloadStabilizationBaseStrategy):
                         self.threshold)
             return self.solution
 
-        # choose the server with largest cpu_util
+        # choose the server with largest cpu usage
         source_nodes = sorted(source_nodes,
                               reverse=True,
                               key=lambda x: (x[self._meter]))

watcher/tests/decision_engine/datasources/test_gnocchi_helper.py

@@ -40,17 +40,25 @@ class TestGnocchiHelper(base.BaseTestCase):
         self.addCleanup(stat_agg_patcher.stop)
 
     def test_gnocchi_statistic_aggregation(self, mock_gnocchi):
+        vcpus = 2
+        mock_instance = mock.Mock(
+            id='16a86790-327a-45f9-bc82-45839f062fdc',
+            vcpus=vcpus)
+
         gnocchi = mock.MagicMock()
+        # cpu time rate of change (ns)
+        mock_rate_measure = 360 * 10e+8 * vcpus * 5.5 / 100
         expected_result = 5.5
 
-        expected_measures = [["2017-02-02T09:00:00.000000", 360, 5.5]]
+        expected_measures = [
+            ["2017-02-02T09:00:00.000000", 360, mock_rate_measure]]
 
         gnocchi.metric.get_measures.return_value = expected_measures
         mock_gnocchi.return_value = gnocchi
 
         helper = gnocchi_helper.GnocchiHelper()
         result = helper.statistic_aggregation(
-            resource=mock.Mock(id='16a86790-327a-45f9-bc82-45839f062fdc'),
+            resource=mock_instance,
             resource_type='instance',
             meter_name='instance_cpu_usage',
             period=300,
@@ -59,6 +67,14 @@ class TestGnocchiHelper(base.BaseTestCase):
         )
         self.assertEqual(expected_result, result)
 
+        gnocchi.metric.get_measures.assert_called_once_with(
+            metric="cpu",
+            start=mock.ANY,
+            stop=mock.ANY,
+            resource_id=mock_instance.uuid,
+            granularity=360,
+            aggregation="rate:mean")
+
     def test_gnocchi_statistic_series(self, mock_gnocchi):
         gnocchi = mock.MagicMock()
         expected_result = {

python_watcher-11.0.0.dist-info/pbr.json

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