diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-09 08:01:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-09 08:01:52 +0000 |
| commit | e50b1462443189d9e1d03e6a1119d731217d40f3 (patch) | |
| tree | 30b1cd539df1d6211fa8c32794a6a5200eef15f0 /ceilometer | |
| parent | a23f2943ab58c18a7575922a9ea5b11022723c68 (diff) | |
| parent | 77b516acac5c7130177e5de5a720cf41e62f3b8b (diff) | |
| download | ceilometer-e50b1462443189d9e1d03e6a1119d731217d40f3.tar.gz | |
Merge "Add AZ resource metadata for volume size polling"
Diffstat (limited to 'ceilometer')
| -rw-r--r-- | ceilometer/tests/unit/volume/test_cinder.py | 2 | ||||
| -rw-r--r-- | ceilometer/volume/cinder.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ceilometer/tests/unit/volume/test_cinder.py b/ceilometer/tests/unit/volume/test_cinder.py index 44e66119..4473f84b 100644 --- a/ceilometer/tests/unit/volume/test_cinder.py +++ b/ceilometer/tests/unit/volume/test_cinder.py @@ -148,6 +148,8 @@ class TestVolumeSizePollster(base.BaseTestCase): self.assertEqual('1ae69721-d071-4156-a2bd-b11bb43ec2e3', volume_size_samples[0].resource_metadata ["instance_id"]) + self.assertEqual('nova', volume_size_samples[0].resource_metadata + ["availability_zone"]) class TestVolumeSnapshotSizePollster(base.BaseTestCase): diff --git a/ceilometer/volume/cinder.py b/ceilometer/volume/cinder.py index 10cf6f31..06d5fca0 100644 --- a/ceilometer/volume/cinder.py +++ b/ceilometer/volume/cinder.py @@ -39,6 +39,7 @@ class VolumeSizePollster(_Base): FIELDS = ['name', 'status', 'volume_type', + 'availability_zone', 'os-vol-host-attr:host', 'migration_status', 'attachments', |