From 77b516acac5c7130177e5de5a720cf41e62f3b8b Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Fri, 2 Oct 2020 12:48:40 +0200 Subject: [PATCH] Add AZ resource metadata for volume size polling Change-Id: I18c2a212a3f4c3ebb55c882c403ac4c374596657 --- ceilometer/tests/unit/volume/test_cinder.py | 2 ++ ceilometer/volume/cinder.py | 1 + ...olume-size-poller-availability_zone-2d20a7527e2341b9.yaml | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 releasenotes/notes/cinder-volume-size-poller-availability_zone-2d20a7527e2341b9.yaml diff --git a/ceilometer/tests/unit/volume/test_cinder.py b/ceilometer/tests/unit/volume/test_cinder.py index 44e661195b..4473f84b3b 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 10cf6f3164..06d5fca052 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', diff --git a/releasenotes/notes/cinder-volume-size-poller-availability_zone-2d20a7527e2341b9.yaml b/releasenotes/notes/cinder-volume-size-poller-availability_zone-2d20a7527e2341b9.yaml new file mode 100644 index 0000000000..a929dfa3b5 --- /dev/null +++ b/releasenotes/notes/cinder-volume-size-poller-availability_zone-2d20a7527e2341b9.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The resource metadata for the Cinder volume size poller now includes + the availability zone field.